feat:修改部分bug

mobile/src/components/toast/index.vue

@@ -48,7 +48,7 @@
           </div>
         </div>
         <div class="bottom" v-if="toastType==='comfirm'">
-          <span @click="visible=false" class="btn primary">{{lang==='en'?'Cancel':'取消'}}</span>
+          <span @click="visible=false" class="btn primary">{{language==='zh'?'取消':'Cancel'}}</span>
           <span class="b-line"></span>
           <span class="btn primary" @click="emitCallback">{{diycomfirm||comfirmtxt}}</span>
         </div>
@@ -65,7 +65,7 @@ import binding from './binding'
 import addcart from './addcart'
 import cooperation from './cooperation'
 import loading from './loadingicon'
-
+import { mapState } from 'vuex'
 let types = {
   warn: '提示',
   error: '错误',
@@ -109,6 +109,9 @@ export default {
     }
   },
   computed: {
+    ...mapState({
+      language: state => state.language.current
+    }),
     typeTxt () {
       return this.lang === 'en' ? typesEn[this.type] : types[this.type]
     },
@@ -120,10 +123,13 @@ export default {
   watch: {
     visible: function (newVal) {
       this.lang = localStorage.getItem('language')
-      this.comfirmtxt = this.lang === 'en' ? 'OK' : '确定'
+      this.comfirmtxt = this.lang === 'zh' ? '确定' : 'OK'
     }
   },
-  mounted () {},
+  mounted () {
+    this.lang = localStorage.getItem('language')
+    this.comfirmtxt = this.lang === 'zh' ? '确定' : 'OK'
+  },
   methods: {
     handleCooClose (data) {
       this.cooperationVisible = false

mobile/src/pages/account/login/index.vue

@@ -60,7 +60,7 @@ export default {
       let checkStr = [
         {
           name: this.isInternational ? '邮箱地址' : '手机号码',
-          En: this.isInternational ? 'Email' : 'Phone number',
+          En: this.isInternational ? 'E-mail' : 'Phone number',
           val: this.phone
         },
         {

mobile/src/pages/home/index.vue

@@ -106,7 +106,7 @@ export default {
       this.language === 'en' ? window.location.href = 'https://www.alibaba.com/product-detail/4DKanKan-Pro-3D-camera-3D-space_62183626283.html?spm=a2700.icbuShop.74.1.66b35b10I4miJd' : this.$router.push({name: 'purchase'})
     },
     showDetailVideo () {
-      const videoUrl = this.language === 'zh' ? `https://4d-tjw.oss-cn-shenzhen.aliyuncs.com/4dHouse/%E5%9B%9B%E7%BB%B4%E7%9C%8B%E7%9C%8BPro-%202020-7-22%E7%89%88%E6%9C%AC%288K%29.mp4` : `https://4dscene.4dage.com/new4dkk/v2/video/4DKanKanPro-en.mp4`
+      const videoUrl = this.language === 'zh' ? `${this.$cdn}v2/video/%E5%9B%9B%E7%BB%B4%E7%9C%8B%E7%9C%8BPro-%202020-7-22%E7%89%88%E6%9C%AC(8K).mp4` : `${this.$cdn}v2/video/4DKanKanPro-en.mp4`
       this.broadcast(videoUrl)
     }
   }

mobile/src/store/user.js

@@ -390,7 +390,8 @@ export default {
         }
         if (qudao === 'email') {
           params = {
-            email: phone
+            email: phone,
+            country: 1
           }
           API.getEmailAuthCode(params)
           return true

pc/src/main.js

@@ -8,7 +8,7 @@ import { i18n } from './lang'
 import './register-components'
 // import axios from './util/http.js'
 // import router from './router'
-Vue.prototype.$cdn = process.env.IS_INTERNATIONAL ? './' : 'https://4dscene.4dage.com/new4dkk/'
+Vue.prototype.$cdn = process.env.IS_INTERNATIONAL ? 'https://4dscene.4dage.com/new4dkk/' : 'https://4dscene.4dage.com/new4dkk/'
 
 Vue.use(vuex)
 Vue.use(Toast)

pc/src/page/home2/index.vue

@@ -215,8 +215,8 @@ export default {
     toMore (item) {
       this.$router.push(item.link)
     },
-    detailVideo () {
-      const videoUrl = this.language === 'zh' ? `https://4d-tjw.oss-cn-shenzhen.aliyuncs.com/4dHouse/%E5%9B%9B%E7%BB%B4%E7%9C%8B%E7%9C%8BPro-%202020-7-22%E7%89%88%E6%9C%AC%288K%29.mp4` : `${this.$cdn}v2/video/4DKanKanPro-en.mp4`
+    detailVideo() {
+      const videoUrl = this.language === 'zh' ? `${this.$cdn}v2/video/%E5%9B%9B%E7%BB%B4%E7%9C%8B%E7%9C%8BPro-%202020-7-22%E7%89%88%E6%9C%AC(8K).mp4` : `${this.$cdn}v2/video/4DKanKanPro-en.mp4`
       this.$bus.$emit('toggleVideo', { url: videoUrl })
     },
     toNewsLink (link) {