Merge branch 'merge-master'

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-06 10:12:37
+ * @LastEditTime: 2023-04-06 14:23:25
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -337,6 +337,7 @@ update
     - 修改 正式环境的appid
 - packageList
     - 修改 正式环境 代理商用户的userId
-
+    - 修复 购买套餐时接口返回数据类型不一致导致购买异常的问题
+    - 注释 获取微信jssdk接口
 - packageHome
-    - 修改 appId获取的方式，本地配置文件固定配置，不再从url路由获取
+    - 修改 appId获取的方式，本地配置文件固定配置，不再从url路由获取

src/views/package-list/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-03-29 16:57:58
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-06 09:14:39
+ * @LastEditTime: 2023-04-06 14:21:05
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-list\index.vue
  * @description: TODO 小台风充值h5
 -->
@@ -144,15 +144,10 @@ export default {
     created() {
         this.getAuth();
         this.getParams();
-        this.getWxAutograph();
+        //this.getWxAutograph();
         //  套餐列表
         this.getDevicePayPackage();
     },
-    /* mounted() {
-        this.getParams();
-        this.getWxAutograph();
-        this.getLiveBasePackage();
-    }, */
     methods: {
         // 根据code获取openId
         getOpenId() {
@@ -284,7 +279,7 @@ export default {
             if (this.payType === '2') {
                 // 全额
                 this.payProductId = payTypeToPackAgeId.filter(item => {
-                    return item.payType === '2'
+                    return item.payType === '2' || item.payType === 2
                 })[0].productId;
                 this.packageIssue = 0;
                 console.log("this.payProductId", this.payProductId);
@@ -292,7 +287,7 @@ export default {
             } else if (this.payType === '3') {
                 // 分期
                 this.payProductId = payTypeToPackAgeId.filter(item => {
-                    return item.payType === '3'
+                    return item.payType === '3' || item.payType === 3
                 })[0].productId;
                 this.packageIssue = 12;
                 this.payType = '2';
@@ -302,7 +297,7 @@ export default {
                 // 微信
                 let openId = this.$store.getters.openId;
                 this.payProductId = payTypeToPackAgeId.filter(item => {
-                    return item.payType === '1'
+                    return item.payType === '1' || item.payType === 1
                 })[0].productId;
                 this.packageIssue = 0;
                 console.log("this.payProductId3", this.payProductId);