Merge branch 'feat' into develop

src/views/package-home/index.vue

@@ -51,7 +51,6 @@ export default {
         // checkBrowser 检查扫码的浏览器内核
         checkBrowser() {
             const userAgent = window.navigator.userAgent;
-            this.$store.commit("wxAuthCode", '');
             console.log("浏览器内核", userAgent);
             if (/AlipayClient/.test(userAgent)) {
                 console.log("支付宝");
@@ -68,7 +67,7 @@ export default {
                     if (isNotNull(code)) {
                         this.$store.commit("wxAuthCode", code);
                         this.wxAuthCode = code;
-                        //this.getOpenId();
+                        this.getOpenId(code);
                         setTimeout(() => {
                             this.getWxCode();
                         },1000)
@@ -101,8 +100,8 @@ export default {
             })
         },
         // 根据code获取openId
-        getOpenId() {
-            let code = this.$store.getters.wxAuthCode;
+        getOpenId(code) {
+            //let code = this.$store.getters.wxAuthCode;
             APIPay.getOpenId(code).then(res => {
                 let data= res.data;
                 if(data.code === 20000) {
@@ -125,7 +124,7 @@ export default {
                     }
                 })
             } else {
-                let redUrl = encodeURIComponent(`${commonUrl}/h5-frontendweb/#/${params.routerName}?imei=${params.imei}&appId=${AppId}&iccid=${params.iccid}&code=${this.wxAuthCode}`);
+                let redUrl = encodeURIComponent(`${commonUrl}/h5-frontendweb/#/${params.routerName}?imei=${params.imei}&iccid=${params.iccid}`);
                 let url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${AppId}&redirect_uri=${redUrl}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect`;
                 window.location.href = url;
             }

src/views/package-list/index.vue

@@ -154,7 +154,7 @@ export default {
     methods: {
         // 根据code获取openId
         getOpenId() {
-            let code = this.$store.getters.wxAuthCode ? this.$store.getters.wxAuthCode : this.params.code;
+            let code = this.$store.getters.wxAuthCode;
             APIPay.getOpenId(code).then(res => {
                 let data= res.data;
                 if(data.code === 20000) {
@@ -174,7 +174,7 @@ export default {
         getParams() {
             let params = this.$route.query;
             if (params) {
-                this.getOpenId();
+                //this.getOpenId();
                 this.params = {...params};
             }
         },