xiaoe_mp_npm 1.1.39 → 1.1.40-alpha.2

package/src/coupon/index.js

@@ -1,271 +1,271 @@
-import { checkPromoCode } from '../common/api/coupon'
-import {
-  MEMBER,
-  SPECIAL_COLUMN,
-  BIG_SPECIAL_COLUMN,
-  TRAINING_CAMP,
-  SVIP,
-  ACTIVITY_MANAGE,
-} from '../common/utils/constants'
-const computedBehavior = require('miniprogram-computed').behavior
-
-Component({
-  behaviors: [computedBehavior],
-  computed: {
-    checkCodeParams(data) {
-      const { promo_code_info } = data.valuateData || {}
-      const { spu_type, count, sku, resource_id, spu_id, resource_type } = data.baseInfoQuery || {}
-      const { activity_id, activity_type } = data.marketingData || {}
-      const coursePackage = [MEMBER, SPECIAL_COLUMN, BIG_SPECIAL_COLUMN, TRAINING_CAMP]
-      let paymentType = 2
-
-      if (coursePackage.includes(spu_type)) {
-        paymentType = 3
-      }
-      if ([SVIP].includes(spu_type)) {
-        paymentType = 15
-      }
-      if ([ACTIVITY_MANAGE].includes(spu_type)) {
-        paymentType = 11
-      }
-
-      return {
-        address_id: data.formData?.address?.id || '',
-        count: count || 1,
-        resource_id: resource_id || '',
-        spu_id: spu_id || '',
-        sku_id: sku || '',
-        resource_type: resource_type || '',
-        spu_type: spu_type || '',
-        product_id: '',
-        payment_type: paymentType,
-        promo_code: promo_code_info?.promo_code,
-        activity_id: activity_id,
-        activity_type: activity_type,
-      }
-    },
-    // 最优解优惠券
-    recommendCoupon(data) {
-      if (data.supportOverlay) {
-          return data.recommendCouponList?.list || [];
-      } else {
-          return data.best_coupon || {};
-      }
-  },
-  },
-  /**
-   * 数据监听
-   */
-  observers: {
-    'usedPromoCode, chooseCouponList, couponList, recommendCouponList': function () {
-      this.setData({
-        msg: this.choosedType(),
-      })
-    },
-    valuateData: function (data) {
-      if (data) {
-        const { coupon_info, price_info, promo_code_info } = data || {}
-        this.setData({
-          couponDiscount: promo_code_info?.promo_code
-            ? promo_code_info?.promo_code_discount
-            : price_info?.coupon_discount,
-          usedPromoCode: !promo_code_info?.can_use_promo_code ? '' : promo_code_info?.promo_code, // 优惠码 - can_use_promo_code为 false 时，不可用
-          couponList: coupon_info?.valid || [],
-          disableCouponList: coupon_info?.invalid || [],
-          recommendCouponList: coupon_info?.recommended_coupons || [],
-          chooseCouponList: coupon_info?.selected_coupons?.list || [],
-          originalPrice: price_info?.original_price,
-          goodsPrice: price_info?.front_end_goods_price || 0,
-          best_coupon: coupon_info?.recommended_coupons?.list[0],
-        })
-      }
-    },
-  },
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    // 批价返回参数
-    valuateData: {
-      type: Object,
-      value: {},
-    },
-    isFullScreen: {
-      type: Boolean,
-      value: false,
-    },
-    formData: {
-      type: Object,
-      default: () => ({}),
-    },
-    baseInfoQuery: {
-      type: Object,
-      default: () => ({}),
-    },
-    marketingData: {
-      type: Object,
-      default: () => ({}),
-    },
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    setCoupon: false, // 判断是否第一次进来
-    msg: '', // 文案提示
-    showPopup: false, // 是否显示弹窗
-    couponDiscount: 0, // 选择 优惠券/码 去批价，实际抵扣的金额
-    couponList: [], // 可用优惠券列表
-    disableCouponList: [], // 不可用优惠券列表
-    chooseCouponList: [], // 当前选中的优惠券
-    recommendCouponList: [], // 最佳优惠券
-    usedPromoCode: '', // 当前使用的优惠码
-    originalPrice: 0, // 商品原价
-    goodsPrice: 0, // 商品实际价格
-    supportOverlay: true, // 是否支持叠加，默认都支持
-    best_coupon: {},
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  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,
-      })
-    },
-    setPricingInfo(cu_id, promo_code) {
-      let coupons = []
-      if (cu_id !== 'couponNoUse') {
-        const arr = Array.isArray(cu_id) ? cu_id : [cu_id]
-        coupons = arr.map((id) => ({ cu_id: id }))
-      }
-      this.triggerEvent('handleCouponChange', {
-        coupons,
-        promoCode: promo_code,
-      })
-    },
-    // 判断两个优惠券列表是否相等
-    isCouponListEqual(usedCoupon, choosedCoupon) {
-      if (this.data.supportOverlay) {
-        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;
-      } else {
-        return usedCoupon.cu_id === choosedCoupon.cu_id;
-      }
-    },
-    // 遍历原先数组的列表
-    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() {
-      if (this.data.usedPromoCode) {
-        return `已选优惠码`
-      }
-
-      if (
-        this.data.couponList.length > 0 &&
-        (Object.keys(this.data.chooseCouponList).length === 0 ||
-          (!this.data.supportOverlay && this.data.chooseCouponList?.cu_id === 'couponNoUse'))
-      ) {
-        return `${this.data.couponList.length}张可用`
-      }
-
-      if (Object.keys(this.data.chooseCouponList).length > 0 && this.data.couponList.length > 0) {
-        if (this.isCouponListEqual(this.data.chooseCouponList, this.data.recommendCoupon)) {
-          return this.data.supportOverlay ? `已选推荐优惠（${this.data.recommendCoupon.length}张）` : `已选最大优惠券`
-        }
-        return this.data.supportOverlay ? `已选${this.data.chooseCouponList.length}张优惠券` : `已选优惠券`
-      }
-
-      return ''
-    },
-  },
-})
+import { checkPromoCode } from '../common/api/coupon'
+import {
+  MEMBER,
+  SPECIAL_COLUMN,
+  BIG_SPECIAL_COLUMN,
+  TRAINING_CAMP,
+  SVIP,
+  ACTIVITY_MANAGE,
+} from '../common/utils/constants'
+const computedBehavior = require('miniprogram-computed').behavior
+
+Component({
+  behaviors: [computedBehavior],
+  computed: {
+    checkCodeParams(data) {
+      const { promo_code_info } = data.valuateData || {}
+      const { spu_type, count, sku, resource_id, spu_id, resource_type } = data.baseInfoQuery || {}
+      const { activity_id, activity_type } = data.marketingData || {}
+      const coursePackage = [MEMBER, SPECIAL_COLUMN, BIG_SPECIAL_COLUMN, TRAINING_CAMP]
+      let paymentType = 2
+
+      if (coursePackage.includes(spu_type)) {
+        paymentType = 3
+      }
+      if ([SVIP].includes(spu_type)) {
+        paymentType = 15
+      }
+      if ([ACTIVITY_MANAGE].includes(spu_type)) {
+        paymentType = 11
+      }
+
+      return {
+        address_id: data.formData?.address?.id || '',
+        count: count || 1,
+        resource_id: resource_id || '',
+        spu_id: spu_id || '',
+        sku_id: sku || '',
+        resource_type: resource_type || '',
+        spu_type: spu_type || '',
+        product_id: '',
+        payment_type: paymentType,
+        promo_code: promo_code_info?.promo_code,
+        activity_id: activity_id,
+        activity_type: activity_type,
+      }
+    },
+    // 最优解优惠券
+    recommendCoupon(data) {
+      if (data.supportOverlay) {
+          return data.recommendCouponList?.list || [];
+      } else {
+          return data.best_coupon || {};
+      }
+  },
+  },
+  /**
+   * 数据监听
+   */
+  observers: {
+    'usedPromoCode, chooseCouponList, couponList, recommendCouponList': function () {
+      this.setData({
+        msg: this.choosedType(),
+      })
+    },
+    valuateData: function (data) {
+      if (data) {
+        const { coupon_info, price_info, promo_code_info } = data || {}
+        this.setData({
+          couponDiscount: promo_code_info?.promo_code
+            ? promo_code_info?.promo_code_discount
+            : price_info?.coupon_discount,
+          usedPromoCode: !promo_code_info?.can_use_promo_code ? '' : promo_code_info?.promo_code, // 优惠码 - can_use_promo_code为 false 时，不可用
+          couponList: coupon_info?.valid || [],
+          disableCouponList: coupon_info?.invalid || [],
+          recommendCouponList: coupon_info?.recommended_coupons || [],
+          chooseCouponList: coupon_info?.selected_coupons?.list || [],
+          originalPrice: price_info?.original_price,
+          goodsPrice: price_info?.front_end_goods_price || 0,
+          best_coupon: coupon_info?.recommended_coupons?.list[0],
+        })
+      }
+    },
+  },
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    // 批价返回参数
+    valuateData: {
+      type: Object,
+      value: {},
+    },
+    isFullScreen: {
+      type: Boolean,
+      value: false,
+    },
+    formData: {
+      type: Object,
+      default: () => ({}),
+    },
+    baseInfoQuery: {
+      type: Object,
+      default: () => ({}),
+    },
+    marketingData: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    setCoupon: false, // 判断是否第一次进来
+    msg: '', // 文案提示
+    showPopup: false, // 是否显示弹窗
+    couponDiscount: 0, // 选择 优惠券/码 去批价，实际抵扣的金额
+    couponList: [], // 可用优惠券列表
+    disableCouponList: [], // 不可用优惠券列表
+    chooseCouponList: [], // 当前选中的优惠券
+    recommendCouponList: [], // 最佳优惠券
+    usedPromoCode: '', // 当前使用的优惠码
+    originalPrice: 0, // 商品原价
+    goodsPrice: 0, // 商品实际价格
+    supportOverlay: true, // 是否支持叠加，默认都支持
+    best_coupon: {},
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  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,
+      })
+    },
+    setPricingInfo(cu_id, promo_code) {
+      let coupons = []
+      if (cu_id !== 'couponNoUse') {
+        const arr = Array.isArray(cu_id) ? cu_id : [cu_id]
+        coupons = arr.map((id) => ({ cu_id: id }))
+      }
+      this.triggerEvent('handleCouponChange', {
+        coupons,
+        promoCode: promo_code,
+      })
+    },
+    // 判断两个优惠券列表是否相等
+    isCouponListEqual(usedCoupon, choosedCoupon) {
+      if (this.data.supportOverlay) {
+        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;
+      } else {
+        return usedCoupon.cu_id === choosedCoupon.cu_id;
+      }
+    },
+    // 遍历原先数组的列表
+    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() {
+      if (this.data.usedPromoCode) {
+        return `已选优惠码`
+      }
+
+      if (
+        this.data.couponList.length > 0 &&
+        (Object.keys(this.data.chooseCouponList).length === 0 ||
+          (!this.data.supportOverlay && this.data.chooseCouponList?.cu_id === 'couponNoUse'))
+      ) {
+        return `${this.data.couponList.length}张可用`
+      }
+
+      if (Object.keys(this.data.chooseCouponList).length > 0 && this.data.couponList.length > 0) {
+        if (this.isCouponListEqual(this.data.chooseCouponList, this.data.recommendCoupon)) {
+          return this.data.supportOverlay ? `已选推荐优惠（${this.data.recommendCoupon.length}张）` : `已选最大优惠券`
+        }
+        return this.data.supportOverlay ? `已选${this.data.chooseCouponList.length}张优惠券` : `已选优惠券`
+      }
+
+      return ''
+    },
+  },
+})

package/src/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/src/coupon/index.less

@@ -1,51 +1,51 @@
-.confrim-order {
-    padding: 0 4.27vmin;
-    // margin-bottom: 2.13vmin;
-    background: #FFF;
-    .coupon-panel {
-        box-sizing: border-box;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        width: 100%;
-        height: 11.73vmin;
-        .coupon-left {
-            display: flex;
-            align-items: center;
-            .coupon-title {
-                margin-right: 2.35vmin;
-                line-height: 6.45vmin;
-                font-size: 3.73vmin;
-                color: #333;
-            }
-            .coupon-tip {
-                box-sizing: border-box;
-                height: 5.28vmin;
-                line-height: 5.28vmin;
-                padding: 0 1.76vmin;
-                border-radius: 0.59vmin;
-                font-size: 3.23vmin;
-                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: 1.07vmin;
-                width: fit-content;
-                font-size: 3.73vmin;
-            }
-            .have-no-coupon {
-                margin-right: 1.07vmin;
-                line-height: 5.87vmin;
-                font-size: 3.73vmin;
-                color: #999;
-            }
-        }
-    }
-}
+.confrim-order {
+    padding: 0 4.27vmin;
+    // margin-bottom: 2.13vmin;
+    background: #FFF;
+    .coupon-panel {
+        box-sizing: border-box;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        width: 100%;
+        height: 11.73vmin;
+        .coupon-left {
+            display: flex;
+            align-items: center;
+            .coupon-title {
+                margin-right: 2.35vmin;
+                line-height: 6.45vmin;
+                font-size: 3.73vmin;
+                color: #333;
+            }
+            .coupon-tip {
+                box-sizing: border-box;
+                height: 5.28vmin;
+                line-height: 5.28vmin;
+                padding: 0 1.76vmin;
+                border-radius: 0.59vmin;
+                font-size: 3.23vmin;
+                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: 1.07vmin;
+                width: fit-content;
+                font-size: 3.73vmin;
+            }
+            .have-no-coupon {
+                margin-right: 1.07vmin;
+                line-height: 5.87vmin;
+                font-size: 3.73vmin;
+                color: #999;
+            }
+        }
+    }
+}