xiaoe_mp_npm 1.0.44-ham1 → 1.0.44-ham10

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

@@ -107,6 +107,10 @@ Component({
       type: Number,
       value: 100
     },
+    refundTipsZIndex:{
+      type: Number,
+      value: 100
+    },
     zIndex:{
       type: Number,
       value: 100

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

@@ -64,6 +64,7 @@
       bind:updataData="updataData"
       bind:dataChange="payInfoChange"
       isFullScreen="{{ popPosition == 'right' }}"
+      zIndex="{{refundTipsZIndex}}"
       bind:onCountChange="onCountChange"
       formData="{{ formData }}"
     ></GoodsInfo>

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

@@ -0,0 +1,56 @@
+// src/ConfirmOrder/components/GoodsInfo/componenets/RefundTips/index.js
+const computedBehavior = require('miniprogram-computed').behavior
+
+Component({
+  behaviors: [computedBehavior],
+
+  properties: {
+    showTips: {
+      type: Boolean,
+      value: false,
+    },
+    zIndex: {
+      type: Number,
+      value: 100,
+    },
+    isFullScreen: {
+      type: Boolean,
+      value: false,
+    },
+    refundMsg: {
+      type: String,
+      value: '称重退补差价',
+    }
+  },
+
+  computed: {
+    tipIndex(properties) {
+      return properties.isFullScreen ? `z-index:${properties.zIndex}` : ''
+    },
+    popPosition(properties) {
+      return properties.isFullScreen ? 'right' : 'bottom'
+    },
+    round(properties) {
+      return properties.isFullScreen ? false : true
+    },
+    customStyle(properties) {
+      return properties.isFullScreen
+        ? `height: 100%;width: 100vmin;z-index:${properties.zIndex};`
+        : 'height: 106.67vmin;'
+    },
+    refundText(properties) {
+      const text = `
+        针对该商品，取货时门店会核对实际称重，
+        如实际称重低于您下单重量，会根据重量差额退差价。
+        ${properties.refundMsg === '称重退补差价' ? '如实际称重高于您下单重量，需根据重量差额补差价。' : ''}
+      `
+      return text
+    }
+  },
+
+  methods: {
+    closeTips() {
+      this.triggerEvent('closeTips')
+    },
+  },
+})

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/RefundTips/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-popup": "@vant/weapp/popup/index"
+  }
+}

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/RefundTips/index.wxml

@@ -0,0 +1,12 @@
+<!-- src/ConfirmOrder/components/GoodsInfo/components/RefundTips/index.wxml -->
+<van-popup show="{{ showTips }}" custom-class="invoice-select-bremind" position="{{popPosition}}" round="{{round}}" custom-style="{{customStyle}}">
+  <view class="text-container">
+    <view class="invoice-tip-title">{{ refundMsg }}</view>
+    <view class="text-main">
+        <text>{{ refundText }}</text>
+    </view>
+    <view class="invoice-tip-button">
+      <view class="button" bindtap="closeTips">我知道了</view>
+    </view>
+  </view>
+</van-popup>

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/RefundTips/index.wxss

@@ -0,0 +1,43 @@
+.text-container {
+  box-sizing: border-box;
+}
+.text-container .invoice-tip-title {
+  text-align: center;
+  font-weight: 500;
+  font-size: 4.27vmin;
+  top: 3.2vmin;
+  position: sticky;
+}
+.text-container .text-main {
+  margin: 9.6vmin 4.8vmin;
+  max-height: 78.94vmin;
+  overflow-y: scroll;
+  font-size: 3.73vmin;
+  color: #333;
+}
+.text-container .invoice-tip-button {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  padding: 2.13vmin 4.27vmin;
+}
+.text-container .invoice-tip-button .button {
+  width: 100%;
+  color: #fff;
+  border-radius: 5.33vmin;
+  width: calc(100% - 8.53vmin);
+  font-weight: 500;
+  border: 0;
+  padding: 2.67vmin 0;
+  text-align: center;
+  font-size: 3.73vmin;
+  background: linear-gradient(180.25deg, #fe6500 0%, #ff4102 100%);
+}
+.text-container .tips-title {
+  font-size: 4.8vmin;
+  color: #333;
+  font-weight: 500;
+  width: 100%;
+  text-align: center;
+}

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

@@ -103,6 +103,15 @@
   font-size: 3.73333vmin;
 }
 
+.goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-refund-tips {
+  display: inline-block;
+  padding: 0 1.06667vmin;
+  border-radius: 0.53333vmin;
+  border: 0.26667vmin solid #e0e0e0;
+  color: #666;
+  font-size: 3.2vmin;
+}
+
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-specification, .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-expire-desc {
   margin-top: 1.6vmin;
   height: 4.8vmin;
@@ -186,6 +195,14 @@
   background: none;
 }
 
+.goods-info-wrapper .goods-info .tips-icon {
+  width: 3.73333vmin;
+  height: 3.73333vmin;
+  margin-left: 1.06667vmin;
+  color: #999;
+  padding-top: 0.26667vmin;
+}
+
 @media screen and (min-width: 768px) and (orientation: portrait) {
   .goods-info-wrapper {
     margin-bottom: 1.17188vmin;
@@ -277,6 +294,14 @@
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-title .goods-name {
     font-size: 1.82292vmin;
   }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-refund-tips {
+    display: inline-block;
+    padding: 0 0.52083vmin;
+    border-radius: 0.26042vmin;
+    border: 0.13021vmin solid #e0e0e0;
+    color: #666;
+    font-size: 1.5625vmin;
+  }
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-specification, .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-expire-desc {
     margin-top: 0.78125vmin;
     height: 2.34375vmin;
@@ -346,6 +371,13 @@
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter .goods-plus, .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter .goods-minus {
     background: none;
   }
+  .goods-info-wrapper .goods-info .tips-icon {
+    width: 1.82292vmin;
+    height: 1.82292vmin;
+    margin-left: 0.52083vmin;
+    color: #999;
+    padding-top: 0.13021vmin;
+  }
 }
 
 @media screen and (min-height: 630px) and (orientation: landscape) {
@@ -439,6 +471,14 @@
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-title .goods-name {
     font-size: 2.22222vmin;
   }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-refund-tips {
+    display: inline-block;
+    padding: 0 0.63492vmin;
+    border-radius: 0.31746vmin;
+    border: 0.15873vmin solid #e0e0e0;
+    color: #666;
+    font-size: 1.90476vmin;
+  }
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-specification, .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-expire-desc {
     margin-top: 0.95238vmin;
     height: 2.85714vmin;
@@ -508,6 +548,13 @@
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter .goods-plus, .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter .goods-minus {
     background: none;
   }
+  .goods-info-wrapper .goods-info .tips-icon {
+    width: 2.22222vmin;
+    height: 2.22222vmin;
+    margin-left: 0.63492vmin;
+    color: #999;
+    padding-top: 0.15873vmin;
+  }
 }
 
 @media screen and (min-height: 768px) and (orientation: landscape) {
@@ -601,6 +648,14 @@
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-title .goods-name {
     font-size: 1.82292vmin;
   }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-refund-tips {
+    display: inline-block;
+    padding: 0 0.52083vmin;
+    border-radius: 0.26042vmin;
+    border: 0.13021vmin solid #e0e0e0;
+    color: #666;
+    font-size: 1.5625vmin;
+  }
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-specification, .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-expire-desc {
     margin-top: 0.78125vmin;
     height: 2.34375vmin;
@@ -670,4 +725,11 @@
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter .goods-plus, .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter .goods-minus {
     background: none;
   }
+  .goods-info-wrapper .goods-info .tips-icon {
+    width: 1.82292vmin;
+    height: 1.82292vmin;
+    margin-left: 0.52083vmin;
+    color: #999;
+    padding-top: 0.13021vmin;
+  }
 }

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

@@ -88,6 +88,10 @@ Component({
       type: Object,
       value: () => {},
     },
+    refundTipsZIndex: {
+      type: Number,
+      value: 100
+    }
   },
 
   /**
@@ -96,6 +100,7 @@ Component({
   data: {
     goodsCount: 1,
     first: true,
+    showRefundTips: false
   },
   computed: {
     isCop(data){
@@ -320,6 +325,19 @@ Component({
     },
     count(data) {
       return Math.max(data.baseInfo?.count, data.minCount, data.goodsCount, data.formData.count) || 1;
+    },
+    // 是否有退补提示（是计重商品才判断）
+    isRefundTips(data) {
+      const is_best = data?.goodsInfo?.is_best
+      const is_refund_tips = data?.goodsInfo?.nonstandard_param?.is_refund_tips
+      return is_best === 2 && is_refund_tips === 1
+    },
+    // 销售单位（是计重商品才展示）
+    saleUnit(data) {
+      const is_best = data?.goodsInfo?.is_best
+      const sale_unit = JSON.parse(data?.goodsInfo?.sku_info?.sales_unit || '{}')?.sale_unit
+      if (is_best === 2 && sale_unit) return `/${sale_unit}`;
+      return '';
     }
   },
   observers: {
@@ -452,5 +470,10 @@ Component({
     toPrice(value) {
       return `￥${((value || 0) / 100).toFixed(2)}`;
     },
+    openRefundTips() {
+      this.setData({
+        showRefundTips: !this.data.showRefundTips
+      })
+    },
   }
 })

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

@@ -5,6 +5,7 @@
     "van-tag": "@vant/weapp/tag/index",
     "van-stepper": "@vant/weapp/stepper/index",
     "GoodsCommerce": "./components/GoodsCommerce/index",
-    "CopGoodsList": "./components/CopGoodsList/index"
+    "CopGoodsList": "./components/CopGoodsList/index",
+    "RefundTips": "./components/RefundTips/index"
   }
 }

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

@@ -105,6 +105,15 @@ $deviceWidth: 750;
               font-size: vmin(28);
             }
           }
+
+          .goods-refund-tips {
+            display: inline-block;
+            padding: 0 vmin(8);
+            border-radius: vmin(4);
+            border: vmin(2) solid #e0e0e0;
+            color: #666;
+            font-size: vmin(24);
+          }
   
           .goods-specification, .goods-expire-desc {
             margin-top: vmin(12);
@@ -190,6 +199,14 @@ $deviceWidth: 750;
           }
         }
       }
+
+      .tips-icon {
+        width: vmin(28);
+        height: vmin(28);
+        margin-left: vmin(8);
+        color: #999;
+        padding-top: vmin(2);
+      }
     }
 }
 

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

@@ -19,6 +19,8 @@
             <view class="goods-tag ET tag" wx:if="{{ goodsTitleTag }}">{{ goodsTitleTag }}</view>
             <view class="goods-name">{{ goodsInfo.goods_name }}</view>
           </view>
+          <view class="goods-refund-tips" wx:if="{{ isRefundTips }}">{{ goodsInfo.nonstandard_param.is_refund_msg || '称重退补差价' }}</view>
+          <image class="tips-icon" wx:if="{{ isRefundTips }}" src="../../../common/assets/images/tips.png"  catchtap="openRefundTips"></image>
           <view class="goods-specification font-12" wx:if="{{ specification }}">{{ specification }}</view>
           <view class="goods-expire-desc font-12" wx:if="{{ isExpireDisplay && expireDesc && expireDesc != '长期有效' }}">有效期：{{ expireDesc }}</view>
         </view>
@@ -30,7 +32,7 @@
             </view>
             <view>
               <view class="goods-price">
-                ￥{{ tools.toPrice(goodsPrice) }}
+                ￥{{ tools.toPrice(goodsPrice) }}{{ saleUnit }}
               </view>
               <view class="goods-tags">
                 <view class="goods-tag marketing-tag" wx:if="{{ marketingTag && !useSvipPrice }}">
@@ -81,4 +83,13 @@
     skuId="{{goodsInfo.sku_id}}"
   >
   </CopGoodsList>
+  <!-- 退补提示弹窗 -->
+  <RefundTips
+    wx:if="{{ isRefundTips }}"
+    showTips="{{ showRefundTips }}"
+    refundMsg ="{{ goodsInfo.nonstandard_param.is_refund_msg  }}"
+    bind:closeTips="openRefundTips"
+    zIndex="{{refundTipsZIndex}}"
+    isFullScreen="{{isFullScreen}}"
+  ></RefundTips>
 </view>

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

@@ -88,6 +88,14 @@
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-title .goods-name {
   font-size: 3.73333vmin;
 }
+.goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-refund-tips {
+  display: inline-block;
+  padding: 0 1.06667vmin;
+  border-radius: 0.53333vmin;
+  border: 0.26667vmin solid #e0e0e0;
+  color: #666;
+  font-size: 3.2vmin;
+}
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-specification,
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-expire-desc {
   margin-top: 1.6vmin;
@@ -159,6 +167,13 @@
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter .goods-minus {
   background: none;
 }
+.goods-info-wrapper .goods-info .tips-icon {
+  width: 3.73333vmin;
+  height: 3.73333vmin;
+  margin-left: 1.06667vmin;
+  color: #999;
+  padding-top: 0.26667vmin;
+}
 @media screen and (min-width: 768px) and (orientation: portrait) {
   .goods-info-wrapper {
     margin-bottom: 1.17188vmin;
@@ -250,6 +265,14 @@
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-title .goods-name {
     font-size: 1.82292vmin;
   }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-refund-tips {
+    display: inline-block;
+    padding: 0 0.52083vmin;
+    border-radius: 0.26042vmin;
+    border: 0.13021vmin solid #e0e0e0;
+    color: #666;
+    font-size: 1.5625vmin;
+  }
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-specification,
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-expire-desc {
     margin-top: 0.78125vmin;
@@ -321,6 +344,13 @@
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter .goods-minus {
     background: none;
   }
+  .goods-info-wrapper .goods-info .tips-icon {
+    width: 1.82292vmin;
+    height: 1.82292vmin;
+    margin-left: 0.52083vmin;
+    color: #999;
+    padding-top: 0.13021vmin;
+  }
 }
 @media screen and (min-height: 630px) and (orientation: landscape) {
   .goods-info-wrapper {
@@ -413,6 +443,14 @@
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-title .goods-name {
     font-size: 2.22222vmin;
   }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-refund-tips {
+    display: inline-block;
+    padding: 0 0.63492vmin;
+    border-radius: 0.31746vmin;
+    border: 0.15873vmin solid #e0e0e0;
+    color: #666;
+    font-size: 1.90476vmin;
+  }
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-specification,
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-expire-desc {
     margin-top: 0.95238vmin;
@@ -484,6 +522,13 @@
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter .goods-minus {
     background: none;
   }
+  .goods-info-wrapper .goods-info .tips-icon {
+    width: 2.22222vmin;
+    height: 2.22222vmin;
+    margin-left: 0.63492vmin;
+    color: #999;
+    padding-top: 0.15873vmin;
+  }
 }
 @media screen and (min-height: 768px) and (orientation: landscape) {
   .goods-info-wrapper {
@@ -576,6 +621,14 @@
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-title .goods-name {
     font-size: 1.82292vmin;
   }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-refund-tips {
+    display: inline-block;
+    padding: 0 0.52083vmin;
+    border-radius: 0.26042vmin;
+    border: 0.13021vmin solid #e0e0e0;
+    color: #666;
+    font-size: 1.5625vmin;
+  }
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-specification,
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-expire-desc {
     margin-top: 0.78125vmin;
@@ -647,4 +700,11 @@
   .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter .goods-minus {
     background: none;
   }
+  .goods-info-wrapper .goods-info .tips-icon {
+    width: 1.82292vmin;
+    height: 1.82292vmin;
+    margin-left: 0.52083vmin;
+    color: #999;
+    padding-top: 0.13021vmin;
+  }
 }

package/miniprogram_dist/ConfirmOrder/index.js

@@ -66,6 +66,10 @@ Component({
       type: Number,
       value: 100
     },
+    refundTipsZIndex:{
+      type: Number,
+      value: 100
+    },
   },
   data: {
     showHeader: true

package/miniprogram_dist/CouponList/components/CouponItem/index.js

@@ -221,6 +221,12 @@ Component({
       const item = data.item;
       return item.coupon_type && +item.coupon_type === 6; // 优惠券类型 1=通用优惠券,2=专属优惠券,3=员工优惠券 6=礼品劵
     },
+    // 是否为红包礼品券
+    isRedPacketGiftCoupon(data) {
+      const { coupon_type, gift_coupon_type } = data?.item || {};
+
+      return +coupon_type === 6 && +gift_coupon_type === 1;
+    },
     priceCustomSize(data) {
       let style = '';
       if (+data.item.discount_way === 1) {

package/miniprogram_dist/CouponList/components/CouponItem/index.wxml

@@ -62,9 +62,11 @@
         >{{ time.formatDateToMinte(item.invalid_at) }}到期</text>
       </view>
       <view class="moreCouponInfo" wx:else>
-        <text class="couponUseHint" wx:if="{{item.type == 0}}">部分商品可用</text>
-        <text class="couponUseHint" wx:if="{{item.type == 2}}">部分商品不可用</text>
-        <text class="couponUseHint" wx:if="{{item.type == 1}}">全部商品可用</text>
+        <view wx:if="{{ !isRedPacketGiftCoupon }}">
+          <text class="couponUseHint" wx:if="{{item.type == 0}}">部分商品可用</text>
+          <text class="couponUseHint" wx:if="{{item.type == 2}}">部分商品不可用</text>
+          <text class="couponUseHint" wx:if="{{item.type == 1}}">全部商品可用</text>
+        </view>
         <text
           class="couponUseTime"
           wx:if="{{item.valid_day}}"
@@ -266,7 +268,7 @@
     </view>
   </block>
   <view class="coupon-usage">
-    <view class="discount-type">{{ useScopeText }}</view>
+    <view wx:if="{{ !isRedPacketGiftCoupon }}" class="discount-type">{{ useScopeText }}</view>
     <view class="discount-date-new">{{ getCouponValidInfo }}</view>
     <view
       wx:if="{{receiveStatus.showStatus}}"

package/miniprogram_dist/CouponReceivePopup/index.js

@@ -65,6 +65,12 @@ Component({
       const item = data.couponInfo;
       return item.coupon_type && +item.coupon_type === 6; // 优惠券类型 1=通用优惠券,2=专属优惠券,3=员工优惠券 6=礼品劵
     },
+    // 是否为红包礼品券
+    isRedPacketGiftCoupon(data) {
+      const { coupon_type, gift_coupon_type } = data?.couponInfo || {};
+
+      return +coupon_type === 6 && +gift_coupon_type === 1;
+    },
     isShowPoint(data) {
       let tempPrice = data.couponInfo.price;
       if (tempPrice % 100 == 0) {

package/miniprogram_dist/CouponReceivePopup/index.wxml

@@ -41,10 +41,12 @@
             </view>
           </block>
           <view class="receive-container-new__content-describe">
-            <!-- 全部商品可用 -->
-            <text wx:if="{{couponInfo.type == 1}}">全部商品可用</text>
-            <!-- 部分商品可用 -->
-            <text wx:else>部分商品可用</text>
+            <view wx:if="{{ !isRedPacketGiftCoupon }}">
+              <!-- 全部商品可用 -->
+              <text wx:if="{{couponInfo.type == 1}}">全部商品可用</text>
+              <!-- 部分商品可用 -->
+              <text wx:else>部分商品可用</text>
+            </view>
             <!-- 领取次日x天内有效 / 自领取起x天内有效-->
             <text wx:if="{{couponInfo.valid_day}}">{{ getCouponValidInfo }}</text>
             <!-- 有效期至 -->
@@ -99,6 +101,6 @@ var formatDateToMinte = function(date) {
   module.exports={
   ToFilter:ToFilter,
   fixedFont:fixedFont,
-  formatDateToMinte: formatDateToMinte 
+  formatDateToMinte: formatDateToMinte
   }
 </wxs>

package/miniprogram_dist/CustomPopup/index.js

@@ -60,6 +60,10 @@ Component({
       type: String,
       value: ''
     },
+    isLottery: {
+      type: Boolean,
+      value: false
+    }
   },
 
   /**

package/miniprogram_dist/CustomPopup/index.wxml

@@ -22,7 +22,7 @@
     >
       <slot name="header"></slot>
     </view>
-    <view class="popup-cont" style="{{popPosition == 'right' ? '-webkit-overflow-scrolling:auto;overflow:auto;' : ''}} {{hasBottom ? 'height: calc(100% - 25.6vmin);' : '' }} {{contentStyle}}">
+    <view class="popup-cont" style="{{popPosition == 'right' && !isLottery ? '-webkit-overflow-scrolling:auto;overflow:auto;' : ''}} {{hasBottom ? 'height: calc(100% - 25.6vmin);' : '' }} {{contentStyle}}">
       <slot name="content"></slot>
     </view>
     <view class="popup-bottom" wx:if="{{ hasBottom }}">

package/miniprogram_dist/GoodsItem/index.js

@@ -196,6 +196,16 @@ Component({
     aliveSubId: {
       type: String,
       value: ''
+    },
+    // 抽奖商品id
+    lotteryGoodsIds: {
+      type: Array,
+      value: []
+    },
+    // 是否是抽奖列表
+    isLottery: {
+      type: Boolean,
+      value: false
     }
   },
 
@@ -428,6 +438,20 @@ Component({
     },
     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;
+    },
+    // 销售单位（是计重商品才展示）
+    saleUnit(data) {
+      const { is_best, sale_unit } = data.goodsItem;
+      if (is_best === 2 && sale_unit) return `/${sale_unit}`;
+      return '';
+    },
+    showLotterySign(data) {
+      return data.lotteryGoodsIds.includes(data.goodsItem.resource_id)
     }
   },
   /**