xiaoe_mp_npm 0.5.42-test13 → 0.5.42-test14

package/miniprogram_dist/LiveGoodsList/index.js

@@ -16,6 +16,18 @@ import {
 import { rpxToVmin } from '../common/utils/index.js'
 const computedBehavior = require('miniprogram-computed').behavior
 
+let activityCountdownTimer = null // 活动倒计时计时器
+let hadActivity = false
+let activityList = [] // 参与活动的商品
+
+// 预热模块
+let preheatTimer = null // 预热倒计时计时器
+let hadPreheat = false
+let preheatList = [] // 参与活动的商品
+
+let hasActivity = false // 是否有参与活动的商品
+let hasPreheat = false // 是否有参与预热的商品
+
 const MARKET_ACTIVITY_MAP = {
   3: "限时折扣",
   4: "好友助力",
@@ -60,6 +72,12 @@ Component({
         newVal && this.data.explainingGoods.length && this.getExplainingGoodsInfo()
         newVal && this.getPreferentialPriceSetting()
         newVal && this.onLoad()
+        if(!newVal){
+          clearInterval(activityCountdownTimer)
+          activityCountdownTimer = null
+          clearInterval(preheatTimer)
+          preheatTimer = null
+        }
       }
     },
     // 讲解中商品
@@ -163,6 +181,56 @@ Component({
     },
   },
   methods: {
+    // 商品总活动倒计时
+    startActivityCountdown(list) {
+      clearInterval(activityCountdownTimer)
+      activityCountdownTimer = setInterval(() => {
+        hadActivity = false
+        list.forEach((i) => {
+          let targetDate = new Date(i.time.replace(/-/g, '/')).getTime() - new Date().getTime()
+          if (targetDate <= 0) return
+          hadActivity = true
+          let temp = `goodsInfo[${i.index}].activityCountdown`
+          this.setData({
+            [temp]: targetDate,
+          })
+        })
+        if (!hadActivity) {
+          clearInterval(activityCountdownTimer)
+          activityCountdownTimer = null
+        }
+      }, 1000)
+    },
+    // 预热倒计时
+    startPreheatCountdown(list) {
+      clearInterval(preheatTimer)
+      preheatTimer = setInterval(() => {
+        hadPreheat = false
+        list.forEach((i) => {
+          let targetDate = new Date(i.time.replace(/-/g, '/')).getTime() - new Date().getTime()
+          if (targetDate <= 0) {
+            activityList.push({
+              time: this.data.goodsInfo[i.index].end_at,
+              index: i.index,
+            })
+            this.setData({
+              [`goodsInfo[${i.index}].preheatTime`]: 0,
+            })
+            return
+          }
+          hadPreheat = true
+          let temp = `goodsInfo[${i.index}].preheatTime`
+          this.setData({
+            [temp]: targetDate,
+          })
+        })
+        if (!hadPreheat) {
+          clearInterval(preheatTimer)
+          preheatTimer = null
+        }
+      }, 1000)
+    },
+
     /**
     * 带货/优惠券实时同步
     * @param {object} msgData im消息体
@@ -420,7 +488,45 @@ Component({
               //下拉刷新的时候直接赋值
               goodsInfo = JSON.parse(JSON.stringify(data))
             }
-            this.setData({goodsInfo})
+            this.setData({goodsInfo},()=>{
+              this.getActivityStatus(this.data.goodsInfo)
+            })
+      },
+      getActivityStatus(data){
+        activityList = []
+        preheatList = []
+        data.forEach((item, index) => {
+          if (item.is_activity && item.end_at) {
+            hasActivity = true
+            item.activityCountdown = 0
+            activityList.push({
+              time: item.end_at,
+              index,
+            })
+          }
+          // this.data.isSeckill && this.data.preheating
+          if (item.activity_type === 8 && item.sec_kill_is_preheat === 1) {
+            //预热开始时间
+            let startTime = (item.start_at && new Date(item.start_at.replace(/-/g, '/'))) || new Date()
+            let times = startTime.getTime() - item.sec_kill_preheat_time * 1000
+            let preHeatTime = new Date(times) || new Date()
+  
+            let startTime2 = (item.start_at && new Date(item.start_at.replace(/-/g, '/'))) || new Date()
+            let nowTime = new Date().getTime()
+            let preheating = nowTime > preHeatTime.getTime() && startTime2.getTime() > nowTime
+  
+            if (preheating) {
+              hasPreheat = true
+              item.preheatTime = 0
+              preheatList.push({
+                time: item.start_at,
+                index,
+              })
+            }
+          }
+        })
+        if (hasActivity) this.startActivityCountdown(activityList) //活动倒计时
+        if (hasPreheat) this.startPreheatCountdown(preheatList) // 预热倒计时
       },
       formatItem(e) {
           e.resourceTypeName = e.resource_type_name // 商品类型

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaoe_mp_npm",
-  "version": "0.5.42-test13",
+  "version": "0.5.42-test14",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "scripts": {

package/src/LiveGoodsList/index.js

@@ -16,6 +16,18 @@ import {
 import { rpxToVmin } from '../common/utils/index.js'
 const computedBehavior = require('miniprogram-computed').behavior
 
+let activityCountdownTimer = null // 活动倒计时计时器
+let hadActivity = false
+let activityList = [] // 参与活动的商品
+
+// 预热模块
+let preheatTimer = null // 预热倒计时计时器
+let hadPreheat = false
+let preheatList = [] // 参与活动的商品
+
+let hasActivity = false // 是否有参与活动的商品
+let hasPreheat = false // 是否有参与预热的商品
+
 const MARKET_ACTIVITY_MAP = {
   3: "限时折扣",
   4: "好友助力",
@@ -60,6 +72,12 @@ Component({
         newVal && this.data.explainingGoods.length && this.getExplainingGoodsInfo()
         newVal && this.getPreferentialPriceSetting()
         newVal && this.onLoad()
+        if(!newVal){
+          clearInterval(activityCountdownTimer)
+          activityCountdownTimer = null
+          clearInterval(preheatTimer)
+          preheatTimer = null
+        }
       }
     },
     // 讲解中商品
@@ -163,6 +181,56 @@ Component({
     },
   },
   methods: {
+    // 商品总活动倒计时
+    startActivityCountdown(list) {
+      clearInterval(activityCountdownTimer)
+      activityCountdownTimer = setInterval(() => {
+        hadActivity = false
+        list.forEach((i) => {
+          let targetDate = new Date(i.time.replace(/-/g, '/')).getTime() - new Date().getTime()
+          if (targetDate <= 0) return
+          hadActivity = true
+          let temp = `goodsInfo[${i.index}].activityCountdown`
+          this.setData({
+            [temp]: targetDate,
+          })
+        })
+        if (!hadActivity) {
+          clearInterval(activityCountdownTimer)
+          activityCountdownTimer = null
+        }
+      }, 1000)
+    },
+    // 预热倒计时
+    startPreheatCountdown(list) {
+      clearInterval(preheatTimer)
+      preheatTimer = setInterval(() => {
+        hadPreheat = false
+        list.forEach((i) => {
+          let targetDate = new Date(i.time.replace(/-/g, '/')).getTime() - new Date().getTime()
+          if (targetDate <= 0) {
+            activityList.push({
+              time: this.data.goodsInfo[i.index].end_at,
+              index: i.index,
+            })
+            this.setData({
+              [`goodsInfo[${i.index}].preheatTime`]: 0,
+            })
+            return
+          }
+          hadPreheat = true
+          let temp = `goodsInfo[${i.index}].preheatTime`
+          this.setData({
+            [temp]: targetDate,
+          })
+        })
+        if (!hadPreheat) {
+          clearInterval(preheatTimer)
+          preheatTimer = null
+        }
+      }, 1000)
+    },
+
     /**
     * 带货/优惠券实时同步
     * @param {object} msgData im消息体
@@ -420,7 +488,45 @@ Component({
               //下拉刷新的时候直接赋值
               goodsInfo = JSON.parse(JSON.stringify(data))
             }
-            this.setData({goodsInfo})
+            this.setData({goodsInfo},()=>{
+              this.getActivityStatus(this.data.goodsInfo)
+            })
+      },
+      getActivityStatus(data){
+        activityList = []
+        preheatList = []
+        data.forEach((item, index) => {
+          if (item.is_activity && item.end_at) {
+            hasActivity = true
+            item.activityCountdown = 0
+            activityList.push({
+              time: item.end_at,
+              index,
+            })
+          }
+          // this.data.isSeckill && this.data.preheating
+          if (item.activity_type === 8 && item.sec_kill_is_preheat === 1) {
+            //预热开始时间
+            let startTime = (item.start_at && new Date(item.start_at.replace(/-/g, '/'))) || new Date()
+            let times = startTime.getTime() - item.sec_kill_preheat_time * 1000
+            let preHeatTime = new Date(times) || new Date()
+  
+            let startTime2 = (item.start_at && new Date(item.start_at.replace(/-/g, '/'))) || new Date()
+            let nowTime = new Date().getTime()
+            let preheating = nowTime > preHeatTime.getTime() && startTime2.getTime() > nowTime
+  
+            if (preheating) {
+              hasPreheat = true
+              item.preheatTime = 0
+              preheatList.push({
+                time: item.start_at,
+                index,
+              })
+            }
+          }
+        })
+        if (hasActivity) this.startActivityCountdown(activityList) //活动倒计时
+        if (hasPreheat) this.startPreheatCountdown(preheatList) // 预热倒计时
       },
       formatItem(e) {
           e.resourceTypeName = e.resource_type_name // 商品类型