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

WXD-SEASON\season
2 parents 4d93e4e0 e53db1cd
Showing 8 changed files with 27 additions and 9 deletions
packageE/pages/cart/cart2/cart2.js
pages/activity/pind_list/pind_list.wxml
pages/giftpack/buygiftpack/giftpackbuy.wxml
pages/giftpack/mygiftpack/mygiftpack.wxml
pages/giftpack/mygiftpack/mygiftpack.wxss
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/team/team_ping/team_ping.wxml
@@ -2231,6 +2231,13 @@ Page({
             if (kitem.act.is_orderyh)
               o_price_no_zh -= kitem.cut_price;
           }
+        }else{
+            //找到那些可以订单优惠叠加的
+            for (let ij in zh_prom_goods) {
+              let kitem_z = zh_prom_goods[ij];
+              if (!kitem_z.act.is_orderyh)
+                  no_order_yh+=kitem_z.actual_price;
+            }
         }
       }
@@ -2244,6 +2251,13 @@ Page({
             if (th.data.ladder_map[ij].is_useorderyh)
               o_price_no_zh -= kitem.cut_price;
           }
+        }else{
+          //找到那些可以订单优惠叠加的不参与的要减掉
+          for (let ij in ladder_prom_goods) {
+            let kitem_l = ladder_prom_goods[ij];
+            if (!th.data.ladder_map[ij].is_useorderyh)
+              no_order_yh+=kitem_l.actual_price;
+          }
         }
       }
@@ -2270,8 +2284,10 @@ Page({
       var ord_prom_condition=0;
+
+      //如果有组合购
       if(o_price_no_zh){
-         ord_prom_condition=o_price_no_zh-whsle_goods_price-no_zh_all_quan_num;
+         ord_prom_condition=o_price_no_zh-whsle_goods_price-no_zh_all_quan_num- no_order_yh;
       }else{
          ord_prom_condition=o_price - quan_price - whsle_goods_price - no_order_yh;
       }
@@ -69,7 +69,7 @@
                     <view class="fs40 flex  xc-top15 {{type==1?'red-co ai-bas':'blue_c xc-lihe42 ai-bas'}}">
                     <text class="fs28 {{type==0?'martop13':''}}">￥</text>
                    <text style="margin-left:-5rpx">{{item.price}}</text>
-                    <text  wx:if="{{is_retail_price}}" class="underline {{type==0?'martop18':''}} no_line_x">￥{{item.shop_price}}</text>
+                    <text  wx:if="{{is_retail_price}}" class="underline {{type==0?'martop18':''}} no_line_x">￥{{item.shop_price || item.market_price}}</text>
                     </view>
                 </view>
@@ -48,7 +48,7 @@
 						</block>
 					</view>
 					<view class="content_ware_price no_line_c">
-						<text class="ellipsis-1">{{"￥"+items.giftPosPrice}}</text>
+						<text class="ellipsis-1">{{"零售价：￥"+items.giftPosPrice}}</text>
 					</view>
 					<view wx:if="{{items.is_show && now < items.starTime1 }}" class="content_ware_time">
 						<text class="ellipsis-1">{{"活动开始时间："+items.starTime}}</text>
@@ -79,10 +79,10 @@
             </block>
           </view>
           <view class="content_ware_price no_line_c">
-            <text >{{"￥"+item.giftPosPrice}}</text>
+            <text >{{"零售价：￥"+item.giftPosPrice}}</text>
           </view>
-          <view class="content_ware_time" wx:if="{{item.iswarelbtype==1}}">
+          <view class="content_ware_time"  wx:if="{{item.iswarelbtype==1}}">
             <block wx:if="{{getDate>item.endTime}}">
             <text>{{"兑换截至日期:"+item.endTime}}</text>
             </block>
@@ -163,7 +163,7 @@
 }
 .content_ware_time {
-  font-size: 25rpx;
+  font-size: 24rpx;
   color: #c61a34;
   margin-top: 20rpx;
   position: absolute;
@@ -6247,7 +6247,9 @@ Page({
               //---文字---
               context.setFontSize(22 * unit)
               context.setFillStyle("black")
+              if(th.data.is_share_text){
               context.fillText("特惠好物，限时秒杀", 40 * unit, 807 * unit);
+              }
               context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 844 * unit);
@@ -96,10 +96,10 @@
         </view>
         <!-- --显示团购价 -->
         <view class="prom_show rel" wx:if="{{prom_type==2}}">
-
+ 
           <view class="abs flex" style="align-items:flex-end;color: #fff; margin-top: 34rpx; margin-left: 10rpx; height: 60rpx">￥{{prom_price}}
-            <view wx:if="{{is_retail_price}}" class="word-line fs24 no_line_x" style="position: relative;top: -6rpx">零售价：￥{{filters.toFix(data.market_price,2)}}</view>
+            <view wx:if="{{is_retail_price}}" class="word-line fs24 no_line_c" style="position: relative;top: -6rpx">零售价：￥{{filters.toFix(data.market_price,2)}}</view>
             <view wx:else class="word-line no_line_x fs24" style="position: relative;top: -6rpx">￥{{filters.toFix(data.shop_price,2)}}</view>
           </view>
@@ -33,7 +33,7 @@
               <view class="flex">
                 <text class='fs24 xc-wc {{item.pt_status==1?"xc-rmbs":"xc-rmb"}}'>￥</text>
                 <view class='pd-jg xc-wc'>{{item.order_goods[0].goods_price}}</view>
-                <view class="flex  word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}"><text class="fs24 xc-black"></text><text class="fs24 xc-wc">￥</text><text class="fs26  xc-wc">{{item.order_goods[0].shop_price}}</text> </view>
+                <view class="flex no_line_c  word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}"><text class="fs24 xc-black"></text><text class="fs24 xc-wc">￥</text><text class="fs26  xc-wc">{{item.order_goods[0].shop_price || item.order_goods[0].market_price}}</text> </view>
               </view>
               <view class="xc-img-frame" wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 || item.pt_status==6}}">