Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/guidecar/index.vue

@@ -370,12 +370,12 @@
 					this.STime = val
 					let myDate = new Date(this.msg.StartTime);
 					let days = myDate.getDay();
-					this.STime.week = this.getweek(days)
+				    this.STime.week = this.getweek(days)
 				}else{//结束时间的选择
 					this.msg.EndTime = val.year+'-'+val.month+'-'+val.day+' '+val.hour+':'+val.minute+':10';
 					this.ETime = val
 					let myDate = new Date(this.msg.EndTime);
-					let days = myDate.getDay();
+					let days = myDate.getDay();	
 					this.ETime.week = this.getweek(days)
 				}
 				let startTime = new Date(this.msg.StartTime); // 开始时间

pages/guidecar/orderDetail.vue

@@ -166,13 +166,12 @@
 						</view>
 						<view class="order_small" style="margin-top:5px;">
 							{{dataList.DetailList[0].UseDay==0.5?'半':dataList.DetailList[0].UseDay}}天,
-							{{dataList.DetailList[0].GoodsName}},
+							{{dataList.DetailList[0].CarBrandName}},
 							{{dataList.DetailList[0].GuideCarType}},
 							{{dataList.DetailList[0].RideNum}}座,
 						</view>
 						<view class="order_small" style="margin-top:5px;">
-
-							车牌号:{{dataList.DetailList[0].CarNumber}},
+						    {{dataList.DetailList[0].CarNumber}},
 							{{dataList.DetailList[0].IsSpell==1?'拼座':'不拼座'}},
 							{{dataList.DetailList[0].CarColorName}},
 							{{dataList.CarTypeStr}}