0808

mobile/src/pages/service/temp/app.vue

@@ -26,8 +26,8 @@
 <script>
 import select from '../plugin/select'
 import { mapState } from 'vuex'
-let sub = '使用四维看看Pro的过程中，需要下载APP控制相机。请在手机软件商店搜索“四维看看Pro”或点击下方“点击下载”。'
-let subEn = 'To use the 4DKanKan Pro Camera you need to download the 4DKanKan Pro App. Please search for“4DKanKan Pro” in the App Store or press “Download”.'
+let sub = '使用四维看看Pro的过程中，需要下载APP控制相机。请点击下方“点击下载”。'
+let subEn = 'To use the 4DKanKan Pro Camera you need to download the 4DKanKan Pro App. Please press “Download”.'
 
 export default {
   computed: {

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

@@ -127,7 +127,7 @@ export default{
     qxfp: '取消协作',
     shooting: '拍摄时间：',
     id: '设备ID：',
-    noScenes: '暂无任何场景，赶紧去拍摄吧。',
+    noScenes: '暂无任何场景。',
     placeholder: {
       searchID: '搜索场景'
     },

pc/src/App.vue

@@ -65,6 +65,20 @@ export default {
       // 深度观察监听
       deep: true
     }
+    // '$route.query.showAside': {
+    //   handler: function (val, oldVal) {
+    //     this.$bus.$emit('showAside')
+    //     if (val === 'register') {
+    //       this.$bus.$emit('changName', {
+    //         name: '立即注册',
+    //         enName: 'Sign in',
+    //         id: 'iregister'
+    //       })
+    //     }
+    //   },
+    //   // 深度观察监听
+    //   deep: true
+    // }
 
   },
   components: {

pc/src/components/toast/index.vue

@@ -100,6 +100,7 @@ export default {
       type: 'warn',
       toastType: 'show',
       callback: '',
+      cooCallback: '',
       cancal: '',
       diycomfirm: '',
       isLoaing: false,
@@ -159,6 +160,7 @@ export default {
     },
     emitCallback () {
       this.callback()
+      this.cooCallback && this.cooCallback()
       this.visible = false
     }
   }

pc/src/components/toast/toast.js

@@ -73,7 +73,7 @@ Toast.install = function (Vue) {
     showCooperation: (sceneNum, callback) => {
       instance.sceneNum = sceneNum
       instance.cooperationVisible = true
-      instance.callback = callback || function () {
+      instance.cooCallback = callback || function () {
       }
     },
     showInvoice: (item, callback) => {

pc/src/page/binocular/index.vue

@@ -41,7 +41,7 @@
         <h2>{{langBinocular.app.sub[0]}}</h2>
         <h3>{{langBinocular.app.sub[1]}}</h3>
         <div class="download-btn">
-          <div class="apple">App Store</div>
+          <div class="apple">IOS</div>
           <div class="android">Android</div>
         </div>
       </div>

pc/src/page/eight/index.vue

@@ -33,7 +33,7 @@
         <h2>{{langEight.app.sub[0]}}</h2>
         <h3>{{langEight.app.sub[1]}}</h3>
         <div class="download-btn">
-          <div class="apple">App Store</div>
+          <div class="apple">IOS</div>
           <div class="android">Android</div>
         </div>
       </div>

pc/src/page/service/down/index.vue

@@ -29,7 +29,7 @@
         <p>
           <a class="button">
             <img :src="`${$cdn}images/service_icon_ios@2x.png`" >
-            <span>App Store</span>
+            <span>IOS</span>
           </a>
         </p>
         <p>

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

@@ -12,7 +12,7 @@
         <p>
           <a class="button">
             <img :src="`${$cdn}images/service_icon_ios@2x.png`" >
-            <span>App Store</span>
+            <span>IOS</span>
           </a>
           <img class="qrcode" :src="`${$cdn}images/iosqrcode.png`" >
         </p>

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

@@ -179,7 +179,7 @@ export default{
   services: {
     down: {
       txt: '3D相机控制APP',
-      sub: '使用四维看看Pro的过程中，需要下载APP控制相机。请在手机软件商店搜索“四维看看Pro”或使用手机扫描二维码安装。'
+      sub: '使用四维看看Pro的过程中，需要下载APP控制相机。请使用手机扫描二维码安装。'
     }
   },
   loginAside: {

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

@@ -121,7 +121,7 @@ export default{
         id: 2
       }
     ],
-    noScenes: '暂无任何场景，赶紧去拍摄吧。',
+    noScenes: '暂无任何场景。',
     placeholder: {
       searchID: '搜索场景'
     },

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

@@ -175,7 +175,7 @@ export default{
   services: {
     down: {
       txt: 'Download the " 4DKanKan Pro " APP to start shooting',
-      sub: 'Please search for“4DKanKan Pro” in the App Store or scan the QR code to install the App.'
+      sub: 'Please scan the QR code to install the App.'
     }
   },
   loginAside: {