feat:修改bug

mobile/src/components/cinvoices/index.vue

@@ -41,7 +41,7 @@
         </div>
         <div class="address-input-item">
           <div class="address-sub">
-            <div class="top-title">纳税人识别号</div>
+            <div class="top-title no-require">纳税人识别号</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,29 +123,15 @@
         </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" v-if="selectedTxt === '企业'">
+        <div class="address-input-item">
           <div class="address-sub">
-            <div class="top-title">纳税人识别号</div>
+            <div class="top-title no-require">纳税人识别号</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>
@@ -199,10 +185,7 @@ export default {
   data () {
     return {
       isShowInvoice3: true,
-      isShowInvoice2: true,
-      selected: false,
-      invoiceType: ['个人', '企业'],
-      selectedTxt: '个人'
+      isShowInvoice2: true
     }
   },
   watch: {
@@ -236,7 +219,7 @@ export default {
         let title = isObject(this.tempInvoice2.title)
         let code = isObject(this.tempInvoice2.code)
         let emailAddress = isObject(this.tempInvoice2.emailAddress)
-        if (this.selectedTxt !== '个人' && (!code || code.length !== 18)) {
+        if (code && code.length !== 18) {
           return this.$toast.show('warn', this.langToast['21'])
         }
         if (!reg.email.test(emailAddress)) {
@@ -348,10 +331,6 @@ 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": "4DKanKan",
-        bannerSubTitle: 'Culture & Relics, Help to Create<br/>Never-ending Museums',
+        "bannerTitle": "Culture & Relics",
+        bannerSubTitle: 'Help to 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",
@@ -62,7 +62,8 @@ module.exports = {
         "itemTitle4": "Personal Customer Service，Real-time Communications"
     },
     "conductSecury": {
-        "bannerTitle": "Security Survey",
+        "bannerTitle": "Investigation",
+        bannerSubTitle: "Efficiently Reconstruct<br/>All Kinds of Scenes",
         "itemTitle1": "Reconstruct Disaster Scenes Efficiently，Create Comprehensive 3D Files",
         "itemTitle2": "Multifunctional Editing Tool，Improve the Communication Quality",
         "itemTitle3": "Pre-collection is Available，Reduce the Claims Disputes"

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

@@ -62,7 +62,8 @@ module.exports = {
         "itemTitle4": "私人专属客服 同屏带看实时沟通"
     },
     "conductSecury": {
-        "bannerTitle": "安防勘查",
+        "bannerTitle": "勘察",
+        bannerSubTitle: "高效复刻各类现场",
         "itemTitle1": "高效复刻灾害现场<br/>记录全面三维档案",
         "itemTitle2": "可将现场说明直接添加至三维空间中，提高沟通质量与工作效率",
         "itemTitle3": "支持预先采集存档<br/>减少理赔纠纷"

mobile/src/pages/conduct/secury/index.vue

@@ -2,6 +2,7 @@
   <div class="conduct-secury">
     <div class="banner">
       <h1>{{ $t('conduct.conductSecury.bannerTitle') }}</h1>
+      <h4 v-html="$t('conduct.conductSecury.bannerSubTitle')"></h4>
     </div>
     <ul class="desc-video">
       <li v-for="item in list" :key="item.name">

mobile/src/pages/layout/footer.vue

@@ -37,7 +37,7 @@
         <div class="copyright">
           <p>{{langFooter.copyright[0]}}</p>
           <p>{{langFooter.copyright[1]}}</p>
-          <p>珠海市四维时代网络科技有限公司</p>
+          <!-- <p>珠海市四维时代网络科技有限公司</p> -->
         </div>
       </div>
       <!-- <div class="layout">

mobile/src/pages/userCenter/confirm/index.vue

@@ -247,6 +247,9 @@ export default {
         return
       }
       let {invoice, goods, payType, receiver} = this.payinfo
+      if (invoice) {
+        invoice.invoiceType = this.selectedId
+      }
       let params = {
         goods,
         receiver,

pc/src/assets/style/public.scss

@@ -75,6 +75,7 @@ body{
     -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.2);
     background-color: #d4d4d4;
   }
+  
 }
 
 .check-con {

pc/src/components/lselect/index.vue

@@ -75,7 +75,8 @@ export default {
     color: #2d2d2d;
     font-size: 14px;
     cursor: pointer;
-
+    white-space: nowrap;
+    padding-right: 20px;
     &.active {
       background-color: #202020;
       color: #fff;

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

@@ -58,7 +58,7 @@ module.exports = {
         "itemTitle4": "Personal Customer Service，Real-time Communications"
     },
     "conductSecury": {
-        "bannerTitle": "4DKanKan<br/>Security Survey",
+        "bannerTitle": "4DKanKan<br/>Investigation, Efficiently Reconstruct<br/>All Kinds of Scenes",
         "itemTitle1": "Reconstruct Disaster Scenes Efficiently，Create Comprehensive 3D Files",
         "itemTitle2": "Multifunctional Editing Tool，Improve the Communication Quality",
         "itemTitle3": "Pre-collection is Available，Reduce the Claims Disputes"

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

@@ -26,7 +26,7 @@ module.exports = {
         "item3Name3": "移动端"
     },
     "conductHouse": {
-        "bannerTitle": "看房 ‧ 海量复刻真房源",
+        "bannerTitle": "看房 • 海量复刻真房源",
         "itemTitle1": "AI自动建模，高效复刻真实房源",
         "itemTitle2": "房源资讯全方位展示，有效提高客户粘性",
         "itemTitle3": "地产资讯多维展示，提高租售决策效率",
@@ -40,7 +40,7 @@ module.exports = {
         "itemTitle4": "数据流量统计，用户画像分析"
     },
     "conductSubject": {
-        "bannerTitle": "文博·助力打造永不落幕的博物馆",
+        "bannerTitle": "文博 • 助力打造永不落幕的博物馆",
         "itemTitle1": "珍贵陈展线上复刻，打破线下时空限制",
         "itemTitle2": "空间交互形式多样，承载丰富历史底蕴",
         "itemTitle3": "多人实时同屏互动，听专家讲述文化故事",
@@ -58,7 +58,7 @@ module.exports = {
         "itemTitle4": "私人专属客服 同屏带看实时沟通"
     },
     "conductSecury": {
-        "bannerTitle": "安防勘察",
+        "bannerTitle": "勘察 • 高效复刻各类现场",
         "itemTitle1": "高效复刻灾害现场，记录全面三维档案",
         "itemTitle2": "可将现场说明直接添加至三维空间中，提高沟通质量与工作效率",
         "itemTitle3": "支持预先采集存档，减少理赔纠纷"

pc/src/page/home2/index.vue

@@ -46,7 +46,7 @@
     </div>
     <div class="plate03 container clear">
       <h1 class="common-title">{{ $t('home.plate2Title') }}
-        <router-link to="/cases/全部" class="more">{{ $t('common.more') }}</router-link>
+        <router-link to="/cases/全部" class="more">{{ $t('common.more') }} ></router-link>
       </h1>
       <h-row class="space-list" :gutter="20">
         <h-col :span="6" class="space-item" v-for="(item,index) in space" :key="index">
@@ -71,7 +71,7 @@
     <div class="plate05 " ref="numcount">
       <div class="container">
         <h1 class="common-title">{{ $t('home.plate4Title') }}
-          <router-link to="/news" class="more">{{ $t('common.more') }}</router-link>
+          <router-link to="/news" class="more">{{ $t('common.more') }} ></router-link>
         </h1>
         <ul class="news-list">
           <li class="news-item" v-for="(item, index) in plate05List" :key="index" @click="toNewsLink(item.link)">

pc/src/page/layout/footer.vue

@@ -48,9 +48,6 @@
           <p class="relevant-1">Copyright © 2020 4DAGE Co., Ltd. All rights reserved. </p>
           <p class="relevant-2"><a class="a_class">粤ICP备14078495号-3</a></p>
         </div>
-        <p>Copyright © 2020 4DAGE Co., Ltd. All rights reserved. </p>
-        <p><a class="a_class" href="https://beian.miit.gov.cn" target="_blank">粤ICP备14078495号-3</a></p>
-        <p>珠海市四维时代网络科技有限公司</p>
       </div>
     </div>
   </div>
@@ -190,16 +187,18 @@ export default {
             text-decoration: underline;
             display: inline-block;
             line-height: 25px;
-
+            
             &:nth-child(2) {
               margin: 0 42px;
             }
           }
         }
-
+        a {
+          color: #909090;
+        }
         p {
           font-size: 14px;
-          color: #ffffff;
+          color: #909090;
           margin-bottom: 8px;
         }
       }

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

@@ -439,6 +439,7 @@ export default {
   .noGoods {
     width: 100%;
     height: 550px;
+    background: url(~@/assets/images/refactor/mall/cartNoGoods.jpg) no-repeat center 22px;
     background: image-set(url(~@/assets/images/refactor/mall/cartNoGoods.jpg) 1x, url(~@/assets/images/refactor/mall/cartNoGoods@2x.jpg) 2x) no-repeat center 22px;
     position: relative;
     border-top: 1px solid #E4E4E4;

pc/src/page/service/plugin/ff-scrollbar.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="outer">
+  <div class="outer" :class="{'isEn': language !== 'zh'}">
     <slot name="con"></slot>
     <div class="ff-scrollbar">
       <div ref="thumb" class="ff-scroll-thumb" :style="{top:scorlltop}"></div>
@@ -8,27 +8,37 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
   props: {
     scorlltop: {
       default: () => [],
       type: String
     }
+  },
+  computed: {
+    ...mapState({
+      language: state => state.language.current
+    })
   }
 }
 </script>
 
 <style lang="scss" scoped>
   $lw: 220px;
-  $cw: 430px;
+  $cw: 440px;
   $encw: 430px;
   .outer{
     overflow: hidden;
     max-height: 100%;
     height: calc(100vh - 380px);
-    width: $cw - 20px;
+    width: 440px;
     text-align: center;
     position: relative;
+    &.isEn {
+      width:410px;
+    }
   }
   .ff-scrollbar{
     height: calc(100vh - 380px);

pc/src/page/service/temp/use.vue

@@ -6,16 +6,17 @@
   <div class="use-layout " :class="language">
     
     <template v-if="isFireFox" >
-      <div class="ls-outer">
+      <div class="ls-outer" :class="{'isEn': language !== 'zh'}">
         <lselect :options="navs" :selected="navActive" class="select firefox-select" :class="{oy: navs.length > 15}" @change="handleChange" />
         <div class="ls-scrollbar">
           <div ref="thumb" class="ls-scroll-thumb" :style="{top:scorlltop}"></div>
         </div>
+        
       </div>
 
       <scrollbar :scorlltop='scorlltop'>
         <div slot="con" class="use-con" ref="dcon" id="dcon">
-          <img class="img" v-for="(item,i) in current.size" :src="`${$cdn}images/use/${current.id}/${language==='en'?'en':'zh'}/${i+1}.jpg`" :key="i" :alt="i+1">
+          <img class="img" v-for="(item,i) in current.size" :src="`${$cdn}v2/use/${current.id}/${language==='en'?'en':'zh'}/${i+1}.jpg`" :key="i" :alt="i+1">
         </div>
       </scrollbar>
     </template>
@@ -139,6 +140,10 @@ export default {
       max-height: 100%;
       overflow: hidden;
       height: 100%;
+      display: block;clear: both;
+      &.isEn {
+        min-width: 354px;
+      }
   }
 
   .ls-scrollbar{
@@ -177,9 +182,8 @@ export default {
     overflow-y: auto;
     height: 590px;
   }
-
   .firefox-select{
-    min-width: $lw + 20px;
+    min-width: $lw + 70px;
   }
 
   .img{