xiaoe_mp_npm 1.0.19 → 1.0.20-alpha.2

package/miniprogram_dist/GoodsItem/index.js

@@ -26,6 +26,30 @@ const { utils, sensorLog } = require("live-mp-tools");
 
 const computedBehavior = require('miniprogram-computed').behavior
 
+const formatNum = (num) => {
+  if (!num || isNaN(num)) return num
+
+  num = Number(num)
+  const isDecimals = (num) => {
+    num = num.toString()
+    if(num.split('.')[1] != '00'){
+      return true
+    }else{
+      return false
+    }
+  }
+
+  if (Math.abs(num) >= 100000000) {
+    num = num / 100000000
+    return isDecimals(Math.floor(num * 100) / 100) ? Math.floor(num * 100) / 100 + '亿' : num + '亿'
+  } else if (Math.abs(num) >= 10000) {
+    num = num / 10000
+    return isDecimals(Math.floor(num * 100) / 100) ? Math.floor(num * 100) / 100 + '万' : num + '万'
+  } else {
+    return num
+  }
+}
+
 Component({
   behaviors: [computedBehavior],
   options: {
@@ -165,6 +189,11 @@ Component({
       type: String,
       value: '',
     },
+    // 是否展示库存
+    stockSwitch: {
+      type: Number,
+      value: 0
+    }
   },
 
   lifetimes: {
@@ -195,8 +224,39 @@ Component({
     isSoldOut: false, //商品是否设置已售罄
     isRealOver: false, //商品是否为非手动售罄下的，真实抢光
     changeStateLoading: false, // 修改状态 loading（如售罄状态、显示状态）
+    skillNowTime: 0 // 秒杀活动对比的当前时间
   },
   computed: {
+    // 是否显示库存
+    showStock(data) {
+      const { current_role, goodsInfo, stockSwitch, skillNowTime } = data
+      // 只涉及实物商品,线下课,班课,有价优惠券,课时包,服务类商品
+      if (![21, 29, 35, 41, 42, 68].includes(goodsInfo.resource_type)) return false
+      // 讲师必定展示
+      if (current_role === 'teacher') return true
+      // 学员的话，参与营销活动有活动库存，并且开始了，就不展示了
+      const activityTime = new Date(goodsInfo.start_at?.replace(/-/g, "/")).getTime() || 0
+      const nowTime = skillNowTime || new Date().getTime()
+      if (+goodsInfo.is_activity === 1 && (nowTime > activityTime) && goodsInfo.activity_stock) return false
+      // 学员其余情况下，根据b端显示库存开关
+      return stockSwitch === 1
+    },
+    goodsStock(data) {
+      const { current_role, goodsInfo, skillNowTime } = data
+      // 讲师显示原库存
+      if (current_role === 'teacher') return formatNum(goodsInfo.stock)
+      // 售罄了
+      if (+goodsInfo.is_sell_out === 1) return 0
+      // 原库存为0
+      if (+goodsInfo.stock === 0) return 0
+      // 如果参与了营销活动开始后且有活动呢库存, 展示活动库存
+      const activityTime = new Date(goodsInfo.start_at?.replace(/-/g, "/")).getTime() || 0
+      const nowTime = skillNowTime || new Date().getTime()
+      if (+goodsInfo.is_activity === 1 && (nowTime > activityTime)) {
+          return goodsInfo.activity_stock ? formatNum(goodsInfo.activity_stock - goodsInfo.activity_order_num) : formatNum(goodsInfo.stock)
+      }
+      return formatNum(goodsInfo.stock)
+    },
     showPreferentialPrice(properties) {
       // 券后价小于展示价格的时候展示券后价; coupon_switch B端店铺设置 是否展示券后价,err_code === 0 是正常，非0表示券后价相关接口报错了，去抢购按钮展示为查看详情
       //超级会员全免权益
@@ -336,20 +396,6 @@ Component({
     },
     // 商品剩余数量
     residueQuantity(data) {
-      let formatNum = (num) => {
-        if (!num || isNaN(num)) return num
-        num = Number(num)
-        if (Math.abs(num) >= 100000000) {
-          num = num / 100000000
-          return this.isDecimals(Math.floor(num * 100) / 100) ? Math.floor(num * 100) / 100 + '亿' : num + '亿'
-        } else if (Math.abs(num) >= 10000) {
-          num = num / 10000
-          return this.isDecimals(Math.floor(num * 100) / 100) ? Math.floor(num * 100) / 100 + '万' : num + '万'
-        } else {
-          return num
-        }
-      }
-
       // "已抢光"
       if (data.isSellOut) return '已抢光'
 
@@ -675,6 +721,7 @@ Component({
       let end = deadline.getTime();
       //剩余时间
       let time = end - now;
+      this.setData({ skillNowTime: now })
       //定义变量 d,h,m,s保存倒计时的时间
       let d = 0, h = 0, m = 0, s = 0;
       if (time >= 0) {
@@ -694,6 +741,8 @@ Component({
       let that = this
       if (!(d === 0 && h === 0 && m === 0 && s === 0)) { //秒杀活动还未到时间
         setTimeout(() => that.countTime(), 1000)
+      } else {
+        this.setData({ skillNowTime: 0 })
       }
     },
     handleContact(e) {

package/miniprogram_dist/GoodsItem/index.scss

@@ -1,4 +1,4 @@
-@import "../common/css/theme.wxss";
+@import "..\\common/css/index.wxss";
 
 $deviceWidth: 750;
 @function vmin($rpx) {
@@ -250,8 +250,18 @@ $deviceWidth: 750;
             border-radius: vmin(4);
           }
         }
-        .order-stock{
-          color: #999999;
+        .stock-and-order {
+          display: flex;
+          align-items: center;
+          .stock-line {
+            background-color: #E5E5E5;
+            width: 1px;
+            height: 10px;
+            margin: 0 4px;
+          }
+          .order-stock{
+            color: #999999;
+          }
         }
       }
 

package/miniprogram_dist/GoodsItem/index.wxml

@@ -62,8 +62,15 @@
           <view wx:if="{{showPreferentialPrice}}" class="preferential-price">{{ '券后¥' + goodsItem.preferentialShowInt }}</view>
         </view>
 
-        <!-- 商品销量 -->
-        <view class="order-stock" wx:if="{{hasSaleNum}}">{{ '已售' + goodsItem.order_num }}</view>
+        <view class="stock-and-order">
+          <block wx:if="{{ showStock }}">
+            <!-- 商品库存 -->
+            <view class="order-stock">{{ current_role === 'teacher' ? '库存' : '剩余' }} {{ goodsStock }}</view>
+            <view wx:if="{{ hasSaleNum }}" class="stock-line"></view>
+          </block>
+          <!-- 商品销量 -->
+          <view class="order-stock" wx:if="{{hasSaleNum}}">{{ '已售' + goodsItem.order_num }}</view>
+        </view>
       </view>
 
       <!-- 活动进度条 -->

package/miniprogram_dist/GoodsItem/index.wxss

@@ -1,20 +1,3 @@
-@charset "UTF-8";
-/* 主题色 */
-.theme-customize-bg {
-  background: linear-gradient(180.25deg, #fe6500 0%, #ff4102 100%) !important;
-}
-.theme-customize-font {
-  color: #1472FF !important;
-}
-.theme-customize-light-new {
-  background-color: #9db8f1 !important;
-}
-.theme-customize-bg-light {
-  background-color: #fff3eb !important;
-}
-.theme-customize-border {
-  border-color: #FF781F !important;
-}
 @keyframes turn {
   0% {
     transform: rotate(0deg);
@@ -211,7 +194,7 @@
   width: 59.46667vmin;
 }
 .goods-item .main-card .right .line-one .super-activity-type {
-  background: linear-gradient(180.25deg, #333333 0%, #525252 68%, #333333 100%);
+  background: linear-gradient(180.25deg, #333 0%, #525252 68%, #333 100%);
   color: #ff781f;
   padding: 0.53333vmin 1.06667vmin;
   font-size: 2.66667vmin;
@@ -280,7 +263,17 @@
   padding: 0.53333vmin 1.06667vmin;
   border-radius: 0.53333vmin;
 }
-.goods-item .main-card .right .order .order-stock {
+.goods-item .main-card .right .order .stock-and-order {
+  display: flex;
+  align-items: center;
+}
+.goods-item .main-card .right .order .stock-and-order .stock-line {
+  background-color: #E5E5E5;
+  width: 1px;
+  height: 10px;
+  margin: 0 4px;
+}
+.goods-item .main-card .right .order .stock-and-order .order-stock {
   color: #999999;
 }
 .goods-item .main-card .right .progress {
@@ -450,12 +443,12 @@
   font-weight: 500;
 }
 .goods-item .main-card .right .line-three .buy-btn-preferential .preferential-flow {
-  color: white;
+  color: #fff;
   font-size: 2.66667vmin;
 }
 .goods-item .main-card .right .line-three .buy-btn-preferential .preferential-show {
   font-size: 3.73333vmin;
-  color: white;
+  color: #fff;
 }
 .goods-item .main-card .manage-right {
   width: 49.86667vmin;
@@ -468,7 +461,7 @@
 }
 .goods-item .main-card .teacher-switch .switch-txt {
   opacity: 1;
-  color: #333333;
+  color: #333;
   font-size: 3.2vmin;
   font-weight: 400;
   font-family: "PingFang SC";
@@ -507,7 +500,7 @@
   align-items: center;
   font-weight: bold;
   color: #333;
-  border: 0.13333vmin solid #cccccc;
+  border: 0.13333vmin solid #ccc;
 }
 .goods-item .option-btn-wrap .option-btn:last-of-type {
   margin-right: 0;
@@ -689,7 +682,7 @@
     width: 29.03646vmin;
   }
   .goods-item .main-card .right .line-one .super-activity-type {
-    background: linear-gradient(180.25deg, #333333 0%, #525252 68%, #333333 100%);
+    background: linear-gradient(180.25deg, #333 0%, #525252 68%, #333 100%);
     color: #ff781f;
     padding: 0.26042vmin 0.52083vmin;
     font-size: 1.30208vmin;
@@ -758,7 +751,17 @@
     padding: 0.26042vmin 0.52083vmin;
     border-radius: 0.26042vmin;
   }
-  .goods-item .main-card .right .order .order-stock {
+  .goods-item .main-card .right .order .stock-and-order {
+    display: flex;
+    align-items: center;
+  }
+  .goods-item .main-card .right .order .stock-and-order .stock-line {
+    background-color: #E5E5E5;
+    width: 1px;
+    height: 10px;
+    margin: 0 4px;
+  }
+  .goods-item .main-card .right .order .stock-and-order .order-stock {
     color: #999999;
   }
   .goods-item .main-card .right .progress {
@@ -928,12 +931,12 @@
     font-weight: 500;
   }
   .goods-item .main-card .right .line-three .buy-btn-preferential .preferential-flow {
-    color: white;
+    color: #fff;
     font-size: 1.30208vmin;
   }
   .goods-item .main-card .right .line-three .buy-btn-preferential .preferential-show {
     font-size: 1.82292vmin;
-    color: white;
+    color: #fff;
   }
   .goods-item .main-card .manage-right {
     width: 24.34896vmin;
@@ -946,7 +949,7 @@
   }
   .goods-item .main-card .teacher-switch .switch-txt {
     opacity: 1;
-    color: #333333;
+    color: #333;
     font-size: 1.5625vmin;
     font-weight: 400;
     font-family: "PingFang SC";
@@ -985,7 +988,7 @@
     align-items: center;
     font-weight: bold;
     color: #333;
-    border: 0.0651vmin solid #cccccc;
+    border: 0.0651vmin solid #ccc;
   }
   .goods-item .option-btn-wrap .option-btn:last-of-type {
     margin-right: 0;
@@ -1168,7 +1171,7 @@
     width: 35.39683vmin;
   }
   .goods-item .main-card .right .line-one .super-activity-type {
-    background: linear-gradient(180.25deg, #333333 0%, #525252 68%, #333333 100%);
+    background: linear-gradient(180.25deg, #333 0%, #525252 68%, #333 100%);
     color: #ff781f;
     padding: 0.31746vmin 0.63492vmin;
     font-size: 1.5873vmin;
@@ -1237,7 +1240,17 @@
     padding: 0.31746vmin 0.63492vmin;
     border-radius: 0.31746vmin;
   }
-  .goods-item .main-card .right .order .order-stock {
+  .goods-item .main-card .right .order .stock-and-order {
+    display: flex;
+    align-items: center;
+  }
+  .goods-item .main-card .right .order .stock-and-order .stock-line {
+    background-color: #E5E5E5;
+    width: 1px;
+    height: 10px;
+    margin: 0 4px;
+  }
+  .goods-item .main-card .right .order .stock-and-order .order-stock {
     color: #999999;
   }
   .goods-item .main-card .right .progress {
@@ -1407,12 +1420,12 @@
     font-weight: 500;
   }
   .goods-item .main-card .right .line-three .buy-btn-preferential .preferential-flow {
-    color: white;
+    color: #fff;
     font-size: 1.5873vmin;
   }
   .goods-item .main-card .right .line-three .buy-btn-preferential .preferential-show {
     font-size: 2.22222vmin;
-    color: white;
+    color: #fff;
   }
   .goods-item .main-card .manage-right {
     width: 29.68254vmin;
@@ -1425,7 +1438,7 @@
   }
   .goods-item .main-card .teacher-switch .switch-txt {
     opacity: 1;
-    color: #333333;
+    color: #333;
     font-size: 1.90476vmin;
     font-weight: 400;
     font-family: "PingFang SC";
@@ -1464,7 +1477,7 @@
     align-items: center;
     font-weight: bold;
     color: #333;
-    border: 0.07937vmin solid #cccccc;
+    border: 0.07937vmin solid #ccc;
   }
   .goods-item .option-btn-wrap .option-btn:last-of-type {
     margin-right: 0;
@@ -1647,7 +1660,7 @@
     width: 29.03646vmin;
   }
   .goods-item .main-card .right .line-one .super-activity-type {
-    background: linear-gradient(180.25deg, #333333 0%, #525252 68%, #333333 100%);
+    background: linear-gradient(180.25deg, #333 0%, #525252 68%, #333 100%);
     color: #ff781f;
     padding: 0.26042vmin 0.52083vmin;
     font-size: 1.30208vmin;
@@ -1716,7 +1729,17 @@
     padding: 0.26042vmin 0.52083vmin;
     border-radius: 0.26042vmin;
   }
-  .goods-item .main-card .right .order .order-stock {
+  .goods-item .main-card .right .order .stock-and-order {
+    display: flex;
+    align-items: center;
+  }
+  .goods-item .main-card .right .order .stock-and-order .stock-line {
+    background-color: #E5E5E5;
+    width: 1px;
+    height: 10px;
+    margin: 0 4px;
+  }
+  .goods-item .main-card .right .order .stock-and-order .order-stock {
     color: #999999;
   }
   .goods-item .main-card .right .progress {
@@ -1886,12 +1909,12 @@
     font-weight: 500;
   }
   .goods-item .main-card .right .line-three .buy-btn-preferential .preferential-flow {
-    color: white;
+    color: #fff;
     font-size: 1.30208vmin;
   }
   .goods-item .main-card .right .line-three .buy-btn-preferential .preferential-show {
     font-size: 1.82292vmin;
-    color: white;
+    color: #fff;
   }
   .goods-item .main-card .manage-right {
     width: 24.34896vmin;
@@ -1904,7 +1927,7 @@
   }
   .goods-item .main-card .teacher-switch .switch-txt {
     opacity: 1;
-    color: #333333;
+    color: #333;
     font-size: 1.5625vmin;
     font-weight: 400;
     font-family: "PingFang SC";
@@ -1943,7 +1966,7 @@
     align-items: center;
     font-weight: bold;
     color: #333;
-    border: 0.0651vmin solid #cccccc;
+    border: 0.0651vmin solid #ccc;
   }
   .goods-item .option-btn-wrap .option-btn:last-of-type {
     margin-right: 0;

package/miniprogram_dist/LiveGoodsList/index.js

@@ -157,6 +157,11 @@ Component({
     useCouponInfo: {
       type: Object,
       value: {}
+    },
+    // 是否展示库存
+    stockSwitch: {
+      type: Number,
+      value: 0
     }
   },
   data: {
@@ -277,6 +282,11 @@ Component({
             type = 'goodsSwitch';
             marketInfo = Number(msgData[key]);
             break;
+          // 直播带货库存显示开关
+          case "stock_switch":
+            type = "stockSwitch";
+            marketInfo = Number(msgData[key]);
+            break;
           // 新增操作
           case 'conf_list':
             type = 'goodsConfList';
@@ -305,7 +315,7 @@ Component({
           default:
             break;
         }
-        if (marketInfo?.length > 0 || ['goodsSwitch', 'couponSwitch', 'goodsIsSellOut'].includes(type)) {
+        if (marketInfo?.length > 0 || ['goodsSwitch', 'couponSwitch', 'goodsIsSellOut', 'stockSwitch'].includes(type)) {
           this.changGoodsList({ type, marketInfo });
           type = '';
           marketInfo = [];
@@ -335,6 +345,10 @@ Component({
         case 'goodsSwitch':
           if ([0, 1].includes(marketInfo)) this.setData({ goodsSwitch: marketInfo });
           break;
+          // 带货库存显示开关操作
+        case 'stockSwitch':
+          if ([0, 1].includes(marketInfo)) this.setData({ stockSwitch: marketInfo });
+          break;
         case 'goodsConfList':
           // 如果已经加载完了，可以拼接数据
           if (this.data.finished || this.data.finishedTxt === 'no-data') {

package/miniprogram_dist/LiveGoodsList/index.wxml

@@ -47,21 +47,22 @@
         <view class="full-item">
           <block wx:if="{{showExplainingGoods}}">
             <goods-item
+              class="goods-item"
               style="display:{{!formExplainingGoods.is_display_package ? 'none' : ''}}"
               aliveInfo="{{aliveInfo}}"
               allContactPay="{{allContactPay}}"
               goodsInfo="{{formExplainingGoods}}"
               coupon_switch="{{coupon_switch}}"
-              bind:sendNewMsg="sendNewMsg"
-              bind:showConfirmOrder="showConfirmOrder"
-              bind:showSku="showSku"
               explainingGoods="{{explainingGoods}}"
-              bind:showDialog="showDialog"
-              class="goods-item"
               envName="{{ENV_NAME}}"
               sensorReportParams="{{sensorReportParams}}"
               isFullScreen="{{ popPosition === 'right'}}"
               isGrayMarketing="{{ isGrayMarketing}}"
+              stockSwitch="{{ stockSwitch }}"
+              bind:showDialog="showDialog"
+              bind:sendNewMsg="sendNewMsg"
+              bind:showConfirmOrder="showConfirmOrder"
+              bind:showSku="showSku"
             ></goods-item>
           </block>
           <goods-item
@@ -69,23 +70,24 @@
             wx:for-item="goodsItem"
             wx:key="index"
             wx:for-index="index"
+            class="goods-item"
             index="{{index}}"
             style="display:{{!goodsItem.is_display_package ? 'none' : ''}}"
             goodsInfo="{{goodsItem}}"
             aliveInfo="{{aliveInfo}}"
             allContactPay="{{allContactPay}}"
             coupon_switch="{{coupon_switch}}"
-            bind:sendNewMsg="sendNewMsg"
-            bind:showConfirmOrder="showConfirmOrder"
-            bind:showSku="showSku"
             explainingGoods="{{explainingGoods}}"
-            bind:showDialog="showDialog"
-            bind:changeGoodsState="changeGoodsState"
-            class="goods-item"
             envName="{{ENV_NAME}}"
             sensorReportParams="{{sensorReportParams}}"
             isFullScreen="{{ popPosition === 'right'}}"
             isGrayMarketing="{{ isGrayMarketing}}"
+            stockSwitch="{{ stockSwitch }}"
+            bind:showDialog="showDialog"
+            bind:sendNewMsg="sendNewMsg"
+            bind:showConfirmOrder="showConfirmOrder"
+            bind:showSku="showSku"
+            bind:changeGoodsState="changeGoodsState"
           ></goods-item>
         </view>
         <view class="finished-text" wx:if="{{!refreshing && finishedTxt !== 'no-data'}}">{{finishedTxt}}</view>

package/miniprogram_dist/Task/taskReceivePopup/coupon/index.js

@@ -26,17 +26,22 @@ Component({
   data: {},
   computed: {
     receiveCouponNowMsg(data){
-        return data.rewardData.coupon_list[0]
+      return data.rewardData.coupon_list[0]
     },
     isShowPoint(data) {
-        let tempPrice = data.receiveCouponNowMsg.price;
-        if (tempPrice % 100 == 0) {
-            return false;
-        } else {
-            return true;
-        }
+      let tempPrice = data.receiveCouponNowMsg.price;
+      if (tempPrice % 100 == 0) {
+        return false;
+      } else {
+        return true;
+      }
     },
-},
+    // 是否为礼品券
+    isGiftCoupon(data) {
+      const item = data.receiveCouponNowMsg;
+      return item && item.coupon_type && +item.coupon_type === 6; // 优惠券类型 1=通用优惠券,2=专属优惠券,3=员工优惠券 6=礼品劵
+    },
+  },
 
   /**
    * 组件的方法列表

package/miniprogram_dist/Task/taskReceivePopup/coupon/index.scss

@@ -11,6 +11,9 @@ $deviceWidth: 750;
       background-size: 100% 100%;
       background-image: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/loqj5jrx0grc.png');
       overflow: hidden;
+      .receive-container-gift {
+          margin-top: vmin(300);
+      }
       &__content {
           display: flex;
           flex-direction: column;
@@ -43,6 +46,35 @@ $deviceWidth: 750;
             font-weight: 600;
           }
       }
+      &__content-gift {
+         .label {
+            color: #fd2b54;
+            font-size: vmin(36);
+            height: vmin(48);
+            line-height: vmin(48);
+            margin-right: vmin(4);
+         }
+         .title {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: vmin(64);
+            margin-top: vmin(4);
+            .title-txt {
+               width: vmin(400);
+               line-height: vmin(64);
+               color: #fd2b54;
+               font-size: vmin(48);
+               font-weight: 600;
+               display: -webkit-box;
+               -webkit-box-orient: vertical;
+               -webkit-line-clamp: 1;
+               font-family: "PingFang SC";
+               font-weight: 600;
+               overflow: hidden;
+            }
+         }
+      }
       &__content-describe {
           color: #333333;
           font-size: vmin(28);

package/miniprogram_dist/Task/taskReceivePopup/coupon/index.wxml

@@ -8,30 +8,42 @@
 >
   <view class="receive-container-wrapper">
     <view class="receive-container">
-      <view class="receive-container__content">
-        <view class="receive-container__content-price">
-          <view wx:if="{{receiveCouponNowMsg.discount_way === 1}}">
-            <text class="smallIcon">¥</text>
-            <text class="boldIcon">{{ couponReceivePopup.filterPrice(receiveCouponNowMsg.price) }}</text>
-            <text
-              class="smallIcon"
-              wx:if="{{isShowPoint}}"
-            >.{{ couponReceivePopup.fixedFont(receiveCouponNowMsg.price) }}</text>
+      <view class="receive-container__content {{ isGiftCoupon ? 'receive-container-gift' : '' }}">
+        <block wx:if="{{!isGiftCoupon}}">
+          <view class="receive-container__content-price">
+            <view wx:if="{{receiveCouponNowMsg.discount_way === 1}}">
+              <text class="smallIcon">¥</text>
+              <text class="boldIcon">{{ couponReceivePopup.filterPrice(receiveCouponNowMsg.price) }}</text>
+              <text
+                class="smallIcon"
+                wx:if="{{isShowPoint}}"
+              >.{{ couponReceivePopup.fixedFont(receiveCouponNowMsg.price) }}</text>
+            </view>
+            <text wx:if="{{receiveCouponNowMsg.discount_way === 2}}">
+              <text class="boldIcon">{{ couponReceivePopup.filterPrice(receiveCouponNowMsg.discount_percent, false) }}</text>
+              <text
+                class="boldIcon"
+                wx:if="{{receiveCouponNowMsg.discount_percent % 10 !== 0}}"
+              >.{{ couponReceivePopup.fixedFont(receiveCouponNowMsg.discount_percent, false) }}</text>
+              <text class="discountFont">折</text>
+            </text>
           </view>
-          <text wx:if="{{receiveCouponNowMsg.discount_way === 2}}">
-            <text class="boldIcon">{{ couponReceivePopup.filterPrice(receiveCouponNowMsg.discount_percent, false) }}</text>
-            <text
-              class="boldIcon"
-              wx:if="{{receiveCouponNowMsg.discount_percent % 10 !== 0}}"
-            >.{{ couponReceivePopup.fixedFont(receiveCouponNowMsg.discount_percent, false) }}</text>
-            <text class="discountFont">折</text>
-          </text>
-        </view>
+        </block>
+        <block wx:else>
+          <view class="receive-container__content-gift">
+            <view class="label">礼品券</view>
+            <view class="title">
+              <view class="title-txt">{{ receiveCouponNowMsg.title }}</view>
+            </view>
+          </view>
+        </block>
         <view class="receive-container__content-describe">
-          <!-- 无门槛 -->
-          <view wx:if="{{receiveCouponNowMsg.require_price == 0}}">无门槛</view>
-          <!-- 满xx元可用 -->
-          <view wx:else>满{{ receiveCouponNowMsg.require_price / 100 }}元可用</view>
+          <block wx:if="{{!isGiftCoupon}}">
+            <!-- 无门槛 -->
+            <view wx:if="{{receiveCouponNowMsg.require_price == 0}}">无门槛</view>
+            <!-- 满xx元可用 -->
+            <view wx:else>满{{ receiveCouponNowMsg.require_price / 100 }}元可用</view>
+          </block>
           <!-- 全部商品可用 -->
           <view wx:if="{{receiveCouponNowMsg.type == 1}}">全部商品可用</view>
           <!-- 部分商品可用 -->