feat:修改bug

mobile/build/webpack.base.conf.js

@@ -3,7 +3,7 @@ const path = require('path')
 const utils = require('./utils')
 const config = require('../config')
 const vueLoaderConfig = require('./vue-loader.conf')
-
+const isProd = process.env.NODE_ENV === 'production'
 function resolve (dir) {
   return path.join(__dirname, '..', dir)
 }
@@ -56,7 +56,8 @@ module.exports = {
         loader: 'url-loader',
         options: {
           limit: 10000,
-          name: utils.assetsPath('img/[name].[hash:7].[ext]')
+          name: utils.assetsPath('v2/mobile/img/[path][name].[ext]'),
+          publicPath: isProd ? 'https://4dscene.4dage.com/new4dkk/' : ''
         }
       },
       {

mobile/config/index.js

@@ -8,7 +8,7 @@ module.exports = {
   dev: {
 
     // Paths
-    assetsSubDirectory: 'static',
+    assetsSubDirectory: '',
     assetsPublicPath: '/',
     proxyTable: {},
 
@@ -49,7 +49,7 @@ module.exports = {
 
     // Paths
     assetsRoot: path.resolve(__dirname, '../../dist/www/mobile'),
-    assetsSubDirectory: 'static',
+    assetsSubDirectory: '',
     assetsPublicPath: './www/mobile/',
 
     /**

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

@@ -1,7 +1,8 @@
 module.exports = {
     "__name": "核心产品",
     "coreProduct": {
-        "bannerTitle": "Product",
+        "bannerTitle": "4DKanKan Pro",
+        bannerSubTitle: 'The first consumer 3D<br/>camera in the world',
         "itemTitle1": "Autonomous & Accurate Modeling，Automatic Distance Measurement",
         "itemTitle2": "720° Immersive Roaming with 8K Picture Quality",
         "itemTitle3": "HDR Mode Balances Light and Dark Area Exposure",
@@ -12,10 +13,11 @@ module.exports = {
     },
     "coreTech": {
         "bannerTitle": "Technology",
-        "itemTitle1": "Space Digitization",
-        "itemText1": "Record and calculate the spatial position of the camera when shooting, and extract the corresponding 3D point cloud, so as to obtain the real situation of 3D space.",
+        bannerSubTitle: "Bringing Digital Technologies to the<br/>Everyday Life of Common People",
+        "itemTitle1": "Space Reconstruction",
+        "itemText1": "[Automatically] & [Precisely] record and calculate camera locations, [Effectively] extract the 3D point cloud data of the real scene to obtain corresponding 3D point clouds and acquire information of the real-life environment.",
         "itemTitle2": "Space Interaction",
-        "itemText2": "Automatic tour with preset route, panoramic and box videos enhance the interaction, different forms of dynamic hot-spot, let the space tell the story.",
+        "itemText2": "[Smart] tracking guide tour, [effective] preset route, can realize real-time interaction of multiple people on the same screen, enhance immersive experience with stunning panoramic videos, capture real wold by abundant dynamic hot spots, create humanized digital space art.",
         "item2Name1": "Dynamic Hot-spot",
         "item2Name2": "Interactive Video",
         "item2Name3": "Automatic Tour",

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

@@ -35,7 +35,7 @@ module.exports = {
     "plate1Item4Desc3": "High Quality Stores Live Broadcast, Real-time Online Share Quality Products.",
     "plate1Item4Desc4": "Personal AI Assistant, Real-time Online Reply.",
     "plate1Item4Desc5": "Gather Customers Together Online, Boost Offline Economy Effectively.",
-    "plate1Item5SubTitle": "Efficient Reconstruct Disaster Scenes，Create Comprehensive 3D Files",
+    "plate1Item5SubTitle": `100% Reconstruct Post-disaster Site, Make "Paperless Evidence" Come True`,
     "plate1Item5Desc1": "Efficient Reconstruct Disaster Scenes，Create Comprehensive 3D Files",
     "plate1Item5Desc2": "Pre-collection is Available，Reduce the Claims Disputes",
     "plate2Item1": "Yongzheng Palace",

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

@@ -5,6 +5,6 @@ module.exports = {
     "app": "APP Download",
     "clause": "Warranty Information",
     "appDownload": {
-        "downloadTip": "Please Scan The QR Code to Install The App."
+        "downloadTip": "To use the 4DKanKan Pro Camera you need to download the 4DKanKan Pro App. Please press “Download”."
     }
 }

mobile/src/lang/index.js

@@ -5,18 +5,18 @@ import en from './en'
 
 Vue.use(VueI18n)
 
-let current = (localStorage && localStorage.getItem('language')) || '中'
-// if (!lang) {
-//     lang = window.navigator.language || window.navigator.userLanguage || null
-//     if (lang && !/^zh/.test(lang)) {
-//         console.log('自动获取浏览器语言:' + lang)
-//         lang = 'en'
-//     }else{
-//         lang = 'zh'
-//     }
-// }
+let lang = (localStorage && localStorage.getItem('language'))
+if (!lang) {
+    lang = window.navigator.language || window.navigator.userLanguage || null
+    if (lang && !/^zh/.test(lang)) {
+        console.log('自动获取浏览器语言:' + lang)
+        lang = 'en'
+    }else{
+        lang = 'zh'
+    }
+}
 const i18n = new VueI18n({
-  locale: current,
+  locale: lang,
   messages: {
     zh,
     en

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

@@ -1,7 +1,8 @@
 module.exports = {
     "__name": "核心产品",
     "coreProduct": {
-        "bannerTitle": "核心产品",
+        "bannerTitle": "四维看看 Pro",
+        bannerSubTitle: '世界上首款消费级3D相机',
         "itemTitle1": "AI全自动精准建模，智能测距",
         "itemTitle2": "720度8K画质，身临其境",
         "itemTitle3": "HDR模式平衡明暗区域曝光",
@@ -12,17 +13,18 @@ module.exports = {
     },
     "coreTech": {
         "bannerTitle": "核心技术",
-        "itemTitle1": "空间数字化",
-        "itemText1": "记录与计算相机在拍摄时的空间位置，并提取对应的3D点云，从而获取三维空间的真实情况。",
+        bannerSubTitle: "让数字化飞入寻常百姓家",
+        "itemTitle1": "空间重建",
+        "itemText1": "「自动记录」并「精准计算」出相机在拍摄时的空间位置，「有效提取」实景对应的3D点云，从而获取三维空间的真实情况",
         "itemTitle2": "空间互动",
-        "itemText2": "自动导览 预先设定路线，球幕视频 BOX视频 增强体验的互动效果，多形式动态热点 赋以空间说话的艺术。",
+        "itemText2": "「智能追踪」导览，「高效预设」路线，可实现多人实时同屏互动，震撼球幕视频增强体验感，多形式动态热点捕捉，打造极具人性化的数字空间艺术",
         "item2Name1": "动态热点",
         "item2Name2": "互动视频",
         "item2Name3": "自动导览",
         "itemTitle3": "空间展示",
-        "itemText3": "无需插件，可在手机、 平板、PC端、VR眼镜，实现720°沉浸式漫游体验。",
-        "item3Name1": "VR端",
-        "item3Name2": "网页端",
+        "itemText3": "「无需插件」即可在手机、平板、PC端、VR眼镜中实现「720°沉浸式」漫游体验",
+        "item3Name1": "VR设备",
+        "item3Name2": "PC端",
         "item3Name3": "移动端"
     },
     "conductHouse": {

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

@@ -35,14 +35,14 @@ module.exports = {
     "plate1Item4Desc3": "好店带货直播，在线分享优质商品",
     "plate1Item4Desc4": "私人智能客服，实时在线答复",
     "plate1Item4Desc5": "汇聚线上客流，有效拉动线下经济",
-    "plate1Item5SubTitle": "高效复刻灾害现场，记录全面三维档案",
+    "plate1Item5SubTitle": "100%还原灾后现场，实现“物证无纸化”",
     "plate1Item5Desc1": "高效复刻灾害现场，记录全面三维档案",
     "plate1Item5Desc2": "支持预先采集存档，减少理赔纠纷",
     "plate2Item1": "雍正故宫",
     "plate2Item2": "小米有品",
     "plate2Item3": "华发依山郡",
     "plate2Item4": "万豪酒店",
-    "plate3Item1Title": "空间数字化",
+    "plate3Item1Title": "空间重建",
     "plate3Item1Text": "自动化三维数字重建<br/>还原空间布局与结构",
     "plate3Item2Title": "空间互动",
     "plate3Item2Text": "自动导览<br/>互动视频多形态动态热点",

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

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

mobile/src/pages/cases/index.vue

@@ -186,7 +186,6 @@ export default {
       deep: true,
       immediate: true,
       handler (newVal) {
-        console.log(newVal)
         this.currentPage = 1
         this.typesActive = typeArr[newVal]
         this.getData()
@@ -199,6 +198,7 @@ export default {
   methods: {
     changeType (type) {
       this.typesActive = type.value
+      this.currentPage = 1
       this.getData()
       this.showSelectType = false
     },

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

@@ -57,7 +57,7 @@ export default {
       runAnimation: true
     })
     this.$set(this.list, 3, {
-      name: this.$t('conduct.conductHouse.itemTitle3'),
+      name: this.$t('conduct.conductHouse.itemTitle4'),
       img: ISZH ? require('@/assets/images/refactor/conduct/house/item4.png') : require('@/assets/images/refactor/conduct/house/item4-en.png'),
       runAnimation: true
     })

mobile/src/pages/coreProduct/index.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="coreProduct">
     <div class="banner">
-      {{ $t('conduct.coreProduct.bannerTitle') }}
+      <h1 v-html="$t('conduct.coreProduct.bannerTitle')"></h1>
+      <h4 v-html="$t('conduct.coreProduct.bannerSubTitle')"></h4>
     </div>
     <ul class="desc-video">
       <li v-for="item in videoArr" :key="item.name">
@@ -83,14 +84,19 @@ export default {
     width: 100%;
     height: 140px;
     display: flex;
-    align-items: center;
-    padding-left: 42px;
+    padding-left: 25px;
     font-size: 22px;
     color: #202020;
     font-weight: bold;
     background: #D4D4D4;
+    flex-direction: column;
+    justify-content: center;
     background: url(~@/assets/images/refactor/coreProduct/banner.jpg);
     background-size: cover;
+    h4 {
+      font-size: 16px;
+      margin-top: 20px;
+    }
   }
   .desc-video {
     padding: 27px 20px;

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

@@ -33,12 +33,12 @@ export default {
         },
         {
           text: '华发依山郡',
-          bgImg: require('@/assets/images/refactor/home/4case_03@2x.png'),
+          bgImg: require('@/assets/images/refactor/home/4case_03@2x.jpg'),
           link: 'https://www.4dkankan.com/spc.html?m=t-VJjZMUl'
         },
         {
           text: '万豪酒店',
-          bgImg: require('@/assets/images/refactor/home/4case_04@2x.png'),
+          bgImg: require('@/assets/images/refactor/home/4case_04@2x.jpg'),
           link: 'https://www.4dkankan.com/showPC.html?m=PoCGXVFP'
         }
       ],

mobile/src/pages/location/index.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="home-layout">
     <div class="banner">
-      {{ $t('conduct.coreTech.bannerTitle') }}
+      <h1 v-html="$t('conduct.coreTech.bannerTitle')"></h1>
+      <h4 v-html="$t('conduct.coreTech.bannerSubTitle')"></h4>
     </div>
     <div class="plate1" id="plate1">
       <h1 class="common-title">{{ $t('conduct.coreTech.itemTitle1') }}</h1>
@@ -56,7 +57,7 @@ export default {
         },
         {
           name: this.$t('conduct.coreTech.item2Name2'),
-          iframeLink: 'https://www.4dkankan.com/spc.html?m=B4T8r0kk6'
+          iframeLink: 'https://www.4dkankan.com/spc.html?m=1TFy0kSQZ'
         },
         {
           name: this.$t('conduct.coreTech.item2Name3'),
@@ -99,15 +100,21 @@ export default {
 
 <style lang="scss" scoped>
 .banner {
-  width: 100%;
-  height: 140px;
   background: url(~@/assets/images/refactor/location/banner.png) no-repeat center center;
   background-size: cover;
+  width: 100%;
+  height: 140px;
+  display: flex;
+  padding-left: 25px;
   font-size: 22px;
   color: #202020;
-  line-height: 33px;
-  padding: 55px 0 0 42px;
   font-weight: bold;
+  flex-direction: column;
+  justify-content: center;
+  h4 {
+    font-size: 16px;
+    margin-top: 20px;
+  }
 }
 .desc {
   color: #909090;
@@ -115,7 +122,7 @@ export default {
   line-height: 18px;
 }
 .plate1 {
-  padding: 26px 20px 60px;
+  padding: 26px 18px 60px;
   .desc {
     margin: 27px 0 18px;
   }

mobile/src/pages/news/index.vue

@@ -9,7 +9,7 @@
         >
         <template>
           <div class="swiper-item" :class="`swiper-item${i+1}`" :style="{'background-image': `url(${item.img}`}" @click="handleClickSlide(item)">
-            <p v-html="item.text"></p>
+            <p v-html="language === 'zh' ? item.text : item.enHtml"></p>
           </div>
         </template>
         </swiper-slide>
@@ -50,16 +50,19 @@ export default {
       banners: [
         {
           text: '四维时代发布新一代3D空间相机',
+          enHtml: 'New 3D Camera Officially<br/>Released by 4Dage',
           img: require('@/assets/images/refactor/news/banner1.jpg'),
           link: 'https://36kr.com/p/782262201344647?from=groupmessage&isappinstalled=0'
         },
         {
           text: '火爆美国CES<br/>四维看看Pro获谷歌AI、LG集团<br/>等国际性企业青睐',
+          enHtml: 'Prevailing in CES: <br/>4DKanKan Pro Gained the Popularity among AI Gaints',
           img: require('@/assets/images/refactor/news/banner2.jpg'),
           link: 'https://mp.weixin.qq.com/s/EHxLGCGvznqijxOLPLTXkQ'
         },
         {
           text: '四维看展与德国<br/>黑提恩斯-陶瓷博物馆合作<br/>可3D鉴赏珍宝',
+          enHtml: '4DMuseum x Hetjens German<br/>Ceramics Museum<br/>Explore the Digtial Twins of the Treasures',
           img: require('@/assets/images/refactor/news/banner3.jpg'),
           link: 'https://mp.weixin.qq.com/s/eQ2IuHdlIVg7n0IsXJs5iA'
         }
@@ -105,7 +108,8 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  text-align: right;
+  text-align: center;
+  padding: 0 20px;
   &.swiper-item2 {
     color: #fff;
     text-align: center;
@@ -113,8 +117,10 @@ export default {
   }
   &.swiper-item3 {
     color: #fff;
-    justify-content: flex-end;
-      padding-right: 20px;
+    padding-right: 20px;
+    text-shadow: 0px 3px 6px rgba(0, 0, 0, 0.78);
+    font-size: 16px;
+    text-align: center;
   }
 }
 

mobile/src/pages/purchase/index.vue

@@ -9,7 +9,8 @@
          />
         <div class="txt-con">
           <img class="p-logo" :src="language==='en'?`${$cdn}images/pro-logo-m-en.png`:`${$cdn}images/pro-logo-m.png`" alt="">
-          <div class="p-price">{{langPurchase.price}}<span class="zdj">{{langPurchase.yushou}}</span></div>
+          <p class="sub b-label" v-html="langPurchase.dec"></p>
+          <div class="p-price">{{langPurchase.price}}</div>
         </div>
         <div class="attr-con">
           <div class="attr">{{langPurchase.color.key}}</div>
@@ -108,7 +109,7 @@
     </div> -->
     <div class="hover-btns">
       <div class="h-price">
-       {{language!=='en'? `RMB ${totalPrice}`:'USD 1799'}}
+       {{language!=='en'? `RMB ${totalPrice}`:''}}
       </div>
       <div class="h-btns">
         <span v-if="language!=='en'" @click="addcart">加入购物车</span>
@@ -429,6 +430,7 @@ export default {
               align-items: center;
               img {
                 vertical-align: middle;
+                margin-right: 2px;
               }
             }
           }

mobile/src/pages/purchasezhijia/index.vue

@@ -84,7 +84,7 @@
 
     <div class="hover-btns">
       <div class="h-price">
-       {{language!=='en'? `RMB ${count*899}`:'USD 209'}}
+       {{language!=='en'? `RMB ${count*899}`:''}}
       </div>
       <div class="h-btns">
         <span v-if="language!=='en'" @click="addcart">加入购物车</span>

mobile/src/store/language/home_en.js

@@ -209,11 +209,11 @@ export default {
           },
           {
             code: 'img_02editmb@2x',
-            name: 'Edit Model- Mobile APP Model Editing'
+            name: 'Mobile APP Model Editing'
           },
           {
             code: 'img_04editpc@2x',
-            name: 'Edit Model- PC Model Editing'
+            name: 'PC Model Editing'
           },
           {
             code: 'img_07share@2x',

mobile/src/store/language/index.js

@@ -9,10 +9,19 @@ const en = {
   home: enLang
 }
 
-let current = (localStorage && localStorage.getItem('language')) || 'zh'
+let current = (localStorage && localStorage.getItem('language'))
 if (current === '中') {
   current = 'zh'
 }
+if (!current) {
+  current = window.navigator.language || window.navigator.userLanguage || null
+  if (current && !/^zh/.test(current)) {
+    console.log('自动获取浏览器语言:' + current)
+    current = 'en'
+  } else {
+    current = 'zh'
+  }
+}
 document.title = current === 'en' ? '4DKanKan' : '四维看看'
 let languageMap = {
   zh: cn,

pc/build/utils.js

@@ -8,7 +8,6 @@ exports.assetsPath = function (_path) {
   const assetsSubDirectory = process.env.NODE_ENV === 'production'
     ? config.build.assetsSubDirectory
     : config.dev.assetsSubDirectory
-
   return path.posix.join(assetsSubDirectory, _path)
 }
 

pc/build/webpack.base.conf.js

@@ -57,8 +57,8 @@ module.exports = {
         loader: 'url-loader',
         options: {
           limit: 10000,
-          name: utils.assetsPath('img/[name].[hash:7].[ext]'),
-          publicPath: isProd ? '/www/static/' : ''
+          name: utils.assetsPath('v2/images/[path][name].[ext]'),
+          publicPath: isProd ? 'https://4dscene.4dage.com/new4dkk/' : ''
         }
       },
       {

pc/config/index.js

@@ -8,7 +8,7 @@ module.exports = {
   dev: {
 
     // Paths
-    assetsSubDirectory: 'static',
+    assetsSubDirectory: '',
     assetsPublicPath: '/',
     proxyTable: {},
 

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

@@ -1,7 +1,8 @@
 module.exports = {
     "__name": "核心产品",
     "coreProduct": {
-        "bannerTitle": "Product",
+        "bannerTitle": "4DKanKan Pro",
+        bannerSubTitle: 'The first consumer 3D camera in the world',
         "itemTitle1": "Autonomous & Accurate Modeling，Automatic Distance Measurement",
         "itemTitle2": "720° Immersive Roaming with 8K Picture Quality",
         "itemTitle3": "HDR Mode Balances Light and Dark Area Exposure",
@@ -12,10 +13,11 @@ module.exports = {
     },
     "coreTech": {
         "bannerTitle": "Technology",
-        "itemTitle1": "Space Digitization",
-        "itemText1": "Record and calculate the spatial position of the camera when shooting, and extract the corresponding 3D point cloud, so as to obtain the real situation of 3D space",
+        bannerSubTitle: "Bringing Digital Technologies to the Everyday Life of Common People",
+        "itemTitle1": "Space Reconstruction",
+        "itemText1": "[Automatically] & [Precisely] record and calculate camera locations, [Effectively] extract the 3D point cloud data of the real scene to obtain corresponding 3D point clouds and acquire information of the real-life environment.",
         "itemTitle2": "Space Interaction",
-        "itemText2": "Automatic tour with preset route, panoramic and box videos enhance the interaction, different forms of dynamic hot-spot, let the space tell the story",
+        "itemText2": "[Smart] tracking guide tour, [effective] preset route, can realize real-time interaction of multiple people on the same screen, enhance immersive experience with stunning panoramic videos, capture real wold by abundant dynamic hot spots, create humanized digital space art.",
         "item2Name1": "Dynamic Hot-spot",
         "item2Name2": "Interactive Video",
         "item2Name3": "Automatic Tour",
@@ -26,21 +28,21 @@ module.exports = {
         "item3Name3": "Mobile"
     },
     "conductHouse": {
-        "bannerTitle": "4DKanKan<br/>Realestate, Mass Reconstruction<br/>of the Real Houses",
+        "bannerTitle": "Realestate<br/>Mass Reconstruction<br/>of the Real Houses",
         "itemTitle1": "AI Automatic Modeling, Efficient Reconstruct the Real Houses",
         "itemTitle2": "Display All the Details, More Efficient for Sales and Rental Decisions",
         "itemTitle3": "Multidimensional Display the Information of Real-estate with Higher Efficiency",
         "itemTitle4": "Multifunctional Editing Tool, Let Houses Display Better"
     },
     "conductExhibition": {
-        "bannerTitle": "4DKanKan<br/>Exhibition, Participate in Exhibitions<br/>without Any Limitations",
+        "bannerTitle": "Exhibition<br/>Participate in Exhibitions<br/>without Any Limitations",
         "itemTitle1": "Online Visiting and Negotiation, Exchange Business Cards Freely",
         "itemTitle2": "No Barries to Communication, Easy to Get All the Information",
         "itemTitle3": "Reduce the Cost of Exhibitions, Promote Transactions Effectively",
         "itemTitle4": "Statistic Data Flow, Analyze User Persona"
     },
     "conductSubject": {
-        "bannerTitle": "4DKanKan<br/>Culture & Relics, Help to Create<br/>Never-ending Museums",
+        "bannerTitle": "Museum<br/>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",
@@ -51,14 +53,14 @@ module.exports = {
         item5SubItem3Title: 'The Archaeological Excavations at the Royal Cemetery of Haihunhou Kingdom in Han Dynasty'
     },
     "conductShop": {
-        "bannerTitle": "4DKanKan<br/>E-commerce，Free Shopping<br/>without Any Limitations",
+        "bannerTitle": "E-commerce<br/>Free Shopping<br/>without Any Limitations",
         "itemTitle1": "New Immersive Shopping Experience in 3D Digital Business District",
         "itemTitle2": "Shopping in the Real 3D Models through Mobile Phones",
         "itemTitle3": "Gather Online Passenger Flow and Boost Offline Economy",
         "itemTitle4": "Personal Customer Service，Real-time Communications"
     },
     "conductSecury": {
-        "bannerTitle": "4DKanKan<br/>Investigation, Efficiently Reconstruct<br/>All Kinds of Scenes",
+        "bannerTitle": "Investigation<br/>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/en/modules/home.js

@@ -35,7 +35,7 @@ module.exports = {
     "plate1Item4Desc3": "High Quality Stores Live Broadcast, Real-time Online Share Quality Products.",
     "plate1Item4Desc4": "Personal AI Assistant, Real-time Online Reply.",
     "plate1Item4Desc5": "Gather Customers Together Online, Boost Offline Economy Effectively.",
-    "plate1Item5SubTitle": "Efficient Reconstruct Disaster Scenes，Create Comprehensive 3D Files",
+    "plate1Item5SubTitle": `100% Reconstruct Post-disaster Site, Make "Paperless Evidence" Come True`,
     "plate1Item5Desc1": "Efficient Reconstruct Disaster Scenes，Create Comprehensive 3D Files",
     "plate1Item5Desc2": "Pre-collection is Available，Reduce the Claims Disputes",
     "plate2Item1": "Yongzheng Palace",

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

@@ -5,6 +5,6 @@ module.exports = {
     "app": "APP Download",
     "clause": "Warranty Information",
     "appDownload": {
-        "downloadTip": "Please Scan The QR Code to Install The App."
+        "downloadTip": "In the process of using 4DKanKan Pro, you are required to control the camera by 4DKanKan Pro APP. Please search [4DKanKan Pro] in mobile APP Store or scan the QR code to install the App."
     }
 }

pc/src/lang/index.js

@@ -5,16 +5,16 @@ import en from './en'
 
 Vue.use(VueI18n)
 
-let current = (localStorage && localStorage.getItem('language')) || '中'
-// if (!lang) {
-//     lang = window.navigator.language || window.navigator.userLanguage || null
-//     if (lang && !/^zh/.test(lang)) {
-//         console.log('自动获取浏览器语言:' + lang)
-//         lang = 'en'
-//     }else{
-//         lang = 'zh'
-//     }
-// }
+let current = (localStorage && localStorage.getItem('language'))
+if (!current) {
+  current = window.navigator.language || window.navigator.userLanguage || null
+    if (current && !/^zh/.test(current)) {
+        console.log('自动获取浏览器语言:' + current)
+        current = 'en'
+    }else{
+      current = 'zh'
+    }
+}
 const i18n = new VueI18n({
   locale: current,
   messages: {

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

@@ -1,7 +1,8 @@
 module.exports = {
     "__name": "核心产品",
     "coreProduct": {
-        "bannerTitle": "核心产品",
+        "bannerTitle": "四维看看 Pro",
+        bannerSubTitle: '世界上首款消费级3D相机',
         "itemTitle1": "AI全自动精准建模，智能测距",
         "itemTitle2": "720度8K画质，身临其境",
         "itemTitle3": "HDR模式平衡明暗区域曝光",
@@ -12,17 +13,18 @@ module.exports = {
     },
     "coreTech": {
         "bannerTitle": "核心技术",
-        "itemTitle1": "空间数字化",
-        "itemText1": "记录与计算相机在拍摄时的空间位置，并提取对应的3D点云，从而获取三维空间的真实情况。",
+        bannerSubTitle: "让数字化飞入寻常百姓家",
+        "itemTitle1": "空间重建",
+        "itemText1": "「自动记录」并「精准计算」出相机在拍摄时的空间位置，「有效提取」实景对应的3D点云，从而获取三维空间的真实情况",
         "itemTitle2": "空间互动",
-        "itemText2": "自动导览 预先设定路线，球幕视频 BOX视频 增强体验的互动效果，多形式动态热点 赋以空间说话的艺术。",
+        "itemText2": "「智能追踪」导览，「高效预设」路线，可实现多人实时同屏互动，震撼球幕视频增强体验感，多形式动态热点捕捉，打造极具人性化的数字空间艺术",
         "item2Name1": "动态热点",
         "item2Name2": "互动视频",
         "item2Name3": "自动导览",
         "itemTitle3": "空间展示",
-        "itemText3": "无需插件，可在手机、 平板、PC端、VR眼镜，实现720°沉浸式漫游体验。",
-        "item3Name1": "VR端",
-        "item3Name2": "网页端",
+        "itemText3": "「无需插件」即可在手机、平板、PC端、VR眼镜中实现「720°沉浸式」漫游体验",
+        "item3Name1": "VR设备",
+        "item3Name2": "PC端",
         "item3Name3": "移动端"
     },
     "conductHouse": {

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

@@ -35,14 +35,14 @@ module.exports = {
     "plate1Item4Desc3": "好店带货直播，在线分享优质商品",
     "plate1Item4Desc4": "私人智能客服，实时在线答复",
     "plate1Item4Desc5": "汇聚线上客流，有效拉动线下经济",
-    "plate1Item5SubTitle": "高效复刻灾害现场，记录全面三维档案",
+    "plate1Item5SubTitle": "100%还原灾后现场，实现“物证无纸化”",
     "plate1Item5Desc1": "高效复刻灾害现场，记录全面三维档案",
     "plate1Item5Desc2": "支持预先采集存档，减少理赔纠纷",
     "plate2Item1": "雍正故宫",
     "plate2Item2": "小米有品",
     "plate2Item3": "华发依山郡",
     "plate2Item4": "万豪酒店",
-    "plate3Item1Title": "空间数字化",
+    "plate3Item1Title": "空间重建",
     "plate3Item1Text": "自动化三维数字重建 还原空间布局与结构",
     "plate3Item2Title": "空间互动",
     "plate3Item2Text": "自动导览 互动视频多形态动态热点",

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/coreProducts/index.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="core-products">
     <div class="banner">
-      <div class="container">{{ $t('conduct.coreProduct.bannerTitle') }}</div>
+      <div class="container">
+        <h1>{{ $t('conduct.coreProduct.bannerTitle') }}</h1>
+        <h4 class="sub-title">{{ $t('conduct.coreProduct.bannerSubTitle') }}</h4>
+      </div>
     </div>
     <div class="" ref="homeLayout">
       <div class="plate item" v-for="(item,i) in sequenceArr" :key="i">
@@ -100,9 +103,21 @@ export default {
   height: 420px;
   background: url(~@/assets/images/core-products/banner.png) no-repeat center center;
   margin-bottom: 110px;
-  line-height: 420px;
   font-size: 40px;
   background-size: cover;
+  padding: 160px 0;
+  font-weight: 400;
+  h1 {
+    font-weight: 400;
+  }
+  .sub-title {
+    font-size: 20px;
+    margin-top: 20px;
+    font-weight: 400;
+  }
+  .container {
+    height: auto;
+  }
 }
 .item {
   padding: 50px 0;

pc/src/page/home2/index.vue

@@ -9,7 +9,7 @@
           <p>{{ $t('home.bannerText') }}</p>
           <div class="actions-w">
             <router-link class="buy-btn" to="/mall/kankanPro">{{ $t('home.bannerBuyBtnText') }}</router-link>
-            <router-link class="action-link" to="/mall/kankanPro">{{ $t('home.bannerMoreBtn') }}</router-link>
+            <router-link class="action-link" to="/coreProducts">{{ $t('home.bannerMoreBtn') }}</router-link>
             <span class="watch-btn action-link" @click="detailVideo">{{ $t('home.bannerIntroVideo') }}</span>
           </div>
           <div class="distributor">
@@ -163,12 +163,12 @@ export default {
         },
         {
           text: '华发依山郡',
-          bgImg: require('@/assets/images/home/4case_03@2x.png'),
+          bgImg: require('@/assets/images/home/4case_03@2x.jpg'),
           link: 'https://www.4dkankan.com/spc.html?m=t-VJjZMUl'
         },
         {
           text: '万豪酒店',
-          bgImg: require('@/assets/images/home/4case_04@2x.png'),
+          bgImg: require('@/assets/images/home/4case_04@2x.jpg'),
           link: 'https://www.4dkankan.com/showPC.html?m=PoCGXVFP'
         }
       ],

pc/src/page/location/index.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="conduct-tech" ref="container">
     <div class="banner">
-      <div class="container">{{ $t('conduct.coreTech.bannerTitle') }}</div>
+      <div class="container">
+        <h1>{{ $t('conduct.coreTech.bannerTitle') }}</h1>
+        <h5 class="sub-title">{{ $t('conduct.coreTech.bannerSubTitle') }}</h5>
+      </div>
     </div>
     <div class="plate-w" ref="homeLayout">
       <div class="plate item" v-for="(item,i) in sequenceArr" :key="i" id="type1">
@@ -80,7 +83,7 @@ export default {
         },
         {
           name: this.$t('conduct.coreTech.item2Name2'),
-          iframeLink: 'https://www.4dkankan.com/spc.html?m=B4T8r0kk6'
+          iframeLink: 'https://www.4dkankan.com/spc.html?m=1TFy0kSQZ'
         },
         {
           name: this.$t('conduct.coreTech.item2Name3'),
@@ -129,9 +132,21 @@ export default {
     width: 100%;
     height: 420px;
     background: url(~@/assets/images/refactor/coreTech/banner.png) no-repeat center center;
-    line-height: 420px;
     font-size: 40px;
     margin-bottom: 0;
+    padding: 160px 0;
+    font-weight: 400;
+    h1 {
+      font-weight: 400;
+    }
+    .sub-title {
+      font-size: 20px;
+      margin-top: 20px;
+      font-weight: 400;
+    }
+    .container {
+      height: auto;
+    }
   }
   .item {
     padding: 110px 0 110px;

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

@@ -10,6 +10,7 @@
          />
         <div class="layout">
           <img class="pro-logo" :src="language==='en'?`${$cdn}images/pro-logo-en.png`:`${$cdn}images/pro-logo.png`" alt="">
+          <p class="sub b-label" v-html="langPurchase.dec"></p>
           <p class="price">
              {{langPurchase.price}}
           </p>

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

@@ -63,8 +63,8 @@
     }
     .price{
       margin: 20px 0 20px;
-      font-size: 40px;
-      line-height: 50px;
+      font-size: 28px;
+      line-height: 28px;
       color: rgba(0,0,0,.7);
       font-weight: 700;
       border-bottom: 1px solid #e2e2e2;

pc/src/page/news/index.vue

@@ -5,7 +5,7 @@
       <swiper-slide v-for="(item, index) in banners" :key="index" class="swiper-item" @click="toNewsDetail(item.link)">
         <div class="banner-bg" :style="{'background-image': `url(${item.banner})`}"></div>
         <div class="container news-banner">
-          <p :class="item.className" v-html="item.html"></p>
+          <p :class="item.className" v-html="language === 'zh' ? item.html : item.enHtml"></p>
         </div>
       </swiper-slide>
       <!-- Optional controls -->
@@ -48,18 +48,21 @@ export default {
       activeIndex: 0,
       banners: [{
         html: '四维时代发布新一代3D空间相机',
+        enHtml: 'New 3D Camera Officially Released by 4Dage',
         className: 'banner-1',
         banner: require('@/assets/images/refactor/news/banner.jpg'),
         link: 'https://www.sohu.com/a/314620954_118392'
       }, {
         html: '火爆美国CES：<br/>四维看看Pro获谷歌AI、LG集团等国际性企业青睐',
+        enHtml: 'Prevailing in CES: <br/>4DKanKan Pro Gained the Popularity among AI Gaints',
         className: 'banner-2',
         banner: require('@/assets/images/refactor/news/banner2.png'),
         link: 'https://mp.weixin.qq.com/s/EHxLGCGvznqijxOLPLTXkQ'
       }, {
-        // html: '四维看展与德国黑提恩斯-陶瓷博物馆合作，<br/>可3D鉴赏珍宝',
+        html: '四维看展与德国黑提恩斯-陶瓷博物馆合作，<br/>可3D鉴赏珍宝',
+        enHtml: '4DMuseum x Hetjens - German Ceramics Museum<br/>Explore the Digtial Twins of the Treasures',
         className: 'banner-3',
-        banner: require('@/assets/images/refactor/news/banner3.png'),
+        banner: require('@/assets/images/refactor/news/banner3.jpg'),
         link: 'https://baijiahao.baidu.com/s?id=1631864683811023774&wfr=spider&for=pc'
       }],
       newsData: [],
@@ -170,8 +173,12 @@ export default {
   .banner-3 {
     color: #fff;
     position: absolute;
-    right: 0;
-    top: 35%;
+    left: 50%;
+    top: 106px;
+    transform: translate(-310px, 0);
+    text-shadow: 0px 3px 6px rgba(0, 0, 0, 0.78);
+    font-size: 40px;
+    white-space: nowrap;
   }
   .news-list {
     padding: 95px 0 50px;

pc/src/store/language/index.js

@@ -9,10 +9,20 @@ const en = {
   home: enLang
 }
 
-let current = (localStorage && localStorage.getItem('language')) || 'zh'
+let current = (localStorage && localStorage.getItem('language'))
 if (current === '中') {
   current = 'zh'
 }
+if (!current) {
+  current = window.navigator.language || window.navigator.userLanguage || null
+  console.log('自动获取浏览器语言:' + current)
+  if (current && !/^zh/.test(current)) {
+      current = 'en'
+  }else{
+    current = 'zh'
+  }
+}
+
 document.title = current === 'en' ? '4DKanKan' : '四维看看'
 let languageMap = {
   zh: cn,