feat:更新到根目录

mobile/src/components/payType/index.vue

@@ -5,7 +5,7 @@
         <div class="common-sub-header no-border">
           支付方式
         </div>
-        <div class="pay-item" v-for="(item,i) in data" :key="i" @click="goPay(item)">
+        <div class="pay-item" v-for="(item,i) in data" :key="i" @click="goPay(item)" :class="{'is-active': activeType === item.name}">
           <img :src="item.img" alt="">
           <span>{{item.name}}</span>
         </div>
@@ -48,15 +48,19 @@ export default {
       img: require('@/assets/images/refactor/userCenter/wx_pay.png')
     }]
     return {
-      data: browser.weixin ? weichatdata : data
+      data: browser.weixin ? weichatdata : data,
+      activeType: ''
     }
   },
+  mounted () {
+    this.goPay(this.data[0])
+  },
   methods: {
     goPay (item) {
       let temp = this.payinfo
       temp['payType'] = item.id
       temp['payTypeName'] = item.name
-
+      this.activeType = item.name
       this.$store.commit('PAYINFO', temp)
       this.$emit('change', temp)
       // this.$router.push({path: '/submit'})
@@ -97,8 +101,8 @@ export default {
   font-size: 12px;
   font-weight: bold;
   line-height: 18px;
-  padding: 17px 0 11px;
   border-bottom: 1px solid #EBEBEB;
+  margin-bottom: 8px;
   &.no-border {
     border-bottom: none;
   }
@@ -116,6 +120,10 @@ export default {
   img {
     height: 28px;
   }
+  &.is-active {
+    background: rgba(31, 228, 220, 0.05);
+    border-color: #1FE4DC;
+  }
 }
 .order-money {
   margin-top: 17px;

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

@@ -34,8 +34,8 @@ module.exports = {
         "applytitle": "Applicant Information",
         "applyNameXing": "Last Name",
         "applyNameMing": "First Name",
-        "applyNamePlaceholder": "Please Input the Last Name",
-        "applyNamePlaceholder1": "Please Input the First Name",
+        "applyNamePlaceholder": "Please Input",
+        "applyNamePlaceholder1": "Please Input",
         "positionLabel": "Title",
         "positionPlaceholder": "Please Input the Title",
         "phoneLabel": "Phone",

mobile/src/pages/coreProduct/index.vue

@@ -8,7 +8,7 @@
         <h1 class="common-title" v-html="item.name"></h1>
         <div class="player">
           <video class="video" controls="controls" playsinline="playsinline" muted="muted" :poster="isNaN(item.post) ? `${$cdn}video/homevideo/v${item.img}.mp4${item.post}` : `${$cdn}images/postv${item.post}.png`">
-            <source :src="`${$cdn}video/homevideo/v${item.img}.mp4`" type="video/mp4">
+            <source :src="`${$cdn}video/homevideo/v${language === 'zh' ? item.img:item.enImg}.mp4`" type="video/mp4">
           </video>
         </div>
       </li>
@@ -18,6 +18,7 @@
 
 <script>
 import { i18n } from '@/lang'
+import { mapState } from 'vuex'
 
 export default {
   data () {
@@ -27,17 +28,20 @@ export default {
           name: i18n.t('conduct.coreProduct.itemTitle1'),
           img: 1,
           post: 1,
+          enImg: '1en',
           runAnimation: true
         },
         {
           name: i18n.t('conduct.coreProduct.itemTitle2'),
           img: 2,
           post: 2,
+          enImg: '2',
           runAnimation: true
         },
         {
           name: i18n.t('conduct.coreProduct.itemTitle4'),
           img: 6,
+          enImg: '6',
           post: '?x-oss-process=video/snapshot,t_100,f_jpg,m_fast',
           runAnimation: true
         },
@@ -45,23 +49,31 @@ export default {
           name: i18n.t('conduct.coreProduct.itemTitle5'),
           img: 3,
           post: 3,
+          enImg: '3en',
           runAnimation: true
         },
         {
           name: i18n.t('conduct.coreProduct.itemTitle6'),
           img: 4,
           post: 4,
+          enImg: '4',
           runAnimation: true
         },
         {
           name: i18n.t('conduct.coreProduct.itemTitle7'),
           img: 5,
           post: 5,
+          enImg: '5en',
           runAnimation: true
         }
       ]
     }
-  }
+  },
+  computed: {
+    ...mapState({
+      language: state => state.language.current
+    })
+  },
 }
 </script>
 

mobile/src/pages/location/index.vue

@@ -7,7 +7,7 @@
       <h1 class="common-title">{{ $t('conduct.coreTech.itemTitle1') }}</h1>
       <p class="desc">{{ $t('conduct.coreTech.itemText1') }}</p>
       <div class="video">
-        <video autoplay controls :src="`${$cdn}video/location-video.mp4?t=1`" :poster="`${$cdn}video/location-video.mp4?x-oss-process=video/snapshot,t_21000,f_jpg,m_fast`"></video>
+        <video autoplay controls :src="`${$cdn}video/location-video.mp4?t=2`" :poster="`${$cdn}video/location-video.mp4?x-oss-process=video/snapshot,t_21000,f_jpg,m_fast`"></video>
       </div>
     </div>
     <div class="plate2" id="plate2">

mobile/src/pages/service/useimg.vue

@@ -30,11 +30,13 @@ export default {
       for (let i = 0; i < use.length; i++) {
         let item = use[i]
         if (!item.sub) {
+          console.log(item.img)
           if (parseInt(item.img) === parseInt(this.$route.params.id)) {
-            img = this.$cdn + `images/${name}/${current[this.$route.params.type]}/${this.language === 'en' ? 'en' : 'zh'}/${item.img}.jpg`
+            img = this.$cdn + `images/${name}/${current[this.$route.params.type]}/${this.language === 'en' ? 'en' : 'zh'}/${this.$route.params.id}.jpg`
             return img
           }
         }
+        
         if (item.sub) {
           for (let j = 0; j < item.sub.length; j++) {
             let sub = item.sub[j]

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

@@ -210,7 +210,7 @@ export default {
       temp['selectedTxt'] = this.selectedTxt
 
       this.$store.commit('PAYINFO', temp)
-      this.$router.push({path: '/paytype'})
+      this.$router.push({path: '/submit'})
     },
     getSum () {
       let sum = 0

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

@@ -23,7 +23,7 @@
     <div class="box-con">
       <div class="bc-title">
         <span>支付信息</span>
-        <span @click="$router.back()">修改</span>
+        <span @click="$router.push('/paytype')">修改</span>
       </div>
       <div class="bc-item pay-item">
         <div class="item-method">
@@ -85,7 +85,7 @@
           <span class="check-box">
             <span class="checkbox-inner" :class="{'checkbox-inner-checked':isAgree}"></span>
           </span>
-          同意<span style="" @click.stop="$router.push({name:'useimg',params:{id:1,type:0,name: 'agreement'}})">四维看看销售协议</span>
+          同意<span style="" @click.stop="$router.push({name:'useimg',params:{id:'1v2',type:0,name: 'agreement'}})">四维看看销售协议</span>
         </label>
         <!-- <input type="checkbox" v-model="isAgree"> -->
       </div>

mobile/src/store/language/en/agent.js

@@ -61,8 +61,8 @@ export default {
       name: {
         xing: 'Last Name',
         ming: 'First Name',
-        placeholder: 'Please input the last name',
-        placeholder1: 'Please input the first name'
+        placeholder: 'Please input',
+        placeholder1: 'Please input'
       },
       position: {
         title: 'Title',

pc/build/webpack.base.conf.js

@@ -58,7 +58,7 @@ module.exports = {
         options: {
           limit: 10000,
           name: utils.assetsPath('img/[name].[hash:7].[ext]'),
-          publicPath: isProd ? '/new4Dkankan/www/static/' : ''
+          publicPath: isProd ? '/www/static/' : ''
         }
       },
       {

pc/src/page/layout/aside/index.vue

@@ -5,7 +5,7 @@
       <div>
         <div class="clause-img" ref="clause">
           <div ref="clauseImg">
-            <img :src="cluseType==='cart'?`${$cdn}images/cluse-long1.jpg`:`${$cdn}images/${language==='en'?'cluse-long-en':'cluse-long'}.jpg`" alt>
+            <img :src="cluseType==='cart'?`${$cdn}images/cluse-long1v2.jpg`:`${$cdn}images/${language==='en'?'cluse-long-en':'cluse-long'}.jpg`" alt>
             <img v-if="cluseType!=='cart'&&language==='en'" :src="`${$cdn}images/cluse-long-en1.jpg`" alt>
             <img v-if="cluseType!=='cart'&&language==='en'" :src="`${$cdn}images/cluse-long-en2.jpg`" alt>
           </div>

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

@@ -73,7 +73,7 @@
       <div>
         <div class="clause-img" ref="clause">
           <div ref="clauseImg">
-            <img :src="`${$cdn}images/cluse-long1.jpg`" alt>
+            <img :src="`${$cdn}images/cluse-long1v2.jpg`" alt>
           </div>
         </div>
         <p> </p>