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

taiyuan
2 parents d40c685d d4058908
Showing 4 changed files with 36 additions and 11 deletions
packageA/pages/goods_share/goods_share.js
packageB/pages/zuhegou/index/index.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
@@ -292,6 +292,11 @@ Page({
 			orderField:this.data.orderField,
 			orderType:this.data.orderType,
 		}
+
+		var user_id=getApp().globalData.user_id;
+		if(!user_id){ user_id=0;}
+        req_data.user_id=user_id;
+
 		if(this.data.key_str && this.data.key_str.trim()){
 			var str=this.data.key_str.trim();
 			req_data.key_str=str;
@@ -124,6 +124,9 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+
+        console.log(options,111);
+
         self = this;
         var the_id = options.id;
 				if(options.title) {
@@ -131,7 +134,8 @@ Page({
 						title: options.title,
 					});
 				};
-        var first_leader='';
+        var first_leader=options.first_leader;
+
         //--如果tg_id是空的话，分享回来--
         if (the_id == undefined || the_id == null || the_id == "") {
             var  gid_str = decodeURIComponent(options.scene);
@@ -249,8 +253,7 @@ Page({
                         return false;
                     }
-                    //获取购物车的内容
-                    th.get_cart_val(e);
+
                     var ee = JSON.parse(JSON.stringify(e));
                     var appd = getApp().globalData;
@@ -342,8 +345,13 @@ Page({
                                     });
                                 }
                             }
+                            //获取购物车的内容
+                            th.get_cart_val(e);
                         })
+                    }else{
+                        //获取购物车的内容
+                        th.get_cart_val(e);
                     }
                 }, 1);
@@ -418,6 +426,18 @@ Page({
      * 用户点击右上角分享
      */
     onShareAppMessage: function () {
+        var title = this.data.act.name;
+        var url= "/packageB/pages/zuhegou/index/index?id="+this.data.act.id;
+        if (getApp().globalData.user_id) {
+            url += "&first_leader=" + getApp().globalData.user_id;
+        }
+        var ob = {
+            title:title,
+            path: url,
+        };
+        if(this.data.act.img_url)
+            ob.imageUrl=this.data.iurl+this.data.act.img_url;
+        return ob;
     },
     /**
@@ -5871,10 +5871,8 @@ Page({
         };
         //获取秒杀的多规格
         getApp().request.promiseGet(url, {data:req_data}).then(res=>{
-            if(res.data.code==0 && res.data.data){
+            if(res.data.code==0 && res.data.data && res.data.data.length){
                 th.setData({more_flash:res.data.data});
-            }else{
-                func(false);
             }
         })
     },
@@ -325,6 +325,9 @@
         </view>
         <!-- 不是拼团，不是积分购 -->
         <block wx:if="{{prom_type!=6 && prom_type!=4}}">
+
+
+
           <view class="goods-price">
             <view class="flex jc_sb">
               <view class="co-red" style="" wx:if="{{prom_type==0 || prom_type==3}}">
@@ -360,7 +363,8 @@
             </view>
             <!-- 不是秒杀 -->
             <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 -->
-            <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && prom_type!=1 && card_list && card_list.length>0}}">
+            <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && prom_type!=1 && card_list && card_list.length>0 && g_filters.get_card_price(data,card_list,1)!=''}}">
+
               <view class="flex ai-center  grade-card-frame card-frame">
                 <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
                 <view class="fs24 white view card-name ellipsis-1">
@@ -374,7 +378,7 @@
             <!-- 等级卡的显示,购买, 等级卡近30天要显示续费 -->
             <block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}">
               <!-- 不是秒杀，且会员不是等级会员 -->
-              <view wx:if="{{!card_field && prom_type!=1 && card_list && card_list.length>0}}">
+              <view wx:if="{{!card_field && prom_type!=1 && card_list && card_list.length>0 && g_filters.get_card_price(data,card_list,1)!=''}}">
                 <view class="beauty-makeup-frame flex ai-center">
                   <view class="left flex ai-center jc_sa">
                     <view class="flex ai-center  grade-card-frame card-frame advert-card">
@@ -570,9 +574,7 @@
             </view>
           </view>
         </block>
-				
-				
-				
+
         <!-- 要判断是不是有订单优惠 -->
         <block wx:if="{{order_prom}}">
           <view class="cx-frame flex" style="position: relative; height: auto">