xiaoe_mp_npm 0.2.1 → 0.2.2-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaoe_mp_npm",
-  "version": "0.2.1",
+  "version": "0.2.2-beta1",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "scripts": {

package/src/AliveInvite/LiveRoomVertical/index.less

@@ -8,7 +8,7 @@
     border-radius: 16px 16px 0 0;
 }
 .scrollViewHeight{
-    height:calc(100vh - 704rpx);
+    height:calc(100vh - 636rpx);
 }
 .scrollViewDefaultHeight{
     height:calc(100vh - 596rpx);

package/src/AliveInvite/LiveRoomVertical/index.wxss

@@ -8,7 +8,7 @@
   border-radius: 16px 16px 0 0;
 }
 .scrollViewHeight {
-  height: calc(100vh - 704rpx);
+  height: calc(100vh - 636rpx);
 }
 .scrollViewDefaultHeight {
   height: calc(100vh - 596rpx);

package/src/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/AliveInvite/LiveRoomVertical/components/friends/friends.js

@@ -1,145 +0,0 @@
-// import room from '@/api/room';
-import base64 from '../../libs/base64'
-import {
-    getInviteDetail
-} from "../../../../common/api/eLiveInvite";
-Component({
-    properties: {
-        // inviteParm: {
-        //     type: String,
-        //     value: ''
-        // },
-        // roomInfo: {
-        //     type: Object,
-        //     value: {}
-        // },
-        switchToControlDialogVisible:{
-            type: Boolean,
-            value:false
-        },
-        aliveId:{
-            type: String,
-            value: ''
-        },
-        appId: {
-            type: String,
-            value: ''
-        },
-        userId: {
-            type: String,
-            value: ''
-        },
-        isPackUp:{
-            type:Boolean,
-            value:false,
-        }
-    },
-    data: {
-        isShowFriends: false,
-        count: 0, // 邀请的好友数
-        inviteParm:'',
-        friendList: [
-            // {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'wendy'
-            // }, {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira1'
-            // }, {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira2'
-            // }
-            // , {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira333333'
-            // }
-            // , {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira4'
-            // }
-            // , {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira5'
-            // }
-            // , {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira6'
-            // }
-
-        ] //邀请的好友列表
-    },
-    observers: {
-        switchToControlDialogVisible(val) {
-            if(val){
-                this.showFriends()
-            }
-        //   this.setData({
-        //     isShowFriends:val
-        //   })
-        //   this.getFriendsList()
-        },
-      },
-    ready() {
-    },
-    methods: {
-        closeFriends() {
-            this.setData({
-                isShowFriends: false
-            })
-        },
-        showFriends() {
-            this.setData({
-                isShowFriends: true
-            })
-            this.getFriendsList()
-        },
-        generateBase64(paymentType, resourceType, resourceId, productId) {
-            const params = {
-              payment_type: paymentType,
-              resource_type: resourceType,
-              resource_id: resourceId,
-              product_id: productId,
-            }
-            return base64.encode(JSON.stringify(params))
-        },
-        getFriendsList() {
-            // let params = {
-            //     "bizData": {
-            //         "inviteParm": this.data.inviteParm,
-            //         "page": 0,
-            //         "count": 10,
-            //     },
-            //     "user_id": this.properties.userId,
-            //     "app_id": this.properties.appId
-            // };
-            let inviteParams = this.generateBase64(2, 4, this.properties.aliveId, '')
-            let params = {
-                "bizData": {
-                    "inviteParm": inviteParams,
-                    "page": 0,
-                    "count": 10,
-                },
-                "user_id": this.properties.userId,
-                "app_id": this.properties.appId
-            };
-            getInviteDetail(params).then(res => {
-                let DATA = res.data;
-                if (DATA.code === 0) {
-                    this.setData({
-                        friendList: DATA.data
-                    })
-                } else {
-                    wx.showToast({
-                        title: DATA.msg,
-                        icon: 'error'
-                    })
-                }
-            }).catch(err => {
-                wx.showToast({
-                    title: err.data.msg,
-                    icon: 'error'
-                })
-            });
-        },
-    }
-})

package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.json

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

package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.wxml

@@ -1,23 +0,0 @@
-<view class="{{isPackUp?'viewAreaPackUp':'viewUnPackUp'}} container-friends" wx:if="{{isShowFriends}}">
-  <van-popup show="{{ isShowFriends }}" bind:close="onClose" position="bottom" custom-class="container-friends">
-    <view bindtap="closeFriends" class="header">
-      <image
-        class="icon-left-back"
-        src="../../../images/icon_arrow_up.png"
-      />
-      <view class="count-style">邀请的好友{{'('+friendList.length+')'}}</view>
-    </view>
-    <view class="friend-list">
-      <view
-        class="friend-item"
-        wx:for="{{friendList}}"
-      >
-        <image wx:if="{{item.wx_avatar}}" class="img-avatar" src="{{item.wx_avatar}}" />
-        <image wx:else class="img-avatar" src="//wechatavator-1252524126.cos.ap-shanghai.myqcloud.com/aaa/default.svg" />
-        <view class="name">
-          {{ item.wx_nickname }}
-        </view>
-      </view>
-    </view>
-  </van-popup>
-</view>

package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.wxss

@@ -1,90 +0,0 @@
-@keyframes popping {
-  from {
-    transform: translateY(11.2rpx);
-    opacity: 0.5;
-  }
-  to {
-    transform: translateY(0);
-    opacity: 1;
-  }
-}
-.container-friends {
-  animation: popping ease 300ms;
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  width: 750rpx;
-  height: calc(100vh - 494rpx);
-  background-color: #fff !important;
-  background: url("https://wechatapppro-1252524126.cos.ap-shanghai.myqcloud.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
-  background-size: contain;
-  background-repeat: no-repeat;
-  border-radius: 16rpx 16rpx 0 0;
-}
-.viewAreaPackUp {
-  height: calc(100vh - 160rpx);
-}
-.viewUnPackUp {
-  height: calc(100vh - 494rpx);
-}
-.header {
-  height: 146rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-family: PingFangSC-Medium;
-  font-size: 36rpx;
-  color: #333333;
-  text-align: center;
-}
-/* .count-style {
-  position: absolute;
-  left: 65%;
-} */
-.icon-left-back {
-  position: absolute;
-  left: 20rpx;
-  transform: rotate(270deg);
-  width: 45rpx;
-  height: 45rpx;
-}
-.detail {
-  padding: 32rpx;
-}
-.friend-list {
-  height: calc(100vh - 700rpx);
-  /* flex: 1; */
-  overflow: scroll;
-  /* display: flex; */
-  /* flex-wrap: wrap; */
-  /* flex-direction: row; */
-  padding: 0 16rpx;
-}
-.friend-item {
-  display: inline-block;
-  text-align: center;
-  width: 96rpx;
-  height: 152rpx;
-  margin: 0 20rpx 32rpx 20rpx;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-}
-.img-avatar {
-  width: 96rpx;
-  height: 96rpx;
-  border-radius: 100%;
-}
-.name {
-  margin-top: 12rpx;
-  width: 96rpx;
-  font-family: PingFangSC-Medium;
-  font-size: 24rpx;
-  color: #333333;
-  text-align: center;
-  /* margin-left: 20px; */
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}

package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/invite-poster/invite-poster.js

@@ -1,227 +0,0 @@
-// associate/alive_pusher/components/invite-poster2/invite-poster2.js
-// import { Current } from "@tarojs/taro";
-// let app = Current.app;
-// import EventBus from '../../../libs/alive_pusher/eventBus/EventBus';
-// import untils from '../../../libs/alive_pusher/user_acction';
-// import store from "@/store";
-// import { GET_ALIVE_INVITE_IMAGE, GET_SHORT_SHARE_URL } from "../../../libs/alive_pusher/constant/api/live";
-import { BASE_URL, ENV_NAME } from "../../../../common/libs/playerRequestUrl";
-// import Taro from '@tarojs/taro';
-// import api from '@/api/index';
-import {
-    getShareUrl
-} from "../../../../common/api/eLiveInvite";
-Component({
-    /**
-     * 组件的属性列表
-     */
-    properties: {
-        alive_id: {
-            type: String,
-            value: ""
-        },
-        alive_mode: {
-            type: Number,
-            value: 0
-        },
-        userId: {
-            type: String
-        },
-        appId: {
-            type: String
-        }
-    },
-
-    /**
-     * 组件的初始数据
-     */
-    data: {
-        user_handle: {
-            index: 1, //海报选择
-            pic_url: '', // 海报图片
-            base_pic_url: ''
-        },
-        poster_list: [
-            '/assets/alive_pusher/poster1.png',
-            '/assets/alive_pusher/poster2.png',
-            '/assets/alive_pusher/poster3.png',
-        ],
-    },
-    error_report_image: '', //数据上报图片url
-
-    /**
-     * 组件生命周期函数，在组件布局完成后执行，此时可以获取节点信息（使用 SelectorQuery ）
-     */
-    ready() {
-        // 海报相关 TODOlist FIXME 
-        // let picUrl = BASE_URL +
-        //     '_alive/client/get_alive_invite_image' + '?' +
-        //     `app_id=${this.properties.appId}&` +
-        //     `user_id=${this.properties.userId}&` +
-        //     `alive_id=${this.properties.alive_id}&` +
-        //     `wx_nickname=${store.state.GlobalModule.userInfo.nickname}&` +
-        //     `wx_avatar=${store.state.GlobalModule.userInfo.headimgurl}&` +
-        //     `token=${store.state.GlobalModule.baseInfo.token}&` +
-        //     'type='
-        // this.setData({
-        //     ['user_handle.base_pic_url']: picUrl,
-        //     ['user_handle.pic_url']: picUrl + '1'
-        // });
-        //TODO 上报数据
-        // this.reportData('click_inviteinalive');
-    },
-    /**
-     * 组件的方法列表
-     */
-    methods: {
-        // 图片加载完成
-        picShow() {
-            wx.hideLoading();
-            this.setData({
-                hasClick: false
-            });
-        },
-        // 图片加载失败
-        picError() {
-            wx.hideLoading();
-        },
-        //关闭直播邀请海报
-        closeInvite() {
-            this.setData({
-                error_report_image: '', //数据上报图片url: ''
-            }),
-                console.log('close====mo-0000-----')
-            this.triggerEvent("changeShowInvite", { showInvite: false });
-        },
-        //切换海报样式
-        switchIndex(e) {
-            if (Number(e.currentTarget.dataset['index']) + 1 == this.data.user_handle.index) {
-                return
-            } else {
-                this.setData({
-                    hasClick: false
-                })
-            }
-            if (this.data.hasClick) return;
-            this.setData({
-                hasClick: true
-            });
-            wx.showLoading({
-                title: '加载中', //提示的内容,
-                mask: true, //显示透明蒙层，防止触摸穿透
-            });
-            console.warn('base ====>', this.data)
-            let url = this.data.user_handle.base_pic_url + `${Number(e.currentTarget.dataset['index']) + 1}`;
-            this.setData({
-                ['user_handle.index']: Number(e.currentTarget.dataset['index']) + 1,
-                ['user_handle.pic_url']: url
-            });
-        },
-
-        // 保存到本地相册 TODO FIXME eventBus 的替代使用
-        // keepPic() {
-        //     let that = this;
-        //     EventBus.$on('cancelKeep', that, function (res) {
-        //         if (!res) {
-        //             wx.showToast({
-        //                 title: '请前往设置页面点击邀请好友开启授权', //提示的内容,
-        //                 icon: 'none', //图标,
-        //                 duration: 2000, //延迟时间
-        //             });
-        //         }
-        //     })
-        //     untils.keepImg(this.data.user_handle.pic_url);
-        // },
-        //数据上报 TODO FIXME 找到app的替代
-        // reportData(type) {
-        //     const params = {
-        //         app_id: app.networkData.SHOP_APP_ID,
-        //         user_id: app.networkData.B_USER_ID,
-        //     };
-        //     // TODO开发暂时屏蔽数据埋点
-        //     // app.mtj.trackEvent(type, params);
-        // },
-        // 复制直播间链接
-        handleCopyLink() {
-            // const LIVE_BASE_URL = `https://${this.properties.appId}.h5${ENV_NAME ? `.${ENV_NAME}` : '' }.xiaoeknow.com/v2/course/alive/`;
-            // const shareUrl = `${LIVE_BASE_URL}${this.properties.alive_id}?app_id=${this.properties.appId}&alive_mode=1&pro_id=&type=2&share_user_id=${this.properties.userId}`;
-            const LIVE_BASE_URL = `https://appmzd7lhrj6214.h5${ENV_NAME ? `.${ENV_NAME}` : '' }.xiaoeknow.com/v2/course/alive/`;
-            const shareUrl = `${LIVE_BASE_URL}l_61935f8260b219ba0025f301?app_id=appmzd7lhrj6214&alive_mode=1&pro_id=&type=2&share_user_id=u_6119db8f279b3_BLLGPeghc5`;
-
-            this.getClipboardData(shareUrl);
-        },
-        getClipboardData(shareUrl) {
-            const that = this;
-            // let params = {
-            //     alive_id: this.properties.alive_id,
-            //     alive_mode: 1,
-            //     app_id: this.properties.appId,
-            //     query: shareUrl
-            // }
-            let params = {
-                alive_id: "l_61935f8260b219ba0025f301",
-                alive_mode: 1,
-                app_id: "appmzd7lhrj6214",
-                query: shareUrl
-            }
-            getShareUrl(params).then((res) => {
-                console.log("debug 复制分享链接的url", res.data);
-                wx.setClipboardData({
-                    data: decodeURIComponent(res.data.data.url_link),
-                    success: res => {
-                        wx.getClipboardData({
-                            success(res) {
-                                console.log("debug share url", res.data);
-                                wx.showToast({
-                                    title: "复制链接成功",
-                                    icon: "success",
-                                    duration: 2000,
-                                });
-                                that.closeInvite();
-                            }
-                        })
-                    },
-                    fail: () => {
-                        wx.showToast({
-                            title: '复制失败',
-                            icon: 'none'
-                        })
-                    }
-                })
-            }, reason => {
-                wx.showToast({
-                  title: '复制失败',
-                  icon: 'none'
-                })
-                console.error(reason); // 出错了！
-            })
-
-        },
-        handleLoadImage() {
-            wx.hideLoading()
-        },
-        toShare() {
-            const LIVE_BASE_URL = `https://${this.properties.appId}.h5${ENV_NAME ? `.${ENV_NAME}` : '' }.xiaoeknow.com/v2/course/alive/`;
-            let shareUrl = `${LIVE_BASE_URL}${this.properties.alive_id}?app_id=${this.properties.appId}&alive_mode=1&pro_id=&type=2`
-            let that = this;
-            let webViewUrl = "/pages/webView/webView";
-            //TODO FIX ME TARO改为原生的分享
-            // Taro.Current.page.onShareAppMessage = function (res) {
-            //     // 跳转
-            //     let params = {
-            //         pageUrl: shareUrl,
-            //         alive_id: that.properties.alive_id,
-            //     };
-            //     let totalParams = encodeURIComponent(JSON.stringify(params));
-            //     return {
-            //         title: 'Custom Title',
-            //         path: `${webViewUrl}?params=${totalParams}`,
-            //         // imageUrl: that.detailMsg.img_url,
-            //     };
-            // };
-        },
-
-    }
-})
-
-

package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/invite-poster/invite-poster.json

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

package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/invite-poster/invite-poster.wxml

@@ -1,64 +0,0 @@
-<!--associate/alive_pusher/components/invite-poster2/invite-poster2.wxml-->
-<view class="poster">
-	<view class="mask-layer" bindtap="closeInvite"></view>
-	<view class="poster-wrap">
-		<view class="poster-header">
-			<view class="header-text">分享给</view>
-			<view bindtap="closeInvite" class="close-icon-view">
-				<image src="../../../images/liveClose.png" class="poster-header_icon" catchtap="closeInvite"/>
-			</view>
-		</view>
-		<!-- <view class="poster-content" hidden="{{true}}">
-			<image src="{{user_handle.pic_url}}" class="poster-content_image" bindload="handleLoadImage" binderror="picError"/>
-		</view>
-		<view class="poster-list" hidden="{{true}}">
-			<scroll-view scroll-x="{{true}}" bindscroll="scroll" class="scroll-view">
-				<image class="poster-item {{user_handle.index===index+1?'active-poster':''}}" wx:for="{{poster_list}}" src="{{item}}" catchtap="switchIndex" data-index="{{index}}"/>
-			</scroll-view>
-			<view class="poster-list_mask"></view>
-		</view> -->
-		<view class="poster-bottom" >
-			<view class="bottom-item">
-        <button open-type="share" class="share-btn">
-          <image src="../../../images/wechat.png" class="bottom-item_img"/>
-        </button>
-				<view class="bottom-item-text">分享给好友</view>
-			</view>
-			<view class="bottom-item" catchtap="handleCopyLink">
-				<image src="../../../images/copylink.png" class="bottom-item_img"/>
-				<view class="bottom-item-text" catchtap="handleCopyLink">复制链接</view>
-			</view>
-		</view>
-    <!-- <view class="cancel-btn" catchtap="closeInvite">取消</view>
-    <view class="blank-view"></view> -->
-	</view>
-	<!-- <view class="poster-top">
-		<view class="poster-pic">
-			<image class="poster_image" src="{{user_handle.pic_url}}" bindload="picShow" binderror="picError"></image>
-		</view>
-		<view class="poster-pic_icon" catchtap="closeInvite">
-			<image class="poster-pic_image" src="/assets/alive_pusher/close.png"></image>
-		</view>
-	</view>
-	<view class="poster-bottom">
-		<view class="poster_tips">保存邀请海报发送给好友</view>
-		<view class="poster-container">
-			<view class="poster_keep" catchtap="keepPic">
-				<image class="poster_keep-image" src="/assets/alive_pusher/download.png"></image>
-				<view class="poster_keep-text">保存到相册</view>
-			</view>
-			<view class="poster-list">
-				<view class="poster-item {{user_handle.index==1?'indexset':''}}" catchtap="switchIndex" data-index="1">
-					<image class="poster_image" src="/assets/alive_pusher/poster1.png"></image>
-				</view>
-				<view class="poster-item {{user_handle.index==2?'indexset':''}}" catchtap="switchIndex" data-index="2">
-					<image class="poster_image" src="/assets/alive_pusher/poster2.png"></image>
-				</view>
-				<view class="poster-item {{user_handle.index==3?'indexset':''}}" catchtap="switchIndex" data-index="3">
-					<image class="poster_image" src="/assets/alive_pusher/poster3.png"></image>
-				</view>
-			</view>
-		</view>
-	</view> -->
-</view>
-