Merge branch 'merge-master'

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-08 21:03:45
+ * @LastEditTime: 2023-04-14 10:48:31
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -356,6 +356,7 @@ update
     - 修改 测试环境appId
 
 ## v1.0.41
-`2023.4.8`
+`2023.4.14`
 update
-增加 正式环境的debug按钮
+- packageList
+    - 增加 无法购买套餐时错误提示

src/config/models.js

@@ -1,7 +1,7 @@
 /*
  * @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:
  */

src/views/package-list/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-03-29 16:57:58
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-08 22:05:03
+ * @LastEditTime: 2023-04-14 10:25:19
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-list\index.vue
  * @description: TODO 小台风充值h5
 -->
@@ -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: `请反馈给一线人员,\n${res.data.message}`,
+                            showCancelButton: false
                         })
                     }
                     let that = this;