xiaoe_mp_npm 0.2.2-t220110 → 0.2.2

package/miniprogram_dist/Lottery/components/LotteryResult/LosingLottery/index.wxml

@@ -6,12 +6,11 @@
   <image class="losing-icon" mode="widthFix" src="{{remotePic.losing_lottery}}" />
   <view class="check-winners">
     <block wx:if="{{resultInfo.prize_activity_num}}">
-      <text>共{{resultInfo.prize_activity_num}}人参与，</text>
+      <text wx:if="{{isShowParticipant}}">共{{resultInfo.prize_activity_num}}人参与，</text>
       <view class="inner" bind:tap="checkWinners">
-        <text>查看中奖名单</text>
-        <image class="right-arrow-icon" src="../../../../common/assets/images/lottery/black-right-arrow.png" />
+        <text class="inner-under-line">查看中奖名单</text>
       </view>
     </block>
-    <text wx:else>本场抽奖无人参与</text>
+    <text wx:else>本次抽奖无人中奖</text>
   </view>
 </view>

package/miniprogram_dist/Lottery/components/LotteryResult/LosingLottery/index.wxss

@@ -38,6 +38,10 @@
   display: inline-flex;
   align-items: center;
 }
+.losing-lottery .check-winners .inner .inner-under-line {
+  text-decoration: underline;
+  color: #2d8cf0;
+}
 .losing-lottery .check-winners .inner .right-arrow-icon {
   width: 40rpx;
   height: 40rpx;

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

@@ -13,7 +13,8 @@ const computedBehavior = require('miniprogram-computed').behavior
 const mapState = state => ({
   baseInfo: state.baseInfo,
   lotteryStatus: state.lotteryStatus,
-  participationCondition: state.participationCondition
+  participationCondition: state.participationCondition,
+  isShowParticipant: state.isShowParticipant
 })
 Component(
   connect(mapState)({

package/miniprogram_dist/Lottery/components/LotteryResult/WinLottery/index.wxml

@@ -2,13 +2,13 @@
   <image class="title" src="{{remotePic.winner_background_new_title}}" />
   <view class="check-winners">
     <block wx:if="{{resultInfo.prize_activity_num}}">
-      <text>共{{resultInfo.prize_activity_num}}人参与，</text>
+      <text wx:if="{{isShowParticipant}}">共{{resultInfo.prize_activity_num}}人参与，</text>
       <view class="inner" bind:tap="checkWinners">
         <text>查看中奖名单</text>
         <image class="right-arrow-icon" src="../../../../common/assets/images/lottery/white_right_arrow.png" />
       </view>
     </block>
-    <text wx:else>本场抽奖无人参与</text>
+    <text wx:else>本次抽奖无人中奖</text>
   </view>
   <view class="prize-card-box">
     <prize-card prize="{{resultInfo.win_product_info}}"></prize-card>

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,21 @@ Component(
           type: visible ? 'show_lottery_result' : 'hide_lottery_result'
         })
       },
-      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)
-      }
+      // 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)
+      // }
     }
   })
 )

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

@@ -3,7 +3,7 @@
     <text class="title">奖品领取方式</text>
     <text class="prompt">请通过以下方式联系兑奖</text>
     <view wx:if="{{hasQrcode}}" class="qrcode-box {{hasWxNumber ? '' : 'swell'}}">
-      <image class="qrcode" mode="widthFix" src="{{contactInfo.qrcode}}" />
+      <image class="qrcode" mode="widthFix" src="{{contactInfo.qrcode}}" show-menu-by-longpress />
       <text class="qrcode-prompt">长按识别二维码，或保存图片</text>
     </view>
     <block wx:if="{{hasWxNumber}}">

package/miniprogram_dist/Lottery/components/NobodyAttend/index.wxml

@@ -2,7 +2,7 @@
   <view class="nobody-attend">
     <view class="title-box">
       <image class="title" src="{{remotePic.losing_lottery_title}}" />
-      <view class="desc">本场抽奖无人参与</view>
+      <view class="desc">本次抽奖无人中奖</view>
     </view>
     <view class="icon-box">
       <image class="losing-icon" mode="widthFix" src="{{remotePic.losing_lottery}}" />

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

@@ -10,7 +10,9 @@ const mapState = state => ({
   prizeId: state.currentPrizeId,
   backTo: state.winnersBackTo,
   myLotteryVisible: state.myLotteryVisible,
-  myLotteryContent: state.myLotteryContent
+  myLotteryContent: state.myLotteryContent,
+  isShowParticipant: state.isShowParticipant
+
 })
 Component(
   connect(mapState)({

package/miniprogram_dist/Lottery/components/Winners/index.wxml

@@ -14,7 +14,8 @@
   <view class="winner-number">
     <image class="emoji-icon" src="../../../common/assets/images/lottery/winner_list_smile_icon.svg" />
     <view class="message-box">
-      <text class="message">共{{winnersInfo.prize_activity_num}}人参与，{{winnersInfo.count}}人中奖</text>
+      <text class="message" wx:if="{{isShowParticipant}}">共{{winnersInfo.prize_activity_num}}人参与，</text>
+      <text class="message">{{winnersInfo.count}}人中奖</text>
     </view>
   </view>
   <scroll-view scroll-y="true" style="height: calc(100% - 198rpx);">

package/miniprogram_dist/Lottery/constants.js

@@ -114,5 +114,6 @@ export const ACTION_TYPE = {
   SET_ADDRESS_QUERY: 'set_address_query',
   SET_ADDRESS_INFO: 'set_address_info',
   SET_ADDRESS_SUBMIT_CALLBACK: 'set_address_submit_callback',
-  SET_PARTICIPATION_CONDITION: 'set_participation_condition'
+  SET_PARTICIPATION_CONDITION: 'set_participation_condition',
+  IS_SHOW_PARTICIPANT: 'is_show_participant'
 }

package/miniprogram_dist/Lottery/store/reducer.js

@@ -182,6 +182,12 @@ export default function reducer(state, action) {
         participationCondition: action.payload
       }
 
+    case ACTION_TYPE.IS_SHOW_PARTICIPANT:
+      return {
+        ...state,
+        isShowParticipant: action.payload
+      }
+
     default:
       return state
   }

package/miniprogram_dist/Lottery/utils.js

@@ -62,3 +62,7 @@ export function delay(duration = 0) {
     }, duration)
   })
 }
+
+export function hasKey(obj) {
+  return obj && Object.keys(obj).length > 0
+}

package/miniprogram_dist/PayModule/index/index.js

@@ -198,6 +198,7 @@ Component({
                     that.queryOrderState({
                         order_id: that.data.payResult.order_id,
                         // front_callback: JSON.stringify(res || {}),
+                        app_id: that.properties.aliveInfo.app_id,
                         front_callback: '{}', 
                     }).then((data) => {
                         that.resolvePayResult(data.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;
+}

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

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

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

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

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

@@ -0,0 +1,11 @@
+<view class="setting-modal" catchtap="closeModal">
+    <view class="main-box">
+        <view class="content-box" catchtap>
+            <view class="title">无法保存</view>
+            <view class="content">请在iPhone的“设置-隐私-照片”选项中，允许微信访问你的照片。</view>
+        </view>
+        <view class="btn">
+            <view class="cancel" catchtap="closeModal">好</view>
+        </view>
+    </view>
+</view>