机票

pages/airTicket/TicketOrderDetails.vue

@@ -60,7 +60,20 @@
         </scroll-view>
         <view style="border-radius: 20rpx 20rpx 0 0;" class="airTicketDetailsFooter bgFFF">
             <view class="TicketOrderDetailsFooter row-sbs-n"
-            v-if="dataModel.OrderState==1||dataModel.OrderState==2||dataModel.OrderState==3">
+            v-if="dataModel.OrderState==1||dataModel.OrderState==2||dataModel.OrderState==3||dataModel.OrderStatus==1">
+            <!-- #ifdef MP-DI -->
+                <view v-if="dataModel.OrderStatus==1&&dataModel.OrderStatus!=3" 
+                    class="fz32 relative TicketOrderListCard-PrQx MR20"
+                    :class="[loading?'color9999A5':'colorDEBF7B']"
+                    @click="cancelOrderZK()">取 消</view>
+                <view v-if="dataModel.OrderStatus==1" 
+                class="airTicketDetailsFooter-order PXY2463 row-ajc-w fontBold"
+                :class="[submit?'bgF5':'bgDEBF7B']"
+                @click="submitGetCodeByOrderNo">
+                    <text class="fz32">立即支付</text>
+                </view>
+            <!-- #endif -->
+            <!-- #ifdef MP-AG -->
                 <view v-if="dataModel.OrderState==1||dataModel.OrderState==2||dataModel.OrderState==3"
                 class="airTicketDetailsFooter-order row-ajc-w fontBold ML50"
                 :class="[loading?'bgF5':'bgF5 colorDEBF7B']"
@@ -73,6 +86,8 @@
                 @click="queren(orderMsg.ID)">
                     <text class="fz32">立即支付</text>
                 </view> -->
+            <!-- #endif -->
+                
             </view>
             <view class="TicketOrderDetailsFooter row-ajc-n" v-if="dataModel.OrderState==5||dataModel.OrderState==4">
                 <view
@@ -129,15 +144,14 @@
                         <view class="fz26 color9999A5 MT5">共 {{dataModel.GuestNum}} 人</view>
                     </view>
                     <view class="row-aic-n">
-                        
                         <!-- #ifdef MP-DI -->
-                            <view v-if="dataModel.OrderState==1" 
+                            <view v-if="dataModel.OrderStatus==1&&dataModel.OrderStatus!=3" 
                                 class="fz32 relative TicketOrderListCard-PrQx MR20"
                                 :class="[loading?'color9999A5':'colorDEBF7B']"
                                 @click="cancelOrderZK()">取 消</view>
-                            <view v-if="dataModel.OrderState==1" 
+                            <view v-if="dataModel.OrderStatus==1" 
                             class="airTicketDetailsFooter-order PXY2463 row-ajc-w fontBold"
-                            :class="[loading?'bgF5':'bgDEBF7B']"
+                            :class="[submit?'bgF5':'bgDEBF7B']"
                             @click="submitGetCodeByOrderNo">
                                 <text class="fz32">立即支付</text>
                             </view>
@@ -196,6 +210,7 @@
                 ],
                 title:'订单详情',
                 OrderNo: '',
+                submit: false,
             }
         },
         onLoad(options){
@@ -229,7 +244,7 @@
         },
         methods: {
             submitGetCodeByOrderNo() {
-				if (this.submit || this.submitCancel) return;
+				if (this.submit || this.loading) return;
 				this.submit = true
 				this.apipost("GetCodeByOrderNo_post", {
 					OrderNo: this.OrderNo,
@@ -284,7 +299,9 @@
 			getOrderInfoHandler(OrderNo){
 				this.apipost("GetDetailsByOrderNo_post",{OrderNo},res=>{
 					if(res.resultCode==1){
-                        this.dataModel = res.data
+                        this.dataModel = {
+                            OrderStatus: res.data.OrderStatus
+                        }
                         this.orderMsg.ID = res.data.ErpOrderId
                         this.getOrderDetails()
 					}else{
@@ -315,9 +332,10 @@
                         this.orderData = res.data;
                         // IsChargeLossOrders 1是收损单 2否
                         // IsApplyForCancel 1是小程序端发起取消 2否
-                        // #ifdef MP-AG
-                            this.dataModel = res.data.model
-                        // #endif
+                        this.dataModel = {
+                            ...this.dataModel,
+                            ...res.data.model
+                        }
                         this.orderData.model.GuestList.forEach(x=>{
                             let obj = {
                                 SurName:x.SurName+x.Name,
@@ -559,9 +577,7 @@
             },
             cancelOrderZK(){
                 let that = this
-                if(this.loading){
-                    return
-                }
+                if (this.submit || this.loading) return;
                 uni.showLoading({
                     title: "请稍等片刻...",
                 })

pages/airTicket/airTicketOrderDetail.vue

@@ -182,7 +182,7 @@
 						<view class="guest row items-center" v-for="(x,i) in order.GuestList" :key="i">
 							<text>{{String(i+1).padStart(2,'0')}}</text>
 							<view class="q-ml-md col">
-								<text class="bold" style="color: #000;">{{x.ESurName}}/{{x.EName}}</text>
+								<text class="bold" style="color: #000;">{{x.SurName}}/{{x.Name}}</text>
 								<text class="q-ml-sm">({{x.Sex==1?'男':'女'}})</text>
 							</view>
 							<view>
@@ -205,7 +205,16 @@
 			<view style="padding-bottom: 20rpx;"></view>
 		</scroll-view>
 		<view class="botton-box" :style="{paddingBottom:`${bottomSafeHeight}rpx`}">
-			<view class="text-center cities-name" @click="cancelVisible=true" v-if="order.status==0" style="background-color: #1d1d20;border-radius: 10rpx;height: 80rpx; line-height: 80rpx;color:#EEF1F4">取消订单</view>
+			<!-- #ifdef MP-DI -->
+				<view style=" display: flex;justify-content: space-between;">
+					<view class="text-center cities-name" @click="goCancelZK" v-if="order.OrderStatus==1" style="background-color: #fff;border: 1px solid #1d1d20;flex:1; border-radius: 10rpx;height: 80rpx; line-height: 80rpx;color:#333">取消订单</view>
+					<view class="text-center cities-name" @click="submitGetCodeByOrderNo" v-if="order.OrderStatus==1" style="background-color: #1d1d20;flex:1;border-radius: 10rpx;height: 80rpx; line-height: 80rpx;color:#EEF1F4;margin-left: 20rpx;">立即支付</view>
+				</view>
+				
+			<!-- #endif -->
+			<!-- #ifdef MP-AG -->
+				<view class="text-center cities-name" @click="cancelVisible=true" v-if="order.status==0" style="background-color: #1d1d20;border-radius: 10rpx;height: 80rpx; line-height: 80rpx;color:#EEF1F4">取消订单</view>
+			<!-- #endif -->
 			<view class="text-center cities-name" @click="requeryHandle" v-if="order.status==2" style="background-color: #1d1d20;border-radius: 10rpx;height: 80rpx; line-height: 80rpx;color:#EEF1F4">再次预定</view>
 			<view class="row" v-if="order.ResultPrice && order.status==1">
 				<view class="col" style="color: #9999A5;">
@@ -327,11 +336,12 @@
 				return this.order.TicketList[0].TicketProductList[0].B2BPrice
 			},
 			babyPrice() {
+				
 				if(!this.order.TicketList) return 0
 				const p = this.order.TicketList[0].TicketProductList[0].B2BPrice
+				
 				let bp = this.order.TicketList[0].TicketProductList[0].BabyPrecent
 				bp = bp && bp != '' ? (parseFloat(bp) / 100.00) : 0
-			
 				return Math.ceil(bp * p)
 			},
 		},
@@ -421,7 +431,11 @@
 					OrderTypeStr: this.OrderTypeStr,
 				},res=>{
 					if(res.resultCode==1){
-						this.id = res.data.id
+						this.OrderNo = res.data.OrderNo
+						this.order = {
+							OrderStatus:res.data.OrderStatus
+						}
+						this.getOrderDetailHandle()
 					}else{
 						
 					}
@@ -469,7 +483,10 @@
 							}
 							this.dielineTime = `${endTime.getHours()}时${endTime.getMinutes()}分`
 						}
-						this.order = res.data
+						this.order = {
+							...this.order,
+							...res.data
+						}
 						this.setThemeHandle()
 						this.lowData = this.formatLowData(res.data.TicketList)
 						this.getGuestHandle()
@@ -515,6 +532,36 @@
 					uni.hideLoading()
 				})
 			},
+			goCancelZK() {
+				let that = this
+				uni.showLoading()
+				wx.showModal({
+					title: '提示',
+					content: '确定取消订单？',
+					success: (tip) => {
+						if (tip.confirm) {
+							that.apipost(
+								"GetCancelOrder_post", {
+									OrderNo: that.OrderNo,
+								},
+								(res) => {
+									if (res.resultCode == 1) {
+										uni.showToast({
+											title: "操作成功",
+											icon: "success",
+										});
+										that.setThemeHandle();
+										that.getOrderInfoHandler()
+									}
+									uni.hideLoading()
+								},
+								(err) => {}
+							);
+						}else uni.hideLoading()
+					}
+				})
+				
+			},
 			requeryHandle(){
 				const x = this.lowData[0].GoFlightList
 				const d=[

pages/airTicket/flightDetail.vue

@@ -454,7 +454,7 @@
 					if(r.resultCode==1){
 						let tempData = r.data
 						// #ifdef MP-DI 
-							this.submitB2COrderHandler(tempData.OrderId)
+							this.submitB2COrderHandler(tempData)
 						// #endif
 						// #ifdef MP-AG
 							this.successVisible=true