自提相关调整2

pages/pay/pay.js

@@ -29,13 +29,14 @@ Page({
     },
     total:0,
     yunfei:0,
+	_yunfei:0,
     payFlag:false,
     useBalance:false,
     afterdec:0,//使用提货券扣除后的总额
 	remark:'',
 	
 	
-	receivetype:0,//提货方式
+	receivetype:1,//提货方式
 	pickdepartsList:[],
 	repickdepartsList:[],
 	pickindex:0,
@@ -46,7 +47,8 @@ Page({
     this.getOrderInfo()
 //  this.getBalanceInfo()
     wx.setStorageSync('use_address', false);
-    wx.setStorageSync('receivetype', 0);
+	wx.setStorageSync('use_pick_address', false);
+    wx.setStorageSync('receivetype', 1);
 	this.getpickdeparts();
   },
   onShow: function () {
@@ -59,7 +61,8 @@ Page({
 			this.setData({
 			  address: address,
 			  selectaddress:true,
-			  receivetype : receivetype
+			  receivetype : receivetype,
+			  yunfei : this.data._yunfei
 			});
 		}
 	}else{
@@ -68,7 +71,8 @@ Page({
 			this.setData({
 			  pick_address: address,
 			  selectpickaddress:true,
-			  receivetype : receivetype
+			  receivetype : receivetype,
+			  yunfei : 0
 			});
 		}
 	}
@@ -114,7 +118,8 @@ Page({
         payData: val.data,
         project: val.data.product_list,
         total:total,
-        yunfei:total<9900?val.data.freight:0
+        yunfei:that.data.receivetype == 0 ? total<9900?val.data.freight:0 : 0,
+		_yunfei:total<9900?val.data.freight:0,
       });
       
       
@@ -153,7 +158,7 @@ Page({
 //      curPayway:val.data.total >= (that.data.total + that.data.yunfei)?'balance':'weixinpay'
 				curPayway:'weixinpay',
 				useBalance:(val.data.total > 0 && that.data.payData.order_type == 0 && that.data.payData.pv >= that.data.payData.total_price)? true:false,
-				afterdec:parseInt(val.data.total) >= parseInt(that.data.total) + parseInt(that.data.yunfei)?'0':(that.data.total + that.data.yunfei)-val.data.total
+				afterdec:that.data.receivetype == 0 ? parseInt(val.data.total) >= parseInt(that.data.total) + parseInt(that.data.yunfei)?'0':(that.data.total + that.data.yunfei)-val.data.total : 0
       });
     }
     __request.$get(url, params, success)
@@ -170,7 +175,7 @@ Page({
         cache: false,
 				curPayway:'cent',
 				useBalance:false,
-				afterdec:parseInt(val.data.total) >= parseInt(that.data.total) + parseInt(that.data.yunfei)?'0':(that.data.total + that.data.yunfei)-val.data.total
+				afterdec:that.data.receivetype == 0 ? parseInt(val.data.total) >= parseInt(that.data.total) + parseInt(that.data.yunfei)?'0':(that.data.total + that.data.yunfei)-val.data.total : 0
       });
     }
     __request.$get(url, params, success)
@@ -471,7 +476,8 @@ Page({
   
   receivetbn(e){
 	this.setData({
-		receivetype: e.target.dataset.value
+		receivetype: e.target.dataset.value,
+		yunfei : e.target.dataset.value == 0 ? this.data._yunfei : 0
 	})
 	wx.setStorageSync('receivetype', e.target.dataset.value) //存入
   },

pages/pay/pay.wxml

@@ -1,7 +1,7 @@
 <view class="app app-bg">
 	<view class="receivetab">
-		<view class="{{receivetype == 0 ? 'receivetab_tit act' : 'receivetab_tit'}}" bindtap="receivetbn" data-value="0">快递运输</view>
 		<view class="{{receivetype == 1 ? 'receivetab_tit act' : 'receivetab_tit'}}" bindtap="receivetbn" data-value="1">门店自提</view>
+		<view class="{{receivetype == 0 ? 'receivetab_tit act' : 'receivetab_tit'}}" bindtap="receivetbn" data-value="0">快递运输</view>
 	</view>
 <view wx:if="{{receivetype == 0}}">
 	<view class="pay-address" wx:if="{{selectaddress && address !== null}}">
@@ -217,11 +217,10 @@
         </view>
         <view class="clean"></view>
       </view> -->
-
-	  <view class="yunfei" wx:if="{{payData.order_type != 3 && total<9900}}">
+	  <view class="yunfei" wx:if="{{receivetype == 0 && payData.order_type != 3 && total<9900}}">
 		 订单小于99元,还需支付<text style="color:#F00">{{yunfei / 100}}</text> 元运费
 	  </view>
-	  <view class="yunfei" wx:if="{{payData.order_type != 3 && total>=9900}}">
+	  <view class="yunfei" wx:if="{{receivetype == 0 && payData.order_type != 3 && total>=9900}}">
 		订单已满99元以上(含99元)免除运费
 	  </view>