xiaoe_mp_npm 0.1.2 → 0.1.5

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

@@ -5,7 +5,7 @@ import {PARTICIPATION_CONDITION} from '../../constants'
 import remotePic from '../../remotePic'
 import eventBus from '../../eventBus'
 import {participateLottery} from '../../store/effect'
-
+import {sensorLog} from 'live-mp-tools'
 const computedBehavior = require('miniprogram-computed').behavior
 
 const mapState = state => ({
@@ -75,11 +75,13 @@ Component(
         if (val) {
           this.setData({selectedIndex: 0})
           this.fetchPrizeInfo()
+          this.reportData();
         }
       }
     },
     lifetimes: {
-      attached() {},
+      attached() {
+      },
       detached() {}
     },
     methods: {
@@ -124,22 +126,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
         }
 
@@ -147,6 +152,21 @@ Component(
           this.store.dispatch({type: 'hide_lottery_info'})
         }
         this.store.dispatch(participateLottery())
+      },
+      reportData(){
+        const data = {
+          page_id: 'raffle#raffle#raffle_window',
+          platform:'mini',
+          l_program: 'e_alive',
+          current_role: this.data.baseInfo.user_type === 0 ? 'C端用户' : '讲师',
+          type: this.data.baseInfo.alive_mode === 0 ? '横屏' : '竖屏',
+          h_live_state: this.data.baseInfo.alive_state,
+          c_user_id: this.data.baseInfo.user_id,
+          app_id: this.data.baseInfo.app_id,
+          user_channel:'',
+          union_id:wx.getStorageSync('unionId')
+        }
+        sensorLog.sensors.track('view_page', data)
       }
     }
   })

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/Lottery/components/LotteryResult/LosingLottery/index.js

@@ -1,6 +1,7 @@
 import remotePic from '../../../remotePic'
 import {connect} from '../../../store/index'
 
+
 const computedBehavior = require('miniprogram-computed').behavior
 
 const mapState = state => ({lotteryInfo: state.lotteryInfo})

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

@@ -20,13 +20,13 @@ Component(
         return data.resultInfo.is_win
       }
     },
-    observers: {
-      visible(val) {
-        if (val && this.data.isWin) {
-          this.reportData()
-        }
-      }
-    },
+    // observers: {
+    //   visible(val) {
+    //     if (val && this.data.isWin) {
+    //       this.reportData()
+    //     }
+    //   }
+    // },
     lifetimes: {
       attached() {}
     },
@@ -36,21 +36,40 @@ Component(
           type: visible ? 'show_lottery_result' : 'hide_lottery_result'
         })
       },
+<<<<<<< HEAD
       reportData() {
         const data = {
-          page_id: 'e_alive#mini#first#alive_room',
-          page_name: this.data.baseInfo.title,
-          page_module: '中奖页面',
-          l_program: '鹅直播',
+          page_id: 'raffle#raffle_result',
+          platform:'mini',
+          l_program: 'e_alive',
           current_role: this.data.baseInfo.user_type === 0 ? 'C端用户' : '讲师',
           type: this.data.baseInfo.alive_mode === 0 ? '横屏' : '竖屏',
           h_live_state: this.data.baseInfo.alive_state,
           c_user_id: this.data.baseInfo.user_id,
-          app_id: this.data.baseInfo.app_id
+          app_id: this.data.baseInfo.app_id,
+          user_channel:'',
+          union_id:wx.getStorageSync('unionId')
         }
         sensorLog.sensors.track('view_page', data)
         console.log('reportData:', data)
       }
+=======
+      // reportData() {
+      //   const data = {
+      //     page_id: 'e_alive#mini#first#alive_room',
+      //     page_name: this.data.baseInfo.title,
+      //     page_module: '中奖页面',
+      //     l_program: '鹅直播',
+      //     current_role: this.data.baseInfo.user_type === 0 ? 'C端用户' : '讲师',
+      //     type: this.data.baseInfo.alive_mode === 0 ? '横屏' : '竖屏',
+      //     h_live_state: this.data.baseInfo.alive_state,
+      //     c_user_id: this.data.baseInfo.user_id,
+      //     app_id: this.data.baseInfo.app_id
+      //   }
+      //   sensorLog.sensors.track('view_page', data)
+      //   console.log('reportData:', data)
+      // }
+>>>>>>> master
     }
   })
 )

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

@@ -1,5 +1,5 @@
 import {connect} from '../../store/index'
-
+import {sensorLog} from 'live-mp-tools'
 const computedBehavior = require('miniprogram-computed').behavior
 
 /**
@@ -7,7 +7,8 @@ const computedBehavior = require('miniprogram-computed').behavior
  */
 const mapState = state => ({
   visible: state.merchantContactInfoVisible,
-  contactInfo: state.merchantContactInfo
+  contactInfo: state.merchantContactInfo,
+  baseInfo: state.baseInfo
 })
 Component(
   connect(mapState)({
@@ -21,6 +22,16 @@ Component(
         return String(data.contactInfo.is_qrcode) === '1'
       }
     },
+    observers: {
+      visible(val) {
+        if (val) {
+          this.reportData()
+        }
+      }
+    },
+    lifetimes: {
+      attached() {}
+    },
     methods: {
       onVisibleChange({detail: visible}) {
         this.store.dispatch({
@@ -34,6 +45,22 @@ Component(
             this.store.dispatch({type: 'hide_merchant_contact_info'})
           }
         })
+      },
+      reportData(){
+        const data = {
+          page_id: 'raffle#redeem',
+          platform:'mini',
+          l_program: 'e_alive',
+          current_role: this.data.baseInfo.user_type === 0 ? 'C端用户' : '讲师',
+          type: this.data.baseInfo.alive_mode === 0 ? '横屏' : '竖屏',
+          h_live_state: this.data.baseInfo.alive_state,
+          c_user_id: this.data.baseInfo.user_id,
+          app_id: this.data.baseInfo.app_id,
+          user_channel:'',
+          union_id:wx.getStorageSync('unionId')
+        }
+        sensorLog.sensors.track('view_page', data)
+        console.log('reportData:', data)
       }
     }
   })

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

@@ -1,12 +1,13 @@
 import remotePic from '../../remotePic'
 import {connect} from '../../store/index'
 import {MY_LOTTERY_CONTENT_TYPE} from '../../constants'
-
+import {sensorLog} from 'live-mp-tools'
 const computedBehavior = require('miniprogram-computed').behavior
 
 const mapState = state => ({
   visible: state.myLotteryVisible,
-  content: state.myLotteryContent
+  content: state.myLotteryContent,
+  baseInfo: state.baseInfo
 })
 Component(
   connect(mapState)({
@@ -30,9 +31,16 @@ Component(
         return data.content === MY_LOTTERY_CONTENT_TYPE.ADDRESS_COLLECTION
       }
     },
-    observers: {},
+    observers: {
+      visible(val) {
+        if (val) {
+          this.reportData()
+        }
+      }
+    },
     lifetimes: {
-      attached() {}
+      attached() {
+      }
     },
     methods: {
       onVisibleChange({detail: visible}) {
@@ -46,6 +54,22 @@ Component(
             this.store.dispatch({type: 'set_my_lottery_content', payload: ''})
           }, POPUP_SLIDE_DURATION)
         }
+      },
+      reportData(){
+        const data = {
+          page_id: 'raffle#my_raffle',
+          platform:'mini',
+          l_program: 'e_alive',
+          current_role: this.data.baseInfo.user_type === 0 ? 'C端用户' : '讲师',
+          type: this.data.baseInfo.alive_mode === 0 ? '横屏' : '竖屏',
+          h_live_state: this.data.baseInfo.alive_state,
+          c_user_id: this.data.baseInfo.user_id,
+          app_id: this.data.baseInfo.app_id,
+          user_channel:'',
+          union_id:wx.getStorageSync('unionId')
+        }
+        sensorLog.sensors.track('view_page', data)
+        console.log('reportData:', data)
       }
     }
   })

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