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

* 'master' of http://47.98.226.240:3000/twt/txCar:
  1
  下单

pages/index/index.vue

@@ -278,7 +278,14 @@
 					})
 					return
 				}
-				
+				if (!this.memberCar) {
+					uni.showToast({
+						title:'请选择车辆',
+						icon:'none',
+						duration: 3000,
+					})
+					return
+				}
 				uni.navigateTo({
 					url: '../module/maintain?brand='+this.brand
 				})

pages/module/orderShop.vue

@@ -70,8 +70,17 @@
 			this.orderData = opt.orderData;
 			this.currentMileage = opt.currentMileage;
 			var selectCity = uni.getStorageSync("selectCity");
+			var dingw = uni.getStorageSync("locationCity")
 			if(selectCity){
-				this.location=selectCity
+				var objdata={
+					cityCode:selectCity.code,
+					cityName:selectCity.city,
+				}
+				if(dingw.cityName==selectCity.city){
+					objdata.lat=dingw.lat
+					objdata.lng=dingw.lng
+				}
+				this.location=objdata
 			}else{
 				this.location = uni.getStorageSync("locationCity");
 			}