xiaoe_mp_npm 0.5.44-test8 → 0.5.44

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

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

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

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

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

@@ -84,10 +84,6 @@ Component({
       type: Boolean,
       value: false
     },
-    prePayInfo: {
-      type: Object,
-      value: () => {},
-    },
   },
 
   /**
@@ -96,9 +92,6 @@ Component({
   data: {
     goodsCount: 1,
     first: true,
-    usedPromoCode: '',
-    couponList: []
-
   },
   computed: {
     historyBuy(data) {
@@ -312,16 +305,7 @@ Component({
       if (count != 1 && this.data.goodsInfo.sku_min_purchase <= 1) {
         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 () {
@@ -339,13 +323,6 @@ 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) {
@@ -411,25 +388,10 @@ Component({
           first: false
         })
         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/ConfirmOrder/index.js

@@ -79,6 +79,8 @@ Component({
       this.setData({
         showPopup: false
       });
+      wx.removeStorage('oldChooseCouponList')
+      wx.removeStorage('oldUsedPromoCode')  
       this.triggerEvent("closePop")
     },
     changeSheetInfo(val) {

package/miniprogram_dist/coupon/index.js

@@ -11,7 +11,6 @@ Component({
       })
     },
     'prePayInfo': function(data) {
-      console.log('data',data)
       if(data) {
         this.setData({
           couponDiscount: data?.coupon_discount || 0,
@@ -24,14 +23,39 @@ Component({
           originalPrice: data?.original_price,
           goodsPrice:  data?.goods_price
         })
-        if(!this.data.setCoupon) {
-          console.log('this.data.chooseCouponList',this.data.chooseCouponList)
-          let chooseCouponList = this.changeCouponId(this.data.chooseCouponList)
-          this.setPricingInfoFirst(chooseCouponList, this.data.usedPromoCode)
-          this.setData({
-            setCoupon: true
-          })
-        }
+        // if(!this.data.setCoupon) {
+        //   let chooseCouponList = this.changeCouponId(this.data.chooseCouponList)
+        //   this.setPricingInfoFirst(chooseCouponList, this.data.usedPromoCode)
+        //   this.setData({
+        //     setCoupon: true
+        //   })
+        // }
+        wx.getStorage({
+          key: 'oldChooseCouponList',
+          success : (res)=> {
+            console.log('this.changeCouponId(this.data.chooseCouponList)',this.changeCouponId(this.data.chooseCouponList))
+            console.log('oldChooseCouponList',res)
+            if(JSON.stringify(this.changeCouponId(this.data.chooseCouponList)) != res.data ){
+              this.setPricingInfoFirst(this.changeCouponId(this.data.chooseCouponList), this.data.usedPromoCode)
+            }
+          }
+        })
+        wx.getStorage({
+          key: 'oldUsedPromoCode',
+          success : (res)=> {
+            if(this.data.usedPromoCode != res.data ){
+              this.setPricingInfoFirst(this.changeCouponId(this.data.chooseCouponList), this.data.usedPromoCode)
+            }
+          }
+        })
+        wx.setStorage({
+          key:"oldChooseCouponList",
+          data: JSON.stringify(this.changeCouponId(this.data.chooseCouponList))
+        })
+        wx.setStorage({
+          key:"oldUsedPromoCode",
+          data: this.data.usedPromoCode
+        })
       }
     },
   },

package/package.json

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

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

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

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

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

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

@@ -84,10 +84,6 @@ Component({
       type: Boolean,
       value: false
     },
-    prePayInfo: {
-      type: Object,
-      value: () => {},
-    },
   },
 
   /**
@@ -96,9 +92,6 @@ Component({
   data: {
     goodsCount: 1,
     first: true,
-    usedPromoCode: '',
-    couponList: []
-
   },
   computed: {
     historyBuy(data) {
@@ -312,16 +305,7 @@ Component({
       if (count != 1 && this.data.goodsInfo.sku_min_purchase <= 1) {
         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 () {
@@ -339,13 +323,6 @@ 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) {
@@ -411,25 +388,10 @@ Component({
           first: false
         })
         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/ConfirmOrder/index.js

@@ -79,6 +79,8 @@ Component({
       this.setData({
         showPopup: false
       });
+      wx.removeStorage('oldChooseCouponList')
+      wx.removeStorage('oldUsedPromoCode')  
       this.triggerEvent("closePop")
     },
     changeSheetInfo(val) {

package/src/coupon/index.js

@@ -11,7 +11,6 @@ Component({
       })
     },
     'prePayInfo': function(data) {
-      console.log('data',data)
       if(data) {
         this.setData({
           couponDiscount: data?.coupon_discount || 0,
@@ -24,14 +23,39 @@ Component({
           originalPrice: data?.original_price,
           goodsPrice:  data?.goods_price
         })
-        if(!this.data.setCoupon) {
-          console.log('this.data.chooseCouponList',this.data.chooseCouponList)
-          let chooseCouponList = this.changeCouponId(this.data.chooseCouponList)
-          this.setPricingInfoFirst(chooseCouponList, this.data.usedPromoCode)
-          this.setData({
-            setCoupon: true
-          })
-        }
+        // if(!this.data.setCoupon) {
+        //   let chooseCouponList = this.changeCouponId(this.data.chooseCouponList)
+        //   this.setPricingInfoFirst(chooseCouponList, this.data.usedPromoCode)
+        //   this.setData({
+        //     setCoupon: true
+        //   })
+        // }
+        wx.getStorage({
+          key: 'oldChooseCouponList',
+          success : (res)=> {
+            console.log('this.changeCouponId(this.data.chooseCouponList)',this.changeCouponId(this.data.chooseCouponList))
+            console.log('oldChooseCouponList',res)
+            if(JSON.stringify(this.changeCouponId(this.data.chooseCouponList)) != res.data ){
+              this.setPricingInfoFirst(this.changeCouponId(this.data.chooseCouponList), this.data.usedPromoCode)
+            }
+          }
+        })
+        wx.getStorage({
+          key: 'oldUsedPromoCode',
+          success : (res)=> {
+            if(this.data.usedPromoCode != res.data ){
+              this.setPricingInfoFirst(this.changeCouponId(this.data.chooseCouponList), this.data.usedPromoCode)
+            }
+          }
+        })
+        wx.setStorage({
+          key:"oldChooseCouponList",
+          data: JSON.stringify(this.changeCouponId(this.data.chooseCouponList))
+        })
+        wx.setStorage({
+          key:"oldUsedPromoCode",
+          data: this.data.usedPromoCode
+        })
       }
     },
   },