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

WXD-SEASON\season
2 parents 3c82f1f6 86a02db2
Showing 22 changed files with 45 additions and 39 deletions
app.js
packageA/pages/liveStream/liveStream.js
packageA/pages/liveStream/liveStream.wxml
packageA/pages/liveStreamDetails/liveStreamDetails.js
packageA/pages/liveStreamDetails/liveStreamDetails.wxml
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
packageC/pages/presell/pregoodsInfo/goodsInfo.js
packageC/pages/presell/pregoodsInfo/goodsInfo.wxml
packageE/pages/giftpack/giftpacklistshop/giftpacklistshop.js
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/giftpacklist/giftpacklist.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
@@ -994,11 +994,17 @@ App({
     },
     //检验能不能分享
-    check_can_share() {
+    check_can_share(th) {
         var userinfo=wx.getStorageSync("userinfo");
-        if (!this.globalData.user_id && !userinfo) wx.hideShareMenu();
+        if (!this.globalData.user_id && !userinfo) {
+            wx.hideShareMenu();
+            if(th) th.setData({isLogin:0 })
+
+
+        }
         else{
+            if(th) th.setData({isLogin:1 })
             wx.showShareMenu({
                 withShareTicket: true,
                 menus: ["shareAppMessage", "shareTimeline"],
@@ -283,13 +283,13 @@ Page({
    */
   onShow: function () {
-    getApp().check_can_share();
+    getApp().check_can_share(this);
     if (app.globalData.userInfo) {
-      if (!this.data.isLogin) {
+      if (!this.data.isLogin_a) {
         this.setData({
           userInfo: app.globalData.userInfo,
           imghost: app.globalData.setting.imghost,
-          isLogin: true,
+          isLogin_a: true,
         });
         this.updateLiveList().then(() => {
@@ -312,9 +312,6 @@ Page({
           });
-
-
-
         });
@@ -84,7 +84,7 @@
                 {{item['anchor_name']}}</view>
               </view>
-              <view style="width: 30%;height: 90rpx;align-items: center;justify-items: center;">
+              <view  wx:if="{{isLogin}}" style="width: 30%;height: 90rpx;align-items: center;justify-items: center;">
                 <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;">
                   <view class="share-image"></view>
                   <view class="fs26" style="color: #fc6247;margin-left: 10rpx;line-height: 46rpx;"> 分享 </view>
@@ -580,9 +580,12 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
       }
     }
-    this.setData({
-      nickName: app.globalData.userInfo.nickname
-    })
+    if(app.globalData.userInfo){
+
+      this.setData({
+        nickName: app.globalData.userInfo.nickname
+      })
+    }
     // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
     //   os.stoid + "?sceneValue=1012" + "&pageValue=pages/goods/goodsInfo/goodsInfo";
@@ -621,7 +624,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-      getApp().check_can_share();
+      getApp().check_can_share(this);
   },
   /**
@@ -50,7 +50,7 @@
   <!-- 分享 -->
   <view class="share-container">
-    <image src="/packageA/images/liveStreamDetails/share.jpg" bindtap="clickShare"></image>
+    <image wx:if="{{isLogin}}" src="/packageA/images/liveStreamDetails/share.jpg" bindtap="clickShare"></image>
     <image src="/packageA/images/liveStreamDetails/home.jpg" bindtap="backHome"></image>
   </view>
@@ -106,7 +106,7 @@ Page({
   },
 	onShow: function() {
-        getApp().check_can_share();
+        getApp().check_can_share(this);
 		this.get_team_info();
 	},
@@ -182,7 +182,7 @@
       <view wx:if="{{teamlist.kttype==3}}" class='bodybutton'>
         <!-- 阶梯团 -->
-				<button wx:if="{{p_status==1}}"  bindtap="clickShare"  style='background-color:#fab55a; color:#fff'>
+				<button wx:if="{{p_status==1 && isLogin}}"  bindtap="clickShare"  style='background-color:#fab55a; color:#fff'>
         <!-- <button wx:if="{{p_status==1}}"  bindtap="clickShare" bindtap='cmeng'  style='background-color:#fab55a; color:#fff'> -->
           邀请好友参团
         </button>
@@ -194,7 +194,7 @@
         <!--会员团 商家团-->
         <button class="bodybutton" style='background-color:#fab55a; color:#fff' bindtap='clickShare'
-                wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1}}">邀请好友参团</button>
+                wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1 && isLogin}}">邀请好友参团</button>
       <!-- </view> -->
     <!-- </block> -->
@@ -240,7 +240,7 @@
 			<view class="pdh20 f1">
 				<button class="btn-red pdh20 fs24" bindtap="gohome">返回首页</button>
 			</view>
-			<view class="pdh20 f1" wx:if="{{!(luckyGoMembers[0].create_time > 0)}}">
+			<view class="pdh20 f1" wx:if="{{!(luckyGoMembers[0].create_time > 0 && isLogin)}}">
 				<button class="btn-yellow pdh20 fs24" bindtap="clickShare">邀请好友参团</button>
 			</view>
 		 <!-- <button class="btn-red pdh20 fs24" bindtap="gohome">返回首页</button>
@@ -894,7 +894,7 @@ Page({
   //---展示---
   onShow: async function () {
-    getApp().check_can_share();
+    getApp().check_can_share(this);
     // console.log('onshow');
     var goods_list = null, th = this, that = this;
     var show_prew_img = this.data.show_prew_img
@@ -208,7 +208,7 @@
               <!-- 这个是分享按钮 -->
               <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c"  bindtap="saveImageToPhotosAlbum"> -->
-             <view class="xc-share-frame t-c" bindtap="{{isTimeUp ? 'timeUp':'clickShare'}}">
+             <view wx:if="{{isLogin}}" class="xc-share-frame t-c" bindtap="{{isTimeUp ? 'timeUp':'clickShare'}}">
                 <view class="iconfont icon-share"></view>
                 <view class="fs22 c-7b">分享</view>
               </view>
@@ -699,7 +699,7 @@ Page({
   //---展示---
   onShow: function () {
-    getApp().check_can_share();
+    getApp().check_can_share(this);
     var goods_list = null, th = this, that = this;
     //-- 如果是预览图片，页面不重新更新 --
@@ -122,7 +122,7 @@
                   {{data.goods_name}}
                 </view>
               <!-- 这个是分享按钮 -->
-              <view class="xc-share-frame t-c" bindtap="clickShare">
+              <view wx:if="{{isLogin}}" class="xc-share-frame t-c" bindtap="clickShare">
                 <view class="iconfont icon-share"></view>
                 <view class="fs22 c-7b">分享</view>
               </view>
@@ -673,7 +673,7 @@ Page({
   //---展示---
   onShow: function () {
-      getApp().check_can_share();
+      getApp().check_can_share(this);
     var goods_list = null, th = this, that = this;
     //-- 如果是预览图片，页面不重新更新 --
@@ -120,7 +120,7 @@
                   {{data.goods_name}}
                 </view>
               <!-- 这个是分享按钮 -->
-              <view class="xc-share-frame t-c" bindtap="clickShare">
+              <view wx:if="{{isLogin}}" class="xc-share-frame t-c" bindtap="clickShare">
                 <view class="iconfont icon-share fs60"></view>
                 <view class="fs22 c-7b">分享</view>
               </view>
@@ -159,7 +159,7 @@ Page({
     },
     onShow: function () {
-        getApp().check_can_share();
+        getApp().check_can_share(this);
         getApp().is_Single_page(this, function () {
             //--先判断会员状态--
             var user_info = getApp().globalData.userInfo;
@@ -359,7 +359,7 @@ Page({
         var th=this;
         this.setData({submit:0})
         com.set_py_fir();
-        getApp().check_can_share();
+        getApp().check_can_share(this);
         getApp().is_Single_page(this, function () {
             //--先判断会员状态--
             var user_info = getApp().globalData.userInfo;
@@ -176,7 +176,7 @@ Page({
         var th=this;
         this.setData({submit:0})
         com.set_py_fir();
-        getApp().check_can_share();
+        getApp().check_can_share(this);
         setTimeout(()=>{
             ut.fy_back('',0,function (){
@@ -169,7 +169,7 @@ Page({
         this.setData({submit:0})
         ut.fy_back('',0);
         com.set_py_fir();
-        getApp().check_can_share();
+        getApp().check_can_share(this);
         getApp().is_Single_page(this, function () {
             //--先判断会员状态--
             var user_info = getApp().globalData.userInfo;
@@ -13,7 +13,7 @@
       <text class="data-v-3a5b7e36 ellipsis-2" style="width:90%;">{{giftTitle}}</text>
         <!-- 这个是分享按钮 -->
-        <view wx:if="{{c_state<2}}" class="xc-share-frame t-c" bindtap="clickShare">
+        <view wx:if="{{c_state<2 && isLogin}}" class="xc-share-frame t-c" bindtap="clickShare">
             <view class="iconfont icon-share fs40" ></view>
             <view class="fs22 c-7b">分享</view>
         </view>
@@ -903,7 +903,7 @@ Page({
   //---展示---
   onShow: function () {
-    getApp().check_can_share();
+    getApp().check_can_share(this);
     var goods_list = null,
       th = this,
@@ -5317,7 +5317,7 @@ Page({
   //-------跳转pt商品-------
   go_to_nopay: function () {
     var th = this;
-    url = "/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id;
+    var url = "/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id;
     getApp().goto(url);
   },
@@ -187,7 +187,7 @@
                   {{data.goods_name}}
                 </view>
                 <!-- 这个是分享按钮 -->
-                <view class="xc-share-frame t-c shrink0" bindtap="clickShare">
+                <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare">
                   <view class="iconfont icon-share"></view>
                   <view class="fs22 c-7b">分享</view>
                 </view>
@@ -278,7 +278,7 @@
               </view>
               <!-- 这个是分享按钮 -->
               <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c"  bindtap="saveImageToPhotosAlbum"> -->
-              <view class="xc-share-frame t-c shrink0" bindtap="clickShare">
+              <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare">
                 <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> -->
                 <view class="iconfont icon-share"></view>
                 <!-- <view class="share-font">1分享</view> -->
@@ -332,7 +332,7 @@
                 </view>
               </view>
               <!-- 这个是分享按钮 -->
-              <view class="xc-share-frame t-c shrink0" bindtap="clickShare" wx:if="{{prom_type != 1 && prom_type != 2}}">
+              <view class="xc-share-frame t-c shrink0" bindtap="clickShare" wx:if="{{prom_type != 1 && prom_type != 2 && isLogin}}">
                 <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> -->
                 <view class="iconfont icon-share"></view>
                 <view class="fs22 c-7b">分享</view>
@@ -428,7 +428,7 @@
                   <view wx:else class="word-line no_line_x fs24">￥{{filters.toFix(data.shop_price,2)}}</view>
                 </view>
                 <!-- 这个是分享按钮 -->
-                <view class="xc-share-frame t-c shrink0" bindtap="clickShare">
+                <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare">
                   <view class="iconfont icon-share"></view>
                   <view class="fs22 c-7b">分享</view>
                 </view>
@@ -444,7 +444,7 @@
             <view class="xc-explain flex jc_sb" wx:if="{{prom_type==2}}">
               <view class="fs32 ellipsis-2" style="max-width:80%; max-height: 90rpx;">{{sele_g.goods_name}}</view>
               <!-- 这个是分享按钮 -->
-              <view class="xc-share-frame t-c shrink0" bindtap="clickShare" style="flex-shrink:0;position: relative;top: -22rpx;">
+              <view wx:if="{{isLogin}}" class="xc-share-frame t-c shrink0" bindtap="clickShare" style="flex-shrink:0;position: relative;top: -22rpx;">
                 <view class="iconfont icon-share"></view>
                 <view class="fs22 c-7b">分享</view>
               </view>
@@ -87,7 +87,7 @@ Page({
 	  })	
   },
   onShow:function () {
-      getApp().check_can_share();
+      getApp().check_can_share(this);
   },
   //关闭展开列表
@@ -166,7 +166,7 @@
       <view wx:if="{{teamlist.kttype==3}}" class='bodybutton'>
         <!-- 阶梯团 -->
-				<button wx:if="{{p_status==1}}"  bindtap="clickShare"  style='background-color:#fab55a; color:#fff'>
+				<button wx:if="{{p_status==1 && isLogin}}"  bindtap="clickShare"  style='background-color:#fab55a; color:#fff'>
         <!-- <button wx:if="{{p_status==1}}"  bindtap="clickShare" bindtap='cmeng'  style='background-color:#fab55a; color:#fff'> -->
           邀请好友参团
         </button>
@@ -178,7 +178,7 @@
         <!--会员团 商家团-->
         <button class="bodybutton" style='background-color:#fab55a; color:#fff' bindtap='clickShare'
-                wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1}}">邀请好友参团</button>
+                wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1 && isLogin}}">邀请好友参团</button>
       <!-- </view> -->
     <!-- </block> -->