Merge branch 'qa' into 'master'

Qa See merge request !1054

Merge branch 'qa' into 'master'
Qa See merge request !1054
后端研发-苏明海
2 parents 94a03e76 91a93a88
Showing 10 changed files with 48 additions and 19 deletions
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart.wxml
packageC/pages/presell/cart/cart2.wxml
pages/cart/cart2/cart2.wxml
pages/cart/cart2_inte/cart2_inte.wxml
pages/cart/cart2_pt/cart2_pt.js
pages/cart/cart2_pt/cart2_pt.wxml
pages/goods/goodsInfo/buy_integral_normal.wxml
@@ -499,6 +499,9 @@ Page({
 		console.log('calculatePrice2');
 		var th = this,
 			good = this.data.bn_goods;
+			
+		th.setData({is_show_sub:0});	
+			
 		//-----------计算商品总价--------------
 		var allpice = th.data.param.goods_price;
 		allpice = parseFloat(allpice).toFixed(2);
@@ -2,6 +2,7 @@
 <form bindsubmit="submitConfirm">
     <view class="container">
+		<block wx:if="{{is_show_sub}}">
 		<view class="tab-container" wx:if="{{kt_type!=3 || is_normal==1}}">
 			<view class="tab-wrapper">			
 					<view hidden="{{bn_t_exp_t==2}}" bindtap='setexptype' data-t='1' class="tab {{bn_exp_type == 1? 'active':''}}"  
@@ -12,7 +13,7 @@
 			</view>
 		</view>
-		
+		</block>
         <!--要进行判断地址是否显示---->
         <view bindtap="enterAddressPage" class="user-mes mgt20" hidden='{{bn_exp_type==1 || kt_type==3}}'>
@@ -608,7 +608,6 @@ Page({
             goods: goods,
             presell: presell,
             pre_arr: pre_arr,
-            show_submit: 1,
             userInfo: getApp().globalData.userInfo,
             tail_pay: tail_pay,
             order_goods: order_goods,
@@ -630,6 +629,8 @@ Page({
     async calculatePrice2() {
         var th = this;
         if (!this.data.pre_arr) return false;
+		th.setData({ show_submit: 0,})
+		
         //--计算物流--
         if (this.data.exp_type == 0) {
             this.calculate_wuliu();
@@ -715,12 +716,12 @@ Page({
                     o_condition1 = parseFloat(o_condition1) - parseFloat(th.data.presell.presell_deposit);
                     if (o_condition1 < 0) o_condition1 = 0;
-                    th.setData({ exp_price: 0, order_m: o_condition1 })
+                    th.setData({ exp_price: 0, order_m: o_condition1, show_submit: 1, })
                 })
             } else {
                 o_condition = parseFloat(o_condition) - parseFloat(th.data.presell.presell_deposit);
                 if (o_condition < 0) o_condition = 0;
-                th.setData({ exp_price: 0, order_m: o_condition })
+                th.setData({ exp_price: 0, order_m: o_condition, show_submit: 1, })
             }
         }
     },
@@ -1952,14 +1953,14 @@ Page({
                 ord_price = parseFloat(ord_price) - parseFloat(th.data.presell.presell_deposit);
                 if (ord_price < 0) ord_price = 0;
-                th.setData({ exp_price: exp_price, order_m: ord_price + parseFloat(exp_price) })
+                th.setData({ exp_price: exp_price, order_m: ord_price + parseFloat(exp_price), show_submit: 1, })
             })
         } else {
             var o_condition1 = parseFloat(o_condition) - parseFloat(th.data.presell.presell_deposit);
             if (o_condition1 < 0) o_condition1 = 0;
-            th.setData({ exp_price: exp_price, order_m: parseFloat(o_condition1) + parseFloat(exp_price) })
+            th.setData({ exp_price: exp_price, order_m: parseFloat(o_condition1) + parseFloat(exp_price), show_submit: 1, })
         }
     },
@@ -108,7 +108,7 @@
             </view>
         </view>-->
-        <block wx:if="{{wait_wk}}">
+        <block wx:if="{{wait_wk && show_submit}}">
             <!-- 立即购买的时候 -->
             <view class="tab-wrapper">
                 <view hidden="{{distr_type==2}}" bindtap='set_wuliu' data-type='1'
@@ -6,7 +6,7 @@
 	<view class="container">
 	    	<!-- 立即购买的时候 -->
-			<view class="tab-container">
+			<view class="tab-container" wx:if="{{show_submit}}">
 				<view class="tab-wrapper">			
 						<view hidden="{{bn_t_exp_t==2}}" bindtap='setexptype' data-t='1' class="tab {{bn_exp_type == 1? 'active':''}}"  
 						data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >门店自提</view>
@@ -4,6 +4,7 @@
 <form>
 	<view class="container">
+		<block wx:if="{{show_submit}}">
 		<!-- 立即购买的时候 -->
 		<block wx:if="{{is_b_now==1}}">
 			<view class="tab-container">
@@ -26,6 +27,7 @@
 				</view>
 			</view>
 		</block>
+		</block>
 		<!--要进行判断地址是否显示---->
 		<view bindtap="enterAddressPage" class="user-mes mgt20" hidden='{{(bn_exp_type==1 && is_b_now==1) || (is_all_zt==1 && is_b_now==0)}}'>
@@ -126,7 +128,7 @@
 					</view>
 					<!-- 当是物流很多单的时候 -->
-					<view class="use-item flex-space-between" wx:if="{{cartlist.length>1}}">
+					<view class="use-item flex-space-between" wx:if="{{cartlist.length>1 && show_submit}}">
 						<view class="flex-vertical">
 							<view bindtap='setexptype_w2' data-ind="{{pidx}}" data-t='1' data-txt='cartlist[{{pidx}}].exp_type' style="padding-right:26rpx;display:{{item.distr_t==2?'none':'flex;align-items: center'}};">
 								<!-- <icon  bindtap='setexptype_w' data-t='1' data-txt='cartlist[{{pidx}}].exp_type'  color="{{item.exp_type==1?'red':'gray'}}" size="16" type="success"></icon> -->
@@ -5,7 +5,7 @@
 <form bindsubmit="submitForm">
 	<view class="container">
-		<view class="tab-container">
+		<view class="tab-container" wx:if="{{show_submit}}">
 			<view class="tab-wrapper">			
 					<view hidden="{{bn_t_exp_t==2}}" bindtap='setexptype' data-t='1' class="tab {{bn_exp_type == 1? 'active':''}}"  
 					data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >门店自提</view>
@@ -62,7 +62,8 @@ Page({
     rank_switch: 0,      //是不是开同等级卡
     show_card: null,     //显示的等级卡
     card_name: '',       //显示的卡的名称
-    card_cut_price: null,//减价多少钱  
+    card_cut_price: null,//减价多少钱 
+	show_btn:0, 
   },
   onLoad: function (t) {
     console.log("onLoad_pt_cart");
@@ -536,14 +537,14 @@ Page({
         //--------------如果使用余额---------------------
         if (th.data.bn_use_money == 1 && th.data.yuer > 0) {
           if (parseFloat(th.data.yuer) > total_m) {
-            th.setData({ [txt]: total_m, [txt2]: 0,submit:0  })
+            th.setData({ [txt]: total_m, [txt2]: 0,submit:0,show_btn:1 })
           } else {
             order_m = parseFloat(order_m) - parseFloat(th.data.yuer);
             order_m = order_m.toFixed(2);
-            th.setData({ [txt]: th.data.yuer, [txt2]: order_m,submit:0 })
+            th.setData({ [txt]: th.data.yuer, [txt2]: order_m,submit:0,show_btn:1 })
           }
         } else {
-          th.setData({ [txt]: 0, [txt2]: order_m,submit:0 })
+          th.setData({ [txt]: 0, [txt2]: order_m,submit:0,show_btn:1 })
         }
         wx.hideLoading();
@@ -2,6 +2,7 @@
 <form bindsubmit="submitForm">
     <view class="container">
+		<block wx:if="{{show_btn}}">
 		<view class="tab-container" wx:if="{{kt_type!=3 || is_normal==1}}">
 			<view class="tab-wrapper">			
 					<view hidden="{{bn_t_exp_t==2}}" bindtap='setexptype' data-t='1' class="tab {{bn_exp_type == 1? 'active':''}}"  
@@ -12,7 +13,7 @@
 			</view>
 		</view>
-		
+		</block>
         <!--要进行判断地址是否显示---->
         <view bindtap="enterAddressPage" class="user-mes mgt20" hidden='{{bn_exp_type==1 || kt_type==3}}'>
@@ -153,7 +154,7 @@
         </view>
     </view>
-     <view class="btn-wrap">
+     <view class="btn-wrap" wx:if="{{show_btn}}">
 			<view class="pay-amount">
 					<view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
 					<!-- <view class="co-red big"></view> -->
@@ -101,7 +101,7 @@
 					 <block wx:else> 				  
 				  	       <!-- 根本就找不到门店 -->
 				  	       <block wx:if="{{!only_pk && !def_pickpu_list}}">
-				  			   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>		   
+				  			   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
 				  		   </block>		 
 				  		   <block wx:else>
@@ -117,9 +117,11 @@
 				  					 <block wx:if="{{!def_pick_store}}">
 				  						 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
 				  					 </block>					 
-				  					 <block wx:else>	 						 						  																	
+				  					 <block wx:else>
+										 <!-- 线下库存 -->
+										 <block wx:if="{{sales_rules==2 && prom_type==0 && !sele_g.whsle_id}}">
 				  							 <block wx:if="{{def_pick_store && !def_pick_store.CanOutQty}}">
-				  								  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>	
+				  								  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
 				  							 </block>
 				  							 <block wx:else>	
 												<view class="flex jc_sb">				  
@@ -129,6 +131,24 @@
 												        data-action="buy">立即购买</view> 
 												</view>		  
 				  							 </block>
+										 </block>
+                                         <!-- 线上库存 -->
+										 <block wx:else>
+											 <block wx:if="{{sele_g.store_count<=0}}">
+												 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
+													 库存不足5
+												 </view>
+											 </block>
+											 <block wx:else>
+												 <view class="flex jc_sb">
+													 <view class="spec-cart-btn spec-buy w40"  bindtap="addCart"
+														   data-action="add" style="background-color: #ffb03f;">加入购物车</view>
+													 <view class="spec-cart-btn spec-buy w40"  bindtap="addCart"
+														   data-action="buy">立即购买</view>
+												 </view>
+											 </block>
+
+										 </block>
 				  					 </block>									 
 				  				 </block>