Merge branch 'develop' into test

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-17 17:41:51
+ * @LastEditTime: 2023-04-19 15:43:07
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -380,4 +380,11 @@ update
 - packageHome
     - 增加 进入充值首页时已充值跳转到话费查询页面
 - cardInfo
-    - 修复 code重复的问题
+    - 修复 code重复的问题
+
+## v1.0.45
+`2023.4.19`
+update
+- packageList
+- packageBuy
+    - 增加 下单接口 pkId 参数

src/config/models.js

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

src/views/package-buy/index.vue

@@ -306,6 +306,7 @@ export default {
             packageName:
             orderData.productModel + "," + orderData.packagesName, //套餐名字
             packagePayType: '1', //支付类型, 默认微信
+            pkId: data.packagesCardId,
             packageIssue: orderData.packageIssue, //分期
             packagePrice: orderData.packagesPrice * 100
         };
@@ -411,6 +412,7 @@ export default {
                 imei: that.$route.query.imei, //imei
                 iccid: that.$route.query.iccid,
                 productId: this.payProductId, //套餐id
+                pkId: data.packagesCardId,
                 packageName: /* data.productModel + ',' +  */data.packagesName, //套餐名字
                 packagePayType: Number(this.payType), //支付类型
                 packageIssue: this.packageIssue, //分期

src/views/package-list/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-03-29 16:57:58
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-14 10:25:19
+ * @LastEditTime: 2023-04-19 15:38:05
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-list\index.vue
  * @description: TODO 小台风充值h5
 -->
@@ -351,6 +351,7 @@ export default {
                 packageName: /* data.productModel */ data.packagesName, //套餐名字
                 packagePayType: Number(this.payType), //支付类型
                 packageIssue: 0, //分期
+                pkId: data.packagesCardId,
                 packagePrice: process.env.NODE_ENV === "production" ? data.packagesPrice * 100 : 1  //总金额单位为分，测试环境写死
             };
             this.$toast.clear();
@@ -509,6 +510,7 @@ export default {
                 productId: this.payProductId, //套餐id
                 packageName: /* data.productModel + ',' +  */data.packagesName, //套餐名字
                 packagePayType: Number(this.payType), //支付类型
+                pkId: data.packagesCardId,
                 packageIssue: this.packageIssue, //分期
                 packagePrice: process.env.NODE_ENV === "production" ? data.packagesPrice * 100 : 1 //总金额单位为分，测试环境写死
             };