Commit d4244aaec9cc8da085dc50b198639a1cc44b8744
1 parent
a2309cb9
1、 直播间
2、预售 幸运购 3、普通,秒杀 团购 积分 拼团 4、专享礼包 月包
Showing
19 changed files
with
33 additions
and
30 deletions
packageA/pages/liveStream/liveStream.js
@@ -283,7 +283,7 @@ Page({ | @@ -283,7 +283,7 @@ Page({ | ||
283 | */ | 283 | */ |
284 | onShow: function () { | 284 | onShow: function () { |
285 | 285 | ||
286 | - getApp().check_can_share(); | 286 | + getApp().check_can_share(this); |
287 | if (app.globalData.userInfo) { | 287 | if (app.globalData.userInfo) { |
288 | if (!this.data.isLogin) { | 288 | if (!this.data.isLogin) { |
289 | this.setData({ | 289 | this.setData({ |
packageA/pages/liveStream/liveStream.wxml
@@ -84,7 +84,7 @@ | @@ -84,7 +84,7 @@ | ||
84 | 84 | ||
85 | {{item['anchor_name']}}</view> | 85 | {{item['anchor_name']}}</view> |
86 | </view> | 86 | </view> |
87 | - <view style="width: 30%;height: 90rpx;align-items: center;justify-items: center;"> | 87 | + <view wx:if="{{isLogin}}" style="width: 30%;height: 90rpx;align-items: center;justify-items: center;"> |
88 | <view bindtap="clickShare" data-sharimg="{{item.share_img}}" data-shartitle="{{item.name}}" data-anchorname="{{item['anchor_name']}}" class="display: flex;" style="width: 70%;border-radius: 25rpx;border: 1rpx solid #fc6247;height: 46rpx;margin-top: 25rpx;margin-left: 30rpx;"> | 88 | <view bindtap="clickShare" data-sharimg="{{item.share_img}}" data-shartitle="{{item.name}}" data-anchorname="{{item['anchor_name']}}" class="display: flex;" style="width: 70%;border-radius: 25rpx;border: 1rpx solid #fc6247;height: 46rpx;margin-top: 25rpx;margin-left: 30rpx;"> |
89 | <view class="share-image"></view> | 89 | <view class="share-image"></view> |
90 | <view class="fs26" style="color: #fc6247;margin-left: 10rpx;line-height: 46rpx;"> 分享 </view> | 90 | <view class="fs26" style="color: #fc6247;margin-left: 10rpx;line-height: 46rpx;"> 分享 </view> |
packageA/pages/liveStreamDetails/liveStreamDetails.js
@@ -580,9 +580,12 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un | @@ -580,9 +580,12 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un | ||
580 | } | 580 | } |
581 | } | 581 | } |
582 | 582 | ||
583 | - this.setData({ | ||
584 | - nickName: app.globalData.userInfo.nickname | ||
585 | - }) | 583 | + if(app.globalData.userInfo){ |
584 | + | ||
585 | + this.setData({ | ||
586 | + nickName: app.globalData.userInfo.nickname | ||
587 | + }) | ||
588 | + } | ||
586 | 589 | ||
587 | // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | 590 | // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + |
588 | // os.stoid + "?sceneValue=1012" + "&pageValue=pages/goods/goodsInfo/goodsInfo"; | 591 | // os.stoid + "?sceneValue=1012" + "&pageValue=pages/goods/goodsInfo/goodsInfo"; |
@@ -621,7 +624,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un | @@ -621,7 +624,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un | ||
621 | * 生命周期函数--监听页面显示 | 624 | * 生命周期函数--监听页面显示 |
622 | */ | 625 | */ |
623 | onShow: function () { | 626 | onShow: function () { |
624 | - getApp().check_can_share(); | 627 | + getApp().check_can_share(this); |
625 | }, | 628 | }, |
626 | 629 | ||
627 | /** | 630 | /** |
packageA/pages/liveStreamDetails/liveStreamDetails.wxml
@@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
50 | 50 | ||
51 | <!-- 分享 --> | 51 | <!-- 分享 --> |
52 | <view class="share-container"> | 52 | <view class="share-container"> |
53 | - <image src="/packageA/images/liveStreamDetails/share.jpg" bindtap="clickShare"></image> | 53 | + <image wx:if="{{isLogin}}" src="/packageA/images/liveStreamDetails/share.jpg" bindtap="clickShare"></image> |
54 | <image src="/packageA/images/liveStreamDetails/home.jpg" bindtap="backHome"></image> | 54 | <image src="/packageA/images/liveStreamDetails/home.jpg" bindtap="backHome"></image> |
55 | </view> | 55 | </view> |
56 | 56 |
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml
@@ -182,7 +182,7 @@ | @@ -182,7 +182,7 @@ | ||
182 | 182 | ||
183 | <view wx:if="{{teamlist.kttype==3}}" class='bodybutton'> | 183 | <view wx:if="{{teamlist.kttype==3}}" class='bodybutton'> |
184 | <!-- 阶梯团 --> | 184 | <!-- 阶梯团 --> |
185 | - <button wx:if="{{p_status==1}}" bindtap="clickShare" style='background-color:#fab55a; color:#fff'> | 185 | + <button wx:if="{{p_status==1 && isLogin}}" bindtap="clickShare" style='background-color:#fab55a; color:#fff'> |
186 | <!-- <button wx:if="{{p_status==1}}" bindtap="clickShare" bindtap='cmeng' style='background-color:#fab55a; color:#fff'> --> | 186 | <!-- <button wx:if="{{p_status==1}}" bindtap="clickShare" bindtap='cmeng' style='background-color:#fab55a; color:#fff'> --> |
187 | 邀请好友参团 | 187 | 邀请好友参团 |
188 | </button> | 188 | </button> |
@@ -194,7 +194,7 @@ | @@ -194,7 +194,7 @@ | ||
194 | 194 | ||
195 | <!--会员团 商家团--> | 195 | <!--会员团 商家团--> |
196 | <button class="bodybutton" style='background-color:#fab55a; color:#fff' bindtap='clickShare' | 196 | <button class="bodybutton" style='background-color:#fab55a; color:#fff' bindtap='clickShare' |
197 | - wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1}}">邀请好友参团</button> | 197 | + wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1 && isLogin}}">邀请好友参团</button> |
198 | 198 | ||
199 | <!-- </view> --> | 199 | <!-- </view> --> |
200 | <!-- </block> --> | 200 | <!-- </block> --> |
@@ -240,7 +240,7 @@ | @@ -240,7 +240,7 @@ | ||
240 | <view class="pdh20 f1"> | 240 | <view class="pdh20 f1"> |
241 | <button class="btn-red pdh20 fs24" bindtap="gohome">返回首页</button> | 241 | <button class="btn-red pdh20 fs24" bindtap="gohome">返回首页</button> |
242 | </view> | 242 | </view> |
243 | - <view class="pdh20 f1" wx:if="{{!(luckyGoMembers[0].create_time > 0)}}"> | 243 | + <view class="pdh20 f1" wx:if="{{!(luckyGoMembers[0].create_time > 0 && isLogin)}}"> |
244 | <button class="btn-yellow pdh20 fs24" bindtap="clickShare">邀请好友参团</button> | 244 | <button class="btn-yellow pdh20 fs24" bindtap="clickShare">邀请好友参团</button> |
245 | </view> | 245 | </view> |
246 | <!-- <button class="btn-red pdh20 fs24" bindtap="gohome">返回首页</button> | 246 | <!-- <button class="btn-red pdh20 fs24" bindtap="gohome">返回首页</button> |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -894,7 +894,7 @@ Page({ | @@ -894,7 +894,7 @@ Page({ | ||
894 | //---展示--- | 894 | //---展示--- |
895 | onShow: async function () { | 895 | onShow: async function () { |
896 | 896 | ||
897 | - getApp().check_can_share(); | 897 | + getApp().check_can_share(this); |
898 | // console.log('onshow'); | 898 | // console.log('onshow'); |
899 | var goods_list = null, th = this, that = this; | 899 | var goods_list = null, th = this, that = this; |
900 | var show_prew_img = this.data.show_prew_img | 900 | var show_prew_img = this.data.show_prew_img |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -208,7 +208,7 @@ | @@ -208,7 +208,7 @@ | ||
208 | 208 | ||
209 | <!-- 这个是分享按钮 --> | 209 | <!-- 这个是分享按钮 --> |
210 | <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c" bindtap="saveImageToPhotosAlbum"> --> | 210 | <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c" bindtap="saveImageToPhotosAlbum"> --> |
211 | - <view class="xc-share-frame t-c" bindtap="{{isTimeUp ? 'timeUp':'clickShare'}}"> | 211 | + <view wx:if="{{isLogin}}" class="xc-share-frame t-c" bindtap="{{isTimeUp ? 'timeUp':'clickShare'}}"> |
212 | <view class="iconfont icon-share"></view> | 212 | <view class="iconfont icon-share"></view> |
213 | <view class="fs22 c-7b">分享</view> | 213 | <view class="fs22 c-7b">分享</view> |
214 | </view> | 214 | </view> |
packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -699,7 +699,7 @@ Page({ | @@ -699,7 +699,7 @@ Page({ | ||
699 | 699 | ||
700 | //---展示--- | 700 | //---展示--- |
701 | onShow: function () { | 701 | onShow: function () { |
702 | - getApp().check_can_share(); | 702 | + getApp().check_can_share(this); |
703 | var goods_list = null, th = this, that = this; | 703 | var goods_list = null, th = this, that = this; |
704 | 704 | ||
705 | //-- 如果是预览图片,页面不重新更新 -- | 705 | //-- 如果是预览图片,页面不重新更新 -- |
packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -122,7 +122,7 @@ | @@ -122,7 +122,7 @@ | ||
122 | {{data.goods_name}} | 122 | {{data.goods_name}} |
123 | </view> | 123 | </view> |
124 | <!-- 这个是分享按钮 --> | 124 | <!-- 这个是分享按钮 --> |
125 | - <view class="xc-share-frame t-c" bindtap="clickShare"> | 125 | + <view wx:if="{{isLogin}}" class="xc-share-frame t-c" bindtap="clickShare"> |
126 | <view class="iconfont icon-share"></view> | 126 | <view class="iconfont icon-share"></view> |
127 | <view class="fs22 c-7b">分享</view> | 127 | <view class="fs22 c-7b">分享</view> |
128 | </view> | 128 | </view> |
packageC/pages/presell/pregoodsInfo/goodsInfo.js
@@ -673,7 +673,7 @@ Page({ | @@ -673,7 +673,7 @@ Page({ | ||
673 | //---展示--- | 673 | //---展示--- |
674 | onShow: function () { | 674 | onShow: function () { |
675 | 675 | ||
676 | - getApp().check_can_share(); | 676 | + getApp().check_can_share(this); |
677 | var goods_list = null, th = this, that = this; | 677 | var goods_list = null, th = this, that = this; |
678 | 678 | ||
679 | //-- 如果是预览图片,页面不重新更新 -- | 679 | //-- 如果是预览图片,页面不重新更新 -- |
packageC/pages/presell/pregoodsInfo/goodsInfo.wxml
@@ -120,7 +120,7 @@ | @@ -120,7 +120,7 @@ | ||
120 | {{data.goods_name}} | 120 | {{data.goods_name}} |
121 | </view> | 121 | </view> |
122 | <!-- 这个是分享按钮 --> | 122 | <!-- 这个是分享按钮 --> |
123 | - <view class="xc-share-frame t-c" bindtap="clickShare"> | 123 | + <view wx:if="{{isLogin}}" class="xc-share-frame t-c" bindtap="clickShare"> |
124 | <view class="iconfont icon-share fs60"></view> | 124 | <view class="iconfont icon-share fs60"></view> |
125 | <view class="fs22 c-7b">分享</view> | 125 | <view class="fs22 c-7b">分享</view> |
126 | </view> | 126 | </view> |
packageE/pages/giftpack/giftpacklistshop/giftpacklistshop.js
@@ -159,7 +159,7 @@ Page({ | @@ -159,7 +159,7 @@ Page({ | ||
159 | }, | 159 | }, |
160 | 160 | ||
161 | onShow: function () { | 161 | onShow: function () { |
162 | - getApp().check_can_share(); | 162 | + getApp().check_can_share(this); |
163 | getApp().is_Single_page(this, function () { | 163 | getApp().is_Single_page(this, function () { |
164 | //--先判断会员状态-- | 164 | //--先判断会员状态-- |
165 | var user_info = getApp().globalData.userInfo; | 165 | var user_info = getApp().globalData.userInfo; |
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
@@ -359,7 +359,7 @@ Page({ | @@ -359,7 +359,7 @@ Page({ | ||
359 | var th=this; | 359 | var th=this; |
360 | this.setData({submit:0}) | 360 | this.setData({submit:0}) |
361 | com.set_py_fir(); | 361 | com.set_py_fir(); |
362 | - getApp().check_can_share(); | 362 | + getApp().check_can_share(this); |
363 | getApp().is_Single_page(this, function () { | 363 | getApp().is_Single_page(this, function () { |
364 | //--先判断会员状态-- | 364 | //--先判断会员状态-- |
365 | var user_info = getApp().globalData.userInfo; | 365 | var user_info = getApp().globalData.userInfo; |
packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js
@@ -176,7 +176,7 @@ Page({ | @@ -176,7 +176,7 @@ Page({ | ||
176 | var th=this; | 176 | var th=this; |
177 | this.setData({submit:0}) | 177 | this.setData({submit:0}) |
178 | com.set_py_fir(); | 178 | com.set_py_fir(); |
179 | - getApp().check_can_share(); | 179 | + getApp().check_can_share(this); |
180 | 180 | ||
181 | setTimeout(()=>{ | 181 | setTimeout(()=>{ |
182 | ut.fy_back('',0,function (){ | 182 | ut.fy_back('',0,function (){ |
pages/goods/goodsInfo/goodsInfo.js
@@ -903,7 +903,7 @@ Page({ | @@ -903,7 +903,7 @@ Page({ | ||
903 | //---展示--- | 903 | //---展示--- |
904 | onShow: function () { | 904 | onShow: function () { |
905 | 905 | ||
906 | - getApp().check_can_share(); | 906 | + getApp().check_can_share(this); |
907 | 907 | ||
908 | var goods_list = null, | 908 | var goods_list = null, |
909 | th = this, | 909 | th = this, |
@@ -5317,7 +5317,7 @@ Page({ | @@ -5317,7 +5317,7 @@ Page({ | ||
5317 | //-------跳转pt商品------- | 5317 | //-------跳转pt商品------- |
5318 | go_to_nopay: function () { | 5318 | go_to_nopay: function () { |
5319 | var th = this; | 5319 | var th = this; |
5320 | - url = "/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id; | 5320 | + var url = "/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id; |
5321 | getApp().goto(url); | 5321 | getApp().goto(url); |
5322 | 5322 | ||
5323 | }, | 5323 | }, |
pages/goods/goodsInfo/goodsInfo.wxml
@@ -187,7 +187,7 @@ | @@ -187,7 +187,7 @@ | ||
187 | {{data.goods_name}} | 187 | {{data.goods_name}} |
188 | </view> | 188 | </view> |
189 | <!-- 这个是分享按钮 --> | 189 | <!-- 这个是分享按钮 --> |
190 | - <view class="xc-share-frame t-c shrink0" bindtap="clickShare"> | 190 | + <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare"> |
191 | <view class="iconfont icon-share"></view> | 191 | <view class="iconfont icon-share"></view> |
192 | <view class="fs22 c-7b">分享</view> | 192 | <view class="fs22 c-7b">分享</view> |
193 | </view> | 193 | </view> |
@@ -278,7 +278,7 @@ | @@ -278,7 +278,7 @@ | ||
278 | </view> | 278 | </view> |
279 | <!-- 这个是分享按钮 --> | 279 | <!-- 这个是分享按钮 --> |
280 | <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c" bindtap="saveImageToPhotosAlbum"> --> | 280 | <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c" bindtap="saveImageToPhotosAlbum"> --> |
281 | - <view class="xc-share-frame t-c shrink0" bindtap="clickShare"> | 281 | + <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare"> |
282 | <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> --> | 282 | <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> --> |
283 | <view class="iconfont icon-share"></view> | 283 | <view class="iconfont icon-share"></view> |
284 | <!-- <view class="share-font">1分享</view> --> | 284 | <!-- <view class="share-font">1分享</view> --> |
@@ -332,7 +332,7 @@ | @@ -332,7 +332,7 @@ | ||
332 | </view> | 332 | </view> |
333 | </view> | 333 | </view> |
334 | <!-- 这个是分享按钮 --> | 334 | <!-- 这个是分享按钮 --> |
335 | - <view class="xc-share-frame t-c shrink0" bindtap="clickShare" wx:if="{{prom_type != 1 && prom_type != 2}}"> | 335 | + <view class="xc-share-frame t-c shrink0" bindtap="clickShare" wx:if="{{prom_type != 1 && prom_type != 2 && isLogin}}"> |
336 | <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> --> | 336 | <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> --> |
337 | <view class="iconfont icon-share"></view> | 337 | <view class="iconfont icon-share"></view> |
338 | <view class="fs22 c-7b">分享</view> | 338 | <view class="fs22 c-7b">分享</view> |
@@ -428,7 +428,7 @@ | @@ -428,7 +428,7 @@ | ||
428 | <view wx:else class="word-line no_line_x fs24">¥{{filters.toFix(data.shop_price,2)}}</view> | 428 | <view wx:else class="word-line no_line_x fs24">¥{{filters.toFix(data.shop_price,2)}}</view> |
429 | </view> | 429 | </view> |
430 | <!-- 这个是分享按钮 --> | 430 | <!-- 这个是分享按钮 --> |
431 | - <view class="xc-share-frame t-c shrink0" bindtap="clickShare"> | 431 | + <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare"> |
432 | <view class="iconfont icon-share"></view> | 432 | <view class="iconfont icon-share"></view> |
433 | <view class="fs22 c-7b">分享</view> | 433 | <view class="fs22 c-7b">分享</view> |
434 | </view> | 434 | </view> |
@@ -444,7 +444,7 @@ | @@ -444,7 +444,7 @@ | ||
444 | <view class="xc-explain flex jc_sb" wx:if="{{prom_type==2}}"> | 444 | <view class="xc-explain flex jc_sb" wx:if="{{prom_type==2}}"> |
445 | <view class="fs32 ellipsis-2" style="max-width:80%; max-height: 90rpx;">{{sele_g.goods_name}}</view> | 445 | <view class="fs32 ellipsis-2" style="max-width:80%; max-height: 90rpx;">{{sele_g.goods_name}}</view> |
446 | <!-- 这个是分享按钮 --> | 446 | <!-- 这个是分享按钮 --> |
447 | - <view class="xc-share-frame t-c shrink0" bindtap="clickShare" style="flex-shrink:0;position: relative;top: -22rpx;"> | 447 | + <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare" style="flex-shrink:0;position: relative;top: -22rpx;"> |
448 | <view class="iconfont icon-share"></view> | 448 | <view class="iconfont icon-share"></view> |
449 | <view class="fs22 c-7b">分享</view> | 449 | <view class="fs22 c-7b">分享</view> |
450 | </view> | 450 | </view> |
pages/team/team_success/team_success.js
pages/team/team_success/team_success.wxml
@@ -166,7 +166,7 @@ | @@ -166,7 +166,7 @@ | ||
166 | 166 | ||
167 | <view wx:if="{{teamlist.kttype==3}}" class='bodybutton'> | 167 | <view wx:if="{{teamlist.kttype==3}}" class='bodybutton'> |
168 | <!-- 阶梯团 --> | 168 | <!-- 阶梯团 --> |
169 | - <button wx:if="{{p_status==1}}" bindtap="clickShare" style='background-color:#fab55a; color:#fff'> | 169 | + <button wx:if="{{p_status==1 && isLogin}}" bindtap="clickShare" style='background-color:#fab55a; color:#fff'> |
170 | <!-- <button wx:if="{{p_status==1}}" bindtap="clickShare" bindtap='cmeng' style='background-color:#fab55a; color:#fff'> --> | 170 | <!-- <button wx:if="{{p_status==1}}" bindtap="clickShare" bindtap='cmeng' style='background-color:#fab55a; color:#fff'> --> |
171 | 邀请好友参团 | 171 | 邀请好友参团 |
172 | </button> | 172 | </button> |
@@ -178,7 +178,7 @@ | @@ -178,7 +178,7 @@ | ||
178 | 178 | ||
179 | <!--会员团 商家团--> | 179 | <!--会员团 商家团--> |
180 | <button class="bodybutton" style='background-color:#fab55a; color:#fff' bindtap='clickShare' | 180 | <button class="bodybutton" style='background-color:#fab55a; color:#fff' bindtap='clickShare' |
181 | - wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1}}">邀请好友参团</button> | 181 | + wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1 && isLogin}}">邀请好友参团</button> |
182 | 182 | ||
183 | <!-- </view> --> | 183 | <!-- </view> --> |
184 | <!-- </block> --> | 184 | <!-- </block> --> |