xiaoe_mp_npm 0.1.1 → 0.1.3

package/.gitlab-ci.yml

@@ -4,7 +4,7 @@ build_test:
   only:
     - dev
     - dev-gwenniezhou
-    - fix/invite-rank
+    - fix/record-lottery
   tags:
     - fe-group-prod-runner-2
   script:

package/miniprogram_dist/{LiveGoodsList/GoodsItem → GoodsItem}/index.js

@@ -6,9 +6,8 @@
  * @LastEditors: conlinchen
  * @LastEditTime: 2021-11-18 19:49:11
  */
-var app = getApp();
-import {debounce} from"../../common/utils/index"
-import { getUserPermission, snapCheck } from "../../common/api/liveGoodsList"
+import {debounce} from "../common/utils/index"
+import { getUserPermission, snapCheck } from "../common/api/liveGoodsList"
 import { sensorLog } from "live-mp-tools";
 
 const computedBehavior = require('miniprogram-computed').behavior
@@ -27,7 +26,8 @@ const SPU_TYPE = {
   35:"BTK",
   41:"VCP",
   42:"OLP",
-  45:"ALC"
+  45:"ALC",
+  23:"SVP"
 }
 
 
@@ -114,6 +114,10 @@ Component({
       type: Object,
       value: {}
     },
+    current_role: {
+      type: String,
+      value: 'student'
+    }
   },
 
   lifetimes: {
@@ -136,7 +140,9 @@ Component({
     isIOS: false,
     page_path: '',
     preHeatTime: '',
-    isSeckill: false
+    isSeckill: false,
+    checked: false,
+    switchLoading: false
   },
   computed: {
     showPreferentialPrice(properties){
@@ -157,6 +163,9 @@ Component({
         return `${data.page_path}?type=1&link=${url2}&title=${data.goodsItem.title}`
       }
     },
+    isStudent(properties){
+      return properties.current_role === 'student'
+    },
     //超过99999不够位置展示划线价，只能不要孩子了
     showPriceLine(data){
       return data.goodsItem.priceLine > 0 && ( data.goodsItem.priceShow < 100000 || !data.showPreferentialPrice )
@@ -175,12 +184,12 @@ Component({
     },
     //销量/订阅。只有 实物商品 21 、专栏 6、大专栏 8、会员 5 展示,受B端店铺设置（hide_sub_count）：隐藏商品销量控制 0-显示 1-隐藏
     hasSaleNum(data){
-      return [21,6,8,5].indexOf(data.goodsItem.resource_type) > -1 && !data.goodsItem.hide_sub_count && data.goodsItem.order_num > 0
+      return [21,6,8,5,41].indexOf(data.goodsItem.resource_type) > -1 && !data.goodsItem.hide_sub_count && data.goodsItem.order_num > 0
     },
     //销量/订阅。只有 实物商品 21 、专栏 6、大专栏 8、会员 5 展示
     saleNum(data){
       //实物商品
-      if(data.goodsItem.resource_type === 21){
+      if(data.goodsItem.resource_type === 21 || data.goodsItem.resource_type === 41){
           return ' 已售 ' + (data.goodsItem.order_num || 0)
       } else if(data.goodsItem.resource_type === 6 || data.goodsItem.resource_type === 8 || data.goodsItem.resource_type === 5){
           return ' 订阅 ' + (data.goodsItem.order_num || 0)
@@ -331,8 +340,8 @@ Component({
   },
   // 判断权益
   judgePermission: debounce(async function (permission){
-    // 实物21 可多次购买,去详情页; 直播商品不管有没有权益都去详情页啦。
-    if(this.data.goodsItem.resource_type === 21 || this.data.goodsItem.resource_type === 4){
+    // 实物21 有价优惠券41  可多次购买,去详情页; 直播商品4不管有没有权益都去详情页啦。
+    if([41, 4, 21].indexOf(Number(this.data.goodsItem.resource_type)) > -1){
       this.toDetails()
       return
     }
@@ -522,6 +531,24 @@ getUserPermission(){
     }
     console.log("exuexiexuexi",params)
     wx.navigateToMiniProgram(params)
+  },
+  sendGoodsCard(){
+    this.triggerEvent('sendGoodsCard',this.data.goodsItem)
+  },
+  changeShowType(){
+    this.setData({
+      switchLoading: true
+    })
+    let that = this
+    setTimeout(()=>{
+      that.setData({
+        checked: !this.data.checked,
+        switchLoading: false
+      })
+    },2000)
+  },
+  stopEvent(){
+    return
   }
 }
 })

package/miniprogram_dist/GoodsItem/index.json

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

package/miniprogram_dist/GoodsItem/index.less

@@ -0,0 +1,249 @@
+@import "../common/css/theme.wxss";
+
+  .goods-explaining {
+    position: absolute;
+    width: 240rpx;
+    height: 36rpx;
+    bottom: 0rpx;
+    left: 0rpx;
+}
+  .goods-item {
+    display: flex;
+    min-height: 180rpx;
+    background: #ffffff;
+    margin: 20rpx 40rpx 0 40rpx;
+    border-radius: 16rpx;
+    padding: 16rpx;
+    flex-direction: column;
+
+    .main-card{
+      display: flex;
+      flex-direction: row;
+      .left {
+        position: relative;
+        height: 180rpx;
+        .goods-img {
+          width: 240rpx;
+          border-radius: 16rpx;
+          height: 180rpx;
+          background: rgba(0,0,0,0.04);
+        }
+        .index {
+          border-radius: 16rpx 0 24rpx 0;
+          position: absolute;
+          left: 0;
+          display: inline-block;
+          text-align: center;
+          width: 48rpx;
+          height: 40rpx;
+          line-height: 35rpx;
+          font-size: 24rpx;
+          background: rgba(0,0,0,0.25);
+          color: #FFFFFF;
+          backdrop-filter: blur(24rpx);
+        }
+        .goods-type {
+          position: absolute;
+          right: calc(100% - 230rpx);
+          bottom: 8rpx;
+          padding: 8rpx 10rpx;
+          background: rgba(0,0,0,0.25);
+          border-radius: 8rpx;
+          color: #fff;
+          font-size: 20rpx;
+          width: fit-content;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          height: 20rpx;
+          backdrop-filter: blur(24rpx);
+        }
+      }
+      .right {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        margin-left: 16rpx;
+        height: 180rpx;
+        width: calc(100% - 256rpx);
+        .line-one {
+          display: flex;
+          align-items: center;
+          height: 36rpx;
+          .activity-type {
+            background-color: #FFF3EB;
+            color: #FF781F;
+            padding: 0rpx 8rpx;
+            font-size: 20rpx;
+            height: 32rpx;
+            line-height: 36rpx;
+            flex-shrink: 0;
+            margin-right: 8rpx;
+            border-radius: 4rpx;
+            display: flex;
+            width: max-content;
+            align-items: center;
+          }
+          .super-activity-type{
+            background: linear-gradient(180.25deg, rgba(51,51,51,1) 0%, rgba(81.6,81.6,81.6,1) 68%, rgba(51,51,51,1) 100%);
+            color: rgba(255,120,31,1);
+            padding: 4rpx 8rpx;
+            font-size: 20rpx;
+            height: 32rpx;
+            width: max-content;
+            line-height: 36rpx;
+            flex-shrink: 0;
+            margin-right: 8rpx;
+            border-radius: 4rpx;
+            display: flex;
+            align-items: center;
+            .super-activity-txt{
+              background: linear-gradient(to right, #FFE4AD, #FFC266);
+              -webkit-background-clip: text;
+              color: transparent;
+            }
+          }
+          .goods-title {
+            font-size: 28rpx;
+            color: #333333;
+            word-break: break-all;
+            display: inline-block;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            display: inline-block;
+            vertical-align: middle;
+            line-height: 36rpx;
+            font-weight: 500;
+          }
+        }
+        .sec-kill {
+          color: #FF781F;
+          font-size: 20rpx;
+          line-height: 32rpx;
+          margin: 8rpx 0;
+        }
+        .left-stock {
+          color: #999999;
+          font-size: 20rpx;
+          height: 24rpx;
+          display: flex;
+          align-items: center;
+          .split{
+            display: inline-block;
+            border-left: 1px solid #999999;
+            width: 2rpx;
+            height: 24rpx;
+            margin: 0 12rpx;
+          }
+        }
+        .line-three {
+          display: flex;
+          justify-content: space-between;
+          align-items: flex-end;
+          .price {
+            position: relative;
+            min-height: 40rpx;
+            font-weight: 500;
+            .price-flow{
+              color: #FF5429;
+              font-size: 24rpx;
+            }
+            .price-show {
+              color: #FF5429;
+              font-size: 36rpx;
+            }
+            .price-line {
+              font-size: 20rpx;
+              text-decoration: line-through;
+              color: #999999;
+              margin-left: 8rpx;
+            }
+          }
+          .buy-btn {
+            font-size: 24rpx;
+            border-radius: 40rpx;
+            width: 160rpx;
+            height: 56rpx;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: white;
+            line-height: 56rpx;
+            font-weight: 500;
+            background-color: red;
+          }
+          .no-stock-btn{
+            font-size: 24rpx;
+            border-radius: 40rpx;
+            width: 160rpx;
+            height: 56rpx;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: white;
+            line-height: 56rpx;
+            font-weight: 500;
+            background-color: #bbb;
+            opacity: 40%;
+          }
+          .see-btn {
+            font-size: 24rpx;
+            border-radius: 40rpx;
+            width: 160rpx;
+            height: 56rpx;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: white;
+            line-height: 56rpx;
+            font-weight: 500;
+            background-color: red;
+            margin-left: inherit;
+            margin-right: inherit;
+          }
+          .buy-btn-preferential{
+            font-size: 24rpx;
+            border-radius: 40rpx;
+            padding: 0 10rpx;
+            min-width: 160rpx;
+            height: 68rpx;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: white;
+            flex-flow: column;
+            line-height: 32rpx;
+            background-color: red;
+            .go-buy{
+              font-size: 24rpx;
+              font-weight: 500;
+            }
+            .preferential-flow{
+              color: rgba(255,255,255,1);
+              font-size: 20rpx;
+            }
+            .preferential-show{
+              font-size: 28rpx;
+              color: rgba(255,255,255,1);
+            }
+          }
+        }
+      }
+    }
+  }
+  .teacher-switch{
+    height: 32rpx;
+    background: #fff;
+    display: flex;
+    margin-top: 16rpx;
+    .switch-txt{
+      opacity: 1;
+      color: rgba(51,51,51,1);
+      font-size: 24rpx;
+      font-weight: 400;
+      font-family: "PingFang SC";
+      margin-left: 16rpx;
+    }
+  }

package/{src/LiveGoodsList → miniprogram_dist}/GoodsItem/index.wxml

@@ -10,6 +10,7 @@
   */
  -->
 <view class="goods-item" bindtap="cardToDetails">
+      <view class="main-card">
         <view class="left">
           <image  alt=""
                 class="goods-img"
@@ -25,8 +26,8 @@
             <view class="super-activity-type" wx:if="{{isSupperVip}}"><text class="super-activity-txt">{{currentActive}}</text></view>
             <text class="goods-title">{{goodsItem.title}}</text>
           </view>
-          <view class="sec-kill">{{secText}}</view>
-          <view class="left-stock" wx:if="{{goodsItem.hasStock || hasSaleNum}}">
+          <view class="sec-kill">{{secText || goodsItem.goods_desc}}</view>
+          <view class="left-stock" wx:if="{{ isStudent && goodsItem.hasStock || hasSaleNum}}">
             <text wx:if="{{goodsItem.hasStock}}">还剩 {{ goodsItem.leftStock }}</text>
             <view class="split" wx:if="{{goodsItem.hasStock && hasSaleNum}}"></view>
             <text wx:if="{{hasSaleNum}}">{{ saleNum }}</text>
@@ -46,6 +47,7 @@
             </view>
 
             <!-- 购买按钮 start -->
+            <block wx:if="{{isStudent}}">
             <!-- IOS虚拟商品 -->
                 <button
                   class="see-btn theme-customize-bg"
@@ -58,20 +60,29 @@
                   send-message-path="{{params_url}}">
                   {{ btnTxt }}
                 </button>
-              <!-- 库存为0的情况 -->
-              <view class="no-stock-btn theme-customize-bg" wx:if="{{ btnTxt === '抢光了' }}" catchtap="()=>{}">{{ btnTxt }}</view>
-              <!-- 正常情况 -->
-              <view class="buy-btn theme-customize-bg" catchtap="snapUpCheck" wx:if="{{ btnTxt === '去抢购' }}">{{ btnTxt }}</view>
-              <!-- 0元商品/超级会员免费/券后价、领券接口熔断的情况 -->
-              <view class="buy-btn theme-customize-bg" catchtap="judgePermission" wx:if="{{  btnTxt === '免费领取' || btnTxt === '查看详情' }}">{{ btnTxt }}</view>
-              <!-- 券后价 -->
-              <view class="buy-btn-preferential theme-customize-bg" 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>
+                <!-- 库存为0的情况 -->
+                <view class="no-stock-btn theme-customize-bg" wx:if="{{ btnTxt === '抢光了' }}" catchtap="()=>{}">{{ btnTxt }}</view>
+                <!-- 正常情况 -->
+                <view class="buy-btn theme-customize-bg" catchtap="snapUpCheck" wx:if="{{ btnTxt === '去抢购' }}">{{ btnTxt }}</view>
+                <!-- 0元商品/超级会员免费/券后价、领券接口熔断的情况 -->
+                <view class="buy-btn theme-customize-bg" catchtap="judgePermission" wx:if="{{  btnTxt === '免费领取' || btnTxt === '查看详情' }}">{{ btnTxt }}</view>
+                <!-- 券后价 -->
+                <view class="buy-btn-preferential theme-customize-bg" 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:else>
+              <view class="buy-btn theme-customize-bg" catchtap="sendGoodsCard">发送</view>
+            </block>
               <!-- 购买按钮 end -->
           </view>
         </view>
+        </view>
+        <view class="teacher-switch" wx:if="{{!isStudent && goodsItem.teacher_auth == 2}}" catchtap="stopEvent">
+          <van-switch checked="{{checked}}" bind:change="changeShowType" loading="{{switchLoading}}" size="28rpx"/>
+          <text class="switch-txt">学员端展示商品</text>
+        </view>
 </view>
 
 

package/miniprogram_dist/{LiveGoodsList/GoodsItem → GoodsItem}/index.wxss

@@ -24,20 +24,27 @@
 .goods-item {
   display: flex;
   min-height: 180rpx;
-  background-color: #fff;
-  margin: 20rpx 40rpx;
+  background: #ffffff;
+  margin: 20rpx 40rpx 0 40rpx;
+  border-radius: 16rpx;
+  padding: 16rpx;
+  flex-direction: column;
+}
+.goods-item .main-card {
+  display: flex;
+  flex-direction: row;
 }
-.goods-item .left {
+.goods-item .main-card .left {
   position: relative;
   height: 180rpx;
 }
-.goods-item .left .goods-img {
+.goods-item .main-card .left .goods-img {
   width: 240rpx;
   border-radius: 16rpx;
   height: 180rpx;
   background: rgba(0, 0, 0, 0.04);
 }
-.goods-item .left .index {
+.goods-item .main-card .left .index {
   border-radius: 16rpx 0 24rpx 0;
   position: absolute;
   left: 0;
@@ -51,7 +58,7 @@
   color: #FFFFFF;
   backdrop-filter: blur(24rpx);
 }
-.goods-item .left .goods-type {
+.goods-item .main-card .left .goods-type {
   position: absolute;
   right: calc(100% - 230rpx);
   bottom: 8rpx;
@@ -67,7 +74,7 @@
   height: 20rpx;
   backdrop-filter: blur(24rpx);
 }
-.goods-item .right {
+.goods-item .main-card .right {
   flex: 1;
   display: flex;
   flex-direction: column;
@@ -76,12 +83,12 @@
   height: 180rpx;
   width: calc(100% - 256rpx);
 }
-.goods-item .right .line-one {
+.goods-item .main-card .right .line-one {
   display: flex;
   align-items: center;
   height: 36rpx;
 }
-.goods-item .right .line-one .activity-type {
+.goods-item .main-card .right .line-one .activity-type {
   background-color: #FFF3EB;
   color: #FF781F;
   padding: 0rpx 8rpx;
@@ -95,7 +102,7 @@
   width: max-content;
   align-items: center;
 }
-.goods-item .right .line-one .super-activity-type {
+.goods-item .main-card .right .line-one .super-activity-type {
   background: linear-gradient(180.25deg, #333333 0%, #525252 68%, #333333 100%);
   color: #ff781f;
   padding: 4rpx 8rpx;
@@ -109,12 +116,12 @@
   display: flex;
   align-items: center;
 }
-.goods-item .right .line-one .super-activity-type .super-activity-txt {
+.goods-item .main-card .right .line-one .super-activity-type .super-activity-txt {
   background: linear-gradient(to right, #FFE4AD, #FFC266);
   -webkit-background-clip: text;
   color: transparent;
 }
-.goods-item .right .line-one .goods-title {
+.goods-item .main-card .right .line-one .goods-title {
   font-size: 28rpx;
   color: #333333;
   word-break: break-all;
@@ -126,51 +133,51 @@
   line-height: 36rpx;
   font-weight: 500;
 }
-.goods-item .right .sec-kill {
+.goods-item .main-card .right .sec-kill {
   color: #FF781F;
   font-size: 20rpx;
   line-height: 32rpx;
   margin: 8rpx 0;
 }
-.goods-item .right .left-stock {
+.goods-item .main-card .right .left-stock {
   color: #999999;
   font-size: 20rpx;
   height: 24rpx;
   display: flex;
   align-items: center;
 }
-.goods-item .right .left-stock .split {
+.goods-item .main-card .right .left-stock .split {
   display: inline-block;
   border-left: 1px solid #999999;
   width: 2rpx;
   height: 24rpx;
   margin: 0 12rpx;
 }
-.goods-item .right .line-three {
+.goods-item .main-card .right .line-three {
   display: flex;
   justify-content: space-between;
   align-items: flex-end;
 }
-.goods-item .right .line-three .price {
+.goods-item .main-card .right .line-three .price {
   position: relative;
   min-height: 40rpx;
   font-weight: 500;
 }
-.goods-item .right .line-three .price .price-flow {
+.goods-item .main-card .right .line-three .price .price-flow {
   color: #FF5429;
   font-size: 24rpx;
 }
-.goods-item .right .line-three .price .price-show {
+.goods-item .main-card .right .line-three .price .price-show {
   color: #FF5429;
   font-size: 36rpx;
 }
-.goods-item .right .line-three .price .price-line {
+.goods-item .main-card .right .line-three .price .price-line {
   font-size: 20rpx;
   text-decoration: line-through;
   color: #999999;
   margin-left: 8rpx;
 }
-.goods-item .right .line-three .buy-btn {
+.goods-item .main-card .right .line-three .buy-btn {
   font-size: 24rpx;
   border-radius: 40rpx;
   width: 160rpx;
@@ -183,7 +190,7 @@
   font-weight: 500;
   background-color: red;
 }
-.goods-item .right .line-three .no-stock-btn {
+.goods-item .main-card .right .line-three .no-stock-btn {
   font-size: 24rpx;
   border-radius: 40rpx;
   width: 160rpx;
@@ -197,7 +204,7 @@
   background-color: #bbb;
   opacity: 40%;
 }
-.goods-item .right .line-three .see-btn {
+.goods-item .main-card .right .line-three .see-btn {
   font-size: 24rpx;
   border-radius: 40rpx;
   width: 160rpx;
@@ -212,7 +219,7 @@
   margin-left: inherit;
   margin-right: inherit;
 }
-.goods-item .right .line-three .buy-btn-preferential {
+.goods-item .main-card .right .line-three .buy-btn-preferential {
   font-size: 24rpx;
   border-radius: 40rpx;
   padding: 0 10rpx;
@@ -226,15 +233,29 @@
   line-height: 32rpx;
   background-color: red;
 }
-.goods-item .right .line-three .buy-btn-preferential .go-buy {
+.goods-item .main-card .right .line-three .buy-btn-preferential .go-buy {
   font-size: 24rpx;
   font-weight: 500;
 }
-.goods-item .right .line-three .buy-btn-preferential .preferential-flow {
+.goods-item .main-card .right .line-three .buy-btn-preferential .preferential-flow {
   color: #ffffff;
   font-size: 20rpx;
 }
-.goods-item .right .line-three .buy-btn-preferential .preferential-show {
+.goods-item .main-card .right .line-three .buy-btn-preferential .preferential-show {
   font-size: 28rpx;
   color: #ffffff;
 }
+.teacher-switch {
+  height: 32rpx;
+  background: #fff;
+  display: flex;
+  margin-top: 16rpx;
+}
+.teacher-switch .switch-txt {
+  opacity: 1;
+  color: #333333;
+  font-size: 24rpx;
+  font-weight: 400;
+  font-family: "PingFang SC";
+  margin-left: 16rpx;
+}

package/miniprogram_dist/LiveGoodsList/Header/index.wxml

@@ -15,7 +15,7 @@
     bindtap="gotoPayRecords"
   >
     <view class="order-icon"></view>
-    <span class="head-left-txt">订单</span>
+    <text class="head-left-txt">订单</text>
   </view>
   <view class="popup-header-title">商品列表</view>
   <!-- <i