Merge branch 'develop' into test

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-03-02 01:14:22
+ * @LastEditTime: 2023-03-23 15:49:25
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -263,3 +263,11 @@ feat
 - cardInfo
     - 增加 物联网卡套餐信息查询页面
     - 增加 加油包合基础套餐购买页面
+
+
+## v1.0.31
+`2023.3.23`
+feat
+- packageList，packageBuy
+    - 增加 下单接口iccid参数
+

src/config/models.js

@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.30F'; //版本号
+export const VERSION_MODEL = '1.0.31F'; //版本号
 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-03-14 11:35:43
+ * @LastEditTime: 2023-03-23 15:48:00
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-buy\index.vue
  * @description:
 -->
@@ -295,6 +295,7 @@ export default {
         let reqBody = {
             openId: this.$store.getters.openId, //openId
             imei: that.$route.query.imei, //imei
+            iccid: that.$route.query.iccid,
             productId: orderData.packagesId, //套餐id
             packageName:
             orderData.productModel + "," + orderData.packagesName, //套餐名字
@@ -376,6 +377,7 @@ export default {
             let reqBody = {
                 openId: this.$store.getters.openId, //openId
                 imei: that.$route.query.imei, //imei
+                iccid: that.$route.query.iccid,
                 productId: this.payProductId, //套餐id
                 packageName: /* data.productModel + ',' +  */data.packagesName, //套餐名字
                 packagePayType: Number(this.payType), //支付类型

src/views/package-list/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-03-29 16:57:58
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-03-13 18:12:26
+ * @LastEditTime: 2023-03-23 15:45:04
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-list\index.vue
  * @description: TODO 小台风充值h5
 -->
@@ -326,6 +326,7 @@ export default {
             let reqBody = {
                 openId: this.$store.getters.openId, //openId
                 imei: this.params.imei, //imei
+                iccid: this.params.iccid,
                 productId: this.payProductId, //套餐id
                 packageName: /* data.productModel */ data.packagesName, //套餐名字
                 packagePayType: Number(this.payType), //支付类型
@@ -421,6 +422,7 @@ export default {
             let reqBody = {
                 openId: this.$store.getters.openId, //openId
                 imei: this.params.imei, //imei
+                iccid: this.params.iccid,
                 productId: this.payProductId, //套餐id
                 packageName: /* data.productModel + ',' +  */data.packagesName, //套餐名字
                 packagePayType: Number(this.payType), //支付类型