xiaoe_mp_npm 0.5.43 → 0.5.44-test10

package/.gitlab-ci.yml

@@ -7,6 +7,7 @@ build_test:
     - feature/live_marketing_iteration
     - feature/remove-error-report
     - fix/record-lottery
+    - feature/coupon_fix
   tags:
     - fe-group-prod-runner-2
   script:

package/miniprogram_dist/ConfirmOrder/components/ConfirmOrderContent/index.js

@@ -487,6 +487,7 @@ Component({
      * @param {Boolean} data.triggerPrePay  本次修改是否触发批价
      */
     payInfoChange(val) {
+      console.log('子组件传参父组件',val)
       let data = {};
       val.detail ? data = val.detail : data = val
       this.setData({
@@ -541,6 +542,8 @@ Component({
           })
         }
       }
+      console.log('prePayParams',this.data.prePayParams);
+      console.log('payParams',this.data.payParams);
     },
     // 返回箭头点击事件
     backClick() {

package/miniprogram_dist/ConfirmOrder/components/ConfirmOrderContent/index.wxml

@@ -49,6 +49,7 @@
     ></ChoosePicker>
     <!-- 商品信息 -->
     <GoodsInfo
+      prePayInfo="{{prePayInfo}}"
       marketingData="{{ marketingData.marketing_info }}"
       goodsInfo="{{ goodsInfo }}"
       confirmOrderInfo="{{ confirmOrderInfo }}"

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/index.js

@@ -83,7 +83,11 @@ Component({
     isFullScreen: {
       type: Boolean,
       value: false
-    }
+    },
+    prePayInfo: {
+      type: Object,
+      value: () => {},
+    },
   },
 
   /**
@@ -91,7 +95,10 @@ Component({
    */
   data: {
     goodsCount: 1,
-    first: true
+    first: true,
+    usedPromoCode: '',
+    couponList: []
+
   },
   computed: {
     historyBuy(data) {
@@ -306,6 +313,15 @@ Component({
         this.changeVal(event)
       }
     },
+    'prePayInfo': function(data) {
+      console.log('data',data)
+      if(data) {
+        this.setData({
+          usedPromoCode: data?.promo_code || '',
+          couponList: this.changeCouponId(data?.coupon?.valid || []),  
+        })
+      }
+    },
   },
   lifetimes: {
     attached: function () {
@@ -323,6 +339,13 @@ Component({
       })
       this.countBlur(true);
     },
+    changeCouponId(list) {
+      const arr = [];
+      for (let i = 0; i < list.length; i++) {
+          arr[i] = list[i].cu_id;
+      }
+      return arr
+    },
     overlimit(limitType) {
       if (limitType.detail === 'plus') {
         if (this.data.goodsInfo?.stock === this.data.count || this.data.count > this.data.goodsInfo?.stock) {
@@ -372,6 +395,7 @@ Component({
       }
     },
     changeVal(event) {
+      console.log('event',event)
       let data = event.detail
       if (data <= 0) {
         data = 1
@@ -386,11 +410,26 @@ Component({
         this.setData({
           first: false
         })
-        this.countBlur()
+        this.countBlur();
+        this.couponCheck();
       })
     },
+    couponCheck(){
+      this.triggerEvent("dataChange", {
+        name: "goodsInfo",
+        prePayParams: {
+          cu_id: this.data.couponList,
+          promo_code: this.data.usedPromoCode
+        },
+        payParams: {
+          cu_id: this.data.couponList,
+          promo_code: this.data.usedPromoCode
+        },
+      });
+    },
     // init 是否初次触发
     countBlur(init) {
+      console.log('init',init)
       if (this.data.count === this.data.goodsCount && init !== true) {
         return false;
       }

package/miniprogram_dist/coupon/index.js

@@ -30,6 +30,26 @@ Component({
             setCoupon: true
           })
         }
+
+        wx.getStorage({
+          key: 'oldChooseCouponList',
+          success : (res)=> {
+            console.log('oldChooseCouponList',res)
+            if(this.changeCouponId(this.data.chooseCouponList) != JSON.parse(res.data) ){
+              this.setPricingInfo(this.changeCouponId(this.data.chooseCouponList), this.data.usedPromoCode)
+            }
+          }
+        })
+
+        wx.getStorage({
+          key: 'oldUsedPromoCode',
+          success : (res)=> {
+            console.log('oldUsedPromoCode',res)
+            if(this.data.usedPromoCode != res.data ){
+              this.setPricingInfo(this.changeCouponId(this.data.chooseCouponList), this.data.usedPromoCode)
+            }
+          }
+        })  
       }
     },
   },
@@ -102,6 +122,7 @@ Component({
       })
     },
     setPricingInfoFirst(cu_id, promo_code) {
+      console.log('cu_id_first',cu_id)
       this.triggerEvent('dataChange', {
         name: "couponSelect",
         payParams: {
@@ -111,6 +132,7 @@ Component({
       })
     },
     setPricingInfo(cu_id, promo_code) {
+      console.log('cu_id',cu_id)
       this.triggerEvent('dataChange', {
         name: "couponSelect",
         payParams: {
@@ -194,6 +216,14 @@ Component({
     // 判断当前显示文案
     choosedType () {
       console.log('properties', this.properties)
+      wx.setStorage({
+        key:"oldChooseCouponList",
+        data: JSON.stringify(this.changeCouponId(this.data.chooseCouponList))
+      })
+      wx.setStorage({
+        key:"oldUsedPromoCode",
+        data: this.data.usedPromoCode
+      })
       if (this.properties.usedPromoCode) {
         return `已选优惠码`;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaoe_mp_npm",
-  "version": "0.5.43",
+  "version": "0.5.44-test10",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "scripts": {

package/src/ConfirmOrder/components/ConfirmOrderContent/index.js

@@ -487,6 +487,7 @@ Component({
      * @param {Boolean} data.triggerPrePay  本次修改是否触发批价
      */
     payInfoChange(val) {
+      console.log('子组件传参父组件',val)
       let data = {};
       val.detail ? data = val.detail : data = val
       this.setData({
@@ -541,6 +542,8 @@ Component({
           })
         }
       }
+      console.log('prePayParams',this.data.prePayParams);
+      console.log('payParams',this.data.payParams);
     },
     // 返回箭头点击事件
     backClick() {

package/src/ConfirmOrder/components/ConfirmOrderContent/index.wxml

@@ -49,6 +49,7 @@
     ></ChoosePicker>
     <!-- 商品信息 -->
     <GoodsInfo
+      prePayInfo="{{prePayInfo}}"
       marketingData="{{ marketingData.marketing_info }}"
       goodsInfo="{{ goodsInfo }}"
       confirmOrderInfo="{{ confirmOrderInfo }}"

package/src/ConfirmOrder/components/GoodsInfo/index.js

@@ -83,7 +83,11 @@ Component({
     isFullScreen: {
       type: Boolean,
       value: false
-    }
+    },
+    prePayInfo: {
+      type: Object,
+      value: () => {},
+    },
   },
 
   /**
@@ -91,7 +95,10 @@ Component({
    */
   data: {
     goodsCount: 1,
-    first: true
+    first: true,
+    usedPromoCode: '',
+    couponList: []
+
   },
   computed: {
     historyBuy(data) {
@@ -306,6 +313,15 @@ Component({
         this.changeVal(event)
       }
     },
+    'prePayInfo': function(data) {
+      console.log('data',data)
+      if(data) {
+        this.setData({
+          usedPromoCode: data?.promo_code || '',
+          couponList: this.changeCouponId(data?.coupon?.valid || []),  
+        })
+      }
+    },
   },
   lifetimes: {
     attached: function () {
@@ -323,6 +339,13 @@ Component({
       })
       this.countBlur(true);
     },
+    changeCouponId(list) {
+      const arr = [];
+      for (let i = 0; i < list.length; i++) {
+          arr[i] = list[i].cu_id;
+      }
+      return arr
+    },
     overlimit(limitType) {
       if (limitType.detail === 'plus') {
         if (this.data.goodsInfo?.stock === this.data.count || this.data.count > this.data.goodsInfo?.stock) {
@@ -372,6 +395,7 @@ Component({
       }
     },
     changeVal(event) {
+      console.log('event',event)
       let data = event.detail
       if (data <= 0) {
         data = 1
@@ -386,11 +410,26 @@ Component({
         this.setData({
           first: false
         })
-        this.countBlur()
+        this.countBlur();
+        this.couponCheck();
       })
     },
+    couponCheck(){
+      this.triggerEvent("dataChange", {
+        name: "goodsInfo",
+        prePayParams: {
+          cu_id: this.data.couponList,
+          promo_code: this.data.usedPromoCode
+        },
+        payParams: {
+          cu_id: this.data.couponList,
+          promo_code: this.data.usedPromoCode
+        },
+      });
+    },
     // init 是否初次触发
     countBlur(init) {
+      console.log('init',init)
       if (this.data.count === this.data.goodsCount && init !== true) {
         return false;
       }

package/src/coupon/index.js

@@ -30,6 +30,26 @@ Component({
             setCoupon: true
           })
         }
+
+        wx.getStorage({
+          key: 'oldChooseCouponList',
+          success : (res)=> {
+            console.log('oldChooseCouponList',res)
+            if(this.changeCouponId(this.data.chooseCouponList) != JSON.parse(res.data) ){
+              this.setPricingInfo(this.changeCouponId(this.data.chooseCouponList), this.data.usedPromoCode)
+            }
+          }
+        })
+
+        wx.getStorage({
+          key: 'oldUsedPromoCode',
+          success : (res)=> {
+            console.log('oldUsedPromoCode',res)
+            if(this.data.usedPromoCode != res.data ){
+              this.setPricingInfo(this.changeCouponId(this.data.chooseCouponList), this.data.usedPromoCode)
+            }
+          }
+        })  
       }
     },
   },
@@ -102,6 +122,7 @@ Component({
       })
     },
     setPricingInfoFirst(cu_id, promo_code) {
+      console.log('cu_id_first',cu_id)
       this.triggerEvent('dataChange', {
         name: "couponSelect",
         payParams: {
@@ -111,6 +132,7 @@ Component({
       })
     },
     setPricingInfo(cu_id, promo_code) {
+      console.log('cu_id',cu_id)
       this.triggerEvent('dataChange', {
         name: "couponSelect",
         payParams: {
@@ -194,6 +216,14 @@ Component({
     // 判断当前显示文案
     choosedType () {
       console.log('properties', this.properties)
+      wx.setStorage({
+        key:"oldChooseCouponList",
+        data: JSON.stringify(this.changeCouponId(this.data.chooseCouponList))
+      })
+      wx.setStorage({
+        key:"oldUsedPromoCode",
+        data: this.data.usedPromoCode
+      })
       if (this.properties.usedPromoCode) {
         return `已选优惠码`;
       }