From 95158674b546ffcb587421109f5b9cff26b45616 Mon Sep 17 00:00:00 2001 From: JinxChen <2183691628@qq.com> Date: Fri, 14 Apr 2023 10:28:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20-=20packageList=20=20=20=20=20-=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=97=A0=E6=B3=95=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E5=A5=97=E9=A4=90=E6=97=B6=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +++++++- src/config/models.js | 4 ++-- src/views/package-list/index.vue | 12 +++++++++--- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 696a32f..b8b7030 100644 --- a/README.md +++ b/README.md @@ -353,4 +353,10 @@ update - packageHome - 增加 微信授权code调用方式,缓存没有则从路由获取 - appId - - 修改 测试环境appId \ No newline at end of file + - 修改 测试环境appId + +## v1.0.41 +`2023.4.14` +update +- packageList + - 增加 无法购买套餐时错误提示 \ No newline at end of file diff --git a/src/config/models.js b/src/config/models.js index a9be204..551bb4c 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-08 14:56:13 + * @LastEditTime: 2023-04-14 10:27:11 * @FilePath: \TelpoH5FrontendWeb\src\config\models.js * @description: */ -export const VERSION_MODEL = '1.0.40F'; //版本号 +export const VERSION_MODEL = '1.0.41F'; //版本号 export const IMAGE_URL = { production: 'http://zfb.ssjlai.com/web/', test: 'http://zfb.ssjlai.com/web/', diff --git a/src/views/package-list/index.vue b/src/views/package-list/index.vue index 6225d88..a7d6084 100644 --- a/src/views/package-list/index.vue +++ b/src/views/package-list/index.vue @@ -1,7 +1,7 @@ @@ -362,8 +362,14 @@ export default { this.wxPay(orderData); }, 1000); } else if (res.data.code === 104) { - this.$dialog.confirm({ - message: `${res.data.message}` + return this.$dialog.confirm({ + message: `${res.data.message}`, + showCancelButton: false + }) + } else if ( res.data.code !== 0){ + return this.$dialog.confirm({ + message: `${res.data.message}`, + showCancelButton: false }) } let that = this; From 87d22f97d3918ae9088d395ef69c5d7980d0faf8 Mon Sep 17 00:00:00 2001 From: JinxChen <2183691628@qq.com> Date: Fri, 14 Apr 2023 10:43:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/package-list/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/package-list/index.vue b/src/views/package-list/index.vue index a7d6084..0f1ce7c 100644 --- a/src/views/package-list/index.vue +++ b/src/views/package-list/index.vue @@ -368,7 +368,7 @@ export default { }) } else if ( res.data.code !== 0){ return this.$dialog.confirm({ - message: `${res.data.message}`, + message: `请反馈给一线人员,\n${res.data.message}`, showCancelButton: false }) }