Merge branch 'merge-master'

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-28 16:04:03
+ * @LastEditTime: 2023-04-28 16:39:51
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -400,3 +400,9 @@ update
 fix
 - buyRecord
     - 修复 购买记录时间格式转换异常导致数据显示不出来的问题
+
+## v1.0.48
+`2023.4.28`
+fix
+- packageBuy
+    - 修复 判断套餐ID类型异常导致下单失败的问题

src/config/models.js

@@ -1,11 +1,11 @@
 /*
  * @Date: 2021-11-20 10:26:39
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-28 09:18:52
+ * @LastEditTime: 2023-04-28 16:41:10
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.47F'; //版本号
+export const VERSION_MODEL = '1.0.48F'; //版本号
 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-27 14:34:26
+ * @LastEditTime: 2023-04-28 16:42:01
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-buy\index.vue
  * @description:
 -->
@@ -254,18 +254,18 @@ export default {
         console.log("基础包", data);
         this.price = data.packagesPrice;
         let payTypeToPackAgeId = data.payTypeList;
-        if (this.payType === '2') {
+        if (this.payType == '2') {
                 // 全额
                 this.payProductId = payTypeToPackAgeId.filter(item => {
-                    return item.payType === '2'
+                    return item.payType == '2'
                 })[0].productId;
                 this.packageIssue = 0;
                 console.log("this.payProductId", this.payProductId);
                 this.aliPay(data);
-            } else if (this.payType === '3') {
+            } else if (this.payType == '3') {
                 // 分期
                 this.payProductId = payTypeToPackAgeId.filter(item => {
-                    return item.payType === '3'
+                    return item.payType == '3'
                 })[0].productId;
                 this.packageIssue = 12;
                 this.payType = '2';
@@ -275,7 +275,7 @@ export default {
                 // 微信
                 let openId = this.$store.getters.openId;
                 this.payProductId = payTypeToPackAgeId.filter(item => {
-                    return item.payType === '1'
+                    return item.payType == '1'
                 })[0].productId;
                 this.packageIssue = 0;
                 console.log("this.payProductId3", this.payProductId);
@@ -321,7 +321,7 @@ export default {
                     }, 1000);
                 } else if ( res.data.code !== 0){
                     return this.$dialog.confirm({
-                        message: `请反馈给一线人员,\n${res.data.message}`,
+                        message: `请反馈给一线人员,\n${res.data.message},或者请您重新进入`,
                         showCancelButton: false
                     })
                 }