包车

pages/bus/order.vue

@@ -569,9 +569,10 @@
 							title: "支付成功",
 						});
 						setTimeout(() => {
-							//跳转到详情页面
 							uni.redirectTo({
-								url: "/pages/bus/orderdetails?orderId=" + this.ErpOrderId,
+								url: "/pages/jiuzhai/paysuccess?PreferPrice=" +
+								(that.orderMsg.Money-that.currentCoupon.discountMoney).toFixed(2) +
+									"&isFrom=6",
 							});
 						}, 100);
 					},

pages/bus/orderdetails.vue

@@ -96,7 +96,8 @@
 					</view>
 				</view>
 			</view>
-			<view class="ReservationInforBox">
+			<view class="ReservationInforBox"
+			style="padding: 37rpx 18rpx 0rpx 18rpx;">
 				<view class="ReservationInforTitle">{{orderData.OrderType==1?'接机':orderData.OrderType==2?'送机':'包车'}}信息</view>
 				<view class="ResInforText row-sb-n">
 					<view class="ResInforL">车型</view>
@@ -149,6 +150,9 @@
 					</view>
 				</view>
 			</view>
+			<view v-if="orderData.OrderStatus==5" style="padding: 0 30rpx;">
+				<cancelProgress :datas="orderData"></cancelProgress>
+			</view>
 			<view class="ReservationInforBox">
 				<view class="big-title">
 					<text>费用明细</text>
@@ -175,8 +179,7 @@
 						<view style="text-align: right">
 							{{orderData.Num}}辆× {{orderData.CurrencyCode}}{{ orderData.Unit_Price }}
 						</view>
-					</view>
-
+					</view>	
 					<view class="flex f12 grey" style="margin-bottom: 40rpx" :style="{'color':mainColor+' !important'}"
 						v-if="orderData.DiscountsMoney&&orderData.DiscountsMoney>0">
 						<view style="flex: 1">
@@ -204,17 +207,17 @@
 			<view style="display: flex">
 				<!-- #ifdef MP-DI -->
 				<button v-if="orderData.OrderStatus==1||orderData.OrderStatus==5" class="jz_OrderReNow"
-					@click="goCancel" style="background: #fff; color: #111; border: 1px solid #111"
+					@click="goCancelZK" style="background: #fff; color: #111; border: 1px solid #111"
 					:disabled="submitCancel" :loading="submitCancel">
 					取消
 				</button>
-				<button v-if="orderData.model.OrderStatus==1" class="jz_OrderReNow" style="margin-left: 20rpx;"
+				<button v-if="orderData.OrderStatus==1" class="jz_OrderReNow" style="margin-left: 20rpx;"
 					@click="payHotelOrder" :disabled="submit" :loading="submit">
 					立即支付
 				</button>
 				<!-- #endif -->
 				<!-- #ifdef MP-AG -->
-				<button v-if="orderData.OrderStatus==1||orderData.model.OrderStatus==5" class="jz_OrderReNow"
+				<button v-if="orderData.OrderStatus==1||orderData.OrderStatus==5" class="jz_OrderReNow"
 					@click="goCancel" style="background: #fff; color: #111; border: 1px solid #111"
 					:disabled="submitCancel" :loading="submitCancel">
 					取消
@@ -340,13 +343,13 @@
 			});
 			this.customer = uni.getStorageSync("b2b_user")
 			this.mainColor = this.$uiConfig.mainColor;
-			if (this.id) this.getOrderDetail(this.id);
+			if (this.id) this.getOrderDetail();
 		},
 		methods: {
 			payHotelOrder() {
 				let userInfo = uni.getStorageSync("mall_UserInfo");
 				var payMsg = {
-					OrderNo: this.orderData.directOrder.OrderNo,
+					OrderNo: this.OrderNo,
 					OpenId: userInfo.OpenId,
 					MallBaseId:userInfo.MallBaseId,
 				};
@@ -383,7 +386,11 @@
 							title: "支付成功",
 						});
 						setTimeout(() => {
-							that.getOrderDetail(that.id)
+							uni.redirectTo({
+								url: "/pages/jiuzhai/paysuccess?PreferPrice=" +
+								(that.orderData.Money-that.orderData.DiscountsMoney).toFixed(2) +
+									"&isFrom=6",
+							});
 						}, 100);
 					},
 					fail: function(err) {
@@ -395,6 +402,42 @@
 					},
 				});
 			},
+			goCancelZK() {
+				var that = this;
+				if (this.submitCancel) return
+				this.submitCancel = true;
+				wx.showModal({
+					title: '提示',
+					content: '确定取消订单？',
+					success: (tip) => {
+						if (tip.confirm) {
+							this.apipost(
+								"GetCancelOrder_post", {
+									OrderNo: this.OrderNo,
+								},
+								(res) => {
+									if (res.resultCode == 1) {
+										uni.showToast({
+											title: "操作成功",
+											icon: "success",
+										});
+										that.submitCancel = false
+										that.getOrderDetail()
+									}
+								},
+								(err) => {
+									uni.showToast({
+										title: err.message,
+										icon: "none",
+									});
+									that.submitCancel = false
+								}
+							);
+						}
+					}
+				})
+				
+			},
 			goCancel() {
 				// #ifdef MP-AG 
 					wx.showModal({
@@ -416,17 +459,17 @@
 				if (this.submitCancel) return
 				this.submitCancel = true;
 				var cancelMsg = {
-					OrderNo: this.orderData.directOrder.OrderNo,
-					ErpOrderId: this.orderData.model.OrderID,
+					OrderNo: this.OrderNo,
+					ErpOrderId: this.id,
 					OrderTypeStr: "Hotel", //订单类型为酒店
 					ConfirmID: "",
 				};
 				//待付款-直接取消
-				if (this.orderData.model.OrderStatus == 1) {
+				if (this.orderData.OrderStatus == 1) {
 					this.apipost(
 						"b2b_get_GetB2BAllCancelOrder", {
 							ID: this.id,
-							OrderTypeStr: 'Vehicle',
+							OrderTypeStr: "5", 
 						},
 						(res) => {
 							if (res.resultCode == 1) {
@@ -434,7 +477,7 @@
 									title: "操作成功",
 									icon: "success",
 								});
-								this.getOrderDetail(this.id)
+								this.getOrderDetail()
 							}
 						},
 						(err) => {
@@ -611,12 +654,12 @@
 				});
 			},
 			//获取详情
-			getOrderDetail(id) {
+			getOrderDetail() {
 				uni.showLoading({
 					title: "加载中",
 				});
 				let msg = {
-					OrderId: id,
+					OrderId: this.id,
 				};
 				this.apipost("CarSingle_post_GetTYMyCarOrderInfo", msg,
 					(res) => {
@@ -647,10 +690,6 @@
 				this.apipost("GetDetailsByErpOrderId_post",parameter,res=>{
 					if(res.resultCode==1){
 							this.OrderNo = res.data.OrderNo
-							this.orderData = {
-								...this.orderData,
-								...res.data
-							}
 							this.formatStatus(
 								res.data.OrderStatus,
 								null,

pages/jiuzhai/paysuccess.vue

@@ -74,6 +74,7 @@ export default {
       } else if (this.isLineOrder == 3) num = '6'//签证订单
       else if (this.isLineOrder == 4) num = '1'//机票订单
       else if (this.isLineOrder == 5) num = '8,9,10,11'//酒店订单
+      else if (this.isLineOrder == 6) num = '12,13,14'//包车订单
       if(num){
         uni.redirectTo({
           url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=${num}`,