xiaoe_mp_npm 0.1.13 → 0.1.14

package/miniprogram_dist/TeacherGoodsList/index.js

@@ -1,269 +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)
-        }
-      }
-  })
+/*
+ * @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

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

package/miniprogram_dist/TeacherGoodsList/index.less

@@ -1,53 +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;
-      }
-    }
-}
+
+.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;
+      }
+    }
+}