|  | @@ -220,14 +220,28 @@
 | 
												
													
														
															|  |  				uni.scanCode({
 |  |  				uni.scanCode({
 | 
												
													
														
															|  |  					onlyFromCamera: true,
 |  |  					onlyFromCamera: true,
 | 
												
													
														
															|  |  					success: (res) => {
 |  |  					success: (res) => {
 | 
												
													
														
															|  | -						console.log('扫描二维码成功,结果:' + res.result);
 |  | 
 | 
												
													
														
															|  | 
 |  | +						// uni.getStorageSync('homestayId'))
 | 
												
													
														
															|  | 
 |  | +						console.log('扫描二维码成功,结果:' + JSON.parse(res.result));
 | 
												
													
														
															|  |  						let obj = {
 |  |  						let obj = {
 | 
												
													
														
															|  | -							orderId: res.result,
 |  | 
 | 
												
													
														
															|  | 
 |  | +							orderId: JSON.parse(res.result).orderCode,
 | 
												
													
														
															|  |  							isDel: 1
 |  |  							isDel: 1
 | 
												
													
														
															|  |  						}
 |  |  						}
 | 
												
													
														
															|  | -						uni.navigateTo({
 |  | 
 | 
												
													
														
															|  | -							url: '/pages/house/orderDetails?obj=' + JSON.stringify(obj)
 |  | 
 | 
												
													
														
															|  | -						})
 |  | 
 | 
												
													
														
															|  | 
 |  | +						console.log(obj);
 | 
												
													
														
															|  | 
 |  | +						if (JSON.parse(res.result).homestayId != uni.getStorageSync('homestayId')) {
 | 
												
													
														
															|  | 
 |  | +							uni.showToast({
 | 
												
													
														
															|  | 
 |  | +								title: '您的核销码不是该商家的核销码',
 | 
												
													
														
															|  | 
 |  | +								icon: 'none',
 | 
												
													
														
															|  | 
 |  | +								duration: 1500
 | 
												
													
														
															|  | 
 |  | +							})
 | 
												
													
														
															|  | 
 |  | +						} else {
 | 
												
													
														
															|  | 
 |  | +							uni.navigateTo({
 | 
												
													
														
															|  | 
 |  | +								url: '/pages/house/orderDetails?obj=' + JSON.stringify(obj)
 | 
												
													
														
															|  | 
 |  | +							})
 | 
												
													
														
															|  | 
 |  | +						}
 | 
												
													
														
															|  | 
 |  | +
 | 
												
													
														
															|  | 
 |  | +
 | 
												
													
														
															|  | 
 |  | +
 | 
												
													
														
															|  | 
 |  | +
 | 
												
													
														
															|  |  
 |  |  
 | 
												
													
														
															|  |  						// uni.navigateTo({
 |  |  						// uni.navigateTo({
 | 
												
													
														
															|  |  						// 	url: '/pages/house/orderDetails?orderId=' + orderId
 |  |  						// 	url: '/pages/house/orderDetails?orderId=' + orderId
 |