下载页面改版

appDownload/app-download.html

@@ -58,8 +58,8 @@
           <p>或用手机浏览器输入这个网址: <span class="datePublished">https://www.4dkankan.com/app-download.html</span></p>
         </div>
         <div class="release-info">
-          <p><span itemprop="softwareVersion">1.5.0</span></p>
-          <p>更新于: <span>2021-04-14 09:00</span></p>
+          <p><span itemprop="softwareVersion">1.5.1</span></p>
+          <p>更新于: <span>2021-04-27 09:00</span></p>
           <p class='only-suport'></p>
         </div>
         <div id="btn" class="btn">下载</div>
@@ -99,7 +99,7 @@
     
     document.getElementById('btn').addEventListener('click',function (e) {
       if(ua.android){
-        location.href = 'https://4dkankan.oss-cn-shenzhen.aliyuncs.com/apps/4dkkpro1.5.0.apk'
+        location.href = 'https://4dkankan.oss-cn-shenzhen.aliyuncs.com/apps/4dkkpro1.5.1.apk'
       }
       else if(ua.weixin){
         alert('微信/QQ内无法下载应用，请点击右上角，选择"浏览器中打开"')

appDownload/app-downloaden.html

@@ -58,8 +58,8 @@
           <p>Please input this URL on your mobile browser.: <span class="datePublished">https://www.4dkankan.com/app-downloaden.html</span></p>
         </div>
         <div class="release-info">
-          <p><span itemprop="softwareVersion">1.5.0</span></p>
-          <p>Updated on: <span>2021-04-14 09:00</span></p>
+          <p><span itemprop="softwareVersion">1.5.1</span></p>
+          <p>Updated on: <span>2021-04-27 09:00</span></p>
           <p class='only-suport'></p>
         </div>
         <div id="btn" class="btn">DownLoad</div>
@@ -99,7 +99,7 @@
     
     document.getElementById('btn').addEventListener('click',function (e) {
       if(ua.android){
-        location.href = 'https://4dkankan.oss-cn-shenzhen.aliyuncs.com/apps/4dkkpro1.5.0.apk'
+        location.href = 'https://4dkankan.oss-cn-shenzhen.aliyuncs.com/apps/4dkkpro1.5.1.apk'
       }
       else if(ua.weixin){
         alert('The application cannot be downloaded in WeChat / QQ, please click the upper right corner and select "Open in Browser"')

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

@@ -3,7 +3,7 @@ module.exports = {
     "solutions": "Solutions",
     "kankan_space": "KanKan-Space",
     "core_tech": "Technology",
-    "service": "Services",
+    "service": "Support",
     "about": "About Us",
     "online_shop": "Shopping Mall",
     "solutionsHouse": "Real-estate Marketing",

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

@@ -1,5 +1,5 @@
 module.exports = {
-    "title": "Service Support",
+    "title": "Support",
     "mVideo": "Video Tutorial",
     "use": "User Tutorial",
     "app": "APP Download",

mobile/src/pages/video/index.vue

@@ -4,7 +4,7 @@
       <div class="mask" @click="()=>{currenVideo='';showVideo=false}"></div>
       <video autoplay controls :src="currenVideo" class="video-fr"></video>
     </div>
-    <mediaSwiper @handleVideo="itemHandle" class="media-con"/>
+    <!-- <mediaSwiper @handleVideo="itemHandle" class="media-con"/> -->
 
     <div class="setion">
       <p class="common-title">{{langVideoCourse.name}}</p>
@@ -12,7 +12,7 @@
       <h-row tag="ul" :gutter="20" class="i-ul">
         <h-col tag="li" :span="12" v-for="(sub,idx) in langVideoCourse.items" :key="idx">
           <div  @click="itemHandle(sub)">
-            <img class="li-img" :src="`${$cdn}course/img/${sub.code}.jpg`" alt="">
+            <img class="li-img" :src="`${$rootCdn}course/img/${sub.code}.jpg?version=7`" alt="">
             <img class="bofang" src="@/assets/images/refactor/service/play-btn.png" alt="">
             <h3 class="btom-text">{{sub.name}}</h3>
           </div>
@@ -45,8 +45,7 @@ export default {
   methods: {
     itemHandle (item) {
       this.showVideo = true
-
-      this.currenVideo = `${this.$cdn}course/videos/${this.language === 'en' ? `en/${item.code}` : item.code}.mp4`
+      this.currenVideo = `${this.$rootCdn}course/videos/${this.language === 'en' ? `en/${item.code}` : item.code}.mp4`
     },
     itemHandles (item) {
       console.log(item)
@@ -105,6 +104,9 @@ export default {
           line-height: 20px;
           font-weight: 400;
           margin-top: 7px;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          overflow: hidden;
         }
         .li-img{
           width: 100%;

mobile/src/store/language/home_cn.js

@@ -174,50 +174,90 @@ export default {
         sub: '快速上手以及详细教学',
         items: [
           {
-            code: 'img_guide01@2x',
-            name: '快速上手指南'
+            code: 'jiqiao-10',
+            name: '快速上手'
           },
           {
-            code: 'img_guide02@2x',
-            name: '完整版操作指南'
+            code: 'jiqiao-1',
+            name: '开箱指引'
+          },
+          {
+            code: 'jiqiao-2',
+            name: '连接设备'
+          },
+          {
+            code: 'jiqiao-3',
+            name: '场景拍摄'
+          },
+          {
+            code: 'jiqiao-4',
+            name: '路线规划'
+          },
+          {
+            code: 'jiqiao-5',
+            name: '关联点位'
+          },
+          {
+            code: 'jiqiao-6',
+            name: '球幕视频'
+          },
+          {
+            code: 'jiqiao-7',
+            name: '上传分享'
+          },
+          {
+            code: 'jiqiao-8',
+            name: '浏览场景'
+          },
+          {
+            code: 'jiqiao-9',
+            name: '多楼层拍摄'
           }
         ]
       },
       {
-        name: '分段教学',
+        name: '视频教程',
         sub: '功能模块拆解分段学习',
         items: [
           {
-            code: 'img_01getready@2x',
-            name: '使用前准备'
+            code: 'jiqiao-10',
+            name: '快速上手'
           },
           {
-            code: 'img_03shotstep@2x',
-            name: '拍摄流程'
+            code: 'jiqiao-1',
+            name: '开箱指引'
           },
           {
-            code: 'img_08shotmode@2x',
-            name: '拍摄方式'
+            code: 'jiqiao-2',
+            name: '连接设备'
           },
           {
-            code: 'img_05point@2x',
-            name: '点位调整功能'
+            code: 'jiqiao-3',
+            name: '场景拍摄'
           },
           {
-            code: 'img_06video@2x',
-            name: '球幕视频功能'
+            code: 'jiqiao-4',
+            name: '路线规划'
           },
           {
-            code: 'img_02editmb@2x',
-            name: '编辑模型-手机APP端模型编辑'
+            code: 'jiqiao-5',
+            name: '关联点位'
           },
           {
-            code: 'img_04editpc@2x',
-            name: '编辑模型-PC端模型编辑'
+            code: 'jiqiao-6',
+            name: '球幕视频'
           },
           {
-            code: 'img_07share@2x',
+            code: 'jiqiao-7',
             name: '上传分享'
+          },
+          {
+            code: 'jiqiao-8',
+            name: '浏览场景'
+          },
+          {
+            code: 'jiqiao-9',
+            name: '多楼层拍摄'
           }
         ]
       }

mobile/src/store/language/home_en.js

@@ -184,10 +184,14 @@ export default {
         ]
       },
       {
-        name: 'Segmented Instruction',
+        name: 'Video Course',
         sub: 'Function Segemented Instruction',
         items: [
           {
+            code: 'img_guide01_v1',
+            name: 'Quick Start Course'
+          },
+          {
             code: 'img_01getready@2x',
             name: 'Preparation before Use'
           },

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

@@ -3,7 +3,7 @@ module.exports = {
     "solutions": "Solutions",
     "kankan_space": "KanKan-Space",
     "core_tech": "Technology",
-    "service": "Services",
+    "service": "Support",
     "about": "About Us",
     "online_shop": "Shopping Mall",
     "solutionsHouse": "Real-estate Marketing",

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

@@ -1,5 +1,5 @@
 module.exports = {
-    "title": "Service Support",
+    "title": "Support",
     "mVideo": "Video Tutorial",
     "use": "User Tutorial",
     "app": "APP Download",

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

@@ -5,6 +5,6 @@ module.exports = {
     "app": "APP下载",
     "clause": "保修条款",
     appDownload: {
-      downloadTip: '使用四维看看Pro的过程中，需要下载APP控制相机。请在手机软件商店搜索【四维看看Pro】或扫描下方二维码完成安装。'
+      downloadTip: '使用四维看看Pro的过程中，需要下载APP控制相机。请在手机软件商店搜索【四维看看Pro】或扫描下方二维码下载安装。'
     }
 }

pc/src/page/login/components/login.vue

@@ -17,7 +17,7 @@
       <div class="checkbox"><input type="checkbox" v-model="rememberMe" id="rember" /><label for="rember">{{$t('login.rememberPassword')}}</label></div>
       <div class="login-btn"  @click="login" >{{$t('login.login')}}</div>
       <div class="others">
-        <a class="other-actions" @click="$router.push('/login/forget')">{{ $t('login.forgetPassword') }}</a>
+        <a class="other-actions" @click="$router.push('/login/forget')">{{ $t('login.forgetPassword') }}<span class="line" @click.stop=""></span></a>
         <a class="other-actions" @click="$router.push(isInternational ? '/login/register?type=email' : '/login/register')">{{ $t('login.registerAccount') }}</a>
       </div>
     </div>
@@ -219,7 +219,7 @@ export default {
   &:first-child {
     margin-right: 34px;
     position: relative;
-    &::after {
+    .line {
       content: '';
       height: 14px;
       width: 1px;
@@ -228,6 +228,8 @@ export default {
       right: -18px;
       top: 50%;
       margin-top: -7px;
+      cursor: initial;
+      display: block;
     }
   }
 }

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

@@ -12,12 +12,12 @@
         <p>{{ $t('service.appDownload.downloadTip')}}</p>
         <div class="download-w">
           <div class="app ios">
-            <img class="qrcode" :src="`${$cdn}images/iosqrcode.png`" >
-            <img class="icon" :src="`${$cdn}images/ios-icon.png`" >
+            <img class="qrcode" :src="`${$cdn}images/iosQrcodeWithIcon.png`" >
+            <div class="icon">IOS</div>
           </div>
           <div class="app android">
-            <img class="qrcode" :src="`${$cdn}images/anzhuoqrcode.png`" >
-            <img   class="icon" :src="`${$cdn}images/android-icon.png`" >
+            <img class="qrcode" :src="`${$cdn}images/androidQrcodeWithIcon.png`" >
+            <div class="icon">Android</div>
           </div>
         </div>
         <!-- <div>
@@ -37,6 +37,7 @@
           </p>
         </div> -->
       </div>
+      <div class="mobile-scan"></div>
     </div>
   </div>
 </template>
@@ -60,7 +61,8 @@ export default {
   background: #F7F7F7;
 }
 .container {
-  padding: 80px 0 190px;
+  padding: 80px 0 196px;
+  position: relative;
   .common-title {
     margin: 0 0 65px;
   }
@@ -153,9 +155,19 @@ export default {
       
     }
     .icon {
-      width: 21px;
-      margin-top: 15px;
+      color: #909090;
+      margin-top: 16px;
+      font-size: 14px;
     }
   }
 }
+.mobile-scan {
+  width: 195px;
+  height: 380px;
+  background: url(~@/assets/images/refactor/appDownload/mobile-scan.png) no-repeat center center;
+  background-size: cover;
+  position: absolute;
+  right: 0;
+  bottom: -135px;
+}
 </style>

pc/src/page/service/video.vue

@@ -8,7 +8,7 @@
         <h-col :span="langVideoCourse[activeTab].items.length > 2 ? 6 : 12"  v-for="(sub,idx) in langVideoCourse[activeTab].items" :key="idx">
           <div class="i-li" :class="{small: langVideoCourse[activeTab].items.length > 2}" @click="itemHandle(sub)">
             <div class="img-w">
-              <img class="li-img" :src="`${$cdn}course/img/${sub.code}.jpg?version=1`" alt="">
+              <img class="li-img" :src="`${$cdn}course/img/${sub.code}.jpg?version=7`" alt="">
               <div class="hover-item">
                 <img :src="`${$cdn}course/img/video-play.png`" alt="">
                 <p>{{sub.name}}</p>
@@ -66,9 +66,7 @@ export default {
       padding-right: 34px;
       margin-right: 32px;
       position: relative;
-      font-weight: 200;
       color: #909090;
-      cursor: pointer;
       &.is-active {
         color: #202020;
         &::after {

pc/src/store/language/home_en.js

@@ -268,7 +268,7 @@ export default {
       //   ]
       // },
       {
-        name: 'Segmented Instruction',
+        name: 'Video Course',
         sub: 'Function Segemented Instruction',
         items: [
           {