Merge branch 'develop' into test

src/views/card-info/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-04-15 10:22:36
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-17 11:03:49
+ * @LastEditTime: 2023-04-17 11:36:29
  * @FilePath: \TelpoH5FrontendWeb\src\views\card-info\index.vue
  * @description:
 -->
@@ -148,7 +148,7 @@ export default {
         let commonUrl = process.env.VUE_APP_BASE_API;
         let redUrl = encodeURIComponent(`${commonUrl}/h5-frontendweb/#/cardInfo?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;
+        window.location.href = url;
     },
      // 根据code获取openId
     getOpenId(code) {

src/views/package-buy/index.vue

@@ -1,16 +1,16 @@
 <!--
  * @Date: 2023-03-14 09:32:37
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-17 11:19:13
+ * @LastEditTime: 2023-04-17 11:35:10
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-buy\index.vue
  * @description:
 -->
 <template>
     <div class="package-buy-container">
-        <van-nav-bar :left-arrow="false" :border="true">
-            <template #title>
+        <van-nav-bar :left-arrow="true" title="套餐订购" :border="true" @click-left="onNavBack">
+            <!-- <template #title>
                 <h5 style="font-size: 16px">套餐订购</h5>
-            </template>
+            </template> -->
         </van-nav-bar>
         <!-- 套餐内容 -->
         <div class="package-container">
@@ -150,6 +150,12 @@ export default {
    }
   },
   methods: {
+    onNavBack() {
+        this.$router.replace({
+            name: "cardInfo",
+            query: { imei: this.$route.query.imei, iccid: this.$route.query.iccid, isShowMenu: true}
+        });
+    },
     //   获取core token
     getAuth() {
         let manufactorId = "5bf13062-a41e-4d00-ba14-1101aad12650";