From b7ce0339747a42fed4c784a0a1c57afeec5eb7c2 Mon Sep 17 00:00:00 2001 From: JinxChen <2183691628@qq.com> Date: Mon, 17 Apr 2023 17:18:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20-=20packageHome=20=20=20=20=20-=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E8=BF=9B=E5=85=A5=E5=85=85=E5=80=BC?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=97=B6=E5=B7=B2=E5=85=85=E5=80=BC=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=88=B0=E8=AF=9D=E8=B4=B9=E6=9F=A5=E8=AF=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 ++++++++- src/config/models.js | 4 ++-- src/views/card-info/index.vue | 6 +++--- src/views/package-home/index.vue | 9 ++++++--- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 5c845e0..a191a96 100644 --- a/README.md +++ b/README.md @@ -371,4 +371,11 @@ update `2023.4.17` update - cardInfo - - 优化 话费查询，购买功能 \ No newline at end of file + - 优化 话费查询，购买功能 + + +## v1.0.44 +`2023.4.17` +update +- packageHome + - 增加 进入充值首页时已充值跳转到话费查询页面 \ No newline at end of file diff --git a/src/config/models.js b/src/config/models.js index 91ee43e..a384113 100644 --- a/src/config/models.js +++ b/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/', diff --git a/src/views/card-info/index.vue b/src/views/card-info/index.vue index f9ee98c..2f378aa 100644 --- a/src/views/card-info/index.vue +++ b/src/views/card-info/index.vue @@ -1,7 +1,7 @@ @@ -51,7 +51,7 @@ -
+

套餐订购

@@ -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; diff --git a/src/views/package-home/index.vue b/src/views/package-home/index.vue index 77af019..d5c4756 100644 --- a/src/views/package-home/index.vue +++ b/src/views/package-home/index.vue @@ -1,7 +1,7 @@ @@ -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`; From fc03061e4d5901343284d81923a59ee62aeddbdb Mon Sep 17 00:00:00 2001 From: JinxChen <2183691628@qq.com> Date: Mon, 17 Apr 2023 17:19:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=80=E6=94=BE=20=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/card-info/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/card-info/index.vue b/src/views/card-info/index.vue index 2f378aa..3f627a5 100644 --- a/src/views/card-info/index.vue +++ b/src/views/card-info/index.vue @@ -1,7 +1,7 @@ @@ -51,7 +51,7 @@
-
+

套餐订购