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

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

pages/module/confirmOrder.vue

@@ -241,108 +241,135 @@ export default {
 			})
 		},
 		settlement(){
+			var that=this;
+			if(this.yhTotalSize>0){
+				if(this.couponID==''){
+					uni.showModal({
+					    title: '提示',
+					    content: '当前有可用优惠券未使用',
+						cancelText:'放弃使用',
+						confirmText:'去使用',
+					    success: function (res) {
+					        if (res.confirm) {
+					            //console.log('用户点击确定');
+								var payMoney=that.goodsMoney+that.itemMoney;
+								uni.navigateTo({
+									url:'../me/discountCard?payMoney='+payMoney
+								})
+					        } else if (res.cancel) {
+					           that.tosettlement()
+					        }
+					    }
+					});
+				}else{
+					that.tosettlement()
+				}
+			}else {
+				that.tosettlement()
+			}
+			
+		},
+		tosettlement(){
 			if(this.couponMoney){
 				this.payMoney=this.goodsMoney+this.itemMoney-this.couponMoney;
 			}else{
 				this.payMoney=this.goodsMoney+this.itemMoney;
-			}
-			
-			//this.payMoney=3;
-			
-		 if(this.iphoneData){
-				if(this.iphoneData.name==''){
-					uni.showToast({
-					     title: '请选择联系人',
-					 	 icon:'none',
-					     duration: 2000
-					 });
-					return false;
-				}
-			}else{
-				uni.showToast({
-				     title: '请选择联系人',
-				 	 icon:'none',
-				     duration: 2000
-				 });
-				return false;
-			}
-			 
-	        /* var cardata={
-				 annualmoney: "2017",
-				 brand: "大众",
-				 brandLogo: "http://img.db.66km.cn/carbrandlogo/D - 大众.png",
-				 buyDate: "",
-				 carModel: "2018 双离合变速器(DSG) 7档 前置前驱 CC",
-				 carName: "",
-				 carNumber: "",
-				 createTime: "2021-10-27 09:20:29",
-				 dayMilage: 661,
-				 displacement: "1.4T",
-				 engineCode: "",
-				 engineType: "1111",
-				 id: "07EB4B07-5302-4574-9709-0EC0D1668155",
-				 insuranceCompany: "",
-				 insuranceExpireDate: "1900-01-01 00:00:00",
-				 insuredCity: "",
-				 isDefault: 0,
-				 istransfer: "",
-				 memberID: "E4416E30-C82A-4136-81B7-6B424DDE4847",
-				 milage: 7788,
-				 model: "C-TREK(蔚领)",
-				 nLevelID: "CFV0718D0038",
-				 plateNumber: "鲁A22333",
-				 saleName: "",
-				 series: "C-TREK(蔚领)",
-				 transmissionType: "自动",
-				 traveltime: "",
-				 vIN: "",
-				 currentMileage:'1111',
-			 } */
-			
-			uni.showLoading({ });
-			this.$http('worldKeepCar/maintainOrder/submitOrder', {
-			  shopName:this.orderShop.shopName,
-			  contactName:this.iphoneData.name,
-			  contactPhone:this.iphoneData.phone,
-			  carID:this.maintainCarData.id,
-			  plateNumber:this.maintainCarData.plateNumber,
-			  carModel:this.maintainCarData.carModel,
-			  currentMileage:this.maintainCarData.milage,//this.currentMileage,
-			  comment:this.remark,
-			  itemMoney:this.itemMoney,
-			  goodsMoney:this.goodsMoney,
-			  goodsCount:this.goodsCount,
-			  itemCount:this.itemCount,
-			  couponMoney:this.couponMoney,
-			  couponID:this.couponID,
-			  payMoney:this.payMoney,
-			  //payMoney:0.01,
-			  packJsonArr:JSON.stringify(this.packJsonArr) ,
-			  shopID:this.orderShop.shopId,
-			 // unionID:this.orderShop.unionId,
-			 },'POST').then(res => {
-				  if(res.code==0){
-					   if(this.payMoney==0){
-						    uni.hideLoading();
-						   /* uni.navigateTo({
-						   	url:'../order/orderDetail?id='+res.data.id+'&type=2'
-							 
-						   }) */
-						   this.orderPayzero(res.data.id)
-					   }else{
-						   this.orderPay(res.data.id) 
-					   }
-					   
-				  }else{
-					   uni.hideLoading();
-					 uni.showToast({
-					      title: res.msg,
-					  	 icon:'none',
-					      duration: 4000
-					  });
-				  }
-				 	
-			})
+			}	
+						//this.payMoney=3;		
+			if(this.iphoneData){
+							if(this.iphoneData.name==''){
+								uni.showToast({
+								     title: '请选择联系人',
+								 	 icon:'none',
+								     duration: 2000
+								 });
+								return false;
+							}
+						}else{
+							uni.showToast({
+							     title: '请选择联系人',
+							 	 icon:'none',
+							     duration: 2000
+							 });
+							return false;
+						}
+						 
+			   /* var cardata={
+							 annualmoney: "2017",
+							 brand: "大众",
+							 brandLogo: "http://img.db.66km.cn/carbrandlogo/D - 大众.png",
+							 buyDate: "",
+							 carModel: "2018 双离合变速器(DSG) 7档 前置前驱 CC",
+							 carName: "",
+							 carNumber: "",
+							 createTime: "2021-10-27 09:20:29",
+							 dayMilage: 661,
+							 displacement: "1.4T",
+							 engineCode: "",
+							 engineType: "1111",
+							 id: "07EB4B07-5302-4574-9709-0EC0D1668155",
+							 insuranceCompany: "",
+							 insuranceExpireDate: "1900-01-01 00:00:00",
+							 insuredCity: "",
+							 isDefault: 0,
+							 istransfer: "",
+							 memberID: "E4416E30-C82A-4136-81B7-6B424DDE4847",
+							 milage: 7788,
+							 model: "C-TREK(蔚领)",
+							 nLevelID: "CFV0718D0038",
+							 plateNumber: "鲁A22333",
+							 saleName: "",
+							 series: "C-TREK(蔚领)",
+							 transmissionType: "自动",
+							 traveltime: "",
+							 vIN: "",
+							 currentMileage:'1111',
+						 } */
+						
+						uni.showLoading({ });
+						this.$http('worldKeepCar/maintainOrder/submitOrder', {
+						  shopName:this.orderShop.shopName,
+						  contactName:this.iphoneData.name,
+						  contactPhone:this.iphoneData.phone,
+						  carID:this.maintainCarData.id,
+						  plateNumber:this.maintainCarData.plateNumber,
+						  carModel:this.maintainCarData.carModel,
+						  currentMileage:this.maintainCarData.milage,//this.currentMileage,
+						  comment:this.remark,
+						  itemMoney:this.itemMoney,
+						  goodsMoney:this.goodsMoney,
+						  goodsCount:this.goodsCount,
+						  itemCount:this.itemCount,
+						  couponMoney:this.couponMoney,
+						  couponID:this.couponID,
+						  payMoney:this.payMoney,
+						  //payMoney:0.01,
+						  packJsonArr:JSON.stringify(this.packJsonArr) ,
+						  shopID:this.orderShop.shopId,
+						 // unionID:this.orderShop.unionId,
+						 },'POST').then(res => {
+							  if(res.code==0){
+								   if(this.payMoney==0){
+									    uni.hideLoading();
+									   /* uni.navigateTo({
+									   	url:'../order/orderDetail?id='+res.data.id+'&type=2'
+										 
+									   }) */
+									   this.orderPayzero(res.data.id)
+								   }else{
+									   this.orderPay(res.data.id) 
+								   }
+								   
+							  }else{
+								   uni.hideLoading();
+								 uni.showToast({
+								      title: res.msg,
+								  	 icon:'none',
+								      duration: 4000
+								  });
+							  }
+							 	
+						})
 		},
 		orderPayzero(id){
 			this.$http('worldKeepCar/maintainOrder/orderPay', {

pages/module/maintain.vue

@@ -39,7 +39,7 @@
 						<view class="contTop">
 							<view class="contTopLeft">
 								<view class="listPackgeName"> {{item.name}} </view>
-								<view class="listPackgeMs">10000公里(或6个月)/次 | 机油参考用量4L</view>
+								<view class="listPackgeMs">{{item.referenceDosage}}</view>
 							</view>
 							<view class="contTopRight" @click="listcheck(item)">
 								<image src="../../static/img/login_icon_checked.png" mode="" class="imgPrivacy" v-show="item.planItem"></image>
@@ -248,7 +248,13 @@ export default {
 		listcheck(item){
 			item.planItem=!item.planItem;
 			//var 
-			this.calculation();
+			if(this.mealData[this.leftIndex].name=='小保养'){
+				this.calculation('大保养');
+			}else if(this.mealData[this.leftIndex].name=='大保养'){
+				this.calculation('小保养');
+			}else{
+				this.calculation();
+			}
 			if(item.planItem){
 				/* this.orderData.push(item) */
 			}
@@ -284,7 +290,7 @@ export default {
 			});
 			
 		},
-		calculation(){
+		calculation(txt){
 			this.total=0;
 			this.totalhj=0;
 			this.goodsTotal=0;
@@ -292,6 +298,14 @@ export default {
 			this.orderData=[]
 			this.mealData.forEach(v=>{
 				v.num=0;
+				if(txt == v.name){
+					console.log(v.name)
+					if(v.listPackage){
+						v.listPackage.forEach(i=>{
+							i.planItem=false
+						})
+					}
+				}else{
 				if(v.listPackage){
 					v.listPackage.forEach(i=>{
 						if(i.planItem){
@@ -335,7 +349,7 @@ export default {
 						}
 					})
 				}
-				
+				}
 				//if(v.listPackage)
 			})
 			this.totalhj=Number(this.goodsTotal)+Number(this.salePriceTotal)

pages/module/orderShop.vue

@@ -41,14 +41,16 @@
 
 				</view>
 			</view>
+			<nodata v-if="queryShopList.length<1"></nodata>
 		</view>
 	</view>
 </template>
 
 <script>
+	import nodata from '@/components/nodata/nodata.vue'
 	export default {
 		components: {
-
+           nodata
 		},
 		data() {
 			return {
@@ -67,7 +69,13 @@
 		onLoad(opt) {
 			this.orderData = opt.orderData;
 			this.currentMileage = opt.currentMileage;
-			this.location = uni.getStorageSync("locationCity");
+			var selectCity = uni.getStorageSync("selectCity");
+			if(selectCity){
+				this.location=selectCity
+			}else{
+				this.location = uni.getStorageSync("locationCity");
+			}
+			
 			this.brand = opt.brand;
 			
 			this.getqueryShopList()