xiaoe_mp_npm 0.1.1 → 0.1.3

package/miniprogram_dist/LiveGoodsList/index.js

@@ -26,6 +26,9 @@ const SPU_TYPE = {
   29: "线下课", //体验课也是29
   22: "分销商品",
   12: "分销商品", //暂时不做
+  41: "有价优惠券",
+  45: "AI互动课",
+  23: "超级会员"
 }
 const MARKET_ACTIVITY_MAP = {
   3: "限时折扣",
@@ -179,6 +182,7 @@ Component({
               type: 1,
               pageSize: 200,
               page: 1,
+              port: 1
             }
             getGoodsList(params).then((res) => {
               console.log('2222222222')
@@ -203,7 +207,8 @@ Component({
               alive_id: this.data.aliveInfo.alive_id,
               type: 1,
               pageSize: this.data.page_size,
-              page: this.data.page_index
+              page: this.data.page_index,
+              port: 1
             }
             getGoodsList(params).then(res=>{
               let { data, code } = res.data
@@ -283,7 +288,7 @@ Component({
             arr.push({
                 active: "",
                 price: e.price,
-                weight: e.price + 0.0002,
+                weight: e.price + 0.0003,
               })
             // 活动管理、实物商品、有价优惠券、线下课和课时包不能设置活动库存，其他可以设置活动库存得需要判断是否还剩余活动库存;拼团也不能设置活动库存。
             let notExistNowStock = [9, 21, 41, 29, 42].indexOf(e.resource_type) > -1
@@ -302,7 +307,7 @@ Component({
                 //判断超级会员价
                 active: "超级会员",
                 price: e.svip_price,
-                weight: e.svip_price + 0.0003,
+                weight: e.svip_price + 0.0002,
               })
             arr.sort((a, b) => a.weight - b.weight)
             let svipAllFree = e.resource_rights_type === 1
@@ -320,7 +325,7 @@ Component({
             }
             e.priceLineShowInt = this.priceInt(e.priceLine) // 展示划线价的整数部分
             e.priceLineShowFlow = this.priceFlow(e.priceLine) // 展示划线的小数部分
-            e.entityShowStock =  e.resource_type === 21 && e.show_stock // 实物商品库存依赖 B端店铺设置（show_stock）：详情页展示不展示剩余件数
+            e.entityShowStock =  (e.resource_type === 21 || e.resource_type === 41) && e.show_stock // 实物商品库存依赖 B端店铺设置（show_stock）：详情页展示不展示剩余件数
             e.hasStock = [29,35].indexOf(e.resource_type) > -1 || e.entityShowStock || e.now_stock // 班课、线下课、实物商品、体验课、有活动库存，满足其一即展示库存
           },
         priceInt(val){

package/miniprogram_dist/LiveGoodsList/index.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "goods-item": "./GoodsItem/index",
+    "goods-item": "../GoodsItem/index",
     "header": "./Header/index",
     "custom-popup": "../CustomPopup",
     "coupon-list": "../CouponList/couponColumn/index",

package/miniprogram_dist/LiveGoodsList/index.less

@@ -1,9 +1,3 @@
-page {
-  background-color: #f7f8fa;
-  color: #323232;
-  width: 100%;
-  height: 100%;
-}
 
 .box {
   margin: 0 12px;

package/miniprogram_dist/LiveGoodsList/index.wxml

@@ -37,7 +37,6 @@
               bind:showSku="showSku"
               explainingGoods="{{explainingGoods}}"
               bind:showDialog="showDialog"
-              bind:toDetails="toDetails"
               class="goods-item"
               envName="{{ENV_NAME}}"
               sensorReportParams="{{sensorReportParams}}"

package/miniprogram_dist/LiveGoodsList/index.wxss

@@ -1,9 +1,3 @@
-page {
-  background-color: #f7f8fa;
-  color: #323232;
-  width: 100%;
-  height: 100%;
-}
 .box {
   margin: 0 12px;
 }

package/miniprogram_dist/Lottery/components/LotteryInfo/index.js

@@ -124,22 +124,25 @@ Component(
             app_id: this.data.baseInfo.app_id, // 店铺id
             alive_id: this.data.baseInfo.alive_id,
             user_id: this.data.baseInfo.user_id,
-            prize_id: this.data.prizeInfo.prize_id
+            prize_id: this.data.prizeInfo.prize_id,
+            type: 1
           }
           joinCommentLottery(params)
             .then(({data}) => {
-              if (data.code === 0) {
-                this.store.dispatch({type: 'set_is_ready_to_comment', payload: true})
-                this.store.dispatch({type: 'hide_lottery_info'})
-                if (prizeCondition === PARTICIPATION_CONDITION.SPECIFY_COMMENT) {
-                  eventBus.emit('input_change', this.data.lotteryInfo.prize_param.ext.content)
-                }
-                eventBus.emit('input_focus')
+              if (data.code !== 0) {
+                return Promise.reject(data);
               }
             })
             .catch(err => {
               console.error(err)
-            })
+            });
+
+            this.store.dispatch({type: 'set_is_ready_to_comment', payload: true})
+            this.store.dispatch({type: 'hide_lottery_info'})
+            if (prizeCondition === PARTICIPATION_CONDITION.SPECIFY_COMMENT) {
+              eventBus.emit('input_change', this.data.lotteryInfo.prize_param.ext.content)
+            }
+            eventBus.emit('input_focus')
           return
         }
 

package/miniprogram_dist/Lottery/components/LotteryPopups/index.js

@@ -8,6 +8,7 @@ import {connect} from '../../store/index'
 import {
   fetchLotteryInfo, participateLottery, drawLottery, joinLottery
 } from '../../store/effect'
+import {joinCommentLottery} from '../../../common/api/lottery'
 import eventBus from '../../eventBus'
 import countdownInstance from '../../countdown'
 
@@ -82,6 +83,22 @@ Component(
             .catch(cancel)
         })
       },
+      // 记录点击按钮状态，作为参与评论抽奖的前置条件（必须满足条件: 1.点击了按钮 2.发送评论）
+      recordLotteryJoin(type) {
+        joinCommentLottery({
+          app_id: this.data.baseInfo.app_id, // 店铺id
+          alive_id: this.data.baseInfo.alive_id,
+          user_id: this.data.baseInfo.user_id,
+          prize_id: this.data.lotteryInfo.current_prize_id,
+          type
+        })
+        .then(res=>{
+          if(res.code !== 0) {
+            return Promise.reject(res);
+          }
+        })
+        .catch(console.error)
+      },
       onSelfContentMsg() {
         getApp().globalData.$im.on(MSG_EVENT.GET_CONTENT_MSG, msg => {
           console.log('dispatch 监听所有content msg: ', msg)
@@ -91,9 +108,11 @@ Component(
 
           if (this.isAnyCommentCondition()) {
             this.store.dispatch(participateLottery())
+            this.recordLotteryJoin(2)
           } else if (this.isSpecifyCommentCondition()) {
             if (msg.msg_content === this.data.lotteryInfo.prize_param.ext.content) {
               this.store.dispatch(participateLottery())
+              this.recordLotteryJoin(2)
             }
           }
         })

package/miniprogram_dist/TeacherGoodsList/Header/index.js

@@ -0,0 +1,36 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: conlinchen
+ * @Date: 2021-10-29 16:35:58
+ * @LastEditors: conlinchen
+ * @LastEditTime: 2021-11-01 18:34:08
+ */
+// src/LiveGoodsList/Components/Header/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    closePop(){
+      this.triggerEvent('closePop')
+    },
+    gotoPayRecords(){
+      return
+    }
+  }
+})

package/{src/LiveGoodsList/GoodsItem → miniprogram_dist/TeacherGoodsList/Header}/index.json

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

package/miniprogram_dist/TeacherGoodsList/Header/index.less

@@ -0,0 +1,47 @@
+.popup-header{
+  padding: 20rpx 32rpx;
+  height: 76rpx;
+  top: auto;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background:rgba(245,245,245,1);
+
+  .head-right-txt {
+    display: inline-block;
+    text-align: right;
+    min-width: 104rpx;
+    font-size: 40rpx;
+  }
+  .popup-header-title{
+    color: rgba(51,51,51,1);
+    font-size: 16px;
+    font-weight: 500;
+    font-family: "PingFang SC";
+  }
+  .van-action-sheet__left {
+    color: #c8c9cc;
+    font-size: 22px;
+    line-height: inherit;
+    display: flex;
+    align-items: center;
+    min-width: 104rpx;
+
+  .order-icon {
+    display: inline-block;
+    width: 40rpx;
+    height: 40rpx;
+    -moz-background-size: 100% 100%;
+    background-size: 100% 100%;
+    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAACXBIWXMAACxLAAAsSwGlPZapAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAANHSURBVHgB7ZzPcdpQEId/yAwXH0IJdBCoINCBXYHlYRAcSQekAnPk34yVCuxUYDowJagEc4ADM0D2xTplkvDEaldE3m+GEYeHkD6e3q7eWwQYhvEfU4ESg8GgcTweh/T2E2RZVyqV8WQySaCAisBer9ekzQudWB06vNGP1ZnP5ysIE0ABEveoKM9RD4LgAQqoCCSaUIZ6YBsKaAksLWePgRQU2vQr38AjKFC7EAVAw0bs0WxNx7eczWbPOIPMAl1AoAN7orcNlIuERN5mDTyZBLpedzgcXpATrodMp9N7MIiiKKbNHXKCgk+HUqCld3vfhi6PI3mPKDl0jk9hGHpnDN4C9/u9S4IbKD/1Wq029G1c9W1Il9sX5IxLNfr9PqtX0z5yPy68Dwkjn4beAiGTyzWKitAnaPg2zCLwj/gEAhrojygASk3+GSTzCECWSDNREUiX6Rv0SaCA1mTCN+jzHQqoCKSxaEwbJzGBPAm9vtJ3jqAAO4j4kp7QCCXDgggTE8jEBDIxgUxMIBMTyMQEMjGBTEwgE/E7kbQq4YHuh9vQZUXrG7fSJR6iPdCto+C9pKMNfZq0vvGaHoMYogLdOopyScfv1NO1HDFEBRYs7xd0GYtWg0kHEfHqqFO4qgMIIipwt9vFKFbiiqbRRCdWRaNwHMduKr9FkTikS0li+fGvUABZXV9fi89Kq0yozufzmDYxSogl0kxMIBMTyMQEMjGBTMSj8HA4rG82mztKY3IpTkrLcVUWzX0QF7jdbl/pls5VYSEnwiiKhpSkd9I8s1BEL2GXQEOmKLNZq9VCXADSkwltCEH7/owLQFSgZFUW3aqtcQGICry6uhpLSHT7dPvGBSAq0E2n04m26HJbIifS6amO1r8xTyEehdMT7aCkWCLNxAQyMYFMTCATE8jEBDIxgUxMIBMTyMQEMjGBTEwgExPIxAQyMYFMTCATE8jEBDIxgUzYayLuuS9RFIX4oGTpgQk+Dt513VkEXkxBjwI/fBt6C9ztduOCnv+iTRIEQezb2Fugq4RyDyhEiXEd5HA43GdZtM8UhReLxZK+pIVyjocJvTruHDN85vxnqHa73ZtqtdqG/IO1pVnv9/vnrOIMwygFPwHK0g4OEWNPBgAAAABJRU5ErkJggg==");
+  }
+  .head-left-txt {
+    opacity: 1;
+    color: #666666;
+    font-size: 14px;
+    font-weight: 500;
+    font-family: "PingFang SC";
+    margin-left: 8rpx;
+  }
+}
+}

package/miniprogram_dist/TeacherGoodsList/Header/index.wxml

@@ -0,0 +1,27 @@
+
+<!--
+  /*
+ * @Descripttion: 
+ * @version: 
+ * @Author: conlinchen
+ * @Date: 2021-10-29 14:42:53
+ * @LastEditors: conlinchen
+ * @LastEditTime: 2021-11-18 18:10:59
+ */
+-->
+<view class="popup-header">
+  <view
+    class="van-action-sheet__left"
+    bindtap="gotoPayRecords"
+  >
+    <text class="head-left-txt"></text>
+  </view>
+  <view class="popup-header-title">商品列表</view>
+  <!-- <i
+    class="van-icon van-icon-cross van-action-sheet__close"
+    bindtap="closePop"
+  ></i> -->
+  <view  class="head-right-txt">
+    <van-icon name="cross" bindtap="closePop"/>
+  </view>
+</view>

package/miniprogram_dist/TeacherGoodsList/Header/index.wxss

@@ -0,0 +1,45 @@
+.popup-header {
+  padding: 20rpx 32rpx;
+  height: 76rpx;
+  top: auto;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: #f5f5f5;
+}
+.popup-header .head-right-txt {
+  display: inline-block;
+  text-align: right;
+  min-width: 104rpx;
+  font-size: 40rpx;
+}
+.popup-header .popup-header-title {
+  color: #333333;
+  font-size: 16px;
+  font-weight: 500;
+  font-family: "PingFang SC";
+}
+.popup-header .van-action-sheet__left {
+  color: #c8c9cc;
+  font-size: 22px;
+  line-height: inherit;
+  display: flex;
+  align-items: center;
+  min-width: 104rpx;
+}
+.popup-header .van-action-sheet__left .order-icon {
+  display: inline-block;
+  width: 40rpx;
+  height: 40rpx;
+  -moz-background-size: 100% 100%;
+  background-size: 100% 100%;
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAACXBIWXMAACxLAAAsSwGlPZapAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAANHSURBVHgB7ZzPcdpQEId/yAwXH0IJdBCoINCBXYHlYRAcSQekAnPk34yVCuxUYDowJagEc4ADM0D2xTplkvDEaldE3m+GEYeHkD6e3q7eWwQYhvEfU4ESg8GgcTweh/T2E2RZVyqV8WQySaCAisBer9ekzQudWB06vNGP1ZnP5ysIE0ABEveoKM9RD4LgAQqoCCSaUIZ6YBsKaAksLWePgRQU2vQr38AjKFC7EAVAw0bs0WxNx7eczWbPOIPMAl1AoAN7orcNlIuERN5mDTyZBLpedzgcXpATrodMp9N7MIiiKKbNHXKCgk+HUqCld3vfhi6PI3mPKDl0jk9hGHpnDN4C9/u9S4IbKD/1Wq029G1c9W1Il9sX5IxLNfr9PqtX0z5yPy68Dwkjn4beAiGTyzWKitAnaPg2zCLwj/gEAhrojygASk3+GSTzCECWSDNREUiX6Rv0SaCA1mTCN+jzHQqoCKSxaEwbJzGBPAm9vtJ3jqAAO4j4kp7QCCXDgggTE8jEBDIxgUxMIBMTyMQEMjGBTEwgE/E7kbQq4YHuh9vQZUXrG7fSJR6iPdCto+C9pKMNfZq0vvGaHoMYogLdOopyScfv1NO1HDFEBRYs7xd0GYtWg0kHEfHqqFO4qgMIIipwt9vFKFbiiqbRRCdWRaNwHMduKr9FkTikS0li+fGvUABZXV9fi89Kq0yozufzmDYxSogl0kxMIBMTyMQEMjGBTMSj8HA4rG82mztKY3IpTkrLcVUWzX0QF7jdbl/pls5VYSEnwiiKhpSkd9I8s1BEL2GXQEOmKLNZq9VCXADSkwltCEH7/owLQFSgZFUW3aqtcQGICry6uhpLSHT7dPvGBSAq0E2n04m26HJbIifS6amO1r8xTyEehdMT7aCkWCLNxAQyMYFMTCATE8jEBDIxgUxMIBMTyMQEMjGBTEwgExPIxAQyMYFMTCATE8jEBDIxgUzYayLuuS9RFIX4oGTpgQk+Dt513VkEXkxBjwI/fBt6C9ztduOCnv+iTRIEQezb2Fugq4RyDyhEiXEd5HA43GdZtM8UhReLxZK+pIVyjocJvTruHDN85vxnqHa73ZtqtdqG/IO1pVnv9/vnrOIMwygFPwHK0g4OEWNPBgAAAABJRU5ErkJggg==");
+}
+.popup-header .van-action-sheet__left .head-left-txt {
+  opacity: 1;
+  color: #666666;
+  font-size: 14px;
+  font-weight: 500;
+  font-family: "PingFang SC";
+  margin-left: 8rpx;
+}

package/miniprogram_dist/TeacherGoodsList/README.md

@@ -0,0 +1,10 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: conlinchen
+ * @Date: 2021-11-13 15:55:49
+ * @LastEditors: conlinchen
+ * @LastEditTime: 2021-11-13 15:55:49
+-->
+## 开发者：Conlin
+## 该组件的业务功能： 直播营销模块中的优惠券列表

package/miniprogram_dist/TeacherGoodsList/index.js

@@ -0,0 +1,269 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: conlinchen
+ * @Date: 2021-10-28 15:32:24
+ * @LastEditors: conlinchen
+ * @LastEditTime: 2021-11-18 19:52:02
+ */
+
+import {  getGoodsList, getCouponSwitch } from "../common/api/liveGoodsList"
+const computedBehavior = require('miniprogram-computed').behavior
+
+const SPU_TYPE = {
+  1: "图文",
+  2: "音频",
+  3: "视频",
+  4: "直播",
+  35: "班课",
+  20: "电子书",
+  6: "专栏",
+  8: "大专栏",
+  5: "会员",
+  25: "训练营",
+  21: "实物商品",
+  29: "线下课", //体验课也是29
+  22: "分销商品",
+  12: "分销商品", //暂时不做
+  41: "有价优惠券",
+  45: "AI互动课",
+  23: "超级会员"
+}
+const MARKET_ACTIVITY_MAP = {
+  3: "限时折扣",
+  4: "好友助力",
+  5: "裂变海报",
+  6: "拼团",
+  7: "涨粉神器",
+  8: "秒杀",
+}
+
+Component({
+    behaviors: [computedBehavior],
+    properties: {
+      sensorReportParams: {
+        type: Object,
+        value: {}
+      },
+      aliveInfo: {
+        type: Object,
+        value: {
+          alive_id: 'l_61c2a4dae4b0ad9a9d6887dc',
+          alive_state: 2
+        },
+      },
+      ENV_NAME: {
+        type: String,
+        value: ""
+      },
+      showList: {
+        type: Boolean,
+        value: false,
+        observer(newVal){
+          this.setData({
+            show: newVal,
+            refreshing: newVal
+          })
+          console.log(newVal)
+          newVal && this.onLoad()
+        }
+      },
+      // 确认订单失败回调 刷新商品列表
+      refresh: {
+        type: Boolean,
+        value: false,
+        observer(newVal, oldVal){
+          if (newVal !== oldVal) {
+            console.log("refresh", newVal, oldVal)
+            this.onLoad()
+          }
+        }
+      },
+    },
+    data: {
+      show: false,
+      goodsInfo:[],
+      page_size: 5,
+      page_index: 1,
+      total: 0,
+      refreshing: false,
+      finishedTxt: '加载中',
+      finished: false,
+    },
+    lifetimes: {
+        // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
+        attached: function () { 
+
+        },
+        moved: function () { },
+        detached: function () { },
+    },
+    methods: {
+        onLoad(){
+            if (this._freshing) return
+            this._freshing = true
+            this.setData({
+              finished: false,
+              page_index: 1
+            })
+            this.getGoodsList()
+        },
+        onScrolltolower(){
+            console.log(this.data.finished, this._freshing )
+            if(this.scrolling){return}
+            this.scrolling = true
+            this.setData({
+              finishedTxt: this.data.finished ? "没有更多了" : "加载中"
+            })
+            if(this.data.finished || this._freshing){
+                return
+            }
+            this.getGoodsList()
+        },
+        getGoodsList(){
+            let params = {
+              alive_id: this.data.aliveInfo.alive_id,
+              type: 1,
+              pageSize: this.data.page_size,
+              page: this.data.page_index,
+              port: 2
+            }
+            getGoodsList(params).then(res=>{
+              let { data, code } = res.data
+              if (code === 0) {
+                var total = data[0] ? data[0].total : this.data.total
+                var finishedTxt = "加载中"
+                var finished = false
+
+                if(this._freshing){
+                    //下拉加载直接赋值
+                    this.formatData(data, true)
+                }else {
+                    this.formatData(data)
+                }
+                // 下拉加载，且数据返回空
+                if(this._freshing && data.length === 0){
+                  finishedTxt = "no-data"
+                }else if (this.data.goodsInfo.length >= total || data.length === 0) {
+                    // 获取到所有数据
+                    finished = true// 没有更多了
+                    finishedTxt = "没有更多了"
+                    this.setData({finishedTxt})
+                }else {
+                  finishedTxt = "加载中"
+                }
+                this.setData({
+                  refreshing: false,
+                  page_index: this.data.page_index + 1,
+                  finishedTxt,
+                  finished,
+                  total
+                })
+                this._freshing = false
+                this.scrolling = false
+              }
+            })
+        },
+        formatData(data, refreshing = false){
+            let goodsInfo = this.data.goodsInfo
+            data.forEach((item,index) => {
+                this.formatItem(item)
+                if (!refreshing) {
+                  goodsInfo.push(item)
+                }
+              })
+              if (refreshing) {
+                //下拉刷新的时候直接赋值
+                goodsInfo = JSON.parse(JSON.stringify(data))
+              }
+              this.setData({goodsInfo})
+        },
+        formatItem(e) {
+            e.resourceTypeName = SPU_TYPE[e.resource_type] // 商品类型
+            e.leftStock = e.is_activity && e.now_stock ? e.now_stock : e.stock // 商品库存，活动中且有活动库存就用活动库存
+            // 处理未到活动时间的限时折扣
+            if (e.activity_type === 3) {
+              let nowTime = new Date().getTime()
+              let startTime = new Date(e.start_at.replace(/-/g, "/")).getTime()
+              let isStart = !!(nowTime - startTime > 0)
+              if (!isStart) {
+                e.is_activity = 0 // 未到活动时间的限时折扣 不参与比价
+              }
+            }
+            // 预热前和活动结束后的秒杀不参与比价
+            if (e.activity_type === 8) {
+              let startTime = new Date(e.start_at.replace(/-/g, "/")).getTime()
+              let preHeatTime = startTime - e.sec_kill_preheat_time * 1000 // 预热开始时间
+              let nowTime = new Date().getTime()
+              let isStartPreHeat = !!(nowTime - preHeatTime > 0) // 预热时间到了
+              let endTime = new Date(e.end_at.replace(/-/g, "/")).getTime()
+              let isEndSecKill = !!(nowTime - endTime > 0) // 秒杀活动结束了
+              if (!isStartPreHeat || isEndSecKill) {
+                e.is_activity = 0 // 预热前和活动结束后的秒杀 不参与比价
+              }
+            }
+            //展示购买价处理；取原价、营销活动价、超级会员价到一个数组从小到大排序，最低为购买价。防止价格一样，所以加了权重比较
+            let arr = []
+            arr.push({
+                active: "",
+                price: e.price,
+                weight: e.price + 0.0003,
+              })
+            // 活动管理、实物商品、有价优惠券、线下课和课时包不能设置活动库存，其他可以设置活动库存得需要判断是否还剩余活动库存;拼团也不能设置活动库存。
+            let notExistNowStock = [9, 21, 41, 29, 42].indexOf(e.resource_type) > -1
+            e.is_activity &&
+              (notExistNowStock ||
+                typeof e.now_stock === "number" ||
+                e.activity_type === 6) &&
+              arr.push({
+                //参与营销活动且有活动库存的时候加入比较 now_stock -""空字符串的时候代表已经买完 -0代表不限量
+                active: MARKET_ACTIVITY_MAP[e.activity_type],
+                price: e.activity_price,
+                weight: e.activity_price + 0.0001,
+              })
+            e.svip_price &&
+              arr.push({
+                //判断超级会员价
+                active: "超级会员",
+                price: e.svip_price,
+                weight: e.svip_price + 0.0002,
+              })
+            arr.sort((a, b) => a.weight - b.weight)
+            let svipAllFree = e.resource_rights_type === 1
+            e.priceShow = arr[0].price //展示的购买价格
+            e.priceShowInt = svipAllFree ? this.priceInt(e.price) : this.priceInt(e.priceShow) // 展示价格的整数部分
+            e.priceShowFlow = svipAllFree ? this.priceFlow(e.price) : this.priceFlow(e.priceShow) // 展示是价格的小数部分
+            e.preferentialShowInt = this.priceInt(e.preferential_price) // 展示券后价的整数部分
+            e.preferentialShowFlow = this.priceFlow(e.preferential_price) // 展示券后价的小数部分
+            e.currentActive = arr[0].active //当前适用得营销模式；有可能是原价，超级会员，营销活动
+            //展示划线价处理；有营销活动、超级会员，划线价是原价；只有原价和原划线价，划线价是原划线价；
+            if (e.currentActive !== "") {
+              e.priceLine = e.price
+            } else {
+              e.priceLine = e.line_price || 0 //未设置原划线价的时候不展示划线价
+            }
+            e.priceLineShowInt = this.priceInt(e.priceLine) // 展示划线价的整数部分
+            e.priceLineShowFlow = this.priceFlow(e.priceLine) // 展示划线的小数部分
+            e.entityShowStock =  (e.resource_type === 21 || e.resource_type === 41) && e.show_stock // 实物商品库存依赖 B端店铺设置（show_stock）：详情页展示不展示剩余件数
+            e.hasStock = [29,35].indexOf(e.resource_type) > -1 || e.entityShowStock || e.now_stock // 班课、线下课、实物商品、体验课、有活动库存，满足其一即展示库存
+          },
+        priceInt(val){
+          val = Number(val)
+          return ((val / 100 ).toFixed(2) + '').split('.')[0]
+        },
+        priceFlow(val){
+            val = Number(val)
+            return ((val / 100 ).toFixed(2) + '').split('.')[1] || '00'
+        },
+        closePop(){
+           this.triggerEvent("closePop")
+        },
+        preventScroll(){
+          return
+        },
+        sendGoodsCard(e){
+          console.log('sendGoodsCard',e.detail)
+          this.triggerEvent('sendGoodsCard',e.detail)
+        }
+      }
+  })

package/miniprogram_dist/TeacherGoodsList/index.json

@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "goods-item": "../GoodsItem/index",
+    "header": "./Header/index",
+    "custom-popup": "../CustomPopup"
+  }
+}

package/miniprogram_dist/TeacherGoodsList/index.less

@@ -0,0 +1,53 @@
+
+.box {
+  margin: 0 12px;
+}
+
+.title {
+  margin: 0;
+  padding: 32px 16px 16px;
+  color: rgba(69, 90, 100, 0.6);
+  font-weight: normal;
+  font-size: 18px;
+  line-height: 20px;
+  text-align: center;
+}
+
+.btn {
+  display: block;
+  width: 100%;
+  margin: 10px 0;
+  background-color: #fff;
+}
+.page-main{
+  height: 100%;
+}
+  .goods-list{
+    box-sizing: border-box;
+    min-height: 300px;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    .finished-text{
+      display: flex;
+      justify-content: center;
+      color: #999;
+      font-size: 28rpx;
+      padding: 20rpx 0;
+    }
+    .no-data{
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      margin-top: 80rpx;
+      .no-data-png{
+        width: 176rpx;
+        height: 176rpx;
+      }
+      .no-data-text{
+        color: #999999;
+        font-size: 28rpx;
+        margin-top: 32rpx;
+      }
+    }
+}