Merge branch 'feat' into develop

src/views/card-info/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-04-15 10:22:36
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-17 14:18:15
+ * @LastEditTime: 2023-04-17 14:43:11
  * @FilePath: \TelpoH5FrontendWeb\src\views\card-info\index.vue
  * @description:
 -->
@@ -109,6 +109,7 @@ export default {
   },
   created() {
     this.getAuth();
+    this.getToken();
     this.getParams();
     this.getCardInfo();
 
@@ -120,6 +121,18 @@ export default {
         APICore.getAuth({ manufactorId: manufactorId }).then(res => {
             this.$store.commit("gatewayToken", res.data.data);
         });
+    },
+    // 获取token
+    getToken() {
+        let manufacturerNo = '9f166b07-ff83-4991-84dc-ca6ad4a6b95b';
+        APIPay.getToken(manufacturerNo).then(res => {
+            console.log("token的数据", res.data)
+            let data = res.data;
+            if(data.code === 20000) {
+                this.$store.commit("token", data.token);
+                console.log("token的数据",  localStorage.getItem('token'))
+            }
+        })
     },
       // 获取url传过来的参数
     getParams() {
@@ -157,6 +170,10 @@ export default {
             let data= res.data;
             if(data.code === 20000) {
                 this.$store.commit("openId", data.data.openId);
+            }else if (data.state === false) {
+                console.log("token过期");
+                this.getToken();
+                this.getOpenId(this.code);
             }
         })
     },

src/views/package-buy/index.vue

@@ -460,8 +460,6 @@ export default {
     },
   },
   created() {
-   /*  this.getAuth(); */
-    this.getWxAutograph();
     //  套餐列表
     this.getDevicePayPackage();
   },