xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/miniprogram_dist/MatchList/index.js

@@ -1,441 +1,445 @@
-import { getSearchGoodsList } from '../common/api/liveGoodsList'
-import { stuFormatItem, teaFormatItem } from '../common/utils/liveGoods'
-
-let activityCountdownTimer = null // 活动倒计时计时器
-let hadActivity = false
-let activityList = [] // 参与活动的商品
-
-// 预热模块
-let preheatTimer = null // 预热倒计时计时器
-let hadPreheat = false
-let preheatList = [] // 参与活动的商品
-
-let hasActivity = false // 是否有参与活动的商品
-let hasPreheat = false // 是否有参与预热的商品
-
-Component({
-  properties: {
-    allSearchList: {
-      type: Array,
-      value: [],
-    },
-    aliveInfo: {
-      type: Object,
-      value: {},
-    },
-    port: {
-      type: Number,
-      value: 1,
-    },
-    aliveInfo: {
-      type: Object,
-      value: {},
-    },
-    // 是否去客服内支付
-    allContactPay: {
-      type: Boolean,
-      value: false,
-    },
-    //店铺设置是否展示券后价
-    coupon_switch: {
-      type: Boolean,
-      value: false,
-    },
-    envName: {
-      type: String,
-      value: '',
-    },
-    sensorReportParams: {
-      type: Object,
-      value: {},
-    },
-    current_role: {
-      type: String,
-      value: 'student',
-    },
-    isFullScreen: {
-      type: Boolean,
-      value: false,
-    },
-    style: {
-      type: String,
-      value: '',
-    },
-    index: {
-      type: Number,
-      value: -1,
-    },
-    sendingGoodId: {
-      type: String,
-      value: '',
-    },
-    // 是否展示库存
-    stockSwitch: {
-      type: Number,
-      value: 0,
-    },
-    aliveSubId: {
-      type: String,
-      value: '',
-    },
-    // 热卖配置
-    hotSalesConf: {
-      type: Object,
-      value: {
-        is_show_stock: 0, // 显示库存开关
-        is_hot_sales_on: 0, // 商品热卖开关
-        hot_conf: {
-          sales: 30, // 热卖销量
-          stock: 10, // 热卖库存
-        },
-      },
-    },
-    isShowItem: {
-      type: Boolean,
-      value: false,
-    },
-    shopFreightSwitch: {
-      type: Boolean,
-      value: false,
-    },
-    isManage: {
-      type: Boolean,
-      value: false,
-    },
-    visibleSwitchStatusBtn: {
-      type: Boolean,
-      value: false,
-    },
-  },
-
-  data: {
-    searchValue: '',
-    searchState: true, // 默认进入就是搜索态
-    filteredGoodsList: [],
-    goodsInfo: [],
-    noResults: false,
-    refreshing: false,
-    loading: false,
-    finished: false,
-    page_size: 20,
-    page_index: 1,
-    resource_ids: [],
-    total: 0,
-    searchFocus: true,
-  },
-
-  observers: {
-    visible(val) {
-      if (val) {
-        this.setData({ searchFocus: true })
-      }
-    },
-  },
-
-  methods: {
-    back(e) {
-      this.setData({
-        searchState: false,
-        searchValue: '',
-        goodsInfo: [],
-        resource_ids: [],
-        page_index: 1,
-        finished: false,
-        loading: false,
-        total: 0,
-      })
-      this.triggerEvent('back', e.detail)
-    },
-
-    onSearchInput(e) {
-      const val = e.detail.value.trim()
-      this.setData({
-        searchValue: val,
-        goodsInfo: [],
-        searchState: true,
-      })
-
-      if (!val) {
-        this.setData({ filteredGoodsList: [], noResults: false })
-        return
-      }
-
-      const keyword = val.toLowerCase()
-      const originalList = this.data.allSearchList.filter(
-        (item) => item.title?.toLowerCase().includes(keyword) || String(item.order_weight || '').includes(keyword),
-      )
-
-      const list = originalList.map((item) => ({
-        ...item,
-        titleParts: this.highlight(item.title, this.data.searchValue),
-        weightParts: this.highlight(item.order_weight, this.data.searchValue),
-      }))
-
-      this.setData({
-        filteredGoodsList: list,
-        noResults: list.length === 0,
-      })
-    },
-
-    highlight(text, keyword) {
-      // 安全处理：把 null/undefined 转为空字符串，把其他类型转为字符串
-      if (text === null || text === undefined) text = ''
-      else if (typeof text !== 'string') text = String(text)
-
-      // 没有关键字时直接返回整个文本（非高亮）
-      if (!keyword) return [{ text, highlight: false }]
-
-      // 转义正则特殊字符并创建不区分大小写的正则
-      const safeKeyword = String(keyword).replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')
-      const reg = new RegExp(safeKeyword, 'gi')
-
-      const result = []
-      let lastIndex = 0
-      let match
-
-      while ((match = reg.exec(text)) !== null) {
-        const start = match.index
-
-        if (start > lastIndex) {
-          result.push({
-            text: text.slice(lastIndex, start),
-            highlight: false,
-          })
-        }
-
-        result.push({
-          text: match[0],
-          highlight: true,
-        })
-
-        lastIndex = start + match[0].length
-
-        // 防止死循环（理论上不用，但保险）
-        if (reg.lastIndex === start) reg.lastIndex++
-      }
-
-      if (lastIndex < text.length) {
-        result.push({
-          text: text.slice(lastIndex),
-          highlight: false,
-        })
-      }
-
-      // 若没有任何匹配，保证返回至少一段
-      if (result.length === 0) return [{ text, highlight: false }]
-
-      return result
-    },
-
-    searchOne(e) {
-      const item = e.currentTarget.dataset.item
-      this.setData({
-        searchState: false,
-        resource_ids: [{ type: Number(item.type), ids: [item.resource_id] }],
-        page_index: 1,
-        loading: true,
-        goodsInfo: [],
-      })
-      this.loadGoods(true)
-    },
-
-    searchGoods() {
-      if (!this.data.searchValue) {
-        wx.showToast({ title: '请输入关键词', icon: 'none' })
-        return
-      }
-
-      const map = {}
-      this.data.filteredGoodsList.forEach((item) => {
-        if (!map[item.type]) map[item.type] = []
-        map[item.type].push(item.resource_id)
-      })
-
-      const resource_ids = Object.keys(map).map((type) => ({
-        type: Number(type),
-        ids: map[type],
-      }))
-
-      if (resource_ids.length === 0) {
-        this.setData({ noResults: true })
-        return
-      }
-
-      this.setData({
-        searchState: false,
-        resource_ids,
-        page_index: 1,
-        loading: true,
-        goodsInfo: [],
-      })
-      this.loadGoods(true)
-    },
-
-    loadGoods(isRefresh = false) {
-      const { aliveInfo, resource_ids, page_size, page_index, port } = this.data
-
-      getSearchGoodsList({
-        alive_id: aliveInfo.alive_id,
-        page_size,
-        page: page_index,
-        port,
-        app_id: aliveInfo.app_id,
-        user_id: aliveInfo.user_id,
-        resource_ids,
-      })
-        .then((res) => {
-          if (res.data.code === 0) {
-            const list = res.data.data || []
-            const total = list[0]?.total || 0
-
-            this.formatData(list, isRefresh)
-
-            this.setData({
-              total,
-              finished: this.data.goodsInfo.length >= total || list.length < page_size,
-              page_index: page_index + 1,
-              loading: false,
-              refreshing: false,
-              noResults: this.data.goodsInfo.length === 0,
-            })
-          } else {
-            this.setData({ loading: false, refreshing: false, finished: true, noResults: true })
-          }
-        })
-        .catch(() => {
-          this.setData({ loading: false, refreshing: false, finished: true })
-        })
-    },
-
-    onRefresh() {
-      this.setData({ refreshing: true, page_index: 1 })
-      this.loadGoods(true)
-    },
-
-    onReachBottom() {
-      if (this.data.finished || this.data.loading) return
-      this.setData({ loading: true })
-      this.loadGoods()
-    },
-
-    formatData(data, isRefresh) {
-      let goodsInfo = this.data.goodsInfo
-      data.forEach((item) => {
-        this.data.current_role === 'student' ? stuFormatItem(item) : teaFormatItem(item)
-        if (!isRefresh) {
-          goodsInfo.push(item)
-        }
-      })
-      if (isRefresh) {
-        //下拉刷新的时候直接赋值
-        goodsInfo = JSON.parse(JSON.stringify(data))
-      }
-      this.setData({ goodsInfo }, () => {
-        this.getActivityStatus(this.data.goodsInfo)
-      })
-    },
-
-    getActivityStatus(data) {
-      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) // 预热倒计时
-    },
-
-    // 商品总活动倒计时
-    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)
-    },
-
-    // 事件透传
-    showDialog(e) {
-      this.triggerEvent('showDialog', e.detail)
-    },
-    showConfirmOrder(e) {
-      this.triggerEvent('showConfirmOrder', e.detail)
-    },
-    showSku(e) {
-      this.triggerEvent('showSku', e.detail)
-    },
-    sendNewMsg() {
-      this.triggerEvent('sendNewMsg')
-    },
-    sendGoodsCard(e) {
-      this.triggerEvent('sendGoodsCard', e.detail)
-    },
-  },
-})
+import { getSearchGoodsList } from '../common/api/liveGoodsList'
+import { stuFormatItem, teaFormatItem } from '../common/utils/liveGoods'
+
+let activityCountdownTimer = null // 活动倒计时计时器
+let hadActivity = false
+let activityList = [] // 参与活动的商品
+
+// 预热模块
+let preheatTimer = null // 预热倒计时计时器
+let hadPreheat = false
+let preheatList = [] // 参与活动的商品
+
+let hasActivity = false // 是否有参与活动的商品
+let hasPreheat = false // 是否有参与预热的商品
+
+Component({
+  properties: {
+    allSearchList: {
+      type: Array,
+      value: [],
+    },
+    aliveInfo: {
+      type: Object,
+      value: {},
+    },
+    userInfo: {
+      type: Object,
+      value: {},
+    },
+    port: {
+      type: Number,
+      value: 1,
+    },
+    aliveInfo: {
+      type: Object,
+      value: {},
+    },
+    // 是否去客服内支付
+    allContactPay: {
+      type: Boolean,
+      value: false,
+    },
+    //店铺设置是否展示券后价
+    coupon_switch: {
+      type: Boolean,
+      value: false,
+    },
+    envName: {
+      type: String,
+      value: '',
+    },
+    sensorReportParams: {
+      type: Object,
+      value: {},
+    },
+    current_role: {
+      type: String,
+      value: 'student',
+    },
+    isFullScreen: {
+      type: Boolean,
+      value: false,
+    },
+    style: {
+      type: String,
+      value: '',
+    },
+    index: {
+      type: Number,
+      value: -1,
+    },
+    sendingGoodId: {
+      type: String,
+      value: '',
+    },
+    // 是否展示库存
+    stockSwitch: {
+      type: Number,
+      value: 0,
+    },
+    aliveSubId: {
+      type: String,
+      value: '',
+    },
+    // 热卖配置
+    hotSalesConf: {
+      type: Object,
+      value: {
+        is_show_stock: 0, // 显示库存开关
+        is_hot_sales_on: 0, // 商品热卖开关
+        hot_conf: {
+          sales: 30, // 热卖销量
+          stock: 10, // 热卖库存
+        },
+      },
+    },
+    isShowItem: {
+      type: Boolean,
+      value: false,
+    },
+    shopFreightSwitch: {
+      type: Boolean,
+      value: false,
+    },
+    isManage: {
+      type: Boolean,
+      value: false,
+    },
+    visibleSwitchStatusBtn: {
+      type: Boolean,
+      value: false,
+    },
+  },
+
+  data: {
+    searchValue: '',
+    searchState: true, // 默认进入就是搜索态
+    filteredGoodsList: [],
+    goodsInfo: [],
+    noResults: false,
+    refreshing: false,
+    loading: false,
+    finished: false,
+    page_size: 20,
+    page_index: 1,
+    resource_ids: [],
+    total: 0,
+    searchFocus: true,
+  },
+
+  observers: {
+    visible(val) {
+      if (val) {
+        this.setData({ searchFocus: true })
+      }
+    },
+  },
+
+  methods: {
+    back(e) {
+      this.setData({
+        searchState: false,
+        searchValue: '',
+        goodsInfo: [],
+        resource_ids: [],
+        page_index: 1,
+        finished: false,
+        loading: false,
+        total: 0,
+      })
+      this.triggerEvent('back', e.detail)
+    },
+
+    onSearchInput(e) {
+      const val = e.detail.value.trim()
+      this.setData({
+        searchValue: val,
+        goodsInfo: [],
+        searchState: true,
+      })
+
+      if (!val) {
+        this.setData({ filteredGoodsList: [], noResults: false })
+        return
+      }
+
+      const keyword = val.toLowerCase()
+      const originalList = this.data.allSearchList.filter(
+        (item) => item.title?.toLowerCase().includes(keyword) || String(item.order_weight || '').includes(keyword),
+      )
+
+      const list = originalList.map((item) => ({
+        ...item,
+        titleParts: this.highlight(item.title, this.data.searchValue),
+        weightParts: this.highlight(item.order_weight, this.data.searchValue),
+      }))
+
+      this.setData({
+        filteredGoodsList: list,
+        noResults: list.length === 0,
+      })
+    },
+
+    highlight(text, keyword) {
+      // 安全处理：把 null/undefined 转为空字符串，把其他类型转为字符串
+      if (text === null || text === undefined) text = ''
+      else if (typeof text !== 'string') text = String(text)
+
+      // 没有关键字时直接返回整个文本（非高亮）
+      if (!keyword) return [{ text, highlight: false }]
+
+      // 转义正则特殊字符并创建不区分大小写的正则
+      const safeKeyword = String(keyword).replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')
+      const reg = new RegExp(safeKeyword, 'gi')
+
+      const result = []
+      let lastIndex = 0
+      let match
+
+      while ((match = reg.exec(text)) !== null) {
+        const start = match.index
+
+        if (start > lastIndex) {
+          result.push({
+            text: text.slice(lastIndex, start),
+            highlight: false,
+          })
+        }
+
+        result.push({
+          text: match[0],
+          highlight: true,
+        })
+
+        lastIndex = start + match[0].length
+
+        // 防止死循环（理论上不用，但保险）
+        if (reg.lastIndex === start) reg.lastIndex++
+      }
+
+      if (lastIndex < text.length) {
+        result.push({
+          text: text.slice(lastIndex),
+          highlight: false,
+        })
+      }
+
+      // 若没有任何匹配，保证返回至少一段
+      if (result.length === 0) return [{ text, highlight: false }]
+
+      return result
+    },
+
+    searchOne(e) {
+      const item = e.currentTarget.dataset.item
+      this.setData({
+        searchState: false,
+        resource_ids: [{ type: Number(item.type), ids: [item.resource_id] }],
+        page_index: 1,
+        loading: true,
+        goodsInfo: [],
+      })
+      this.loadGoods(true)
+    },
+
+    searchGoods() {
+      if (!this.data.searchValue) {
+        wx.showToast({ title: '请输入关键词', icon: 'none' })
+        return
+      }
+
+      const map = {}
+      this.data.filteredGoodsList.forEach((item) => {
+        if (!map[item.type]) map[item.type] = []
+        map[item.type].push(item.resource_id)
+      })
+
+      const resource_ids = Object.keys(map).map((type) => ({
+        type: Number(type),
+        ids: map[type],
+      }))
+
+      if (resource_ids.length === 0) {
+        this.setData({ noResults: true })
+        return
+      }
+
+      this.setData({
+        searchState: false,
+        resource_ids,
+        page_index: 1,
+        loading: true,
+        goodsInfo: [],
+      })
+      this.loadGoods(true)
+    },
+
+    loadGoods(isRefresh = false) {
+      const { aliveInfo, resource_ids, page_size, page_index, port } = this.data
+
+      getSearchGoodsList({
+        alive_id: aliveInfo.alive_id,
+        page_size,
+        page: page_index,
+        port,
+        app_id: aliveInfo.app_id,
+        user_id: aliveInfo.user_id,
+        resource_ids,
+      })
+        .then((res) => {
+          if (res.data.code === 0) {
+            const list = res.data.data || []
+            const total = list[0]?.total || 0
+
+            this.formatData(list, isRefresh)
+
+            this.setData({
+              total,
+              finished: this.data.goodsInfo.length >= total || list.length < page_size,
+              page_index: page_index + 1,
+              loading: false,
+              refreshing: false,
+              noResults: this.data.goodsInfo.length === 0,
+            })
+          } else {
+            this.setData({ loading: false, refreshing: false, finished: true, noResults: true })
+          }
+        })
+        .catch(() => {
+          this.setData({ loading: false, refreshing: false, finished: true })
+        })
+    },
+
+    onRefresh() {
+      this.setData({ refreshing: true, page_index: 1 })
+      this.loadGoods(true)
+    },
+
+    onReachBottom() {
+      if (this.data.finished || this.data.loading) return
+      this.setData({ loading: true })
+      this.loadGoods()
+    },
+
+    formatData(data, isRefresh) {
+      let goodsInfo = this.data.goodsInfo
+      data.forEach((item) => {
+        this.data.current_role === 'student' ? stuFormatItem(item) : teaFormatItem(item)
+        if (!isRefresh) {
+          goodsInfo.push(item)
+        }
+      })
+      if (isRefresh) {
+        //下拉刷新的时候直接赋值
+        goodsInfo = JSON.parse(JSON.stringify(data))
+      }
+      this.setData({ goodsInfo }, () => {
+        this.getActivityStatus(this.data.goodsInfo)
+      })
+    },
+
+    getActivityStatus(data) {
+      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) // 预热倒计时
+    },
+
+    // 商品总活动倒计时
+    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)
+    },
+
+    // 事件透传
+    showDialog(e) {
+      this.triggerEvent('showDialog', e.detail)
+    },
+    showConfirmOrder(e) {
+      this.triggerEvent('showConfirmOrder', e.detail)
+    },
+    showSku(e) {
+      this.triggerEvent('showSku', e.detail)
+    },
+    sendNewMsg() {
+      this.triggerEvent('sendNewMsg')
+    },
+    sendGoodsCard(e) {
+      this.triggerEvent('sendGoodsCard', e.detail)
+    },
+  },
+})