Merge branch 'master' of http://47.98.226.240:3000/twt/txCar

* 'master' of http://47.98.226.240:3000/twt/txCar:
  优惠券bug修改
  1
  选择门店列表接口传值

pages/me/discountCard.vue

@@ -84,7 +84,7 @@
 					}); 
 				}else{
 					uni.navigateTo({
-						url: 'discountDetail?couponId=' + item.CouponID,
+						url: 'discountDetail?couponId=' + item.ID,
 					})
 				}
 			},
@@ -123,7 +123,7 @@
 			goDiscountDetail(item) {
 
 				uni.navigateTo({
-					url: 'discountDetail?couponId=' + item.CouponID,
+					url: 'discountDetail?couponId=' + item.ID,
 				})
 			},
 			getItemData() {

pages/me/discountDetail.vue

@@ -76,7 +76,7 @@
 				})
 				let url = 'worldKeepCar/keepCarMy/queryTCouponDetail',
 					params = {
-						id: this.couponId,
+						ID: this.couponId,
 						
 					}
 				this.$http(url, params, 'GET').then(res => {

pages/module/orderShop.vue

@@ -100,8 +100,8 @@ export default {
 					lat:this.location.lat,
 					lng:this.location.lng,
 					cityCode:this.location.cityCode,
+					comprehensive:1,
 				}
-				
 			}else{
 				
 			}