Merge branch 'merge-master'

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-28 16:39:51
+ * @LastEditTime: 2023-05-07 13:38:49
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -406,3 +406,10 @@ fix
 fix
 - packageBuy
     - 修复 判断套餐ID类型异常导致下单失败的问题
+
+
+## v1.0.49
+`2023.5.7`
+update
+- 微信支付
+    - 修改 取消微信支付时文字 “您取消了支付”

src/config/models.js

@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.48F'; //版本号
+export const VERSION_MODEL = '1.0.49F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

src/views/package-buy/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2023-03-14 09:32:37
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-28 16:42:01
+ * @LastEditTime: 2023-05-07 13:28:01
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-buy\index.vue
  * @description:
 -->
@@ -374,8 +374,9 @@ export default {
                                 });
                             }
                         } else {
+                            let cancelMessage = packageType === 1 ? '立即订购': '套餐订购'
                             that.$dialog.confirm({
-                                message: "您取消了支付",
+                                message: `请点击“${cancelMessage}”支付`,
                                 showCancelButton: false
                             });
                         }

src/views/package-list/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-03-29 16:57:58
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-19 15:38:05
+ * @LastEditTime: 2023-05-07 13:16:55
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-list\index.vue
  * @description: TODO 小台风充值h5
 -->
@@ -425,7 +425,7 @@ export default {
                             // 用户取消支付
                             that.$dialog.confirm({
                                 title: "温馨提示",
-                                message: "您取消了支付",
+                                message: "请点击“ 一键办理”支付",
                                 showCancelButton: false
                             });
                             console.log("用户取消了支付::", err);
@@ -471,7 +471,7 @@ export default {
                             });
                         } else {
                             that.$dialog.confirm({
-                                message: "您取消了支付",
+                                message: "请点击“ 第一步：充值话费”支付",
                                 showCancelButton: false
                             });
                         }