xiaoe_mp_npm 0.1.5 → 0.1.9

package/miniprogram_dist/ConfirmOrder/components/ConfirmOrderContent/index.js

@@ -219,6 +219,17 @@ Component({
     },
   },
   observers: {
+    distributionMode(val) {
+      if (val === 1) {
+        this.setData({
+          express_type: val
+        })
+      } else if (val === 2) {
+        this.setData({
+          express_type: val
+        })
+      }
+    },
     marketingData(marketingData) {
       // 这里的逻辑应该是存在拼团的时候那么payment_type就要赋值为13，如果是限时折扣或者是单买的话，payment_type不做赋值默认为2
       if (

package/miniprogram_dist/ConfirmOrder/components/PickupSelect/index.less

@@ -1,9 +1,24 @@
 .pickup-select-content {
   .van-cell__value {
     flex: 3;
-    text-align: right;
   }
-  .custom-title {
-    margin-left: 16rpx;
+  .right {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    .custom-title {
+      max-width: 450rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      margin-left: 16rpx;
+    }
+    .custom-site {
+      max-width: 450rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      margin-left: 16rpx;
+    }
   }
 }

package/miniprogram_dist/ConfirmOrder/components/PickupSelect/index.wxml

@@ -5,8 +5,10 @@
       <view slot="title">
         <van-tag color="#EBF1FF" text-color="#105CFB">自提</van-tag>
       </view>
-      <view class="custom-title">{{ setPlace_name }}</view>
-      <view class="custom-site">{{ setPlace_area }}</view>
+      <view class="right">
+        <view class="custom-title">{{ setPlace_name }}</view>
+        <view class="custom-site">{{ setPlace_area }}</view>
+      </view>
     </van-cell>
   </van-cell-group>
 </view>

package/miniprogram_dist/ConfirmOrder/components/PickupSelect/index.wxss

@@ -1,7 +1,22 @@
 .pickup-select-content .van-cell__value {
   flex: 3;
-  text-align: right;
 }
-.pickup-select-content .custom-title {
+.pickup-select-content .right {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+.pickup-select-content .right .custom-title {
+  max-width: 450rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  margin-left: 16rpx;
+}
+.pickup-select-content .right .custom-site {
+  max-width: 450rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
   margin-left: 16rpx;
 }

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,13 +75,11 @@ Component(
         if (val) {
           this.setData({selectedIndex: 0})
           this.fetchPrizeInfo()
-          this.reportData();
         }
       }
     },
     lifetimes: {
-      attached() {
-      },
+      attached() {},
       detached() {}
     },
     methods: {
@@ -152,21 +150,6 @@ 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/LotteryResult/LosingLottery/index.js

@@ -1,7 +1,6 @@
 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

@@ -36,24 +36,6 @@ Component(
           type: visible ? 'show_lottery_result' : 'hide_lottery_result'
         })
       },
-<<<<<<< HEAD
-      reportData() {
-        const data = {
-          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,
-          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',
@@ -69,7 +51,6 @@ Component(
       //   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,8 +7,7 @@ const computedBehavior = require('miniprogram-computed').behavior
  */
 const mapState = state => ({
   visible: state.merchantContactInfoVisible,
-  contactInfo: state.merchantContactInfo,
-  baseInfo: state.baseInfo
+  contactInfo: state.merchantContactInfo
 })
 Component(
   connect(mapState)({
@@ -22,16 +21,6 @@ Component(
         return String(data.contactInfo.is_qrcode) === '1'
       }
     },
-    observers: {
-      visible(val) {
-        if (val) {
-          this.reportData()
-        }
-      }
-    },
-    lifetimes: {
-      attached() {}
-    },
     methods: {
       onVisibleChange({detail: visible}) {
         this.store.dispatch({
@@ -45,22 +34,6 @@ 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,13 +1,12 @@
 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,
-  baseInfo: state.baseInfo
+  content: state.myLotteryContent
 })
 Component(
   connect(mapState)({
@@ -31,16 +30,9 @@ Component(
         return data.content === MY_LOTTERY_CONTENT_TYPE.ADDRESS_COLLECTION
       }
     },
-    observers: {
-      visible(val) {
-        if (val) {
-          this.reportData()
-        }
-      }
-    },
+    observers: {},
     lifetimes: {
-      attached() {
-      }
+      attached() {}
     },
     methods: {
       onVisibleChange({detail: visible}) {
@@ -54,22 +46,6 @@ 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/SharePoster/PosterDom/index.js

@@ -1,6 +1,7 @@
 import  objToPoster from '../createPoster/index'
 import { posterInfo } from '../libs/positionMap';
 import { TYPES,POSTER_CLS, } from '../libs/constant';
+import { sensorLog }  from "live-mp-tools";
 const computedBehavior = require('miniprogram-computed').behavior;
 const POSTER_WIDTH = 750;
 const POSTER_HEIGHT = 1344;
@@ -39,6 +40,14 @@ Component({
         showPopup:{
             type: Boolean,
             value: false 
+        },
+        sensorReportParams: {
+            type: Object,
+            value: () => {}
+        },
+        roomInfo: {
+            type: Object,
+            value: () => {} 
         }
     },
     observers: {
@@ -88,6 +97,7 @@ Component({
         posterItemData:{},
         posterStyle:"",
         defaultAvatarUrl: 'https://wechatavator-1252524126.cos.ap-shanghai.myqcloud.com/dasda.jpg',
+        longPressCount: 0
     },
     computed:{
         posterData(data) {
@@ -180,6 +190,31 @@ Component({
      * 组件的方法列表
      */
     methods: {
+        longPress() {
+            try{
+                let params = {
+                    page_id: 'e_alive#mini#first#alive_room',
+                    l_program: '鹅直播',
+                    page_name: '直播间页面',
+                    page_path: '鹅直播#小程序#首页#直播间页面',
+                    app_id: this.properties.roomInfo.appId,
+                    page_button: "长按保存海报",
+                    c_user_id: this.properties.roomInfo.userId,
+                    union_id:this.properties.roomInfo.unionId,
+                    resource_id: this.properties.roomInfo.aliveId,
+                    current_role:this.properties.sensorReportParams.current_role,
+                    type:this.properties.sensorReportParams.type,
+                    cmm1:this.properties.sensorReportParams.alive_type,
+                    cmm2:this.properties.sensorReportParams.version_type,
+                    comm2:this.properties.sensorReportParams.pay_type,
+                    cmm3:'鹅直播增长'
+                }
+                sensorLog.sensors.track('click_butt', params);         
+                console.log("当前长按了 保存图片" +  Number(++this.data.longPressCount) +"次",params);
+            }catch(e) {
+                console.log("埋点", e)
+            }
+        },
         getPosterData() {
             let temInfo = this.data.posterItemData;
             let defaultPoster = this.data.posterMapInfo[this.data.posterItemData.default_poster_mark];
@@ -311,7 +346,7 @@ Component({
                                 isSwitchBtnShow: isShow,
                                 isVisible: false
                             })
-                            that.triggerEvent('drawPosterFulfilled');
+                            that.triggerEvent('drawPosterFulfilled', that.imageUrl);
                         }
                     }else{
                         that.wxWriteFile(response,random)
@@ -365,7 +400,7 @@ Component({
                     this.setData({
                         isSwitchBtnShow:isShow
                     })
-                    this.triggerEvent('drawPosterFulfilled');
+                    this.triggerEvent('drawPosterFulfilled', this.data.imageUrl);
                 },
                 fail:(error)=>{
                     console.log(error);

package/miniprogram_dist/SharePoster/PosterDom/index.wxml

@@ -2,8 +2,8 @@
         <view>
         <canvas class="canvasPosition" wx-if="{{isVisible}}"  type="2d" style="height: 1344px; width:750px;"  id='customCanvas'></canvas>
         </view>
-        <view class="posterDetail {{isSinglePoster? 'single-poster': '' }}">
-                <image lazy-load="true" class="posterContent" src="{{imageUrl}}" show-menu-by-longpress="true" alt=""></image>
+        <view class="posterDetail">
+                <image lazy-load="true" class="posterContent" src="{{imageUrl}}" show-menu-by-longpress="true" alt="" bindlongpress="longPress"></image>
                 <view class="saveDes">
                     <image class="finger-print" src="../../common/assets/images/fingerprint.png"></image>
                     <view>长按上方图片保存并分享</view>

package/miniprogram_dist/SharePoster/PosterDom/index.wxss

@@ -7,15 +7,15 @@
   position: fixed;
   left: 50%;
   transform: translateX(-50%);
-  bottom: 470rpx;
+  bottom: 512rpx;
   display: flex;
   flex-direction: column;
 }
 .posterDetail .posterContent {
-  height: calc(100vh - 570rpx);
+  height: calc(100vh - 616rpx);
   border-radius: 16rpx;
   box-shadow: 0rpx 12rpx 20rpx 0rpx rgba(0, 0, 0, 0.08);
-  width: calc((100vh - 570rpx)*9/16);
+  width: calc((100vh - 616rpx)*9/16);
 }
 .posterDetail .saveDes .finger-print,
 .posterDetail .switch-motive-btn .finger-print,

package/miniprogram_dist/SharePoster/components/saveTip/index.js

@@ -0,0 +1,40 @@
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    firstContent: {
+      type: String,
+      value: ''
+    },
+    secondContent: {
+      type: String,
+      value: ''
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+  },
+
+  /**
+ * 生命周期函数--监听页面显示
+ */
+  ready: function () {
+    
+  },
+
+  /**
+   *  计算属性
+   */
+  computed: {
+   },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+  }
+})

package/miniprogram_dist/SharePoster/components/saveTip/index.json

@@ -0,0 +1,5 @@
+{
+  "component": true,
+  "usingComponents": {
+  }
+}

package/miniprogram_dist/SharePoster/components/saveTip/index.wxml

@@ -0,0 +1,6 @@
+<view class="setting-modal">
+    <view class="content-box">
+        <view class="first-line">{{firstContent}}</view>
+        <view class="second-line">{{secondContent}}</view>
+    </view>
+</view>

package/miniprogram_dist/SharePoster/components/saveTip/index.wxss

@@ -0,0 +1,21 @@
+.setting-modal {
+  position: fixed;
+  z-index: 999;
+  top: 0;
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.content-box {
+  background-color: rgba(0, 0, 0, 0.7);
+  padding: 24rpx 32rpx;
+  border-radius: 8rpx;
+  margin-bottom: 176rpx;
+  font-size: 28rpx;
+  font-weight: 400;
+  line-height: 40rpx;
+  color: #fff;
+  text-align: center;
+}

package/miniprogram_dist/SharePoster/components/settingModal/index.js

@@ -0,0 +1,38 @@
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+  },
+
+  /**
+ * 生命周期函数--监听页面显示
+ */
+  ready: function () {
+    
+  },
+
+  /**
+   *  计算属性
+   */
+  computed: {
+   },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    closeModal() {
+      this.triggerEvent('close')
+    },
+    confirm(){
+      this.triggerEvent('confirm')
+    }
+  }
+})

package/miniprogram_dist/SharePoster/components/settingModal/index.json

@@ -0,0 +1,5 @@
+{
+  "component": true,
+  "usingComponents": {
+  }
+}

package/miniprogram_dist/SharePoster/components/settingModal/index.wxml

@@ -0,0 +1,9 @@
+<view class="setting-modal" catchtap="closeModal">
+    <view class="content-box" catchtap>
+        <view class="content">无法访问相册，请前往设置允许鹅直播访问你的照片</view>
+        <view class="btn">
+            <view class="cancel" catchtap="closeModal">取消</view>
+            <view class="confirm" catchtap="confirm">去设置</view>
+        </view>
+    </view>
+</view>

package/miniprogram_dist/SharePoster/components/settingModal/index.wxss

@@ -0,0 +1,45 @@
+.setting-modal {
+  position: fixed;
+  z-index: 999;
+  top: 0;
+  width: 100vw;
+  height: 100vh;
+  background: rgba(0, 0, 0, 0.4);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.content-box {
+  background-color: #fff;
+  width: 576rpx;
+  border-radius: 16rpx;
+  margin-bottom: 176rpx;
+}
+.content-box .content {
+  padding: 48rpx;
+  font-size: 28rpx;
+  font-weight: 400;
+  line-height: 40rpx;
+  color: #000;
+  text-align: center;
+}
+.content-box .btn {
+  display: flex;
+}
+.content-box .btn .cancel,
+.content-box .btn .confirm {
+  flex: 1;
+  height: 96rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #999;
+  font-weight: 500;
+}
+.content-box .btn .cancel {
+  box-shadow: inset 0 0.1rpx 0 0 #ebebeb;
+}
+.content-box .btn .confirm {
+  color: #1472FF;
+  box-shadow: inset 0 0.1rpx 0 0 #ebebeb, inset 0.1rpx 0 0 0 #ebebeb;
+}

package/miniprogram_dist/SharePoster/components/shareCircleTip/index.js

@@ -0,0 +1,35 @@
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+  },
+
+  /**
+ * 生命周期函数--监听页面显示
+ */
+  ready: function () {
+    
+  },
+
+  /**
+   *  计算属性
+   */
+  computed: {
+   },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    closeModal() {
+      this.triggerEvent('close')
+    }
+  }
+})

package/miniprogram_dist/SharePoster/components/shareCircleTip/index.json

@@ -0,0 +1,5 @@
+{
+  "component": true,
+  "usingComponents": {
+  }
+}

package/miniprogram_dist/SharePoster/components/shareCircleTip/index.wxml

@@ -0,0 +1,5 @@
+<view class="setting-modal" catchtap="closeModal">
+    <view class="instructor">
+        点击屏幕右上角「…」将直播间分享到朋友圈
+    </view>
+</view>

package/miniprogram_dist/SharePoster/components/shareCircleTip/index.wxss

@@ -0,0 +1,35 @@
+.setting-modal {
+  position: fixed;
+  z-index: 999;
+  top: 0;
+  width: 100vw;
+  height: 100vh;
+  background: rgba(0, 0, 0, 0.4);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.instructor {
+  position: absolute;
+  top: 16rpx;
+  color: #fff;
+  border-radius: 8rpx;
+  background-color: #1472FF;
+  padding: 24rpx 32rpx;
+  font-size: 28rpx;
+  font-weight: 400;
+  line-height: 44rpx;
+  box-shadow: 0 -4rpx 80rpx 0 rgba(51, 51, 51, 0.2);
+}
+.instructor:after {
+  content: '';
+  position: absolute;
+  top: -30rpx;
+  right: 60rpx;
+  border: 16rpx solid #1472FF;
+  border-color: transparent;
+  border-bottom-color: #1472FF;
+}
+.instructor .share-tip {
+  width: 624rpx;
+}