Merge branch 'develop' into test

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-02-24 18:49:37
+ * @LastEditTime: 2023-02-25 16:43:43
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -192,4 +192,5 @@ fix
 ## v1.0.20
 `2023.2.25`
 fix
-- 修复 调起微信支付异常的问题
+- 修复 调起微信支付异常的问题
+- 修复 获取imei异常的问题

src/views/package-home/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2023-02-24 14:18:25
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-02-24 15:39:49
+ * @LastEditTime: 2023-02-25 16:55:16
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-home\index.vue
  * @description:
 -->
@@ -46,7 +46,7 @@ export default {
                     let timeStamp = new Date().getTime();
                     let code = url.split("&")[0];
                     if (isNotNull(code)) {
-                        this.$store.commit("wxAuthCode", `${code}`);
+                        this.$store.commit("wxAuthCode", code);
                         /* this.getOpenId(); */
                     }
                 } else {

src/views/package-list/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-03-29 16:57:58
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-02-25 16:31:31
+ * @LastEditTime: 2023-02-25 16:54:07
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-list\index.vue
  * @description: TODO 小台风充值h5
 -->
@@ -119,12 +119,17 @@ export default {
         // 根据code获取openId
         getOpenId() {
             let code = this.$store.getters.wxAuthCode;
-            APIPay.getOpenId(code).then(res => {
-                let data= res.data;
-                if(data.code === 20000) {
-                    this.$store.commit("openId", data.data.openId);
-                }
-            })
+            let openId = this.$store.getters.openId;
+            if(isNotNull(openId)) {
+                console.log("已经存在openId");
+            } else {
+                APIPay.getOpenId(code).then(res => {
+                    let data= res.data;
+                    if(data.code === 20000) {
+                        this.$store.commit("openId", data.data.openId);
+                    }
+                })
+            }
         },
          // 获取b端接口的token
         getAuth() {
@@ -298,7 +303,7 @@ export default {
                                     rechargeUrl: data.rechargeUrl,
                                     iccid: that.params.iccid,
                                     isAdmin: that.$route.query.isAdmin || false,
-                                    serialNo: that.$route.query.serialNo,
+                                    serialNo: that.params.imei,
                                     issue: data.packageIssue
                                 }
                             });
@@ -367,9 +372,9 @@ export default {
                             outTradeNo: that.outTradeNo,
                             price: that.price,
                             alipayForm: alipayForm,
-                            iccid: that.$route.query.iccid,
+                            iccid: that.params.iccid,
                             isAdmin: that.$route.query.isAdmin || false,
-                            serialNo: that.$route.query.serialNo,
+                            serialNo: that.params.imei,
                             alipayUserId: alipayUserId,
                             productId: data.productId
                         }