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

WXD-SEASON\season
2 parents 0793d39d c8056f5a
Showing 4 changed files with 19 additions and 5 deletions
packageA/pages/goodsInfo/goodsInfo.js
packageE/pages/cart/cart2/cart2.js
pages/goods/categoryList/categoryList.wxml
pages/goods/goodsInfo/goodsInfo.js
@@ -235,6 +235,8 @@ Page({
         room_id = t.room_id,
         room_user_share = t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id
+      var share_openid= t.share_openid;
+
       //检查测肤
       getApp().check_skin_face(t,1,gid);
@@ -1960,11 +1960,11 @@ Page({
           //--------循环计算商品是不是包邮，是不是使用优惠券,此时循环是商品从表-----------
           for (var j = 0; j < ord_goods.length; j++) {
-            if (ord_goods[j].is_gift) continue;
             if (ord_goods[j].whsle_id) continue;
             if (ord_goods[j].prom_type == 3 && ord_goods[j].prom_id == item_map.prom_id) {
               ord_goods[j].is_xz_yh = ord_goods[j].is_xz_yh ? ord_goods[j].is_xz_yh : item_map.is_xz_yh;
               ord_goods[j].is_past = item_map.is_past;
+              if (ord_goods[j].is_gift) continue;  //赠品不平摊
               ord_goods[j].account_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_fir;
               ord_goods[j].account_yu_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu_fir;
               ord_goods[j].account = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account;
@@ -6563,6 +6563,14 @@ Page({
           is_post_temp:1 //赠品暂时的是要包邮运算， 后面和主商品是不是包邮一样
         };
+        var  prom_goods_map=th.data.prom_goods_map[gf_pickup_id];
+        var fd=prom_goods_map[th.data.gf_prom_id];
+
+        if(fd){
+          newd.is_past=fd.is_past;
+          newd.is_xz_yh=fd.is_xz_yh;
+        }
+
         //-- 如果是代发商品的时候 --
         if (gf_item.goodsinfo.whsle_id) {
           newd.whsle_id = gf_item.goodsinfo.whsle_id;
@@ -131,11 +131,11 @@
 					<view class="search-img left">
 						<image class="wh100" src="{{iurl}}/miniapp/images/search.png"></image>
 					</view>
-					<input bindfocus="goseach" class="search-cont" placeholder="输入商品关键字" type="text"></input>
+					<input bindfocus="goseach" class="search-cont" placeholder="请输入商品关键字" type="text"></input>
 				</view> -->
       <!-- 搜索框 -->
       <view class="search-container f1">
-        <view bindtap="goseach"><text class="iconfont icon-sousuo pdr10"></text>输入商品关键字</view>
+        <view bindtap="goseach"><text class="iconfont icon-sousuo pdr10"></text>请输入商品关键字</view>
       </view>
       <view class="pdl30" bindtap="getScancode">
         <image class="scanning_black-img" src="{{iurl}}/miniapp/images/goodscategory/scanning_black.png"></image>
@@ -284,7 +284,11 @@ Page({
       prom_id = t.prom_id || 0; //活动ID
       var share_openid = t.share_openid;
-      //群id
+
+    console.log("gd onload-- 3 --");
+    console.log(t);
+
+    //群id
       if(t && t.groupchat_id && !t.groupchat_id!='undefined' && !t.groupchat_id!='null'){
         getApp().globalData.groupchat_id=t.groupchat_id
       }
@@ -378,7 +382,7 @@ Page({
       gid: gid
     });
-    console.log("gd onload--2");
+    console.log("gd onload-- 2 --");
     console.log(first_leader);
     if (first_leader) {