xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/src/GoodsItem/index.js

@@ -16,6 +16,7 @@ import {
   requestChangeShow,
   setGoodsSellOut,
   getGoodValue,
+  getGoodsExplain,
   requestChangePrice
 } from "../common/api/liveGoodsList"
 import {
@@ -103,7 +104,8 @@ Component({
           preHeatTime,
           preheating,
           isSeckill,
-          checked
+          checked,
+          isExplainDisabled: false,
         }, () => {
           const isSoldOut = +newVal.is_sell_out === 1;
           const isRealOver = newVal.stock === 0 ||
@@ -137,6 +139,10 @@ Component({
       type: Object,
       value: {},
     },
+    userInfo: {
+      type: Object,
+      value: {}
+    },
     // 是否去客服内支付
     allContactPay: {
       type: Boolean,
@@ -239,7 +245,12 @@ Component({
 
     },
     moved: function () { },
-    detached: function () { },
+    detached: function () {
+      this.setData({
+        isExplainDisabled: false
+      })
+      clearInterval(this.data.disableExplainTimer);
+    },
   },
 
   /**
@@ -256,7 +267,7 @@ Component({
     isSeckill: false,
     checked: false,
     switchLoading: false,
-    imageRadius: rpxToVmin(16),
+    imageRadius: rpxToVmin(12),
     isOver: null, //是否已抢光
     isSoldOut: false, //商品是否设置已售罄
     isRealOver: false, //商品是否为非手动售罄下的，真实抢光
@@ -264,11 +275,35 @@ Component({
     skillNowTime: 0, // 秒杀活动对比的当前时间
     hideBubble: false,
     customStyle: 'top: 16rpx;margin-left: 4rpx;',
+    isExplainDisabled: false,
+    disableExplainTimer: null,
   },
   computed: {
+    // 是否是讲解商品
+    isExplaining(data) {
+      const { sendingGoodId, goodsItem } = data
+      return sendingGoodId === goodsItem.id
+    },
     isShowBubble(data) {
       return data.hotSalesConf.is_hot_sales_on && data.isOver !== null && !data.isOver && data.isShowItem && data.isStudent && data.sendingGoodId === data.goodsItem.id
     },
+    // 是否展示商品描述
+    isShowGoodsDesc(data) {
+      if (+data.hotSalesConf.goods_conf.is_goods_desc !== 0) {
+        return data.goodsItem.goods_desc && !data.isManage;
+      } else {
+        return false;
+      }
+    },
+    // 带货氛围配置
+    // card_show_style: 0, // 商品卡片展示方式 0-默认 1-中间 2-左侧
+    // is_explain_on: 0, // 求讲解
+    // is_preheat: 0, // 是否开启预热
+    // is_open_msg_bubble: 0, // 是否开启带货列表弹幕开关 
+    // is_goods_desc: 0,  // 是否开启带货列表亮点描述
+    // is_pick_up_goods: 0, // 是否开启带货列表快递提货方式标签
+    // is_coupon_on: 0, // 是否开启带货列表优惠券标签
+    // is_weight_diff: 0, // 是否开启带货列表称重退差价标签
     // 学员购物车 气泡库存展示
     hasStock(data) {
       const { goodsInfo, skillNowTime } = data
@@ -304,6 +339,91 @@ Component({
     goodsDistributionPattern(data) {
       return data.goodsInfo.distribution_pattern
     },
+    distributionPattern(data) {
+      if(+data.hotSalesConf?.goods_conf.is_pick_up_goods !== 0) {
+        return [-1, 1, 2].indexOf(data.goodsItem.distribution_pattern) !== -1;
+      } else {
+        return false;
+      }
+    },
+    // 优惠券信息
+    couponsList(data) {
+      if (+data.hotSalesConf.goods_conf.is_coupon_on === 0 || !data.goodsItem.coupon_list || data.aliveInfo.user_type === 1)
+        return [];
+      const coupons = JSON.parse(JSON.stringify(data.goodsItem.coupon_list || []));
+
+      // 根据是否开启称重退差价决定展示数量
+      const maxCoupons = data.isRefundTips ? 1 : 3;
+
+      const getTypePriority = (coupon) => {
+        if (coupon.require_price === 0 && coupon.discount_way === 1) return 1; // 立减
+        if (coupon.require_price === 0 && coupon.discount_way === 2) return 2; // 立折
+        if (coupon.require_price > 0 && coupon.discount_way === 1) return 3;   // 满减
+        if (coupon.require_price > 0 && coupon.discount_way === 2) return 4;   // 满折
+        return 5; // 兜底
+      }
+
+      // 排序函数
+      coupons.sort((a, b) => {
+        const typeA = getTypePriority(a);
+        const typeB = getTypePriority(b);
+        if (typeA !== typeB) return typeA - typeB; // 按类型优先级排序
+
+        // 同类型内再按优惠力度排序
+        if (a.discount_way === 1) {
+          // 抵扣券：金额大的在前
+          return b.price - a.price;
+        } else if (a.discount_way === 2) {
+          // 折扣券：折扣百分比小的在前
+          return a.discount_percent - b.discount_percent;
+        }
+        return 0;
+      });
+
+      function formatePrice(cents) {
+        const sign = cents < 0 ? '-' : '';
+        const abs = Math.abs(cents);
+        const yuan = Math.floor(abs / 100);
+        const rem = String(abs % 100).padStart(2, '0');
+        return `${sign}${yuan}.${rem}`;
+      }
+
+      // 根据优先级取对应数量的优惠券
+      return coupons.slice(0, maxCoupons).map(coupon => {
+        let couponDesc = '';
+        coupon.real_price = formatePrice(coupon.price);
+        coupon.real_require_price = formatePrice(coupon.require_price);
+        const isFull = coupon.require_price > 0; // 有门槛即为满减/满折
+
+        if (coupon.discount_way === 1) { // 减券
+          if (isFull) {
+            // 满减券：满x减x
+            couponDesc = `满${coupon.real_require_price}减${coupon.real_price}`;
+          } else {
+            // 立减券：立减x
+            couponDesc = `立减${coupon.real_price}`;
+
+          }
+        } else if (coupon.discount_way === 2) { // 折券
+          // 计算折扣值：discount_percent是百分比，如90表示9折，85表示8.5折
+          const discountValue = coupon.discount_percent / 10;
+
+          // 注意这里去掉'立'字，直接显示折数
+          if (isFull) {
+            // 满折券：满x享x折
+            couponDesc = `满${coupon.real_require_price}享${discountValue}折`;
+          } else {
+            // 立折券：x折
+            couponDesc = `${discountValue}折`;
+          }
+        }
+
+        return {
+          id: coupon.id,
+          couponDesc: couponDesc
+        };
+      });
+    },
     // 是否显示库存
     showStock(data) {
       const { current_role, goodsInfo, stockSwitch, skillNowTime } = data
@@ -502,30 +622,36 @@ Component({
     },
     // 配送方式（-1:全部 1:快递配送 2:自提）
     distributionWay(data) {
-      let text = ''
-      switch (data.goodsItem.distribution_pattern) {
+      const { distribution_pattern, freight } = data.goodsItem;
+      switch (distribution_pattern) {
         case -1:
-          text = '自提·快递'
-          break
-        case 1:
-          text = '快递'
-          break
-        case 2:
-          text = '自提'
-          break
+          const expressLabel = freight === 0 ? '包邮' : '快递';
+          return {
+            first: expressLabel,
+            second: '自提'
+          };
+        case 1: // 仅快递
+          return {
+            first: freight === 0 ? '包邮' : '快递'
+          };
+        case 2: // 仅自提
+          return {
+            first: '自提'
+          };
         default:
-          text = ''
-          break
+          return {
+            first: ""
+          };
       }
-      return text
-    },
-    distributionPattern(data) {
-      return [-1,1,2].indexOf(data.goodsItem.distribution_pattern) !== -1
     },
     // 是否有退补提示（是计重商品才判断）
     isRefundTips(data) {
-      const { is_best, is_refund_tips } = data.goodsItem;
-      return is_best === 2 && is_refund_tips === 1;
+      if(+data.hotSalesConf.goods_conf.is_weight_diff === 0) {
+        return false;
+      } else {
+        const { is_best } = data.goodsItem;
+        return is_best === 2;
+      }
     },
     // 销售单位（是计重商品才展示）
     saleUnit(data) {
@@ -541,6 +667,38 @@ Component({
    * 组件的方法列表
    */
   methods: {
+    // 学员求讲解
+    pleaseExplain(){
+      if (this.data.isExplainDisabled) return;
+      this.setData({
+        isExplainDisabled: true,
+      }, () => {
+        wx.showToast({
+          title: '稍后主播为你讲解',
+          icon: 'none'
+        });
+        const params = {
+          app_id: this.properties.aliveInfo.app_id,
+          alive_id: this.properties.aliveInfo.alive_id,
+          user_id: this.properties.aliveInfo.user_id,
+          resource_id: this.data.goodsItem.id,
+          wx_nickname: this.properties.userInfo.wx_nickname,
+          order_weight: this.data.goodsItem.order_weight || 0,
+          target_url: this.data.goodsItem.target_url,
+          spu_id: this.data.goodsItem.spu_id,
+          token: wx.getStorageSync('login_data').token,
+        }
+        console.log("请求求讲解接口参数", params);
+        getGoodsExplain(params)
+        this.data.disableExplainTimer = setTimeout(() => {
+          this.setData({
+            isExplainDisabled: false,
+          })
+          clearTimeout(this.data.disableExplainTimer);
+          this.data.disableExplainTimer = null;
+        }, 10000);
+      })
+    },
     async checkSellOut() {
       // 非真实抢光，需要拿最新状态判断下
       if (this.data.isRealOver) return;
@@ -817,6 +975,7 @@ Component({
     },
     showSku() {
       let params = {
+        ...this.data.goodsItem,
         spuId: this.data.goodsItem.resource_id,
         isCollectCoupons: this.data.showPreferentialPrice
       }