酒店支付

pages/hotel/mapList.vue

@@ -102,7 +102,7 @@
 					iconPath: '',
 					title: '',
 					alpha: 0,
-					width: 30,
+					width: 20,
 					height: 30,
 					callout:{
 						content:'¥ 99999起',
@@ -118,8 +118,6 @@
 						padding: 5,
 						display: 'ALWAYS',
 					},
-					joinCluster: true,
-					clusterId: 10,
 				},
 				bubble:[
 					'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638761641584224459.png',

pages/hotel/order.vue

@@ -336,7 +336,6 @@
 					roomType: 0,
 					CustomerId: 0, //同行Id
 					DirectCustomerId: 0, //直客Id
-					CreateBy: 0, //同业联系人
 					Remarks: '', //备注
 				},
 				showtime: false,
@@ -838,18 +837,17 @@
 					if (this.customer && this.customer.erpBaseInfo && this.customer.erpBaseInfo.employeeId) {
 						that.orderMsg.EmployeeIdStr = this.customer.erpBaseInfo.employeeId;
 					}
-				// this.orderMsg.OrderSource = 7
 				// #endif
 
 				// #ifdef MP-AG
 					CreateBy = this.CreateBy
 					that.orderMsg.CustomerId = this.customer.customerId
-				// this.orderMsg.OrderSource = 5
-				if (this.customer && this.customer.salesBaseInfo && this.customer.salesBaseInfo.employeeId) {
-					this.orderMsg.EmployeeIdStr = this.customer.salesBaseInfo.employeeId
-				}
+					// if (this.customer && this.customer.salesBaseInfo && this.customer.salesBaseInfo.employeeId) {
+					// 	this.orderMsg.EmployeeIdStr = this.customer.salesBaseInfo.employeeId
+					// }
+					that.orderMsg.EmployeeIdStr = CreateBy
 				// #endif
-				that.orderMsg.CreateBy = CreateBy
+				
 				let CouponAllotIds = ''
 				if(this.useCouponIds.length>0){
 					CouponAllotIds = this.useCouponIds.join(',')

pages/hotel/orderdetails.vue

@@ -34,10 +34,8 @@
 							src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638766174213789755.png" />
 					</view>
 					<view class="orderIforRzTime column col">
-						<view>入住：<text>{{getDate(orderData.parmResultRoomInfo.CheckInDate)}}
-								{{ getWeek(orderData.parmResultRoomInfo.CheckInDate) }} 14:00后</text></view>
-						<view style="margin-top: 28rpx;">离店：<text>{{getDate(orderData.parmResultRoomInfo.CheckOutDate)}}
-								{{ getWeek(orderData.parmResultRoomInfo.CheckOutDate) }} 12:00前</text></view>
+						<view>入住：<text>{{getDate(orderData.parmResultRoomInfo.CheckInDate)}} {{ getWeek(orderData.parmResultRoomInfo.CheckInDate) }} 14:00后</text></view>
+						<view style="margin-top: 28rpx;">离店：<text>{{getDate(orderData.parmResultRoomInfo.CheckOutDate)}} {{ getWeek(orderData.parmResultRoomInfo.CheckOutDate) }} 12:00前</text></view>
 					</view>
 					<view class="orderIforRzNum">
 						{{getDay(orderData.parmResultRoomInfo.CheckInDate.slice(0, 10),orderData.parmResultRoomInfo.CheckOutDate.slice(0, 10))}}晚
@@ -316,7 +314,7 @@
 				this.apipost("GetCodeByOrderNo_post", payMsg, (res) => {
 					if (res.resultCode == 1) {
 						this.orderInfo = JSON.parse(res.data.sPayInfo)
-						this.goPayHandler();
+						this.goPayHandler(res.data);
 					} else {
 						uni.showToast({
 							title: res.message,
@@ -334,6 +332,41 @@
 					this.submit = false
 				});
 			},
+			goPayHandler(item) {
+				let OrderNo=item.OrderNo;
+				let that = this;
+				uni.requestPayment({
+					provider: "wxpay",
+					timeStamp: this.orderInfo.timeStamp,
+					nonceStr: this.orderInfo.nonceStr,
+					package: this.orderInfo.package,
+					signType: this.orderInfo.signType,
+					paySign: this.orderInfo.sign,
+					success: function(res) {
+						that.submit = false;
+						uni.showToast({
+							title: "支付成功",
+						});
+						setTimeout(() => {
+							// (that.getPrice(that.orderMsg.TotalPrice) - that
+							// 			.currentCoupon.discountMoney).toFixed(2) +
+							// 		"&isFrom=5
+							uni.redirectTo({
+								url: "/pages/jiuzhai/paysuccess?PreferPrice=" +
+									(that.orderData.model.TotalPrice-that.orderData.model.DiscountMoney).toFixed(2) +
+									"&isFrom=5",
+							});
+						}, 100);
+					},
+					fail: function(err) {
+						that.submit = false;
+						uni.showToast({
+							title: "支付失败",
+							icon: "none",
+						});
+					},
+				});
+			},
 			goCancel() {
 				if (this.submitCancel) return
 				this.submitCancel = true