Merge branch 'develop' into test

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-17 11:20:12
+ * @LastEditTime: 2023-04-17 17:41:51
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -378,4 +378,6 @@ update
 `2023.4.17`
 update
 - packageHome
-    - 增加 进入充值首页时已充值跳转到话费查询页面
+    - 增加 进入充值首页时已充值跳转到话费查询页面
+- cardInfo
+    - 修复 code重复的问题

src/views/buy-record/index.vue

@@ -95,7 +95,7 @@ export default {
     onNavBack() {
         this.$router.replace({
             name: "cardInfo",
-            query: { imei: this.$route.query.imei, iccid: this.$route.query.iccid, isShowMenu: true}
+            query: { imei: this.$route.query.imei, iccid: this.$route.query.iccid, isShowMenu: true, isHasCode: true}
         });
     },
     // 复制订单号

src/views/card-info/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-04-15 10:22:36
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-17 17:19:33
+ * @LastEditTime: 2023-04-17 17:40:01
  * @FilePath: \TelpoH5FrontendWeb\src\views\card-info\index.vue
  * @description:
 -->
@@ -145,7 +145,9 @@ export default {
                 let code = url.split("&")[0];
                 if (isNotNull(code)) {
                     this.isShowPage = true;
-                    this.getOpenId(code);
+                    if(!params.isHasCode) {
+                        this.getOpenId(code);
+                    }
                 } else {
                     this.$dialog({
                         message: '系统繁忙，请重新进入'
@@ -183,7 +185,7 @@ export default {
           this.$toast.loading({ message: '查询中...' });
           let reqBody = {
               imei: this.$route.query.imei,
-              iccid: '' || this.$route.query.iccid
+              iccid: this.$route.query.iccid || ''
           }
           APIWx.GetCardInfo(reqBody)
             .then(res => {

src/views/package-buy/index.vue

@@ -153,7 +153,7 @@ export default {
     onNavBack() {
         this.$router.replace({
             name: "cardInfo",
-            query: { imei: this.$route.query.imei, iccid: this.$route.query.iccid, isShowMenu: true}
+            query: { imei: this.$route.query.imei, iccid: this.$route.query.iccid, isShowMenu: true, isHasCode: true}
         });
     },
     //   获取core token