Procházet zdrojové kódy

完善版本更新,取消多一次支付成功

dujingxian před 4 roky
rodič
revize
c75ce9ffb7
3 změnil soubory, kde provedl 17 přidání a 10 odebrání
  1. 15 8
      src/App.vue
  2. 1 1
      src/static/common.json
  3. 1 1
      src/views/order/payment.ts

+ 15 - 8
src/App.vue

@@ -66,18 +66,25 @@ import login from "./store/module/login";
             const clientVersion =localStorage.getItem('_version_')
             console.log('当前版本号app.vue:',clientVersion)
             if(clientVersion !== version){
-                // configJson.version = clientVersion;
-                console.log('configJson', configJson);
-                // window.location.reload()
-                let  storage = window.localStorage;
+                let storage = window.localStorage;
                 storage.clear()
                 this.$router.replace('/login')
                 
-                localStorage.setItem('_version_', version)
+                localStorage.setItem('_version_', JSON.stringify(version))
+            }
+        }
+        beforeUpdate() {
+            const version = configJson.version;          //版本号(每次上线前需要更新下版本号)
+            // console.log('修改版本号common.js:',version)
+            const clientVersion =localStorage.getItem('_version_')
+            // console.log('修改版本号app.vue:',clientVersion)
+            if(clientVersion !== version){
+                let storage = window.localStorage;
+                storage.clear()
+                this.$router.replace('/login')
+                
+                localStorage.setItem('_version_', JSON.stringify(version))
             }
-            // setTimeout(() => {
-            //     this.checkVersion()
-            // }, 500)
         }
 
     }

+ 1 - 1
src/static/common.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.4.12"
+  "version": "1.4.14"
 }

+ 1 - 1
src/views/order/payment.ts

@@ -188,7 +188,7 @@ export default class UserIndex extends Vue {
                 signType: res.data.signType, // 签名方式,默认为'SHA1',使用新版支付需传入'MD5'
                 paySign: res.data.paySign, // 支付签名
                 success: (r) => {
-                    alert('支付成功');
+                    // alert('支付成功');
                     if (r.errMsg == "chooseWXPay:ok") {
                         alert('支付成功');
                         if (this.data.recharfe) {