修复bug

pages/AggregateOrders/components/orders.vue

@@ -190,7 +190,7 @@
 				// }
 				
 			},
-			
+			// 酒店详情
 			getOrderDetail(id) {
 				let msg = {
 					orderId: id,
@@ -247,6 +247,7 @@
 					}
 				);
 			},
+			// 酒店支付
 			submitB2COrderHandler(){
 				let userInfo = uni.getStorageSync("mall_UserInfo");
 				let model = this.orderData.parmResultRoomInfo

pages/hotel/detail.vue

@@ -688,6 +688,7 @@
 						}, 1000);
 					}
 				},err=> {
+					this.DidaHotelRoomDetails = {};
 					this.loading = false
 					uni.hideLoading()
 					uni.showToast({

pages/hotel/list.vue

@@ -78,9 +78,6 @@
 		},
 		onLoad(options) {
 			this.apimc = this.$uiConfig.mainColor;
-			if (options && options.Name) {
-				this.searchObj.KeyWords = options.KeyWords;
-			}
 		},
 		created() {
 			uni.setNavigationBarTitle({
@@ -146,14 +143,6 @@
 					this.status = "nomore";
 				}
 			},
-			chosenMorewhere(obj) {
-				if (obj.IsCheck == 0) {
-					obj.IsCheck = 1;
-				} else {
-					obj.IsCheck = 0;
-				}
-				this.research();
-			},
 			change(item) {
 				this.searchObj = {
 					...this.searchObj,
@@ -181,9 +170,7 @@
 			//获取列表数据
 			getList(type) {
 				if (this.showLoading) return
-				uni.showLoading({
-					title: "加载中",
-				});
+				uni.showLoading();
 				this.showLoading = true;
 				if (type == 1) {
 					this.HotelList = [];

pages/hotel/mapList.vue

@@ -171,9 +171,6 @@
 		},
 		onLoad(options) {
 			this.mc = this.$uiConfig.mainColor;
-			if (options && options.Name) {
-				this.searchObj.Name = options.Name;
-			}
 			if (options && options.msg) {
 				this.searchObj = JSON.parse(decodeURIComponent(options.msg))
 				this.pageTitle = this.searchObj.CityName
@@ -329,7 +326,7 @@
 			async getList(type) {
 				if(this.showLoading) return
 				this.showLoading = true
-				uni.showLoading({ title: "加载中" , mask: true});
+				uni.showLoading();
 				this.searchObj.QStars = this.tempRateAndPrice.rate.toString();
 				if (type == 1||this.searchObj.pageIndex==1) {
 					this.HotelList = [];
@@ -357,9 +354,7 @@
 								length = this.HotelList.length
 							}
 							this.setMarkers(res.data.pageData)
-
 							this.page_count = res.data.pageCount;
-
 							this.prevCurrent = length-1
 							if((length-1)==this.current){
 								this.nextCurrent = 0
@@ -373,11 +368,11 @@
 				);
 			},
 			async setMarkers(pageData){
-				if(pageData.length==0)return
+				if(pageData.length==0) return
 				for (let i = 0; i < pageData.length; i++) {
 					this.includePoints.push({
-						latitude: pageData[i].latitude+ i * 0.00001,
-						longitude: pageData[i].longitude+ i * 0.00001,
+						latitude: pageData[i].latitude,
+						longitude: pageData[i].longitude,
 					})
 					let obj = JSON.parse(JSON.stringify(this.markersObj))
 					obj = {

pages/hotel/orderdetails.vue

@@ -278,17 +278,17 @@
 				RatePlanList: null,
 				HotelMealTypes: [],
 				orderMsg: {
-					ArrivalTime: '14:00', //预计到达时间
+					ArrivalTime: '', //预计到达时间
 					EmployeeIdStr: "", //销售id
 					CheckInDate: "", //到店时间
 					RatePlanID: "",
 					CheckOutDate: "", //离店时间
 					RoomCount: "", //房间数量
-					guestLastName: "张", //英文姓
-					guestFirstName: "无误", //英文名
+					guestLastName: "", //英文姓
+					guestFirstName: "", //英文名
 					guestAddress: "",
-					guestPhoneNumber: "13344445555",
-					guestEmail: "123@qq.com", //Email
+					guestPhoneNumber: "",
+					guestEmail: "", //Email
 					BookingID: "",
 					HotelName: "", //酒店名称
 					HotelPic: "", //酒店封面