token修改4&订单修改

packageUser/pages/user/orders/orders.js

@@ -12,21 +12,21 @@ Page({
   },
   onLoad: function (options) {
     rid = options.type
-    if (rid) {
-      if (rid === 'unpay') {
-        this.tabUnpay()
-      } else if (rid === 'processing') {
-        this.tabProcessing()
-      } else if (rid === 'dispatch') {
-        this.tabDispatch()
-      } else if (rid === 'complete') {
-        this.tabComplete()
-      } else {
-        this.getOrderList()
-      }
-    } else {
-      this.getOrderList()
-    }
+    // if (rid) {
+    //   if (rid === 'unpay') {
+    //     this.tabUnpay()
+    //   } else if (rid === 'processing') {
+    //     this.tabProcessing()
+    //   } else if (rid === 'dispatch') {
+    //     this.tabDispatch()
+    //   } else if (rid === 'complete') {
+    //     this.tabComplete()
+    //   } else {
+    //     this.getOrderList()
+    //   }
+    // } else {
+    //   this.getOrderList()
+    // }
   },
   onShow () {
     if (getApp().globalData.order) {

pages/centcart/centcart.js

@@ -112,11 +112,11 @@ Page({
 	        cartTotal: res.data.total
 	      })
     	}else{
-    		wx.showToast({
-	        title: '请先授权登录~',
-	        icon: 'none',
-	        duration: 2000
-	      })
+    		// wx.showToast({
+	     //    title: '请先授权登录~',
+	     //    icon: 'none',
+	     //    duration: 2000
+	     //  })
     	}
     }
     _request.$get(url, params, success)

pages/pay/pay.js

@@ -53,7 +53,7 @@ Page({
   },
   onShow: function () {
     this.getUserInfo()
-    
+	this.getOrderInfo()
 	var receivetype = wx.getStorageSync('receivetype');
 	if(receivetype == 0){
 		var address = wx.getStorageSync('use_address');
@@ -145,6 +145,38 @@ Page({
       	that.getBalanceInfo();
       }
       
+	  if(val.data.pay_way != '' && (val.data.address_id != 0 || val.data.pick_dept != 0)){
+		  if(val.data.pick_way == 0){
+			  that.getAddress(val.data.address_id);
+		  	that.setData({
+		  	  selectaddress:true,
+		  	  receivetype : val.data.pick_way,
+		  	  yunfei : val.data.freight,
+			  remark : val.data.remark
+		  	});
+		  }else{
+			  // that.getPickAddress(val.data.pick_dept);
+			  var pid = 0;
+			  for(var i = 0;i<that.data.pickdepartsList.length;i++){
+			  	if(that.data.pickdepartsList[i]['id'] == val.data.pick_dept) pid = i;
+			  }
+			  var _pick_address = {
+				  contact:val.data.contact,
+				  tel:val.data.tel
+			  }
+		  	that.setData({
+		  	  selectpickaddress:true,
+		  	  receivetype : val.data.pick_way,
+		  	  yunfei : 0,
+			  pick_address:_pick_address,
+			  pickindex:pid,
+			  pickid:that.data.payData.pick_dept,
+			  remark : val.data.remark
+		  	});
+		  }
+	  }
+	  
+	  
     }
     __request.$get(url, params, success)
   },
@@ -453,6 +485,7 @@ Page({
 							that.setData({
 					      payFlag: false
 					    })
+					that.onShow()
 	          }
 	        })
 	      } else {
@@ -469,10 +502,12 @@ Page({
 	      that.setData({
 		      payFlag: false
 		    })
+			that.onShow()
     	}else{
     		that.setData({
 		      payFlag: false
 		    })
+			that.onShow()
     	}
     }
     var fail = function(err){
@@ -511,12 +546,21 @@ Page({
   
   
   receivetbn(e){
-	this.setData({
-		receivetype: e.target.dataset.value,
-		yunfei : e.target.dataset.value == 0 ? this.data._yunfei : 0
-	})
-	wx.setStorageSync('receivetype', e.target.dataset.value) //存入
-	this.getBalanceInfo()
+	  if(this.data.payData.pay_way != ''){
+		  wx.showToast({
+		    title: '当前订单内容已生效无法更改',
+		    icon: 'none',
+		    duration: 2000
+		  })
+	  }else{
+		  this.setData({
+		  	receivetype: e.target.dataset.value,
+		  	yunfei : e.target.dataset.value == 0 ? this.data._yunfei : 0
+		  })
+		  wx.setStorageSync('receivetype', e.target.dataset.value) //存入
+		  this.getBalanceInfo()
+	  }
+	
   },
   getpickdeparts: function () {
     var that = this
@@ -537,11 +581,50 @@ Page({
     __request.$get(url, params, success)
   },
   bindPickerChange: function(e) {
-      console.log('picker发送选择改变，携带值为', e.detail.value)
 	  var that = this;
-      this.setData({
-        pickindex: e.detail.value,
-		pickid:that.data.pickdepartsList[e.detail.value]['id']
-      })
+	 console.log('picker发送选择改变，携带值为', e.detail.value)
+	 this.setData({
+	   pickindex: e.detail.value,
+			pickid:that.data.pickdepartsList[e.detail.value]['id']
+	 }) 
+      
+   },
+   getAddress(id) {
+     var that = this
+     var url = 'v1/address/'
+     var params = {
+     }
+     var success = function (res) {
+		 var setaddress;
+		 for(var i in res.data){
+			 if(res.data[i]['id'] == id){
+				 setaddress = res.data[i];
+			 }
+		 }
+       
+	   that.setData({
+	     address:setaddress
+	   })
+     }
+     __request.$get(url, params, success)
    },
+   getPickAddress(id) {
+     var that = this
+     var url = 'v1/pick_address'
+     var params = {
+     }
+     var success = function (res) {
+   		 var setaddress;
+   		 for(var i in res.data){
+   			 if(res.data[i]['id'] == id){
+   				 setaddress = res.data[i];
+   			 }
+   		 }
+       
+   	   that.setData({
+   	     pick_address:setaddress
+   	   })
+     }
+     __request.$get(url, params, success)
+   }
 })

pages/pay/pay.wxml

@@ -5,7 +5,18 @@
 	</view>
 <view wx:if="{{receivetype == 0}}">
 	<view class="pay-address" wx:if="{{selectaddress && address !== null}}">
-		<navigator url="/packageUser/pages/user/address/address">
+		<view wx:if="{{payData.pay_way != ''}}">
+			<view class="pay-font">
+			  <text class="fl">收件人: {{address.contact}}</text>
+			  <text class="fr">{{address.tel}}</text>
+			  <view class="clean"></view>
+			</view>
+			<view  class="pay-font">
+			  <text>收件地址：{{address.province}}{{address.city}}{{address.district}}{{address.address}}</text>
+			</view>
+			<image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/arrow_right.jpg" class="pay-arrowR"></image>
+		</view>
+		<navigator url="/packageUser/pages/user/address/address" wx:else>
 			<view class="pay-font">
 			  <text class="fl">收件人: {{address.contact}}</text>
 			  <text class="fr">{{address.tel}}</text>
@@ -25,7 +36,15 @@
 </view>
 <view wx:else>
 	<view class="pay-address" wx:if="{{selectpickaddress && pick_address !== null}}">
-		<navigator url="/packageUser/pages/user/selfReceive/selfReceive">
+		<view wx:if="{{payData.pay_way != ''}}">
+			<view class="pay-font" style="line-height: 75rpx;margin-bottom:0">
+			  <text class="fl">自提人：{{pick_address.contact}}</text>
+			  <text class="fr">{{pick_address.tel}}</text>
+			  <view class="clean"></view>
+			</view>
+			<image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/arrow_right.jpg" class="pay-arrowR"></image>
+		</view>
+		<navigator url="/packageUser/pages/user/selfReceive/selfReceive" wx:else>
 			<view class="pay-font" style="line-height: 75rpx;margin-bottom:0">
 			  <text class="fl">自提人：{{pick_address.contact}}</text>
 			  <text class="fr">{{pick_address.tel}}</text>
@@ -40,7 +59,12 @@
 		<navigator url="/packageUser/pages/user/selfReceive/selfReceive" class="pay-address-add">点击选择提货人</navigator>
 	</view>
 	
-	<picker bindchange="bindPickerChange" value="{{index}}" range="{{repickdepartsList}}">
+	<view wx:if="{{payData.pay_way != ''}}">
+	    <view class="picker">
+	      {{pickid ? '自提点：'+repickdepartsList[pickindex] : '自提点：点击选择自提门店'}}
+	    </view>
+	</view>
+	<picker bindchange="bindPickerChange" value="{{index}}" range="{{repickdepartsList}}" wx:else>
 	    <view class="picker">
 	      {{pickid ? '自提点：'+repickdepartsList[pickindex] : '自提点：点击选择自提门店'}}
 	    </view>
@@ -238,7 +262,8 @@
     </view>
 	
 	<view class="remark">
-		<input type="text" class="nameText" placeholder="选填,请输入给商家的留言" placeholder-class="text-placeholder" bindinput="bindremark" />
+		<text wx:if="{{payData.pay_way != ''}}">{{payData.remark}}</text>
+		<input type="text" class="nameText" placeholder="选填,请输入给商家的留言" placeholder-class="text-placeholder" bindinput="bindremark" wx:else/>
 	</view>
 	
   </view>

pages/user/all/all.js

@@ -50,6 +50,8 @@ Page({
     var that = this;
 	// that.checkLogin();
     this.info();
+	that.getBalanceInfo()
+	that.getIntegralInfo()
     // if (this.data.bindTel) {
     //   this.getBalanceInfo()
     //   this.getIntegralInfo()

pages/user/all/all.wxml

@@ -117,7 +117,7 @@
 		  <view class="user-line__title">我的赠券</view>
 		  <image class="user-line__right" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
 		</view>
-      <view class="user-line" bindtap="toInviteList" wx:if="{{userInfo.show_invite_mode}}">
+      <view class="user-line" bindtap="toInviteList">
         <view class="user-line__title">我的推广</view>
         <image class="user-line__right" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/user/right.png"></image>
       </view>