xiaoe_mp_npm 0.5.42-test2 → 0.5.42-test21

package/miniprogram_dist/CouponReceivePopup/index.wxss

@@ -0,0 +1,75 @@
+.coupon-receive .receive-box {
+  display: flex;
+  flex-direction: column;
+}
+.coupon-receive .receive-box-scale {
+  transform: scale(80%);
+  transform-origin: 50% 10%;
+}
+.coupon-receive .receive-popup {
+  background-color: transparent;
+  display: flex;
+  flex-direction: column;
+}
+.coupon-receive .receive-popup .receive-container {
+  width: 68.26667vmin;
+  height: 101.33333vmin;
+  background-size: 100% 100%;
+}
+.coupon-receive .receive-popup .receive-container__content {
+  display: flex;
+  flex-direction: column;
+  margin: 37.33333vmin 4.26667vmin 4.26667vmin;
+  padding: 4.26667vmin 3.2vmin 3.2vmin;
+}
+.coupon-receive .receive-popup .receive-container__content-price {
+  font-weight: 500;
+  font-family: "PingFang SC";
+  text-align: left;
+  display: flex;
+  align-items: baseline;
+}
+.coupon-receive .receive-popup .receive-container__content-price .smallIcon {
+  color: #fd2b54;
+  font-size: 5.33333vmin;
+  line-height: 5.33333vmin;
+}
+.coupon-receive .receive-popup .receive-container__content-price .boldIcon {
+  color: #fd2b54;
+  font-size: 10.66667vmin;
+  line-height: 10.66667vmin;
+}
+.coupon-receive .receive-popup .receive-container__content-describe {
+  margin-top: 3.73333vmin;
+  color: #333333;
+  font-size: 3.73333vmin;
+  font-weight: 400;
+  font-family: "PingFang SC";
+  text-align: left;
+  line-height: 5.33333vmin;
+}
+.coupon-receive .receive-popup .receive-container__content-describe span {
+  display: block;
+  margin-bottom: 1.06667vmin;
+}
+.coupon-receive .receive-popup .receive-container__btn {
+  width: 53.33333vmin;
+  height: 10.66667vmin;
+  border-radius: 1.06667vmin;
+  opacity: 1;
+  background: linear-gradient(270deg, #ff5820 0%, #ff4067 100%);
+  color: #ffffff;
+  font-size: 4.26667vmin;
+  font-weight: 500;
+  font-family: "PingFang SC";
+  text-align: left;
+  margin: 5.33333vmin 7.46667vmin 7.46667vmin;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.coupon-receive .receive-popup .receive-container__close {
+  width: 8.53333vmin;
+  height: 8.53333vmin;
+  margin: 4.26667vmin auto 0;
+}

package/miniprogram_dist/GoodsItem/index.js

@@ -73,8 +73,10 @@ Component({
           checked
         }, () => {
           if (
-            (newVal.is_activity && currentActive && newVal.activity_order_num === newVal.activity_stock) ||
-            newVal.stock === 0
+            newVal.stock === 0 ||
+            (newVal.is_activity &&
+              (newVal.activity_type === 8 || newVal.activity_type === 3) &&
+              newVal.activity_stock - newVal.activity_order_num === 0)
           ) {
             this.setData({
               isOver: true,
@@ -236,9 +238,9 @@ Component({
       if (data.allContactPay || (data.isIOS && !data.IOSMiniProgramCanBuy)) {
         // IOS小程序中不能买的展示去查看，跳转到小程序客服
         return "购买"
-      } else if (data.goodsItem.hasStock && data.goodsItem.leftStock === 0) {
+      } else if (data.isOver) {
         // 库存为0，已售罄
-        return "抢光了"
+        return "已抢光"
       } else if (data.goodsItem.err_code) {
         // 券后价接口报错，领取不了优惠券的情况
         return "查看详情"
@@ -247,7 +249,7 @@ Component({
         return "免费领取"
       } else if (data.showPreferentialPrice) {
         // 展示券后价
-        return "券后"
+        return "购买"
       } else {
         return "购买"
       }

package/miniprogram_dist/GoodsItem/index.scss

@@ -1,19 +1,4 @@
-/* 主题色 */
-.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;
-}
+@import "..\\common\\css\\theme.wxss";
 
 $deviceWidth: 750;
 @function vmin($rpx) {
@@ -26,7 +11,8 @@ $deviceWidth: 750;
   background: #ffffff;
   border-radius: vmin(16);
   flex-direction: column;
-  margin-top: vmin(32);
+  padding: vmin(16);
+  margin: vmin(16) vmin(16) vmin(0) vmin(16);
   .main-card{
     display: flex;
     flex-direction: row;
@@ -34,6 +20,10 @@ $deviceWidth: 750;
       position: relative;
       width: vmin(224);
       height: vmin(224);
+      image{
+        width: vmin(224);
+      height: vmin(224);
+      }
       .index {
         border-radius: vmin(16) 0 vmin(16) 0;
         position: absolute;
@@ -80,6 +70,20 @@ $deviceWidth: 750;
         background: rgba(0,0,0,0.25) !important;
         backdrop-filter: blur(vmin(24));
       }
+      .is-over {
+        border-radius: vmin(10.67) vmin(10.67) 0 0;
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: vmin(264);
+        height: 100%;
+        background: rgba(0, 0, 0, 0.4);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        color: #ffffff;
+        font-size: vmin(24);
+      }
     }
     .right {
       flex: 1;
@@ -277,7 +281,7 @@ $deviceWidth: 750;
         }
         .no-stock-btn{
           font-size: vmin(24);
-          border-radius: vmin(40);
+          border-radius: vmin(8);
           width: vmin(128);
           height: vmin(48);
           display: flex;
@@ -291,7 +295,7 @@ $deviceWidth: 750;
         }
         .see-btn {
           font-size: vmin(24);
-          border-radius: vmin(40);
+          border-radius: vmin(8);
           width: vmin(128);
           height: vmin(48);
           display: flex;
@@ -302,11 +306,11 @@ $deviceWidth: 750;
           font-weight: 500;
           margin-left: inherit;
           margin-right: inherit;
-          background: linear-gradient(270deg, rgba(254,101,0,1) 0%, rgba(255,65,2,1) 100%);
+          background: linear-gradient(270deg, #ff2e57 0%, #ff4d82 100%);
         }
         .buy-btn-preferential{
           font-size: vmin(24);
-          border-radius: vmin(40);
+          border-radius: vmin(8);
           padding: 0 vmin(10);
           min-width: vmin(160);
           height: vmin(68);
@@ -316,7 +320,7 @@ $deviceWidth: 750;
           color: white;
           flex-flow: column;
           line-height: vmin(32);
-          background: linear-gradient(270deg, rgba(254,101,0,1) 0%, rgba(255,65,2,1) 100%);
+          background: linear-gradient(270deg, #ff2e57 0%, #ff4d82 100%);
           .go-buy{
             font-size: vmin(24);
             font-weight: 500;
@@ -332,6 +336,9 @@ $deviceWidth: 750;
         }
       }
     }
+    .manage-right{
+      width: vmin(374);
+    }
     .teacher-switch{
       height: vmin(32);
       background: #fff;
@@ -347,6 +354,22 @@ $deviceWidth: 750;
       }
     }
   }
+  .hide-tip {
+    width: vmin(240);
+    height: vmin(48);
+    border-radius: vmin(24);
+    background: #f5f5f5;
+    font-size: vmin(20);
+    color: #666666;
+    font-weight: 500;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: vmin(8);
+  }
+  .full-hide-tip{
+    width: 100%;
+  }
 }
 
 @keyframes turn {

package/miniprogram_dist/GoodsItem/index.wxml

@@ -24,8 +24,9 @@
         class="goods-explaining"
         src="../../common/assets/images/liveGoodsList/explaining.png"
       />
+      <view class="is-over" wx:if="{{isOver}}">- 已抢光 -</view>
     </view>
-    <view class="right">
+    <view class="right {{isManage?'manage-right':''}}">
       <!-- 标题 -->
       <view class="line-one">
         <view class="super-activity-type" wx:if="{{isSupperVip}}">
@@ -50,11 +51,11 @@
           <!-- <view></view> -->
 
           <!-- 券后价 -->
-          <view wx:if="{{ btnTxt === '券后'}}" class="preferential-price">{{ '券后' + goodsItem.preferentialShowInt }}</view>
+          <view wx:if="{{showPreferentialPrice}}" class="preferential-price">{{ '券后¥' + goodsItem.preferentialShowInt }}</view>
         </view>
 
         <!-- 商品销量 -->
-        <view class="order-stock" wx:if="{{hasSaleNum}}">{{ saleNum }}</view>
+        <view class="order-stock" wx:if="{{hasSaleNum}}">{{ '已售' + goodsItem.order_num }}</view>
       </view>
 
       <!-- 活动进度条 -->
@@ -94,13 +95,12 @@
             <text class="price-flow">¥</text>
             <text class="price-show">{{ goodsItem.priceShowInt }}</text>
             <text class="price-show" wx:if="{{ goodsItem.priceShowFlow !== '00'}}">.{{ goodsItem.priceShowFlow }}</text>
-            <text class="price-line" wx:if="{{ showPriceLine }}">
+            <text class="price-line" wx:if="{{ showPriceLine && !isManage }}">
               <text>¥{{ goodsItem.priceLineShowInt }}</text>
               <text wx:if="{{ goodsItem.priceLineShowFlow !== '00'}}">.{{ goodsItem.priceLineShowFlow }}</text>
             </text>
           </view>
         </view>
-
         <!-- 购买按钮 start -->
         <block wx:if="{{isStudent}}">
           <!-- IOS虚拟商品 -->
@@ -111,11 +111,11 @@
             show-message-card="{{true}}"
             send-message-img="{{goodsItem.img_url}}"
             send-message-title="{{goodsItem.title}}"
-            wx:if="{{btnTxt === '购买'}}"
+            wx:if="{{btnTxt === '去查看'}}"
             send-message-path="{{params_url}}"
           >{{ btnTxt }}</button>
           <!-- 库存为0的情况 -->
-          <view class="no-stock-btn" wx:if="{{ btnTxt === '抢光了' }}" catchtap="()=>{}">{{ btnTxt }}</view>
+          <view class="no-stock-btn" wx:if="{{ btnTxt === '已抢光' }}" catchtap="()=>{}">{{ btnTxt }}</view>
           <!-- 正常情况 -->
           <view class="buy-btn" catchtap="snapUpCheck" wx:if="{{ btnTxt === '购买' }}">{{ btnTxt }}</view>
           <!-- 0元商品/超级会员免费/券后价、领券接口熔断的情况 -->
@@ -156,8 +156,8 @@
       </view>
     </view>
   </view>
-  <!-- <view class="teacher-switch" wx:if="{{!isStudent}}" catchtap="stopEvent">
-    <van-switch checked="{{checked}}" bind:change="changeShowType" loading="{{switchLoading}}" size="3.73vmin" />
-    <text class="switch-txt">学员端展示商品</text>
-  </view>-->
+  <view
+    class="hide-tip {{isFullScreen?'full-hide-tip':''}}"
+    wx:if="{{!goodsItem.is_display_package && !isStudent}}"
+  >用户端已隐藏该商品</view>
 </view>

package/miniprogram_dist/GoodsItem/index.wxs

@@ -1,19 +1,19 @@
-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
-}
-
-module.exports = {
-  timeFormat:timeFormat
+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
+}
+
+module.exports = {
+  timeFormat:timeFormat
 }