Merge branch 'feat' into develop

README.md

@@ -371,4 +371,11 @@ update
 `2023.4.17`
 update
 - cardInfo
-    - 优化 话费查询，购买功能
+    - 优化 话费查询，购买功能
+
+
+## v1.0.44
+`2023.4.17`
+update
+- packageHome
+    - 增加 进入充值首页时已充值跳转到话费查询页面

src/config/models.js

@@ -1,11 +1,11 @@
 /*
  * @Date: 2021-11-20 10:26:39
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-14 10:27:11
+ * @LastEditTime: 2023-04-17 16:55:44
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.43F'; //版本号
+export const VERSION_MODEL = '1.0.44F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

src/views/card-info/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-04-15 10:22:36
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-17 14:43:11
+ * @LastEditTime: 2023-04-17 17:19:33
  * @FilePath: \TelpoH5FrontendWeb\src\views\card-info\index.vue
  * @description:
 -->
@@ -190,7 +190,7 @@ export default {
                 let data = res.data;
                 if (data.stateCode === 1 ) {
                     let item = data.data;
-                    this.setMeal.expireTime = this.$dayjs(item.expireTime).format("YYYY-MM-DD");
+                    this.setMeal.expireTime = item.expireTime == '' ? "": this.$dayjs(item.expireTime).format("YYYY-MM-DD");
                     this.setMeal.residueVoiceData = item.availableVoiceData;
                     this.setMeal.residueFlow = item.availableData;
                     this.setMeal.cardState = item.cardState;

src/views/package-home/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2023-02-24 14:18:25
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-15 13:53:30
+ * @LastEditTime: 2023-04-17 16:34:52
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-home\index.vue
  * @description:
 -->
@@ -110,13 +110,16 @@ export default {
             // todo 暂时去掉
             if(this.isRecharge) {
                 // 如果是已经支付，但未激活，跳转激活界面
-                this.$router.replace({
+               /*  this.$router.replace({
                     name: 'cardActive',
                     query: {
                         imei: params.imei,
                         iccid: params.iccid
                     }
-                })
+                }) */
+                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;
             } else {
                 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`;