xiaoe_mp_npm 0.1.13 → 0.1.14

package/miniprogram_dist/Lottery/countdown.js

@@ -1,88 +1,88 @@
-export class Countdown {
-  static create(tickStep) {
-    return new Countdown(tickStep)
-  }
-
-  static parseCountdown(countdown) {
-    countdown = Math.floor(countdown / 1000)
-    return {
-      h: Math.floor(countdown / 3600),
-      m: Math.floor((countdown / 60) % 60),
-      s: countdown % 60
-    }
-  }
-
-  // 兼容IOS端，转换时间格式
-  // 2021-11-29 to 2021/11/29
-  static convertDate(date = '') {
-    return date.replaceAll('-', '/')
-  }
-
-  constructor(tickStep = 1000) {
-    this.timer = 0
-    this.targetDate = ''
-    this.countdown = 0
-    this.callbacks = []
-    this.tickStep = tickStep
-  }
-
-  onTick(callback) {
-    this.callbacks.push(callback)
-    return this
-  }
-
-  updateTargetDate(targetDate) {
-    this.targetDate = targetDate
-    return this
-  }
-
-  getRemainingTime() {
-    if (!this.targetDate) return 0
-    const now = new Date().getTime()
-    const endAt = new Date(Countdown.convertDate(this.targetDate)).getTime()
-    return endAt - now
-  }
-
-  clearTimer() {
-    clearInterval(this.timer)
-    this.timer = 0
-  }
-
-  start() {
-    if (!this.targetDate) {
-      console.warn('targetDate is not defined.')
-      return this
-    }
-
-    this.clearTimer()
-    this.countdown = this.getRemainingTime()
-    this.timer = setInterval(() => {
-      let nextCountdown = this.getRemainingTime()
-      if (nextCountdown <= 0) {
-        nextCountdown = 0
-        this.clearTimer()
-      }
-      this.countdown = nextCountdown
-      this.callbacks.forEach(callback => {
-        callback(nextCountdown)
-      })
-    }, this.tickStep)
-
-    return this
-  }
-
-  pause() {
-    this.clearTimer()
-    return this
-  }
-
-  stop() {
-    this.clearTimer()
-    this.countdown = 0
-    this.targetDate = ''
-    return this
-  }
-}
-
-const countdownInstance = Countdown.create()
-export default countdownInstance
+export class Countdown {
+  static create(tickStep) {
+    return new Countdown(tickStep)
+  }
+
+  static parseCountdown(countdown) {
+    countdown = Math.floor(countdown / 1000)
+    return {
+      h: Math.floor(countdown / 3600),
+      m: Math.floor((countdown / 60) % 60),
+      s: countdown % 60
+    }
+  }
+
+  // 兼容IOS端，转换时间格式
+  // 2021-11-29 to 2021/11/29
+  static convertDate(date = '') {
+    return date.replaceAll('-', '/')
+  }
+
+  constructor(tickStep = 1000) {
+    this.timer = 0
+    this.targetDate = ''
+    this.countdown = 0
+    this.callbacks = []
+    this.tickStep = tickStep
+  }
+
+  onTick(callback) {
+    this.callbacks.push(callback)
+    return this
+  }
+
+  updateTargetDate(targetDate) {
+    this.targetDate = targetDate
+    return this
+  }
+
+  getRemainingTime() {
+    if (!this.targetDate) return 0
+    const now = new Date().getTime()
+    const endAt = new Date(Countdown.convertDate(this.targetDate)).getTime()
+    return endAt - now
+  }
+
+  clearTimer() {
+    clearInterval(this.timer)
+    this.timer = 0
+  }
+
+  start() {
+    if (!this.targetDate) {
+      console.warn('targetDate is not defined.')
+      return this
+    }
+
+    this.clearTimer()
+    this.countdown = this.getRemainingTime()
+    this.timer = setInterval(() => {
+      let nextCountdown = this.getRemainingTime()
+      if (nextCountdown <= 0) {
+        nextCountdown = 0
+        this.clearTimer()
+      }
+      this.countdown = nextCountdown
+      this.callbacks.forEach(callback => {
+        callback(nextCountdown)
+      })
+    }, this.tickStep)
+
+    return this
+  }
+
+  pause() {
+    this.clearTimer()
+    return this
+  }
+
+  stop() {
+    this.clearTimer()
+    this.countdown = 0
+    this.targetDate = ''
+    return this
+  }
+}
+
+const countdownInstance = Countdown.create()
+export default countdownInstance

package/miniprogram_dist/Lottery/store/effect.js

@@ -1,204 +1,204 @@
-/* eslint-disable camelcase */
-/* eslint-disable promise/catch-or-return */
-import {ROLE, RESOURCE_TYPE, PRIZE_TYPE} from '../constants'
-import {
-  addJoiner, initPrizeData, isWinPrize, receivePrize
-} from '../../common/api/lottery'
-import {toast} from '../utils'
-import eventBus from '../eventBus'
-
-export const fetchLotteryInfo = () => (dispatch, getState) => {
-  const state = getState()
-  const params = {alive_id: state.baseInfo.alive_id}
-  return initPrizeData(params)
-    .then(({data}) => {
-      if (data.code === 0) {
-        dispatch({type: 'set_lottery_status', payload: 'waiting'})
-        dispatch({type: 'set_lottery_info', payload: data.data})
-        dispatch({type: 'show_lottery_fab'})
-        if (data.data.is_join) {
-          dispatch({type: 'set_is_ready_to_comment', payload: false})
-        }
-      } else if (data.code === 1) {
-        dispatch({type: 'set_lottery_status', payload: 'origin'})
-      }
-    })
-    .catch(err => {
-      console.error('err', err)
-      return Promise.reject(err)
-    })
-}
-
-export const participateLottery = () => (dispatch, getState) => {
-  const state = getState()
-  const params = {
-    alive_id: state.baseInfo.alive_id,
-    user_id: state.baseInfo.user_id,
-    prize_id: state.lotteryInfo.current_prize_id,
-    type: ROLE.STUDENT
-  }
-  return addJoiner(params)
-    .then(({data}) => {
-      if (data.code === 0) {
-        // attention: 抽奖参与成功判定不走接口回调，而是等待 IM 通知
-      } else if (data.code === 1) {
-        toast('您已参与本轮抽奖')
-        dispatch(fetchLotteryInfo())
-      } else {
-        toast('参与失败，请稍后重试')
-      }
-    })
-    .catch(err => {
-      console.error(err)
-      return Promise.reject(err)
-    })
-}
-
-export const fetchLotteryResult = () => (dispatch, getState) => {
-  const state = getState()
-  const params = {prize_id: state.lotteryInfo.current_prize_id}
-  return isWinPrize(params)
-    .then(({data}) => {
-      if (data.code === 0) {
-        dispatch({type: 'set_lottery_result_info', payload: data.data})
-      }
-    })
-    .catch(err => {
-      console.error(err)
-      return Promise.reject(err)
-    })
-}
-
-export const drawLottery =
-  ({users = [], prize_activity_num}) => (dispatch, getState) => new Promise((resolve, reject) => {
-    const state = getState()
-    dispatch({type: 'set_lottery_status', payload: 'origin'})
-    eventBus.emit('input_blur')
-    dispatch({type: 'hide_lottery_info'})
-
-    if (state.lotteryInfo.is_join) {
-      // 等待时间随机，防止接口请求并发
-      const randomDuration = Math.random() * 2000 + 4000
-      dispatch({type: 'show_lottery_animation'})
-      dispatch({type: 'hide_lottery_fab'})
-      setTimeout(() => {
-        const isWin = users.includes(state.baseInfo.user_id)
-        if (isWin) {
-          dispatch(fetchLotteryResult())
-            .then(() => {
-              dispatch({type: 'show_lottery_result'})
-              dispatch({type: 'hide_lottery_animation'})
-              dispatch({type: 'show_lottery_fab'})
-              resolve()
-            })
-            .catch(reject)
-        } else {
-          dispatch({
-            type: 'set_lottery_result_info',
-            payload: {
-              is_win: isWin,
-              prize_activity_num
-            }
-          })
-          dispatch({type: 'show_lottery_result'})
-          dispatch({type: 'hide_lottery_animation'})
-          dispatch({type: 'show_lottery_fab'})
-          resolve()
-        }
-      }, randomDuration)
-    }
-  })
-
-export const joinLottery = msgContent => (dispatch, getState) => {
-  const state = getState()
-  if (msgContent.user_id !== state.baseInfo.user_id) {
-    return Promise.resolve()
-  }
-
-  toast('已参与抽奖')
-  dispatch({type: 'hide_lottery_info'})
-  return dispatch(fetchLotteryInfo())
-}
-
-function getReceiverInfo(addressContent) {
-  if (!addressContent) return {}
-
-  const receiverInfo = {}
-  if (addressContent.express_type === 1) {
-    const infoKeys = ['receiver', 'province', 'city', 'county', 'detail', 'phone', 'remark']
-    for (const item of infoKeys) {
-      receiverInfo[item] = addressContent.addressInfo[item] || ''
-    }
-  }
-  if (addressContent.express_type === 2) {
-    receiverInfo.place_id = addressContent.picksiteInfo.place_id
-    receiverInfo.picker_id = addressContent.pickerUserInfo.id
-  }
-  return {
-    ...receiverInfo,
-    express_type: addressContent.express_type
-  }
-}
-
-export const receiveLotteryPrize = winProductInfo => (dispatch, getState) => {
-  const state = getState()
-  const params = {
-    app_id: winProductInfo.app_id,
-    prize_id: winProductInfo.prize_id,
-    prize_product_id: winProductInfo.prize_product_id,
-    receiver_info:
-      winProductInfo.resource_type === RESOURCE_TYPE.ENTITY_GOODS ? getReceiverInfo(state.addressInfo) : {},
-    user_id: state.baseInfo.user_id
-  }
-  return receivePrize(params)
-    .then(({data}) => {
-      if (data.code === 0) {
-        if (winProductInfo.prize_type === PRIZE_TYPE.CUSTOM) {
-          dispatch({
-            type: 'set_merchant_contact_info',
-            payload: winProductInfo.prize_value.contact_information
-          })
-          dispatch({type: 'show_merchant_contact_info'})
-        }
-        toast('领取成功')
-        return Promise.resolve()
-      }
-      const reason = data.msg || '领取失败'
-      eventBus.emit('dialog_confirm', {
-        title: '领取失败',
-        message: reason,
-        showCancelButton: false,
-        confirmButtonText: '我知道了'
-      })
-
-      return Promise.reject()
-    })
-    .catch(err => {
-      console.error('err: ', err)
-      return Promise.reject(err)
-    })
-}
-
-export const getLotteryPrize = winProductInfo => dispatch => new Promise((resolve, reject) => {
-  const submitFn = () => {
-    dispatch(receiveLotteryPrize(winProductInfo)).then(resolve).catch(reject)
-  }
-  if (winProductInfo.resource_type === RESOURCE_TYPE.ENTITY_GOODS) {
-    const addressQuery = {
-      id: winProductInfo.spu_id,
-      spu_id: winProductInfo.spu_id,
-      resource_type: winProductInfo.resource_type,
-      resource_id: winProductInfo.resource_id,
-      spu_type: winProductInfo.spu_type,
-      sku: winProductInfo.sku_id,
-      count: 1,
-      isAlive: 1
-    }
-    dispatch({type: 'set_address_query', payload: addressQuery})
-    dispatch({type: 'set_address_submit_callback', payload: submitFn})
-    dispatch({type: 'set_my_lottery_content', payload: 'address_collection'})
-    dispatch({type: 'show_my_lottery'})
-  } else {
-    submitFn()
-  }
-})
+/* eslint-disable camelcase */
+/* eslint-disable promise/catch-or-return */
+import {ROLE, RESOURCE_TYPE, PRIZE_TYPE} from '../constants'
+import {
+  addJoiner, initPrizeData, isWinPrize, receivePrize
+} from '../../common/api/lottery'
+import {toast} from '../utils'
+import eventBus from '../eventBus'
+
+export const fetchLotteryInfo = () => (dispatch, getState) => {
+  const state = getState()
+  const params = {alive_id: state.baseInfo.alive_id}
+  return initPrizeData(params)
+    .then(({data}) => {
+      if (data.code === 0) {
+        dispatch({type: 'set_lottery_status', payload: 'waiting'})
+        dispatch({type: 'set_lottery_info', payload: data.data})
+        dispatch({type: 'show_lottery_fab'})
+        if (data.data.is_join) {
+          dispatch({type: 'set_is_ready_to_comment', payload: false})
+        }
+      } else if (data.code === 1) {
+        dispatch({type: 'set_lottery_status', payload: 'origin'})
+      }
+    })
+    .catch(err => {
+      console.error('err', err)
+      return Promise.reject(err)
+    })
+}
+
+export const participateLottery = () => (dispatch, getState) => {
+  const state = getState()
+  const params = {
+    alive_id: state.baseInfo.alive_id,
+    user_id: state.baseInfo.user_id,
+    prize_id: state.lotteryInfo.current_prize_id,
+    type: ROLE.STUDENT
+  }
+  return addJoiner(params)
+    .then(({data}) => {
+      if (data.code === 0) {
+        // attention: 抽奖参与成功判定不走接口回调，而是等待 IM 通知
+      } else if (data.code === 1) {
+        toast('您已参与本轮抽奖')
+        dispatch(fetchLotteryInfo())
+      } else {
+        toast('参与失败，请稍后重试')
+      }
+    })
+    .catch(err => {
+      console.error(err)
+      return Promise.reject(err)
+    })
+}
+
+export const fetchLotteryResult = () => (dispatch, getState) => {
+  const state = getState()
+  const params = {prize_id: state.lotteryInfo.current_prize_id}
+  return isWinPrize(params)
+    .then(({data}) => {
+      if (data.code === 0) {
+        dispatch({type: 'set_lottery_result_info', payload: data.data})
+      }
+    })
+    .catch(err => {
+      console.error(err)
+      return Promise.reject(err)
+    })
+}
+
+export const drawLottery =
+  ({users = [], prize_activity_num}) => (dispatch, getState) => new Promise((resolve, reject) => {
+    const state = getState()
+    dispatch({type: 'set_lottery_status', payload: 'origin'})
+    eventBus.emit('input_blur')
+    dispatch({type: 'hide_lottery_info'})
+
+    if (state.lotteryInfo.is_join) {
+      // 等待时间随机，防止接口请求并发
+      const randomDuration = Math.random() * 2000 + 4000
+      dispatch({type: 'show_lottery_animation'})
+      dispatch({type: 'hide_lottery_fab'})
+      setTimeout(() => {
+        const isWin = users.includes(state.baseInfo.user_id)
+        if (isWin) {
+          dispatch(fetchLotteryResult())
+            .then(() => {
+              dispatch({type: 'show_lottery_result'})
+              dispatch({type: 'hide_lottery_animation'})
+              dispatch({type: 'show_lottery_fab'})
+              resolve()
+            })
+            .catch(reject)
+        } else {
+          dispatch({
+            type: 'set_lottery_result_info',
+            payload: {
+              is_win: isWin,
+              prize_activity_num
+            }
+          })
+          dispatch({type: 'show_lottery_result'})
+          dispatch({type: 'hide_lottery_animation'})
+          dispatch({type: 'show_lottery_fab'})
+          resolve()
+        }
+      }, randomDuration)
+    }
+  })
+
+export const joinLottery = msgContent => (dispatch, getState) => {
+  const state = getState()
+  if (msgContent.user_id !== state.baseInfo.user_id) {
+    return Promise.resolve()
+  }
+
+  toast('已参与抽奖')
+  dispatch({type: 'hide_lottery_info'})
+  return dispatch(fetchLotteryInfo())
+}
+
+function getReceiverInfo(addressContent) {
+  if (!addressContent) return {}
+
+  const receiverInfo = {}
+  if (addressContent.express_type === 1) {
+    const infoKeys = ['receiver', 'province', 'city', 'county', 'detail', 'phone', 'remark']
+    for (const item of infoKeys) {
+      receiverInfo[item] = addressContent.addressInfo[item] || ''
+    }
+  }
+  if (addressContent.express_type === 2) {
+    receiverInfo.place_id = addressContent.picksiteInfo.place_id
+    receiverInfo.picker_id = addressContent.pickerUserInfo.id
+  }
+  return {
+    ...receiverInfo,
+    express_type: addressContent.express_type
+  }
+}
+
+export const receiveLotteryPrize = winProductInfo => (dispatch, getState) => {
+  const state = getState()
+  const params = {
+    app_id: winProductInfo.app_id,
+    prize_id: winProductInfo.prize_id,
+    prize_product_id: winProductInfo.prize_product_id,
+    receiver_info:
+      winProductInfo.resource_type === RESOURCE_TYPE.ENTITY_GOODS ? getReceiverInfo(state.addressInfo) : {},
+    user_id: state.baseInfo.user_id
+  }
+  return receivePrize(params)
+    .then(({data}) => {
+      if (data.code === 0) {
+        if (winProductInfo.prize_type === PRIZE_TYPE.CUSTOM) {
+          dispatch({
+            type: 'set_merchant_contact_info',
+            payload: winProductInfo.prize_value.contact_information
+          })
+          dispatch({type: 'show_merchant_contact_info'})
+        }
+        toast('领取成功')
+        return Promise.resolve()
+      }
+      const reason = data.msg || '领取失败'
+      eventBus.emit('dialog_confirm', {
+        title: '领取失败',
+        message: reason,
+        showCancelButton: false,
+        confirmButtonText: '我知道了'
+      })
+
+      return Promise.reject()
+    })
+    .catch(err => {
+      console.error('err: ', err)
+      return Promise.reject(err)
+    })
+}
+
+export const getLotteryPrize = winProductInfo => dispatch => new Promise((resolve, reject) => {
+  const submitFn = () => {
+    dispatch(receiveLotteryPrize(winProductInfo)).then(resolve).catch(reject)
+  }
+  if (winProductInfo.resource_type === RESOURCE_TYPE.ENTITY_GOODS) {
+    const addressQuery = {
+      id: winProductInfo.spu_id,
+      spu_id: winProductInfo.spu_id,
+      resource_type: winProductInfo.resource_type,
+      resource_id: winProductInfo.resource_id,
+      spu_type: winProductInfo.spu_type,
+      sku: winProductInfo.sku_id,
+      count: 1,
+      isAlive: 1
+    }
+    dispatch({type: 'set_address_query', payload: addressQuery})
+    dispatch({type: 'set_address_submit_callback', payload: submitFn})
+    dispatch({type: 'set_my_lottery_content', payload: 'address_collection'})
+    dispatch({type: 'show_my_lottery'})
+  } else {
+    submitFn()
+  }
+})