xiaoe_mp_npm 0.1.13 → 0.1.14

package/miniprogram_dist/coupon/index.css

@@ -1,50 +1,50 @@
-.coupon-panel {
-  box-sizing: border-box;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  width: 100%;
-  height: 110rpx;
-  background: #fff;
-}
-.coupon-panel .coupon-left {
-  display: flex;
-  align-items: center;
-}
-.coupon-panel .coupon-left .coupon-title {
-  margin-right: 17.6rpx;
-  line-height: 48.4rpx;
-  font-size: 30.8rpx;
-  color: #333;
-}
-.coupon-panel .coupon-left .coupon-tip {
-  box-sizing: border-box;
-  height: 39.6rpx;
-  line-height: 39.6rpx;
-  padding: 13.2rpx;
-  border-radius: 4.4rpx;
-  font-size: 24.2rpx;
-  color: #FF821F;
-  background: rgba(255, 132, 31, 0.16);
-}
-.coupon-panel .coupon-right {
-  display: flex;
-  align-items: center;
-  flex: 1;
-  justify-content: flex-end;
-}
-.coupon-panel .coupon-right .coupon-value {
-  color: #ff821f;
-  margin-right: 17.6rpx;
-  width: fit-content;
-  font-size: 30.8rpx;
-}
-.coupon-panel .coupon-right .have-no-coupon {
-  margin-right: 17.6rpx;
-  line-height: 44rpx;
-  font-size: 30.8rpx;
-  color: #999;
-}
-.coupon-panel .coupon-right .pay-coupon-img {
-  height: 33rpx;
-}
+.coupon-panel {
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  height: 110rpx;
+  background: #fff;
+}
+.coupon-panel .coupon-left {
+  display: flex;
+  align-items: center;
+}
+.coupon-panel .coupon-left .coupon-title {
+  margin-right: 17.6rpx;
+  line-height: 48.4rpx;
+  font-size: 30.8rpx;
+  color: #333;
+}
+.coupon-panel .coupon-left .coupon-tip {
+  box-sizing: border-box;
+  height: 39.6rpx;
+  line-height: 39.6rpx;
+  padding: 13.2rpx;
+  border-radius: 4.4rpx;
+  font-size: 24.2rpx;
+  color: #FF821F;
+  background: rgba(255, 132, 31, 0.16);
+}
+.coupon-panel .coupon-right {
+  display: flex;
+  align-items: center;
+  flex: 1;
+  justify-content: flex-end;
+}
+.coupon-panel .coupon-right .coupon-value {
+  color: #ff821f;
+  margin-right: 17.6rpx;
+  width: fit-content;
+  font-size: 30.8rpx;
+}
+.coupon-panel .coupon-right .have-no-coupon {
+  margin-right: 17.6rpx;
+  line-height: 44rpx;
+  font-size: 30.8rpx;
+  color: #999;
+}
+.coupon-panel .coupon-right .pay-coupon-img {
+  height: 33rpx;
+}

package/miniprogram_dist/coupon/index.js

@@ -1,205 +1,205 @@
-import {checkPromoCode} from '../common/api/coupon'
-
-Component({
-  /**
-   * 数据监听
-   */
-  observers: {
-    'usedPromoCode, chooseCouponList, couponList, recommendCouponList': function() {
-      this.setData({
-        msg: this.choosedType()
-      })
-    },
-    'prePayInfo': function(data) {
-      if(data) {
-        this.setData({
-          couponDiscount: data?.coupon_discount || 0,
-          usedPromoCode: data?.promo_code || '',
-          couponList: data?.coupon?.valid || [],
-          disableCouponList: data?.coupon?.invalid || [],
-          recommendCouponList: data?.coupon?.recommend?.list || [],
-          chooseCouponList: data?.promo_code ? []
-          : data?.coupon?.choose_use_coupon?.list || [],
-          originalPrice: data?.original_price,
-          goodsPrice:  data?.goods_price
-        })
-        if(!this.data.setCoupon) {
-          let chooseCouponList = this.changeCouponId(this.data.chooseCouponList)
-          this.setPricingInfoFirst(chooseCouponList, this.data.usedPromoCode)
-          this.setData({
-            setCoupon: true
-          })
-        }
-      }
-    },
-  },
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    // 批价返回参数
-    prePayInfo: {
-      type: Object,
-      value: {}
-    },
-    // 批价校验优惠码参数
-    checkCodeParams: {
-      type: Object,
-      value: {}
-    },
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    setCoupon: false, // 判断是否第一次进来
-    msg: '', // 文案提示
-    showPopup: false, // 是否显示弹窗
-    couponDiscount: 0, // 选择 优惠券/码 去批价，实际抵扣的金额
-    couponList: [], // 可用优惠券列表
-    disableCouponList: [], // 不可用优惠券列表
-    chooseCouponList: [], // 当前选中的优惠券
-    recommendCouponList: [], // 最佳优惠券
-    usedPromoCode: '', // 当前使用的优惠码
-    originalPrice: 0, // 商品原价
-    goodsPrice: 0, // 商品实际价格
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    // 将传过来的优惠券列表数组  转换成 优惠券id 数组
-    changeCouponId(list) {
-      const arr = [];
-      for (let i = 0; i < list.length; i++) {
-          arr[i] = list[i].cu_id;
-      }
-      return arr
-  },
-    // 确认选择优惠券/码
-    closeCouponSelect(e) {
-      if (!this.isCouponListEqual(e.detail.params.chooseCouponList, this.data.chooseCouponList) || e.detail.params.usedPromoCode !== this.data.usedPromoCode) {
-        this.setData({
-          chooseCouponList: e.detail.params.chooseCouponList,
-          usedPromoCode: e.detail.params.usedPromoCode
-        })
-        let cuId
-        if (Object.keys(this.data.chooseCouponList).length === 0) {
-            cuId = 'couponNoUse'
-        } else {
-            cuId = this.changeCouponId(this.data.chooseCouponList)
-        }
-        this.setPricingInfo(cuId, e.detail.params.usedPromoCode)
-      }
-      this.setData({
-        showPopup: e.detail.params.showPopup,
-      })
-    },
-    setPricingInfoFirst(cu_id, promo_code) {
-      this.triggerEvent('dataChange', {
-        name: "couponSelect",
-        payParams: {
-          cu_id: cu_id,
-          promo_code: promo_code
-        }
-      })
-    },
-    setPricingInfo(cu_id, promo_code) {
-      this.triggerEvent('dataChange', {
-        name: "couponSelect",
-        payParams: {
-          cu_id: cu_id,
-          promo_code: promo_code
-        },
-        prePayParams: {
-          cu_id: cu_id,
-          promo_code: promo_code
-        }
-      })
-    },
-    // 判断两个优惠券列表是否相等
-    isCouponListEqual(usedCoupon, choosedCoupon) {
-      if (choosedCoupon.length !== usedCoupon.length) {
-          return false;
-      }
-      for (let i = 0; i < usedCoupon.length; i++) {
-          if (this.beforeCouponList(choosedCoupon).indexOf(usedCoupon[i].cu_id) === -1) {
-              return false;
-          }
-      }
-      return true;
-    },
-    // 遍历原先数组的列表
-    beforeCouponList(list) {
-      return list.map(item => item.cu_id);
-    },
-    // 展示优惠券选择器弹窗
-    showCouponSelect() {
-      this.setData({
-        showPopup: true
-      })
-    },
-    // 判断两个优惠券列表是否相等
-    isCouponListEqual (curUsedCoupon, curChoosedCoupon) {
-      let usedCoupon = typeof (curUsedCoupon) === 'string' ? [] : curUsedCoupon;
-      let chooseCouponList = typeof (curChoosedCoupon) === 'string' ? [] : curChoosedCoupon;
-      if (chooseCouponList.length !== usedCoupon.length) {
-        return false;
-      }
-      for (let i = 0; i < usedCoupon.length; i++) {
-        if (this.beforeCouponList(chooseCouponList).indexOf(usedCoupon[i].cu_id) === -1) {
-          return false;
-        }
-      }
-      return true;
-    },
-    // 点击使用优惠码，验证优惠码是否可用
-     checkPromoCodeCanUse(e) {
-      const params = {
-          ...this.data.checkCodeParams,
-          cu_id: '',
-          promo_code: e.detail.promoCode,
-          original_price: this.data.originalPrice
-      };
-      checkPromoCode(params)
-      .then((res) => {
-        if(res.data.code === 0) {
-          // 优惠码可用，调用 couponSelect 组件的成功回调. 会关闭选择优惠码的面板
-          e.detail.success()
-        } else {
-          wx.showToast({
-            title: res.data.msg,
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-      .catch(err => {
-        // 处理优惠码不可用的情况， toast 提示
-        console.error(err)
-      })
-  },
-    // 遍历原先数组的列表
-    beforeCouponList (list) {
-      return list.map(item => {
-        return item.cu_id;
-      });
-    },
-    // 判断当前显示文案
-    choosedType () {
-      console.log('properties', this.properties)
-      if (this.properties.usedPromoCode) {
-        return `已选优惠码`;
-      }
-      if (this.properties.couponList.length > 0 && this.properties.chooseCouponList.length === 0) {
-        return `${this.properties.couponList.length}张可用`;
-      } else if (this.properties.chooseCouponList.length > 0){
-        return this.isCouponListEqual(this.properties.chooseCouponList, this.properties.recommendCouponList) ? `已选推荐优惠（${this.properties.recommendCouponList.length}张）` : `已选${this.properties.chooseCouponList.length}张优惠券`;
-      }
-
-      return '';
-    },
-  },
-})
+import {checkPromoCode} from '../common/api/coupon'
+
+Component({
+  /**
+   * 数据监听
+   */
+  observers: {
+    'usedPromoCode, chooseCouponList, couponList, recommendCouponList': function() {
+      this.setData({
+        msg: this.choosedType()
+      })
+    },
+    'prePayInfo': function(data) {
+      if(data) {
+        this.setData({
+          couponDiscount: data?.coupon_discount || 0,
+          usedPromoCode: data?.promo_code || '',
+          couponList: data?.coupon?.valid || [],
+          disableCouponList: data?.coupon?.invalid || [],
+          recommendCouponList: data?.coupon?.recommend?.list || [],
+          chooseCouponList: data?.promo_code ? []
+          : data?.coupon?.choose_use_coupon?.list || [],
+          originalPrice: data?.original_price,
+          goodsPrice:  data?.goods_price
+        })
+        if(!this.data.setCoupon) {
+          let chooseCouponList = this.changeCouponId(this.data.chooseCouponList)
+          this.setPricingInfoFirst(chooseCouponList, this.data.usedPromoCode)
+          this.setData({
+            setCoupon: true
+          })
+        }
+      }
+    },
+  },
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    // 批价返回参数
+    prePayInfo: {
+      type: Object,
+      value: {}
+    },
+    // 批价校验优惠码参数
+    checkCodeParams: {
+      type: Object,
+      value: {}
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    setCoupon: false, // 判断是否第一次进来
+    msg: '', // 文案提示
+    showPopup: false, // 是否显示弹窗
+    couponDiscount: 0, // 选择 优惠券/码 去批价，实际抵扣的金额
+    couponList: [], // 可用优惠券列表
+    disableCouponList: [], // 不可用优惠券列表
+    chooseCouponList: [], // 当前选中的优惠券
+    recommendCouponList: [], // 最佳优惠券
+    usedPromoCode: '', // 当前使用的优惠码
+    originalPrice: 0, // 商品原价
+    goodsPrice: 0, // 商品实际价格
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 将传过来的优惠券列表数组  转换成 优惠券id 数组
+    changeCouponId(list) {
+      const arr = [];
+      for (let i = 0; i < list.length; i++) {
+          arr[i] = list[i].cu_id;
+      }
+      return arr
+  },
+    // 确认选择优惠券/码
+    closeCouponSelect(e) {
+      if (!this.isCouponListEqual(e.detail.params.chooseCouponList, this.data.chooseCouponList) || e.detail.params.usedPromoCode !== this.data.usedPromoCode) {
+        this.setData({
+          chooseCouponList: e.detail.params.chooseCouponList,
+          usedPromoCode: e.detail.params.usedPromoCode
+        })
+        let cuId
+        if (Object.keys(this.data.chooseCouponList).length === 0) {
+            cuId = 'couponNoUse'
+        } else {
+            cuId = this.changeCouponId(this.data.chooseCouponList)
+        }
+        this.setPricingInfo(cuId, e.detail.params.usedPromoCode)
+      }
+      this.setData({
+        showPopup: e.detail.params.showPopup,
+      })
+    },
+    setPricingInfoFirst(cu_id, promo_code) {
+      this.triggerEvent('dataChange', {
+        name: "couponSelect",
+        payParams: {
+          cu_id: cu_id,
+          promo_code: promo_code
+        }
+      })
+    },
+    setPricingInfo(cu_id, promo_code) {
+      this.triggerEvent('dataChange', {
+        name: "couponSelect",
+        payParams: {
+          cu_id: cu_id,
+          promo_code: promo_code
+        },
+        prePayParams: {
+          cu_id: cu_id,
+          promo_code: promo_code
+        }
+      })
+    },
+    // 判断两个优惠券列表是否相等
+    isCouponListEqual(usedCoupon, choosedCoupon) {
+      if (choosedCoupon.length !== usedCoupon.length) {
+          return false;
+      }
+      for (let i = 0; i < usedCoupon.length; i++) {
+          if (this.beforeCouponList(choosedCoupon).indexOf(usedCoupon[i].cu_id) === -1) {
+              return false;
+          }
+      }
+      return true;
+    },
+    // 遍历原先数组的列表
+    beforeCouponList(list) {
+      return list.map(item => item.cu_id);
+    },
+    // 展示优惠券选择器弹窗
+    showCouponSelect() {
+      this.setData({
+        showPopup: true
+      })
+    },
+    // 判断两个优惠券列表是否相等
+    isCouponListEqual (curUsedCoupon, curChoosedCoupon) {
+      let usedCoupon = typeof (curUsedCoupon) === 'string' ? [] : curUsedCoupon;
+      let chooseCouponList = typeof (curChoosedCoupon) === 'string' ? [] : curChoosedCoupon;
+      if (chooseCouponList.length !== usedCoupon.length) {
+        return false;
+      }
+      for (let i = 0; i < usedCoupon.length; i++) {
+        if (this.beforeCouponList(chooseCouponList).indexOf(usedCoupon[i].cu_id) === -1) {
+          return false;
+        }
+      }
+      return true;
+    },
+    // 点击使用优惠码，验证优惠码是否可用
+     checkPromoCodeCanUse(e) {
+      const params = {
+          ...this.data.checkCodeParams,
+          cu_id: '',
+          promo_code: e.detail.promoCode,
+          original_price: this.data.originalPrice
+      };
+      checkPromoCode(params)
+      .then((res) => {
+        if(res.data.code === 0) {
+          // 优惠码可用，调用 couponSelect 组件的成功回调. 会关闭选择优惠码的面板
+          e.detail.success()
+        } else {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      })
+      .catch(err => {
+        // 处理优惠码不可用的情况， toast 提示
+        console.error(err)
+      })
+  },
+    // 遍历原先数组的列表
+    beforeCouponList (list) {
+      return list.map(item => {
+        return item.cu_id;
+      });
+    },
+    // 判断当前显示文案
+    choosedType () {
+      console.log('properties', this.properties)
+      if (this.properties.usedPromoCode) {
+        return `已选优惠码`;
+      }
+      if (this.properties.couponList.length > 0 && this.properties.chooseCouponList.length === 0) {
+        return `${this.properties.couponList.length}张可用`;
+      } else if (this.properties.chooseCouponList.length > 0){
+        return this.isCouponListEqual(this.properties.chooseCouponList, this.properties.recommendCouponList) ? `已选推荐优惠（${this.properties.recommendCouponList.length}张）` : `已选${this.properties.chooseCouponList.length}张优惠券`;
+      }
+
+      return '';
+    },
+  },
+})

package/miniprogram_dist/coupon/index.json

@@ -1,8 +1,8 @@
-{
-  "component": true,
-  "usingComponents": {
-    "CouponSelect": "./components/CouponSelect/index",
-    "van-icon": "@vant/weapp/icon/index",
-    "van-popup": "@vant/weapp/popup/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "CouponSelect": "./components/CouponSelect/index",
+    "van-icon": "@vant/weapp/icon/index",
+    "van-popup": "@vant/weapp/popup/index"
+  }
 }

package/miniprogram_dist/coupon/index.less

@@ -1,51 +1,51 @@
-.confrim-order {
-    padding: 0 32rpx;
-    // margin-bottom: 16rpx;
-    background: #FFF;
-    .coupon-panel {
-        box-sizing: border-box;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        width: 100%;
-        height: 88rpx;
-        .coupon-left {
-            display: flex;
-            align-items: center;
-            .coupon-title {
-                margin-right: 17.6rpx;
-                line-height: 48.4rpx;
-                font-size: 28rpx;
-                color: #333;
-            }
-            .coupon-tip {
-                box-sizing: border-box;
-                height: 39.6rpx;
-                line-height: 39.6rpx;
-                padding: 0 13.2rpx;
-                border-radius: 4.4rpx;
-                font-size: 24.2rpx;
-                color: #FF821F;
-                background: rgba(255, 132, 31, 0.16);
-            }
-        }
-        .coupon-right {
-            display: flex;
-            flex: 1;
-            align-items: center;
-            justify-content: flex-end;
-            .coupon-value {
-                color: #ff821f;
-                margin-right: 8rpx;
-                width: fit-content;
-                font-size: 28rpx;
-            }
-            .have-no-coupon {
-                margin-right: 8rpx;
-                line-height: 44rpx;
-                font-size: 28rpx;
-                color: #999;
-            }
-        }
-    }
-}
+.confrim-order {
+    padding: 0 32rpx;
+    // margin-bottom: 16rpx;
+    background: #FFF;
+    .coupon-panel {
+        box-sizing: border-box;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        width: 100%;
+        height: 88rpx;
+        .coupon-left {
+            display: flex;
+            align-items: center;
+            .coupon-title {
+                margin-right: 17.6rpx;
+                line-height: 48.4rpx;
+                font-size: 28rpx;
+                color: #333;
+            }
+            .coupon-tip {
+                box-sizing: border-box;
+                height: 39.6rpx;
+                line-height: 39.6rpx;
+                padding: 0 13.2rpx;
+                border-radius: 4.4rpx;
+                font-size: 24.2rpx;
+                color: #FF821F;
+                background: rgba(255, 132, 31, 0.16);
+            }
+        }
+        .coupon-right {
+            display: flex;
+            flex: 1;
+            align-items: center;
+            justify-content: flex-end;
+            .coupon-value {
+                color: #ff821f;
+                margin-right: 8rpx;
+                width: fit-content;
+                font-size: 28rpx;
+            }
+            .have-no-coupon {
+                margin-right: 8rpx;
+                line-height: 44rpx;
+                font-size: 28rpx;
+                color: #999;
+            }
+        }
+    }
+}