xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/src/GoodsItem/index.wxml

@@ -37,122 +37,171 @@
       >{{goodsItem.order_weight}}</text>
       <view wx:if="{{showLotterySign}}" class="lottery-sign {{!isSpecifyGoods && 'lottery-sign-index'}}">下单抽奖</view>
       <text class="goods-type {{isIOS && 'ios-goods-type'}}" wx:if="{{sendingGoodId !== goodsItem.id}}">{{goodsItem.resource_type_name}}</text>
-      <image
+      <!-- <image
         wx:if="{{ isShowExamplaining }}"
         class="goods-explaining"
-        src="../../common/assets/images/liveGoodsList/explaining.png"
-      />
+        src="../common/assets/images/liveGoodsList/explaining.png"
+      /> -->
       <!-- 讲解中 -->
       <view class="goods-explaining" wx:if="{{sendingGoodId === goodsItem.id}}">
         <view class="loadingWrapper">
-          <view class="loading" wx:for="{{4}}" wx:key="i"></view>
+          <view class="loading" wx:for="{{3}}" wx:key="i"></view>
         </view>
         <view class="text">讲解中</view>
       </view>
-      <view class="is-over" wx:if="{{!isStudent && isSoldOut}}">- 已售罄 -</view>
-      <view class="is-over" wx:elif="{{isOver}}">- 已抢光 -</view>
+      <view class="goods-over-mask" wx:if="{{ !isStudent && isSoldOut }}" catchtap="checkSellOut"><view class="radio-box">已售罄</view></view>
+      <view class="goods-over-mask" wx:if="{{ isOver }}" catchtap="checkSellOut"><view class="radio-box">已抢光</view></view>
+      <!-- 求讲解 -->
+      <view class="seek-explaining {{ isExplainDisabled && 'disabled' }}" wx:if="{{!isExplaining && !isSoldOut && isStudent && hotSalesConf.goods_conf.is_explain_on }}" catchtap="pleaseExplain">
+        <image class="seek-img" src="{{ isExplainDisabled ?'https://commonresource-1252524126.cdn.xiaoeknow.com/image/mfevtih10oab.svg':'https://commonresource-1252524126.cdn.xiaoeknow.com/image/mfevtigx0om9.svg' }}" />
+        <view class="seek-text {{ isExplainDisabled && 'disabled-text' }}">{{ isExplainDisabled ? '已申请' : '求讲解' }}</view>
+      </view>
     </view>
     <view class="right {{isManage?'manage-right':''}}">
-      <!-- 标题 -->
-      <view class="line-one">
-        <!-- 超级会员label -->
-        <view class="super-activity-type" wx:if="{{isSupperVip}}">
-          <text class="super-activity-txt">{{currentActive}}</text>
+      <view class="top-part">
+        <!-- 标题 -->
+        <view class="line-one">
+          <!-- 超级会员label -->
+          <view class="super-activity-type" wx:if="{{isSupperVip}}">
+            <text class="super-activity-txt">{{currentActive}}</text>
+          </view>
+          <!-- 等级会员label -->
+          <view wx:if="{{isMembership}}" class="membership-activity-type">
+            <text class="membership-activity-txt">{{ showMembershipRankName }}</text>
+          </view>
+          <!-- 预热中 -->
+          <text class="goods-is-preheat" wx:if="{{goodsItem.is_preheat && !isStudent}}">预热中</text>
+          <!-- 活动标签 -->
+          <text class="activity-type" wx:if="{{goodsItem.is_activity && currentActive && !isManage && goodsItem.activityCountdown && !goodsItem.preheatTime}}">{{
+            currentActive
+          }} {{ goodsItemTools.timeFormat(goodsItem.activityCountdown)}}</text>
+          <text class="goods-title {{isManage?'manage-title':''}}">{{goodsItem.title}}</text>
         </view>
-        <!-- 等级会员label -->
-        <view wx:if="{{isMembership}}" class="membership-activity-type">
-          <text class="membership-activity-txt">{{ showMembershipRankName }}</text>
+  
+        <!-- 亮点、销量 -->
+        <view class="desc-order">
+          <!-- 亮点 -->
+          <view class="desc" wx:if="{{isShowGoodsDesc}}">{{goodsItem.goods_desc}}</view>
+          <!-- 商品销量 -->
+          <view class="order-num" wx:if="{{hasSaleNum}}">
+            <image wx:if="{{goodsItem.order_num > 100}}" class="hot-icon" src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/mhllqki30yyg.svg"></image>
+            <view class="text {{ goodsItem.order_num > 100 && 'hot-text' }}">{{ goodsItem.order_num }} 人买过</view>
+          </view>
         </view>
-        <!-- 预热中 -->
-        <text class="goods-is-preheat" wx:if="{{goodsItem.is_preheat && !isStudent}}">预热中</text>
-        <text class="goods-title {{isManage?'manage-title':''}}">{{goodsItem.title}}</text>
-      </view>
-
-      <!-- 亮点 -->
-      <view class="desc" wx:if="{{!isManage && goodsItem.goods_desc}}">{{goodsItem.goods_desc}}</view>
-
-      <!-- 快递方式 券后 总售量 -->
-      <!-- <view class="left-stock" wx:if="{{ isStudent && goodsItem.hasStock || hasSaleNum}}">
-        <view class="split" wx:if="{{goodsItem.hasStock && hasSaleNum}}"></view>
-        <text wx:if="{{hasSaleNum}}">{{ saleNum }}</text>
-      </view>-->
-
-      <!-- 快递方式 券后 总售量 -->
-      <view class="order">
-        <view class="order-left">
-          <!-- 自提/快递 二期才有哈-->
-          <view class="distribution" wx:if="{{distributionPattern}}">{{distributionWay}}</view>
-
-          <!-- 计重商品的退补提示 -->
-          <view class="distribution" wx:if="{{ isRefundTips }}">{{ goodsItem.is_refund_msg || '称重退补差价' }}</view>
-
-          <!-- 券后价 -->
-          <view wx:if="{{showPreferentialPrice}}" class="preferential-price">{{ '券后¥' + (goodsItem.is_preheat ? goodsItemTools.hidePrice(goodsItem.preferentialShowInt) : goodsItem.preferentialShowInt) }}{{ saleUnit }}</view>
+  
+        <!-- 等级会员-专属商品标识 -->
+        <level-member-bar good-data="{{ goodsItem }}" />
+  
+        <!-- 活动进度条 -->
+        <view
+          class="progress"
+          wx:if="{{goodsItem.is_activity && currentActive && !isManage && goodsItem.activityCountdown && !goodsItem.preheatTime}}"
+        >
+          <!-- 库存占比 -->
+          <view class="schedule" style="{{'width:' + percentage + '%'}}"></view>
+  
+          <!-- 剩余数量 -->
+          <text class="residue-num">{{ residueQuantity }}</text>
+  
+          <!-- 活动剩余时间(已售<=50才显示) -->
+          <!-- <text
+            class="residue-time"
+            wx:if="{{percentage <= 50}}"
+          >{{ goodsItemTools.timeFormat(goodsItem.activityCountdown) }}</text> -->
         </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 class="goods-order" >
+          <view class="order-left">
+            <!-- 自提/快递 二期才有哈-->
+            <!-- 优惠券标签 -->
+            <text wx:for="{{ couponsList }}" wx:for-item="coupon" wx:key="index" class="coupon-tag">券<text class="coupon-separator"></text>{{ coupon.couponDesc }}</text>
+            <!-- 计重商品 是否开启称重退补差价 -->
+            <view wx:if="{{isRefundTips}}" class="distribution">
+              称重退补差价
+            </view>
+            <!-- 配送方式标签 -->
+            <view wx:if="{{distributionPattern}}" class="distribution">
+              {{ distributionWay.first }}<block wx:if="{{distributionWay.second}}"> · </block>{{ distributionWay.second }}
+            </view>
+            <!-- 商品销量 -->
+            <view wx:if="{{showStock}}" class="left-stock">
+              <!-- 商品库存, 讲师 -->
+              <view wx:if="{{!isStudent}}" class="prod-stock">
+                库存{{goodsStock}}
+              </view>
+              <!-- 商品库存，学员 -->
+              <view wx:else class="prod-stock">剩余{{goodsStock}}</view>
+            </view>
+          </view>
+          
+        </view>
+  
+        <!-- 预热倒计时 -->
+        <view class="sec-kill" wx:if="{{!isManage && goodsItem.preheatTime && goodsItem.start_at}}">
+          <text>活动</text>
+          <text class="time">{{goodsItemTools.timeFormat(goodsItem.preheatTime)}}</text>
+          <text>后开始</text>
         </view>
-      </view>
-
-      <!-- 等级会员-专属商品标识 -->
-      <level-member-bar good-data="{{ goodsItem }}" />
-
-      <!-- 活动进度条 -->
-      <view
-        class="progress"
-        wx:if="{{goodsItem.is_activity && currentActive && !isManage && goodsItem.activityCountdown && !goodsItem.preheatTime}}"
-      >
-        <!-- 库存占比 -->
-        <view class="schedule" style="{{'width:' + percentage + '%'}}"></view>
-
-        <!-- 剩余数量 -->
-        <text class="residue-num">{{ residueQuantity }}</text>
-
-        <!-- 活动剩余时间(已售<=50才显示) -->
-        <text
-          class="residue-time"
-          wx:if="{{percentage <= 50}}"
-        >{{ goodsItemTools.timeFormat(goodsItem.activityCountdown) }}</text>
-      </view>
-
-      <!-- 预热倒计时 -->
-      <view class="sec-kill" wx:if="{{!isManage && goodsItem.preheatTime && goodsItem.start_at}}">
-        <text>活动</text>
-        <text class="time">{{goodsItemTools.timeFormat(goodsItem.preheatTime)}}</text>
-        <text>后开始</text>
       </view>
 
       <!-- 价格 按钮 -->
       <view class="line-three">
-        <view class="price">
+        <view class="price-box {{isOver && isStudent && 'over-price-box'}}">
           <!--IOS小程序端不能买得商品不显示价格-->
-          <view wx:if="{{showPrice}}">
-            <text
-              class="activity-type"
-              wx:if="{{goodsItem.is_activity && !isSupperVip && currentActive}}"
-            >{{currentActive}}</text>
-            <text class="price-flow">¥</text>
-            <text class="price-show" wx:if="{{goodsItem.is_preheat && isStudent}}">{{ goodsItemTools.hidePrice(goodsItem.priceShowInt) }}</text>
-            <text class="price-show" wx:else>{{ goodsItem.priceShowInt }}</text>
-            <text class="pending-price" wx:if="{{goodsItem.is_preheat && isStudent}}">待开价</text>
-            <text class="price-show" wx:if="{{ goodsItem.priceShowFlow !== '00' && !goodsItem.is_preheat}}">.{{ goodsItem.priceShowFlow }}</text>
-            <text class="sale-unit">{{ saleUnit }}</text>
-            <text class="price-line" wx:if="{{ showPriceLine && !isManage }}">
-              <text>¥{{ goodsItem.priceLineShowInt }}</text>
-              <text wx:if="{{ goodsItem.priceLineShowFlow !== '00'}}">.{{ goodsItem.priceLineShowFlow }}</text>
-              <text>{{ saleUnit }}</text>
-            </text>
-          </view>
+          <block wx:if="{{showPrice}}">
+            <!-- 价格展示场景一：券后价 + 原价 -->
+            <block wx:if="{{showPreferentialPrice}}">
+              <view class="red-price" wx:if="{{showPrice}}">
+                <view class="price-box">
+                  <view class="icon {{isOver && isStudent && 'over-icon'}}"></view>
+                  <view class="red-price-txt">券后</view>
+                </view>
+                 
+                <block wx:if="{{goodsItem.is_preheat && isStudent}}">
+                  <view class="red-price-num">¥{{ goodsItemTools.hidePrice(goodsItem.preferentialShowInt) }}</view>
+                  <view class="wait-open-price">待开价</view>
+                </block>
+                <!--  预热价(学员)  -->
+                <block wx:else>
+                  <view class="red-price-num">¥{{ goodsItem.preferentialShowInt }}</view>
+                  <view class="sale-unit">{{ saleUnit }}</view>
+                </block>
+              </view>
+              <!-- 原价 -->
+              <view class="grey-price" wx:if="{{showPrice}}">
+                <view class="grey-price-value">原价</view>
+                <view class="grey-price-value">¥{{ goodsItem.priceShowInt }}</view>
+                <view class="grey-price-value" wx:if="{{goodsItem.priceShowFlow !== '00'}}">
+                  .{{ goodsItem.priceShowFlow }}
+                </view>
+                <view class="grey-price-value">{{ saleUnit }}</view>
+              </view>
+            </block>
+            <!-- 价格展示场景二：原价|预热价(学员) + 划线价 -->
+            <block wx:else>
+              <!-- 原价价格 -->
+              <view class="red-price" wx:if="{{showPrice}}">
+                <view class="red-price-txt" wx:if="{{goodsItem.is_activity && currentActive && !isManage && goodsItem.activityCountdown && !goodsItem.preheatTime}}">{{ currentActive }}</view>
+                <block wx:if="{{goodsItem.is_preheat && isStudent}}">
+                  <view class="red-price-num">¥{{ goodsItemTools.hidePrice(goodsItem.priceShowInt) }}</view>
+                  <view class="wait-open-price">待开价</view>
+                </block>
+                <block wx:else>
+                  <view class="red-price-num">¥{{ goodsItem.priceShowInt }} {{ goodsItem.priceShowFlow !== '00' && !goodsItem.is_preheat ? '.' + goodsItem.priceShowFlow : '' }}</view>
+                  <view class="sale-unit">{{ saleUnit }}</view>
+                </block>
+              </view>
+              <!-- 划线价 -->
+              <view class="grey-price" wx:if="{{showPrice && showPriceLine && isManage}}">
+                <text class="grey-price-value grey-price-line-through">¥{{ goodsItem.priceLineShowInt }} {{ goodsItem.priceLineShowFlow !== '00' ? '.' + goodsItem.priceLineShowFlow : '' }}</text>
+                <text class="grey-price-value grey-price-line-through">{{ saleUnit }}</text>
+              </view>
+            </block>
+          </block>
         </view>
         <!-- 购买按钮 start -->
-        <block wx:if="{{isStudent}}">
+        <block wx:if="{{!isOver && isStudent}}">
           <!-- IOS虚拟商品 -->
           <button
             class="see-btn {{goodsItem.is_preheat ? 'preheat-btn' : ''}}"
@@ -179,22 +228,10 @@
             catchtap="judgePermission"
             wx:if="{{ btnTxt === '查看详情' }}"
           >{{ btnTxt }}</view>
-          <!-- 券后价 -->
-          <!-- <view class="buy-btn-preferential" catchtap="snapUpCheck" wx:if="{{ btnTxt === '券后'}}">
-            <text class="go-buy">去抢购</text>
-            <text>
-              <text class="preferential-flow">券后 ¥</text>
-              <text class="preferential-show">{{ goodsItem.preferentialShowInt }}</text>
-              <text
-                class="preferential-flow"
-                wx:if="{{ goodsItem.preferentialShowFlow !== '00'}}"
-              >.{{ goodsItem.preferentialShowFlow }}</text>
-            </text>
-          </view>-->
         </block>
         <block wx:elif="{{!isManage && !isStudent && !visibleSwitchStatusBtn}}">
           <view
-            class="buy-btn-teacher {{ sendingGoodId === goodsItem.id ? 'cancel-explain-bg' : 'explain-bg' }}"
+            class="buy-btn-teacher {{ sendingGoodId === goodsItem.id && 'cancel-explain-bg' }}"
             catchtap="sendGoodsCard"
             data-item="{{goodsItem}}"
             data-type="10"

package/src/GoodsItem/index.wxs

@@ -1,41 +1,41 @@
-var timeFormat = function (time) {
-  if (!time) return
-
-  // 将毫秒转换为天、小时、分钟和秒
-  var days = Math.floor(time / (1000 * 60 * 60 * 24))
-  var hours = Math.floor((time % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))
-  var minutes = Math.floor((time % (1000 * 60 * 60)) / (1000 * 60))
-  var seconds = Math.floor((time % (1000 * 60)) / 1000)
-  days = days > 0 ? days + '天 ' : ''
-  hours = hours < 10 ? '0' + hours : hours
-  minutes = minutes < 10 ? '0' + minutes : minutes
-  seconds = seconds < 10 ? '0' + seconds : seconds
-
-  return days + hours + ':' + minutes + ':' + seconds
-}
-
-var hidePrice =  function (price) {
-  if (price === "" || price === undefined || price === null) {
-    return "?";
-  }
-  
-  var str = price.toString();
-  var dotIndex = str.indexOf(".");
-  var integerDigits = (dotIndex > -1) ? str.substring(0, dotIndex) : str;
-  
-  if (integerDigits.length <= 1) {
-    return "?";
-  }
-  
-  var result = "";
-  for (var i = 0; i < integerDigits.length - 1; i++) {
-    result += "?";
-  }
-  
-  return result + integerDigits.substring(integerDigits.length - 1);
-}
-
-module.exports = {
-  timeFormat:timeFormat,
-  hidePrice:hidePrice
+var timeFormat = function (time) {
+  if (!time) return
+
+  // 将毫秒转换为天、小时、分钟和秒
+  var days = Math.floor(time / (1000 * 60 * 60 * 24))
+  var hours = Math.floor((time % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))
+  var minutes = Math.floor((time % (1000 * 60 * 60)) / (1000 * 60))
+  var seconds = Math.floor((time % (1000 * 60)) / 1000)
+  days = days > 0 ? days + '天' : ''
+  hours = hours < 10 ? '0' + hours : hours
+  minutes = minutes < 10 ? '0' + minutes : minutes
+  seconds = seconds < 10 ? '0' + seconds : seconds
+
+  return days + hours + ':' + minutes + ':' + seconds
+}
+
+var hidePrice =  function (price) {
+  if (price === "" || price === undefined || price === null) {
+    return "?";
+  }
+  
+  var str = price.toString();
+  var dotIndex = str.indexOf(".");
+  var integerDigits = (dotIndex > -1) ? str.substring(0, dotIndex) : str;
+  
+  if (integerDigits.length <= 1) {
+    return "?";
+  }
+  
+  var result = "";
+  for (var i = 0; i < integerDigits.length - 1; i++) {
+    result += "?";
+  }
+  
+  return result + integerDigits.substring(integerDigits.length - 1);
+}
+
+module.exports = {
+  timeFormat:timeFormat,
+  hidePrice:hidePrice
 }