包车订单修复

pages/AggregateOrders/components/orders.vue

@@ -356,7 +356,9 @@
 				} else if (item.goodsType == 7) { //道旅酒店住宿
 					url = `hotel/orderdetails?`;
 				} else if (item.goodsType == 5) { //目的地用车
-					url = `bus/orderdetails?SalePhone=${item.SalePhone}&`;
+					let phone = `SalePhone=${item.SalePhone}&`
+					url = `bus/orderdetails?`;
+					if(item.SalePhone) url+=phone
 				} else if (item.goodsType == 6) url = `visa/visa_SureOrder?` //签证  
 				else if (item.goodsType == 1) { //机票
 					url = `airTicket/airTicketOrderDetail?`

pages/bus/busList.vue

@@ -6,6 +6,7 @@
                     {{ busInfor.CityName  }}
                     {{ busInfor.time }}
                     {{pageTitle}}
+                    共{{ busInfor.peopleNum }}人
                 </view>
                 <u-icon name="arrow" :size="32" color="#000" style="position: relative;top: 2rpx;"></u-icon>
             </view>
@@ -111,6 +112,7 @@ export default {
                 this.msg.Q_Date = obj.time
                 this.msg.Q_SPeopleNum = obj.peopleNum
                 this.msg.Range = obj.Range
+                this.msg.Q_AirportId = obj.AirportId
                 if(obj.CarType == 1) this.pageTitle = '接机'
                 else if(obj.CarType == 2) this.pageTitle = '送机'
                 else if(obj.CarType == 3) this.pageTitle = '包车'

pages/bus/components/address/alightingPoint.vue

@@ -186,6 +186,7 @@
 			},
 			searchClose() {
 				this.isShow = false
+				this.parameters.KeyWords = ''
 				this.addressList = []
 				this.$emit('close')
 			},

pages/bus/index.vue

@@ -88,19 +88,7 @@
                         </view>
                     </template>
                     <template v-if="busInfor.CarType==3">
-                        <view class="bus-input row-sbas-n" style="padding:36rpx 18rpx;" @click="showDateHandle">
-                            <view class="row">
-                                <text class="bus-inputText" :style="{color: busInfor.time?'#080A09':'#BCBCBC'}">
-                                    {{busInfor.time?busInfor.time:'接载时间'}}
-                                </text>
-                            </view>
-                            <u-icon name="arrow" :size="32" color="#000" style="position: relative;top: 2rpx;"></u-icon>
-                            <!--
-                            <view class="row" @click="peopleVisible=true">
-                                <text>包车{{busInfor.days}}天</text>
-                                <u-icon name="arrow" :size="32" color="#000" style="position: relative;top: 2rpx;"></u-icon>
-                            </view>-->
-                        </view>
+                        
                         <!--
                         <scroll-view scroll-y="true"
                         style="height: 346rpx;overflow: hidden;margin-bottom: 30rpx;">
@@ -126,6 +114,19 @@
                             {{busInfor.destination?busInfor.destination:'目的地：地址或酒店'}}
                             </text>
                         </view>
+                        <view class="bus-input row-sbas-n" @click="showDateHandle" style="padding:36rpx 18rpx;">
+                            <view class="row">
+                                <text class="bus-inputText" :style="{color: busInfor.time?'#080A09':'#BCBCBC'}">
+                                    {{busInfor.time?busInfor.time:'接载时间'}}
+                                </text>
+                            </view>
+                            <u-icon name="arrow" :size="32" color="#000" style="position: relative;top: 2rpx;"></u-icon>
+                            <!--
+                            <view class="row" @click="peopleVisible=true">
+                                <text>包车{{busInfor.days}}天</text>
+                                <u-icon name="arrow" :size="32" color="#000" style="position: relative;top: 2rpx;"></u-icon>
+                            </view>-->
+                        </view>
                     </template>
 					
 					<view @click="searchHandle" class="text-center cities-name" style="background-color: #B99846;border-radius: 10rpx;height: 90rpx; line-height: 90rpx;color:#EEF1F4">查 询</view>

pages/bus/order.vue

@@ -794,7 +794,8 @@
 				} else {
 					this.orderMsg.Num++;
 				}
-				this.CalTotalPrice();	
+				this.getUserCouponList()
+				// this.CalTotalPrice();	
 			},
 			formatDate(str) {
 				let temp = str.split("-");

pages/bus/orderdetails.vue

@@ -334,7 +334,7 @@
 					Remarks: '', //备注
 				},
 				customer: {},
-				SalePhone: '',
+				SalePhone: null,
 				showModal: false,
 			};
 		},
@@ -345,7 +345,7 @@
 		},
 		onLoad(options) {
 			this.id = options.orderId;
-			this.SalePhone = options.SalePhone?options.SalePhone:'';
+			if(options.SalePhone) this.SalePhone = options.SalePhone
 			let that = this;
 			uni.getSystemInfo({
 				success(res) {
@@ -434,7 +434,7 @@
 							that.submitCancel = true;
 							this.apipost(
 								"GetCancelOrder_post", {
-									OrderNo: this.OrderNo,
+									OrderNo: that.OrderNo,
 								},
 								(res) => {
 									if (res.resultCode == 1) {
@@ -460,15 +460,17 @@
 				
 			},
 			goCancel() {
+				let that = this
+				console.log("this.orderData----", that.SalePhone);
 				// #ifdef MP-AG 
 					wx.showModal({
 						title: '提示',
-						content: `${this.SalePhone!=''?'确定拨打服务电话取消订单吗？':'请联系服务人员进行取消？'}`,
+						content: `${that.SalePhone?'确定拨打服务电话取消订单吗？':'请联系服务人员进行取消？'}`,
 						success: (tip) => {
 							if (tip.confirm) {
-								if(this.SalePhone!=''){
+								if(that.SalePhone){
 									uni.makePhoneCall({
-										phoneNumber: this.SalePhone,
+										phoneNumber: that.SalePhone,
 									});
 								}
 							}
@@ -476,7 +478,6 @@
 					})
 					return 
 				// #endif
-				var that = this;
 				if (this.submitCancel) return
 				this.submitCancel = true;
 				var cancelMsg = {