Merge branch 'develop' into test

src/views/package-list/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-03-29 16:57:58
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-02-28 14:58:08
+ * @LastEditTime: 2023-02-28 16:44:15
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-list\index.vue
  * @description: TODO 小台风充值h5
 -->
@@ -361,7 +361,7 @@ export default {
             // 需要区分是要用微信支付还是支付宝花呗支付
             if (this.payType === '2') {
                 this.payProductId =  process.env.NODE_ENV === "production" ? '1629407413618294784' : '1629405716684029952', //支付宝全额支付
-                this.packageIssue = 0;
+                this.packageIssue = 1;
                 this.aliPay(data);
             } else if (this.payType === '3') {
                 this.payProductId =  process.env.NODE_ENV === "production" ? '1629407705558630400': '1629405558344859648', //支付宝花呗支付
@@ -370,6 +370,7 @@ export default {
                 this.aliPay(data);
             } else {
                 let openId = this.$store.getters.openId;
+                this.payProductId =  process.env.NODE_ENV === "production" ? '1629407705558630400': '1629405558344859648'; //支付宝花呗支付
                 if(openId === null || openId === 'null') {
                     this.$dialog.confirm({
                         message: '获取OpenId失败，请您重新进入',
@@ -398,9 +399,9 @@ export default {
                 openId: this.$store.getters.openId, //openId
                 imei: this.params.imei, //imei
                 productId: this.payProductId, //套餐id
-                packageName: /* data.productModel */ + ',' + data.packageName, //套餐名字
+                packageName: /* data.productModel */ data.packageName, //套餐名字
                 packagePayType: Number(this.payType), //支付类型
-                packageIssue: this.packageIssue, //分期
+                packageIssue: 1, //分期
                 packagePrice: process.env.NODE_ENV === "production" ? data.packagePrice * 100 : 1  //总金额单位为分，测试环境写死
             };
             APICore.payLiveBaseDevice(reqBody)
@@ -508,7 +509,7 @@ export default {
                     that.outTradeNo = alipayData.outTradeNo;
                     let alipayForm = decodeURI(alipayData.payXmlStr);
                     that.$store.commit("isFromWx", true);
-                    let alipayUserId = process.env.NODE_ENV === "production" ? 42 : 18
+                    let alipayUserId = process.env.NODE_ENV === "production" ? 42 : 18;
                     this.$router.replace({
                         name: "payResult",
                         query: {