Merge branch 'develop' into test

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-19 15:43:07
+ * @LastEditTime: 2023-04-27 14:37:24
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -387,4 +387,10 @@ update
 update
 - packageList
 - packageBuy
-    - 增加 下单接口 pkId 参数
+    - 增加 下单接口 pkId 参数
+
+## v1.0.46
+`2023.4.27`
+update
+- packageBuy
+    - 修改 加油包 下单接口 productId 参数，从原来 packagesId 变成 payTypeList[0].productId 即收单系统id

src/config/models.js

@@ -1,11 +1,11 @@
 /*
  * @Date: 2021-11-20 10:26:39
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-17 16:55:44
+ * @LastEditTime: 2023-04-27 14:37:31
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.45F'; //版本号
+export const VERSION_MODEL = '1.0.46F'; //版本号
 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-17 11:35:10
+ * @LastEditTime: 2023-04-27 14:34:26
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-buy\index.vue
  * @description:
 -->
@@ -298,11 +298,12 @@ export default {
     wxPay(data, packageType) {
         let that = this;
         const orderData = data;
+        console.log("orderData", orderData);
         let reqBody = {
             openId: this.$store.getters.openId, //openId
             imei: that.$route.query.imei, //imei
             iccid: that.$route.query.iccid,
-            productId: orderData.packagesId, //套餐id
+            productId: orderData.payTypeList[0].productId, //套餐id
             packageName:
             orderData.productModel + "," + orderData.packagesName, //套餐名字
             packagePayType: '1', //支付类型, 默认微信