0608

mobile/src/pages/account/manage/myscene/index.vue

@@ -220,7 +220,7 @@ export default {
     gotoEdit (item) {
       let url = item.webSite
       let page = url.substring(url.lastIndexOf('/') + 1, url.lastIndexOf('.html'))
-      let pStr = ''
+      let pStr = 'edit'
       if (item.buildType) {
         switch (item.buildType.toLowerCase()) {
           case 'v1':
@@ -234,6 +234,7 @@ export default {
             pStr = 'emobile'
             break
           default:
+            pStr = 'edit'
             break
         }
       }

mobile/src/pages/video/index.vue

@@ -30,7 +30,8 @@ export default {
   },
   computed: {
     ...mapState({
-      langVideoCourse: state => state.language.home.videoCourse.content[1]
+      langVideoCourse: state => state.language.home.videoCourse.content[1],
+      language: state => state.language.current
     })
   },
   data () {
@@ -42,7 +43,8 @@ export default {
   methods: {
     itemHandle (item) {
       this.showVideo = true
-      this.currenVideo = `${this.$cdn}course/videos/${item.code}.mp4`
+
+      this.currenVideo = `${this.$cdn}course/videos/${this.language === 'en' ? `en/${item.code}` : item.code}.mp4`
     },
     itemHandles (item) {
       console.log(item)

mobile/src/store/language/cn/about.js

@@ -67,6 +67,15 @@ export default{
           '4月 为黑提恩斯-德国国立陶瓷博物馆展馆及馆藏进行三维数字化重建，并开发数字博物馆App，该案例作为一带一路文化输出的杰出代表入选第二届一带一路峰会案例集。',
           '5月 四维看看Pro在德国柏林人工智能大会上亮相。'
         ]
+      },
+      {
+        year: '2020年',
+        txt: [
+          '1月 荣获工业和信息化科技司的新一代人工智能产业创新重点任务之“四维看看”项目技术揭榜书。',
+          '2月 为抗击疫情，主动联合国内100+家博物馆发起“足不出户逛3D博物馆”活动，为广大民众免费公开3D博物馆资源，线上观展人数达到1.5亿。',
+          '3月 新一代3D空间相机四维看看Pro荣登中国警用装备网，作为人工智能警用装备产品助力智慧警务升级。',
+          '为全球最顶级艺术博览会提供3D技术支持，因数字化博物馆为人们提供了极大的帮助，被美国商业杂志Bloomberg Businessweek报道。'
+        ]
       }
     ]
   },

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

@@ -70,6 +70,15 @@ export default{
           '2019.04 4DAGE cooperated with Hetjens German Museum of Ceramics in 3D digitization, and developed a digital museum application. As an outstanding case of the Belt and Road Initiative\'s cultural output, the project was included in the case collection of the 2019 Belt and Road Forum.',
           '2019.05 4DKanKan Pro was unveiled at Rise of AI Conference in Berlin, Germany.'
         ]
+      },
+      {
+        year: '2020',
+        txt: [
+          '2020.01 In January, 4DKanKan won the new generation of artificial intelligence industry innovation key tasks of the Ministry of Industry and Information Technology.',
+          '2020.02 In February, in order to combat COVID-19, 4Dage united more than 100 local museums to initiated the “Stay at home with online 3D museums” activity voluntarily to to freely expose the resources of 3D museums to the general public, and the number of online visitors has reached 150 million.',
+          '2020.03 In March, a new generation of 3D space camera 4DKanKan Pro was listed on the China Police Equipment Network, 4DKanKan Pro, as an artificial intelligence police equipment product help upgrade smart police.',
+          'In March, 4Dage Exclusively Provides 3D Technical Support for the World\'s Top Art Fair. It was reported by the American business magazine Bloomberg Businessweek because its digital museum has provided great help to people.'
+        ]
       }
     ]
   },

mobile/src/store/language/home_cn.js

@@ -92,6 +92,11 @@ export default {
             to: {name: 'service', params: {id: 'app'}}
           },
           {
+            icon: 'icon-teaching',
+            name: '视频教程',
+            to: {name: 'video-course'}
+          },
+          {
             icon: 'icon-tutorial',
             name: '使用教程',
             to: {name: 'service', params: {id: 'use'}}
@@ -105,11 +110,6 @@ export default {
             icon: 'icon-baoxiutiaokuan',
             name: '售后服务',
             to: {name: 'service', params: {id: 'clause'}}
-          },
-          {
-            icon: 'icon-teaching',
-            name: '视频教程',
-            to: {name: 'video-course'}
           }
         ]
       },

mobile/src/store/language/home_en.js

@@ -92,6 +92,11 @@ export default {
           to: {name: 'service', params: {id: 'app'}}
         },
         {
+          icon: 'icon-teaching',
+          name: 'Video tutorial',
+          to: {name: 'video-course'}
+        },
+        {
           icon: 'icon-tutorial',
           name: 'User Tutorial',
           to: {name: 'service', params: {id: 'use'}}
@@ -105,11 +110,6 @@ export default {
           icon: 'icon-baoxiutiaokuan',
           name: 'Warranty Information',
           to: {name: 'service', params: {id: 'clause'}}
-        },
-        {
-          icon: 'icon-teaching',
-          name: 'Video tutorial',
-          to: {name: 'video-course'}
         }
         ]
       },
@@ -170,54 +170,54 @@ export default {
   videoCourse: {
     content: [
       {
-        name: '视频教程',
-        sub: '快速上手以及详细教学',
+        name: 'Video Course',
+        sub: 'Quick Start and Detailed Teaching',
         items: [
           {
             code: 'img_guide01@2x',
-            name: '快速上手指南'
+            name: 'Quick Start Course'
           },
           {
             code: 'img_guide02@2x',
-            name: '完整版操作指南'
+            name: 'Full Version Course'
           }
         ]
       },
       {
-        name: '分段教学',
-        sub: '功能模块拆解分段学习',
+        name: 'Segmented Instruction',
+        sub: 'Function Segemented Instruction',
         items: [
           {
             code: 'img_01getready@2x',
-            name: '使用前准备'
+            name: 'Preparation before Use'
           },
           {
             code: 'img_03shotstep@2x',
-            name: '拍摄流程'
+            name: 'Shooting Process'
           },
           {
             code: 'img_08shotmode@2x',
-            name: '拍摄方式'
+            name: 'Shooting Method'
           },
           {
             code: 'img_05point@2x',
-            name: '点位调整功能'
+            name: 'Spot Adjustment Function'
           },
           {
             code: 'img_06video@2x',
-            name: '球幕视频功能'
+            name: 'Panoramic Video Function'
           },
           {
             code: 'img_02editmb@2x',
-            name: '编辑模型-手机APP端模型编辑'
+            name: 'Edit Model- Mobile APP Model Editing'
           },
           {
             code: 'img_04editpc@2x',
-            name: '编辑模型-PC端模型编辑'
+            name: 'Edit Model- PC Model Editing'
           },
           {
             code: 'img_07share@2x',
-            name: '上传分享'
+            name: 'Upload and Share'
           }
         ]
       }

pc/src/page/manage/temp/change.vue

@@ -143,7 +143,7 @@ export default {
   $border-color: #e7e7e7;
   margin-bottom: 300px;
   .input{
-    width: 300px;
+    width: 464px;
     margin-bottom: 20px;
   }
   input {

pc/src/page/manage/temp/device.vue

@@ -45,7 +45,7 @@
               <p class="p-sub">{{langDevices.expire}}{{item.spaceEndStr||'--'}}</p>
 
               <div class="d-edit">
-                <router-link class="primary" target="_blank" :to="{name:'introduce',params:{id:item.childName}}"><span>{{langDevices.capacity}}</span></router-link>
+                <router-link class="primary" :to="{name:'introduce',params:{id:item.childName}}"><span>{{langDevices.capacity}}</span></router-link>
                 <div>
                   <span @click="unbind(item)">{{langDevices.unbind}}</span>
                 </div>
@@ -55,7 +55,7 @@
               <p class="d-id">ID: {{item.childName}}</p>
               <p class="p-sub">剩余点数：{{item.balance}}</p>
               <div class="d-edit" :class="{'dtow-edit':tabActive!==4}">
-              <router-link class="primary" target="_blank" :to="{name:'introtow',params:{id:item.childName}}"><span>{{langDevices.recharge}}</span></router-link>
+              <router-link class="primary" :to="{name:'introtow',params:{id:item.childName}}"><span>{{langDevices.recharge}}</span></router-link>
                 <!-- <span @click="$router.push({name:'introtow',params:{id:item.childName}})">充值</span> -->
               <div>
                   <span @click="unbind(item)">{{langDevices.unbind}}</span>

pc/src/page/manage/temp/scene.vue

@@ -258,7 +258,7 @@ export default {
     gotoEdit (item) {
       let url = item.webSite
       let page = url.substring(url.lastIndexOf('/') + 1, url.lastIndexOf('.html'))
-      let pStr = ''
+      let pStr = 'edit'
       if (item.buildType) {
         switch (item.buildType.toLowerCase()) {
           case 'v1':
@@ -266,12 +266,12 @@ export default {
             break
           case 'v2':
             pStr = 'editProPC'
-
             break
           case 'v3':
             pStr = 'epc'
             break
           default:
+            pStr = 'edit'
             break
         }
       }
@@ -456,6 +456,7 @@ export default {
               top: 50%;
               left: 50%;
               transform: translate(-50%,-50%);
+              width: 100%;
             }
           }
           .primary{

pc/src/page/service/video.vue

@@ -20,6 +20,7 @@ import { mapState } from 'vuex'
 export default {
   computed: {
     ...mapState({
+      language: state => state.language.current,
       langVideoCourse: state => state.language.home.videoCourse.content
     })
   },
@@ -32,7 +33,7 @@ export default {
     itemHandle (item) {
       this.$bus.$emit('toggleVideo', {
         status: true,
-        url: item.code
+        url: this.language === 'en' ? `en/${item.code}` : item.code
       })
     }
   }
@@ -68,12 +69,13 @@ export default {
           height: 30px;
           position: absolute;
           left: 20px;
-          bottom: 50px;
+          bottom: 60px;
         }
         .li-p{
           font-size: 16px;
           color: #2d2d2d;
           margin-top: 10px;
+          min-height: 40px;
         }
       }
     }

pc/src/store/language/cn/about.js

@@ -37,7 +37,7 @@ export default{
         txt: [
           '<span>8月</span>“高精度一键式三维数字化重建及其展示”获“中国创翼”青年创业创新大赛三等奖。',
           '<span>10月</span>四维时代CEO作为全国双创代表获得李克强总理接见，并向总理汇报工作。',
-          '<span></span>相继成为故宫博物院、广东省博物馆等文物保护机构的合作伙伴。'
+          '<span>10月</span>相继成为故宫博物院、广东省博物馆等文物保护机构的合作伙伴。'
         ]
       },
       {
@@ -58,7 +58,7 @@ export default{
         txt: [
           '<span>5月</span>推出全球首款消费级3D相机四维看看，10分钟即可复刻100平米空间。',
           '<span>11月</span>中国高科技产业化研究会授予四维看看“科学技术成果”称号。',
-          '<span></span>中国国际高新技术成果交易会授予四维看看“优秀产品奖”。'
+          '<span>11月</span>中国国际高新技术成果交易会授予四维看看“优秀产品奖”。'
         ]
       },
       {
@@ -67,6 +67,15 @@ export default{
           '<span>4月</span>为黑提恩斯-德国国立陶瓷博物馆展馆及馆藏进行三维数字化重建，并开发数字博物馆App，该案例作为一带一路文化输出的杰出代表入选第二届一带一路峰会案例集。',
           '<span>5月</span>四维看看Pro在德国柏林人工智能大会上亮相。'
         ]
+      },
+      {
+        year: '2020年',
+        txt: [
+          '<span>1月</span>荣获工业和信息化科技司的新一代人工智能产业创新重点任务之“四维看看”项目技术揭榜书。',
+          '<span>2月</span>为抗击疫情，主动联合国内100+家博物馆发起“足不出户逛3D博物馆”活动，为广大民众免费公开3D博物馆资源，线上观展人数达到1.5亿。',
+          '<span>3月</span>新一代3D空间相机四维看看Pro荣登中国警用装备网，作为人工智能警用装备产品助力智慧警务升级。',
+          '<span>3月</span>为全球最顶级艺术博览会提供3D技术支持，因数字化博物馆为人们提供了极大的帮助，被美国商业杂志Bloomberg Businessweek报道。'
+        ]
       }
     ]
   },

pc/src/store/language/cn/home.js

@@ -208,10 +208,10 @@ export default{
       placeholder: '昵称'
     },
     newpass: {
-      placeholder: '密码（最少8位以上数字和字母）'
+      placeholder: '密码（最少8位以上数字和大小写字母）'
     },
     comfirmpass: {
-      placeholder: '再次输入密码（最少8位以上数字和字母）'
+      placeholder: '再次输入密码（最少8位以上数字和大小写字母）'
     }
   }
 }

pc/src/store/language/cn/manage.js

@@ -214,8 +214,8 @@ export default{
   modify: {
     code: '获取验证码',
     codep: '验证码',
-    newpass: '新密码（最少8位以上数字和字母）',
-    comfirm: '再次输入新密码（最少8位以上数字和字母）',
+    newpass: '新密码（最少8位以上数字和大小写字母）',
+    comfirm: '再次输入新密码（最少8位以上数字和大小写字母）',
     submit: '提交'
   },
   cart: {

pc/src/store/language/en/about.js

@@ -39,7 +39,7 @@ export default{
         txt: [
           '<i>2015.08</i>4DAGE, in competition with over 27,000 enterprises, won the China Innovation and Entrepreneurship Competition\'s Outstanding Enterprise Award.',
           '<i>2015.10</i>Dr. Cui Yan, founder of 4DAGE, was received by Premier Li Keqiang and commended to him for his work as a representative of the national "Mass Entrepreneurship and Innovation" initiative.',
-          '<i></i>Became partner of organizations that preserves cultural heritage, including the Palace Museum and Guangdong Provincial Museum.'
+          '<i>2015.10</i>Became partner of organizations that preserves cultural heritage, including the Palace Museum and Guangdong Provincial Museum.'
         ]
       },
       {
@@ -60,7 +60,7 @@ export default{
         txt: [
           '<i>2018.05</i>4DKanKan, the world\'s first consumer 3D camera was launched, capable of reconstructing 100㎡ of space in five minutes – one twentieth of the time required for image acquisition by existing machines – and costing one-tenth the price of traditional 3D modeling equipment.',
           '<i>2018.11</i>4DKanKan was recognized as “Scientific and Technological Achievement” by China High-tech Industrialization Association',
-          '<i></i>4DKanKan was evaluated as “Excellent Product” by China Hi-Tech Fair.'
+          '<i>2018.11</i>4DKanKan was evaluated as “Excellent Product” by China Hi-Tech Fair.'
         ]
       },
       {
@@ -69,6 +69,15 @@ export default{
           '<i>2019.04</i>4DAGE cooperated with Hetjens German Museum of Ceramics in 3D digitization, and developed a digital museum application. As an outstanding case of the Belt and Road Initiative\'s cultural output, the project was included in the case collection of the 2019 Belt and Road Forum.',
           '<i>2019.05</i>4DKanKan Pro was unveiled at Rise of AI Conference in Berlin, Germany.'
         ]
+      },
+      {
+        year: '2020',
+        txt: [
+          '<i>2020.01</i>In January, 4DKanKan won the new generation of artificial intelligence industry innovation key tasks of the Ministry of Industry and Information Technology.',
+          '<i>2020.02</i>In February, in order to combat COVID-19, 4Dage united more than 100 local museums to initiated the “Stay at home with online 3D museums” activity voluntarily to to freely expose the resources of 3D museums to the general public, and the number of online visitors has reached 150 million.',
+          '<i>2020.03</i>In March, a new generation of 3D space camera 4DKanKan Pro was listed on the China Police Equipment Network, 4DKanKan Pro, as an artificial intelligence police equipment product help upgrade smart police.',
+          '<i>2020.03</i>In March, 4Dage Exclusively Provides 3D Technical Support for the World\'s Top Art Fair. It was reported by the American business magazine Bloomberg Businessweek because its digital museum has provided great help to people.'
+        ]
       }
     ]
   },

pc/src/store/language/en/home.js

@@ -204,7 +204,7 @@ export default{
       placeholder: 'User name'
     },
     newpass: {
-      placeholder: 'Password (minimum 8 letters and digits)'
+      placeholder: 'Password must contain English case and numbers, 8-16 characters'
     },
     comfirmpass: {
       placeholder: 'Enter password again'

pc/src/store/language/en/manage.js

@@ -212,7 +212,7 @@ export default{
   modify: {
     code: 'Get verification code',
     codep: 'Verification code    ',
-    newpass: 'New password (minimum 8 letters and digits)',
+    newpass: 'New password must contain English case and numbers, 8-16 characters',
     comfirm: 'Enter new password again',
     submit: 'Submit'
   },

pc/src/store/language/home_cn.js

@@ -58,6 +58,11 @@ export default {
           to: {name: 'service_list', params: {id: 'app', active: 'pro'}}
         },
         {
+          icon: 'icon-teaching',
+          name: '视频教程',
+          to: {name: 'video-course'}
+        },
+        {
           icon: 'icon-tutorial',
           name: '使用教程',
           to: {name: 'service_list', params: {id: 'use', active: 'pro'}}
@@ -76,11 +81,6 @@ export default {
           icon: 'icon-baoxiutiaokuan',
           name: '保修条款',
           to: {name: 'service_list', params: {id: 'clause', active: 'pro'}}
-        },
-        {
-          icon: 'icon-teaching',
-          name: '视频教程',
-          to: {name: 'video-course'}
         }
       ],
       'case_overview': [

pc/src/store/language/home_en.js

@@ -59,6 +59,11 @@ export default {
           to: {name: 'service_list', params: {id: 'app', active: 'pro'}}
         },
         {
+          icon: 'icon-teaching',
+          name: 'Video <br/>tutorial',
+          to: {name: 'video-course'}
+        },
+        {
           icon: 'icon-tutorial',
           name: 'User <br/>Tutorial',
           to: {name: 'service_list', params: {id: 'use', active: 'pro'}}
@@ -77,11 +82,6 @@ export default {
           icon: 'icon-baoxiutiaokuan',
           name: 'Warranty <br/>Information',
           to: {name: 'service_list', params: {id: 'clause', active: 'pro'}}
-        },
-        {
-          icon: 'icon-teaching',
-          name: 'Video <br/>tutorial',
-          to: {name: 'video-course'}
         }
       ],
       'case_overview': [
@@ -254,54 +254,54 @@ export default {
   videoCourse: {
     content: [
       {
-        name: '视频教程',
-        sub: '快速上手以及详细教学',
+        name: 'Video Course',
+        sub: 'Quick Start and Detailed Teaching',
         items: [
           {
             code: 'img_guide01@2x',
-            name: '快速上手指南'
+            name: 'Quick Start Course'
           },
           {
             code: 'img_guide02@2x',
-            name: '完整版操作指南'
+            name: 'Full Version Course'
           }
         ]
       },
       {
-        name: '分段教学',
-        sub: '功能模块拆解分段学习',
+        name: 'Segmented Instruction',
+        sub: 'Function Segemented Instruction',
         items: [
           {
             code: 'img_01getready@2x',
-            name: '使用前准备'
+            name: 'Preparation before Use'
           },
           {
             code: 'img_03shotstep@2x',
-            name: '拍摄流程'
+            name: 'Shooting Process'
           },
           {
             code: 'img_08shotmode@2x',
-            name: '拍摄方式'
+            name: 'Shooting Method'
           },
           {
             code: 'img_05point@2x',
-            name: '点位调整功能'
+            name: 'Spot Adjustment Function'
           },
           {
             code: 'img_06video@2x',
-            name: '球幕视频功能'
+            name: 'Panoramic Video Function'
           },
           {
             code: 'img_02editmb@2x',
-            name: '编辑模型-手机APP端模型编辑'
+            name: 'Edit Model- Mobile APP Model Editing'
           },
           {
             code: 'img_04editpc@2x',
-            name: '编辑模型-PC端模型编辑'
+            name: 'Edit Model- PC Model Editing'
           },
           {
             code: 'img_07share@2x',
-            name: '上传分享'
+            name: 'Upload and Share'
           }
         ]
       }