Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents 0c80e5ee 22b9a14d
Showing 2 changed files with 8 additions and 4 deletions
packageB/pages/luckactivity/luckinfo/luckinfo.js
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
@@ -351,6 +351,12 @@ Page({
 								luckInfo: res.data.data,
 							});
 							WxParse.wxParse('content', 'html', self.data.luckInfo.remark, self);
+							
+							// 如果is_share为1,隐藏发送给朋友和分享到朋友圈功能
+							if(!self.data.luckInfo.is_share) {
+								wx.hideShareMenu();
+							};
+							
 						} else {
 							wx.showToast({
 								title: res.data.msg,
@@ -124,7 +124,7 @@
 </view>
 <!-- 分享按钮 -->
-<view class="circle-container zhuanfa" bindtap="showPoster"><text class="iconfont icon-zhuanfa1"></text></view>
+<view class="circle-container zhuanfa" bindtap="showPoster" wx:if="{{!luckInfo.is_share}}"><text class="iconfont icon-zhuanfa1"></text></view>
 <!-- 悬浮按钮 -->
 <view class="circle-container gift {{((record && record.length != 0) || isActive) ? 'active':''}}" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
@@ -199,10 +199,8 @@
 <!-- 遮罩层 -->
 <view class="mask" wx:if="{{showMask}}"></view>
-<!-- 遮罩层2 -->
-<!-- <cover-view class="mask2"></cover-view> -->
 <qrcode id="qrcode" bind:close="closeQr"></qrcode>
-<painter style="position: absolute;" palette="{{imgDraw}}" bind:imgOK="onImgOK"/>
 \ No newline at end of file
+<painter style="position: absolute;left: -9999rpx;" palette="{{imgDraw}}" bind:imgOK="onImgOK"/>
 \ No newline at end of file