Merge branch 'qa' into 'master'

Qa See merge request !758

Merge branch 'qa' into 'master'
Qa See merge request !758
后端研发-苏明海
2 parents 7d916781 a22589e2
Showing 4 changed files with 17 additions and 12 deletions
packageB/pages/luckactivity/luckinfo/luckinfo.js
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
packageB/pages/user/choice_guide/choice_guide.js
pages/index/index/index.js
@@ -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
 var a = getApp(),
   os = a.globalData.setting,
-  util = require("../../../utils/util.js"),
+  util = require("../../../../utils/util.js"),
   ut = util;
 Page({
   data: {
@@ -28,7 +28,6 @@ Page({
   onShareAppMessage: function(t) {
 	  return o.share;
   },
-
   get_list: function() {
     var th = this, e = th;
     var r_data={
@@ -1010,12 +1010,14 @@ Page({
   check_holiday_pop:function(){
 	  var th=this;
 	  getApp().waitfor2(th,'w_holiday_pop','holiday_image',function(){
-		    console.log(th.data.holiday_image);
-			th.setData({			
-			  new_image: th.data.holiday_image,
-			  new_nav: th.data.holiday_url,
-			  is_disgraceful: 1
-			})
+         //等到结果才显示
+         if(th.data.holiday_image){
+           th.setData({
+               new_image: th.data.holiday_image,
+               new_nav: th.data.holiday_url,
+               is_disgraceful: 1
+           })
+        }
 	  })
   },