wxd / MShopWeApp

Commit a22589e2c23bfd24e417825fcf1ab3281f10e1e1

Authored by 后端研发-苏明海
2 parents bd52e0f2 9d29e4f2

Merge branch 'test' into 'qa' 

Test

See merge request !757
Inline Side-by-side
Showing 4 changed files with 17 additions and 12 deletions
packageB/pages/luckactivity/luckinfo/luckinfo.js
  View file @a22589e
... ... @@ -351,6 +351,12 @@ Page({
351 351 luckInfo: res.data.data,
352 352 });
353 353 WxParse.wxParse('content', 'html', self.data.luckInfo.remark, self);
  354 +
  355 + // 如果is_share为1,隐藏发送给朋友和分享到朋友圈功能
  356 + if(!self.data.luckInfo.is_share) {
  357 + wx.hideShareMenu();
  358 + };
  359 +
354 360 } else {
355 361 wx.showToast({
356 362 title: res.data.msg,
... ...
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
  View file @a22589e
... ... @@ -124,7 +124,7 @@
124 124 </view>
125 125  
126 126 <!-- 分享按钮 -->
127   -<view class="circle-container zhuanfa" bindtap="showPoster"><text class="iconfont icon-zhuanfa1"></text></view>
  127 +<view class="circle-container zhuanfa" bindtap="showPoster" wx:if="{{!luckInfo.is_share}}"><text class="iconfont icon-zhuanfa1"></text></view>
128 128  
129 129 <!-- 悬浮按钮 -->
130 130 <view class="circle-container gift {{((record && record.length != 0) || isActive) ? 'active':''}}" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
... ... @@ -199,10 +199,8 @@
199 199 <!-- 遮罩层 -->
200 200 <view class="mask" wx:if="{{showMask}}"></view>
201 201  
202   -<!-- 遮罩层2 -->
203   -<!-- <cover-view class="mask2"></cover-view> -->
204 202  
205 203 <qrcode id="qrcode" bind:close="closeQr"></qrcode>
206 204  
207 205  
208   -<painter style="position: absolute;" palette="{{imgDraw}}" bind:imgOK="onImgOK"/>
209 206 \ No newline at end of file
  207 +<painter style="position: absolute;left: -9999rpx;" palette="{{imgDraw}}" bind:imgOK="onImgOK"/>
210 208 \ No newline at end of file
... ...
packageB/pages/user/choice_guide/choice_guide.js
  View file @a22589e
1 1 var a = getApp(),
2 2 os = a.globalData.setting,
3   - util = require("../../../utils/util.js"),
  3 + util = require("../../../../utils/util.js"),
4 4 ut = util;
5 5 Page({
6 6 data: {
... ... @@ -28,7 +28,6 @@ Page({
28 28 onShareAppMessage: function(t) {
29 29 return o.share;
30 30 },
31   -
32 31 get_list: function() {
33 32 var th = this, e = th;
34 33 var r_data={
... ...
pages/index/index/index.js
  View file @a22589e
... ... @@ -1010,12 +1010,14 @@ Page({
1010 1010 check_holiday_pop:function(){
1011 1011 var th=this;
1012 1012 getApp().waitfor2(th,'w_holiday_pop','holiday_image',function(){
1013   - console.log(th.data.holiday_image);
1014   - th.setData({
1015   - new_image: th.data.holiday_image,
1016   - new_nav: th.data.holiday_url,
1017   - is_disgraceful: 1
1018   - })
  1013 + //等到结果才显示
  1014 + if(th.data.holiday_image){
  1015 + th.setData({
  1016 + new_image: th.data.holiday_image,
  1017 + new_nav: th.data.holiday_url,
  1018 + is_disgraceful: 1
  1019 + })
  1020 + }
1019 1021 })
1020 1022 },
1021 1023  
... ...