Merge branch 'B2C' of http://gitlab.oytour.com/zk123/jz_travel into B2C

pages/hotel/order.vue

@@ -76,15 +76,15 @@
 									<input type="text" v-model="sItem.LastName" :placeholder="`住客 ${i+1} 姓`" />
 									<input type="text" v-model="sItem.FirstName" :placeholder="`住客 ${i+1} 名`" />
 									<view class="row" style="margin-left:20rpx;">
-										<image v-if="item.GuestInfo.length>1"  
-										style="width: 27rpx;height: 27rpx;display: block;" 
-										@click="deleteGuest(index,i)"
-										src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638751245939665786.png" />
-										<image v-else
+										<image v-if="item.GuestInfo.length>1"
 											style="width: 27rpx;height: 27rpx;display: block;"
-										src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638755711218891689.png" />
-										<image style="width: 27rpx;height: 27rpx;display: block;margin-left:20rpx;" @click="addGuest(index)"
-										src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638751245974558349.png" />	
+											@click="deleteGuest(index,i)"
+											src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638751245939665786.png" />
+										<image v-else style="width: 27rpx;height: 27rpx;display: block;"
+											src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638755711218891689.png" />
+										<image style="width: 27rpx;height: 27rpx;display: block;margin-left:20rpx;"
+											@click="addGuest(index)"
+											src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638751245974558349.png" />
 									</view>
 								</view>
 							</view>
@@ -155,11 +155,10 @@
 							<view class="val f14 regular" style="text-align: right;">
 								<text style="margin-right: 30rpx;">{{searchObj.peoples}}人</text>
 								<text style="margin-right: 30rpx;">{{orderMsg.RoomCount}}间房</text>
-								<text
-									class="red">{{RoomInfo.Currency}}
+								<text class="red">{{RoomInfo.Currency}}
 									<!--{{getPrice(orderMsg.TotalPrice)*orderMsg.RoomCount}}-->
 									{{orderMsg.TotalPrice*orderMsg.RoomCount}}
-									</text>
+								</text>
 							</view>
 						</view>
 						<view class="form-items PriceMinXi" style="border-bottom: none;">
@@ -237,13 +236,13 @@
 					<text>
 						<!--{{ (getPrice(orderMsg.TotalPrice)*orderMsg.RoomCount)-currentCoupon.discountMoney }}-->
 						{{ (orderMsg.TotalPrice*orderMsg.RoomCount)-currentCoupon.discountMoney }}
-						</text>
+					</text>
 				</view>
 				<view class="sum-detail">共计 {{orderMsg.RoomCount}}间房</view>
-				<u-button :ripple="true" :hair-line="false" 
-				:disabled="(this.orderMsg&&this.orderMsg.TotalPrice==0)||submit"
-				:custom-style="(this.orderMsg&&this.orderMsg.TotalPrice==0)||submit?btnStyle2:btnStyle" @click="buyRoom"
-					:loading="submit">立即购买</u-button>
+				<u-button :ripple="true" :hair-line="false"
+					:disabled="(this.orderMsg&&this.orderMsg.TotalPrice==0)||submit"
+					:custom-style="(this.orderMsg&&this.orderMsg.TotalPrice==0)||submit?btnStyle2:btnStyle"
+					@click="buyRoom" :loading="submit">立即购买</u-button>
 			</view>
 		</view>
 		<u-picker v-model="showtime" mode="time" @confirm='confirm' :params="paramsTime"
@@ -382,7 +381,7 @@
 				this.orderMsg.hotelId = this.HotelInfo.hotelid;
 				this.orderMsg.HotelName = this.HotelInfo.name;
 				if (this.HotelInfo.images && this.HotelInfo.images.length > 0) {
-					this.orderMsg.HotelPic = this.HotelInfo.images[0];
+					this.orderMsg.HotelPic = this.HotelInfo.images[0].Path;
 				}
 			}
 			if (options.RoomInfo) {
@@ -462,7 +461,7 @@
 					GoodsPic: "",
 					GoodsType: 9,
 					OrderMake: `${this.orderMsg.CheckInDate}入住；${this.orderMsg.CheckOutDate}离店 ${guestInfo}`,
-					TotalPrice: this.orderMsg.TotalPrice,//this.getPrice(this.orderMsg.TotalPrice)
+					TotalPrice: this.orderMsg.TotalPrice, //this.getPrice(this.orderMsg.TotalPrice)
 					PreferentialPrice: this.currentCoupon.discountMoney,
 					ErpOrderId: OrderId,
 					Country: 0,
@@ -473,7 +472,7 @@
 					CreateBy: 0
 				};
 				if (this.HotelInfo.images && this.HotelInfo.images.length > 0) {
-					msg.GoodsPic = this.HotelInfo.images[0];
+					msg.GoodsPic = this.HotelInfo.images[0].Path;
 				}
 				// #ifdef MP-DI
 				if (this.customer.salesBaseInfo && this.customer.salesBaseInfo.employeeId) {
@@ -558,7 +557,8 @@
 							this.roomRateDetails = res.data.PriceDetails.HotelList[0];
 							this.orderMsg.BookingID = res.data.PriceDetails.ReferenceNo;
 							this.orderMsg.checkInTime = res.data.PriceDetails.CheckInDate;
-							this.orderMsg.TotalPrice = this.roomRateDetails.TotalPrice//this.getPrice(this.roomRateDetails.TotalPrice);
+							this.orderMsg.TotalPrice = this.roomRateDetails
+								.TotalPrice //this.getPrice(this.roomRateDetails.TotalPrice);
 							if (this.roomRateDetails.RatePlanList && this.roomRateDetails.RatePlanList.length > 0) {
 								this.orderMsg.roomType = this.roomRateDetails.RatePlanList[0].BedType
 							}
@@ -701,7 +701,7 @@
 					LastName: "",
 					FirstName: "",
 					Age: ""
-				})	
+				})
 			},
 			deleteGuest(index, index1) {
 				this.orderMsg.GuestList[index].GuestInfo.splice(index1, 1)
@@ -786,8 +786,8 @@
 					})
 					return
 				}
-				
-				
+
+
 				if (this.submit) return;
 				this.submit = true;
 				let that = this;