feat:修改英文版的新闻

mobile/src/components/cinvoices/index.vue

@@ -41,7 +41,7 @@
         </div>
         <div class="address-input-item">
           <div class="address-sub">
-            <div class="top-title no-require">纳税人识别号</div>
+            <div class="top-title">纳税人识别号</div>
             <div class="ant-input">
               <input @blur="blurHandle" oninput="value=value.replace(/[^\d]/g,'')" maxlength='18' v-model="tempInvoice3.code" type="text" placeholder="请输入18位纳税人识别号" />
             </div>
@@ -123,15 +123,29 @@
         </div>
         <div class="address-input-item">
           <div class="address-sub">
+            <div class="top-title">抬头类型</div>
+            <div style="position: relative;">
+              <div class="invoice-select" @click="selected=!selected">
+              <div class="select-txt">{{ selectedTxt }}</div>
+              <i class="iconfont icon-xia"></i>
+            </div>
+            <ul class="invoice-item" :class="{'invoice-active':selected}">
+              <li v-for="(item,i) in invoiceType" :key="i" @click="handleItem(item)">{{item}}</li>
+            </ul>
+            </div>
+          </div>
+        </div>
+        <div class="address-input-item">
+          <div class="address-sub">
             <div class="top-title">发票抬头</div>
             <div class="ant-input">
               <input @blur="blurHandle" maxlength='15' v-model="tempInvoice2.title" type="text" placeholder="请输入发票抬头" />
             </div>
           </div>
         </div>
-        <div class="address-input-item">
+        <div class="address-input-item" v-if="selectedTxt === '企业'">
           <div class="address-sub">
-            <div class="top-title no-require">纳税人识别号</div>
+            <div class="top-title">纳税人识别号</div>
             <div class="ant-input">
               <input @blur="blurHandle" oninput="value=value.replace(/[^\d]/g,'')" maxlength='18' v-model="tempInvoice2.code" type="text" placeholder="请输入18位纳税人识别号" />
             </div>
@@ -185,7 +199,10 @@ export default {
   data () {
     return {
       isShowInvoice3: true,
-      isShowInvoice2: true
+      isShowInvoice2: true,
+      selected: false,
+      invoiceType: ['个人', '企业'],
+      selectedTxt: '个人'
     }
   },
   watch: {
@@ -219,9 +236,12 @@ export default {
         let title = isObject(this.tempInvoice2.title)
         let code = isObject(this.tempInvoice2.code)
         let emailAddress = isObject(this.tempInvoice2.emailAddress)
-        if (code && code.length !== 18) {
+        if (this.selectedTxt !== '个人' && (!code || code.length !== 18)) {
           return this.$toast.show('warn', this.langToast['21'])
         }
+        if (this.selectedTxt === '个人') {
+          code = ''
+        }
         if (!reg.email.test(emailAddress)) {
           return this.$toast.show('warn', this.langToast['8'])
         }
@@ -331,6 +351,10 @@ export default {
             }
           })
         })
+    },
+    handleItem (item) {
+      this.selectedTxt = item
+      this.selected = false
     }
   }
 }

mobile/src/lang/en/modules/conduct.js

@@ -42,8 +42,8 @@ module.exports = {
         "itemTitle4": "Statistic Data Flow, Analyze User Persona"
     },
     "conductSubject": {
-        "bannerTitle": "Culture & Relics",
-        bannerSubTitle: 'Help to Create<br/>Never-ending Museums',
+        "bannerTitle": "Museum",
+        bannerSubTitle: 'Culture & Relics, Create<br/>Never-ending Museums',
         "itemTitle1": "Digital Twin of Treasure Relics，Break the Time Limitation",
         "itemTitle2": "Various Forms of Spatial Interaction, Carrying Rich Historical Heritage",
         "itemTitle3": "Simultaneous Operation by Multi-user, Listening to Historical Stories",

mobile/src/lang/zh/modules/conduct.js

@@ -54,7 +54,7 @@ module.exports = {
         item5SubItem3Title: '南昌汉代海昏侯国考古成果展'
     },
     "conductShop": {
-        "bannerTitle": "四维看店",
+        "bannerTitle": "看店",
         bannerSubTitle: '宅家中 云逛街 轻松买',
         "itemTitle1": "3D数字化商圈沉浸式购物新体验",
         "itemTitle2": "真实复刻空间手机一点就逛",

mobile/src/pages/account/forget/components/style.scss

@@ -49,6 +49,8 @@ input[type='password']{
       border-bottom: none;
       position: absolute;
       right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
     }
   }
   img{

mobile/src/pages/account/mailRegister/style.scss

@@ -49,6 +49,8 @@ input[type='password']{
       border-bottom: none;
       position: absolute;
       right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
     }
   }
   img{

mobile/src/pages/account/register/style.scss

@@ -49,6 +49,8 @@ input[type='password']{
       border-bottom: none;
       position: absolute;
       right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
     }
   }
   img{

mobile/src/pages/home/components/plate5.vue

@@ -28,7 +28,8 @@
 </template>
 
 <script>
-import { News } from '@/../../common/data/newsData'
+import { News, EnNews } from '@/../../common/data/newsData'
+import { mapState } from 'vuex'
 export default {
   data () {
     return {
@@ -40,6 +41,14 @@ export default {
       }
     }
   },
+  computed: {
+    ...mapState({
+      language: state => state.language.current
+    })
+  },
+  mounted () {
+    this.newsData = this.language === 'zh' ? News.slice(0, 4) : EnNews.slice(0, 4)
+  },
   methods: {
     toLink ({link}) {
       window.open(link)

mobile/src/pages/location/index.vue

@@ -85,6 +85,12 @@ export default {
     }
   },
   mounted () {
+    if (this.language !== 'zh') {
+      this.plate2List = this.plate2List.map(item => {
+        item.iframeLink = item.iframeLink + '&lang=en'
+        return item
+      })
+    }
   },
   beforeDestroy () {
   }

mobile/src/pages/news/index.vue

@@ -29,11 +29,12 @@
 </template>
 
 <script>
-import { News } from '@/../../common/data/newsData'
+import { News, EnNews } from '@/../../common/data/newsData'
+import { mapState } from 'vuex'
 export default {
   data () {
     return {
-      newsList: News,
+      newsList: [],
       activeIndex: 0,
       swiperOption: {
         autoplay: {
@@ -66,10 +67,16 @@ export default {
     }
   },
   computed: {
+    ...mapState({
+      language: state => state.language.current
+    }),
     mySwiper () {
       return this.$refs.mySwiper.swiper
     }
   },
+  mounted () {
+    this.newsList = this.language === 'zh' ? News : EnNews
+  },
   methods: {
     toNewsDetail (item) {
       location.href = item.link

mobile/src/pages/purchase/index.vue

@@ -420,13 +420,15 @@ export default {
             color: rgba(0, 0, 0, 0.7);
             font-weight: bold;
             display: flex;
+            align-items: center;
             a {
               color: #486ACE !important;
               line-height: 18px;
               margin-top: 0;
+              display: flex;
+              align-items: center;
               img {
                 vertical-align: middle;
-                margin-top: -2px;
               }
             }
           }
@@ -434,6 +436,7 @@ export default {
             display: flex;
             justify-content: space-between;
             min-width: 271px;
+            align-items: center;
           }
           ul{
             padding: 6px 10px 0 15px;

pc/src/page/conduct/conductShop/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="conduct-shop">
-    <div class="banner">
+    <div class="banner" :class="{isEn: language !== 'zh'}">
       <div class="container" v-html="$t('conduct.conductShop.bannerTitle')"></div>
     </div>
     <div class="plate-w" ref="homeLayout">
@@ -74,6 +74,9 @@ export default {
     font-size: 40px;
     margin-bottom: 0;
     line-height: 56px;
+    &.isEn {
+      background-image: url(~@/assets/images/refactor/conductShop/banner-en.png);
+    }
     .container {
       display: flex;
       align-items: center;

pc/src/page/home2/index.vue

@@ -102,7 +102,7 @@ import vcenter from '@/components/vcenter'
 import number from '@/components/number'
 import sequence from '@/components/sequence'
 import {mapState} from 'vuex'
-import { News } from '@/../../common/data/newsData'
+import { News, EnNews } from '@/../../common/data/newsData'
 export default {
   data () {
     return {
@@ -192,7 +192,7 @@ export default {
           value: 'type3'
         }
       ],
-      plate05List: News.slice(0, 4)
+      plate05List: []
     }
   },
   methods: {
@@ -242,6 +242,7 @@ export default {
     }
   },
   mounted () {
+    this.plate05List = this.language === 'zh' ? News.slice(0,4) : EnNews.slice(0,4)
     let open = this.$route.query.open
     setTimeout(() => {
       if (open && !this.token) {

pc/src/page/location/index.vue

@@ -106,7 +106,18 @@ export default {
   components: {
     sequence
   },
+  computed: {
+    ...mapState({
+      language: state => state.language.current
+    })
+  },
   mounted () {
+    if (this.language !== 'zh') {
+      this.items_2 = this.items_2.map(item => {
+        item.iframeLink = item.iframeLink + '&lang=en'
+        return item
+      })
+    }
   },
   destroyed () {
   },

pc/src/page/mall/pay/index.vue

@@ -28,7 +28,7 @@
             <img :src="`${$serverName}${response.src}`" alt="">
             <p>{{ $t('mall.payTip', {type: selectedPayType === 'alipay' ? $t('mall.aliPay') : $t('mall.wechat')}) }}</p>
           </div>
-          <div class="pay-scan-tip"></div>
+          <div :class="`pay-scan-tip ${language === 'zh' ? '' : 'isEn'}`"></div>
         </div>
       </div>
     </div>
@@ -276,6 +276,9 @@ export default {
     position: absolute;
     top: 113px;
     left: 562px;
+    &.isEn {
+      background-image: url(~@/assets/images/refactor/mall/scan-tip-en.png);
+    }
   }
 }
 </style>

pc/src/page/mall/zhijia/style.scss

@@ -374,7 +374,6 @@
     }
   }
   .sub{
-    width: 845px;
     text-align: left;
     padding: 28px 0;
     font-size: 12px;

pc/src/page/news/index.vue

@@ -40,7 +40,8 @@
 import 'swiper/css/swiper.css'
 
 import { Swiper, SwiperSlide } from 'vue-awesome-swiper'
-import { News } from '@/../../common/data/newsData'
+import { News, EnNews } from '@/../../common/data/newsData'
+import { mapState } from 'vuex'
 export default {
   data () {
     return {
@@ -61,7 +62,7 @@ export default {
         banner: require('@/assets/images/refactor/news/banner3.png'),
         link: 'https://baijiahao.baidu.com/s?id=1631864683811023774&wfr=spider&for=pc'
       }],
-      newsData: News,
+      newsData: [],
       swiperOption: {
         autoplay: {
           delay: 5000,
@@ -76,6 +77,9 @@ export default {
     }
   },
   computed: {
+    ...mapState({
+      language: state => state.language.current
+    }),
     mySwiper() {
       return this.$refs.mySwiper.$swiper
     }
@@ -85,6 +89,7 @@ export default {
     SwiperSlide
   },
   mounted () {
+    this.newsData = this.language === 'zh' ? News : EnNews
   },
   methods: {
     slide(num) {