| 
				
				
					
				
				
				 | 
			
			 | 
			@@ -419,8 +419,6 @@ Page({ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    if (options && options.couponChannelId){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			      that.getDetail(options.couponChannelId, 'notendclock'); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    } | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    console.log(options.cuserId) | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    console.log("---------------------------------options.cuserId---------------------------------------------------") | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    /** | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			     * 转赠判断 | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			     */ | 
		
		
	
	
		
			
				| 
				
					
				
				
					
				
				
				 | 
			
			 | 
			@@ -746,19 +744,31 @@ Page({ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            mask: false | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			          }); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			        } else if (err.code == 3012) { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			          wx.showModal({ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            title: '提示', | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            content: '您有未支付订单,请先进行支付', | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            confirmText:"去支付", | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            success: function (res) { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			              console.log(res.confirm) | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			              if(res.confirm){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                wx.navigateTo({ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                  url: '/pages/order/index/index?id=all', | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                }) | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			          if(that.data.data.type == 8){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            wx.showModal({ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			              title: '提示', | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			              content: "您有未支付订单,请到'我的-我的砍价'进行支付'", | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			              showCancel:false, | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			              success: function (res) { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                console.log(res.confirm) | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                if (res.confirm) { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                } | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			              } | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            } | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			          }) | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            }) | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			          }else{ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            wx.showModal({ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			              title: '提示', | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			              content: '您有未支付订单,请先进行支付', | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			              success: function (res) { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                console.log(res.confirm) | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                if(res.confirm){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                  wx.navigateTo({ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                    url: '/pages/order/index/index?id=all', | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                  }) | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                } | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			              } | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            }) | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			          } | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			        } else if (err.code == 11005) { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			          /** | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			           * 将值传到用户手机号授权的页面 | 
		
		
	
	
		
			
				| 
				
					
				
				
				
				 | 
			
			 | 
			
  |