|  |  | @@ -154,9 +154,6 @@ Page({ | 
		
	
		
			
			|  |  |  | wx.showLoading({ | 
		
	
		
			
			|  |  |  | title: "加载中" | 
		
	
		
			
			|  |  |  | }); | 
		
	
		
			
			|  |  |  | setTimeout(function () { | 
		
	
		
			
			|  |  |  | wx.hideLoading(); | 
		
	
		
			
			|  |  |  | }, 1500); | 
		
	
		
			
			|  |  |  | Http.get({ | 
		
	
		
			
			|  |  |  | url: config.api.orderDetail, | 
		
	
		
			
			|  |  |  | data: { | 
		
	
	
		
			
				|  |  | @@ -164,6 +161,7 @@ Page({ | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | }) | 
		
	
		
			
			|  |  |  | .then(res => { | 
		
	
		
			
			|  |  |  | wx.hideLoading(); | 
		
	
		
			
			|  |  |  | if(res.code == 200){ | 
		
	
		
			
			|  |  |  | that.getUserInfo() | 
		
	
		
			
			|  |  |  | that.setData({ | 
		
	
	
		
			
				|  |  | @@ -182,6 +180,7 @@ Page({ | 
		
	
		
			
			|  |  |  | }); | 
		
	
		
			
			|  |  |  | }) | 
		
	
		
			
			|  |  |  | .catch(error=>{ | 
		
	
		
			
			|  |  |  | wx.hideLoading(); | 
		
	
		
			
			|  |  |  | wx.showModal({ | 
		
	
		
			
			|  |  |  | title: '提示', | 
		
	
		
			
			|  |  |  | content: error.errMsg, | 
		
	
	
		
			
				|  |  | @@ -199,7 +198,6 @@ Page({ | 
		
	
		
			
			|  |  |  | * 去拼团 | 
		
	
		
			
			|  |  |  | */ | 
		
	
		
			
			|  |  |  | goToOrderGroup(orderId, orderGroupId, _this) { | 
		
	
		
			
			|  |  |  | console.log(22222222) | 
		
	
		
			
			|  |  |  | let that = this; | 
		
	
		
			
			|  |  |  | // 支付成功 | 
		
	
		
			
			|  |  |  | Http.post({ | 
		
	
	
		
			
				|  |  | @@ -241,10 +239,6 @@ Page({ | 
		
	
		
			
			|  |  |  | orderId: orderId | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | }).then(res => { | 
		
	
		
			
			|  |  |  | /// Begin payment ---- | 
		
	
		
			
			|  |  |  | that.setData({ | 
		
	
		
			
			|  |  |  | showButton: false | 
		
	
		
			
			|  |  |  | }) | 
		
	
		
			
			|  |  |  | var payOrderId = "" + res.data.payOrderId; | 
		
	
		
			
			|  |  |  | wx.hideLoading(); | 
		
	
		
			
			|  |  |  | wx.requestPayment({ | 
		
	
	
		
			
				|  |  | @@ -283,7 +277,6 @@ Page({ | 
		
	
		
			
			|  |  |  | return; | 
		
	
		
			
			|  |  |  | }, | 
		
	
		
			
			|  |  |  | }); | 
		
	
		
			
			|  |  |  | /// End payment  -------- | 
		
	
		
			
			|  |  |  | }); | 
		
	
		
			
			|  |  |  | } else { | 
		
	
		
			
			|  |  |  | // 免费券 | 
		
	
	
		
			
				|  |  | @@ -321,7 +314,10 @@ Page({ | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | }) | 
		
	
		
			
			|  |  |  | .then(res => { | 
		
	
		
			
			|  |  |  | wx.hideLoading() | 
		
	
		
			
			|  |  |  | wx.hideLoading(); | 
		
	
		
			
			|  |  |  | this.setData({ | 
		
	
		
			
			|  |  |  | showButton: false | 
		
	
		
			
			|  |  |  | }) | 
		
	
		
			
			|  |  |  | if (!type&&type!='free') { | 
		
	
		
			
			|  |  |  | wx.showToast({ | 
		
	
		
			
			|  |  |  | title: "购买成功", | 
		
	
	
		
			
				|  |  | 
 |