Browse Source

查看新旧订单

gcz 3 weeks ago
parent
commit
b0245f05f0
2 changed files with 22 additions and 4 deletions
  1. 14 2
      center/order.vue
  2. 8 2
      center/orderdetails.vue

+ 14 - 2
center/order.vue

@@ -93,7 +93,7 @@
 					0:[{name:'取消订单',fun:'cancelOrder',class:''},{name:'去支付',fun:'pay',class:'red'}],
 					1:[],
 					2:[],
-					3:[{name:'改签',fun:'rebook',class:'',condition: (item) => item.allowReSubmit === 1},{name:'出示二维码',fun:'goOrderDetails',class:'red'}],
+					3:[{name:'改签',fun:'rebook',class:'',condition: (item) => item.allowReSubmit === 1},{name:'查看原订单',fun:'viewOldOrder',class:'',condition: (item) => !!item.orgOrderId},{name:'出示二维码',fun:'goOrderDetails',class:'red'}],
 					//,{name:'评价',fun:'evaluate',class:'green'}
 					4:[],
 					5:[],
@@ -102,7 +102,7 @@
 					7:[],
 					8:[],
 					9:[],
-					10:[]
+					10:[{name:'查看新订单',fun:'viewNewOrder',class:'red'}]
 				},
 				orderBadge:{
 					noPayNum:0,
@@ -255,6 +255,7 @@
 				  confirmReceipt:this.confirmReceipt,
 				  viewEvaluate:this.viewEvaluate,
 				  rebook:this.rebook,
+				  viewNewOrder:this.viewNewOrder,
 				};
 				// console.log('funObj[fun]',funObj[fun]);
 				if (fun in funObj) {
@@ -376,6 +377,17 @@
 				// console.log('rebook',item);
 				uni.$u.route('pages/ticketlist',{performId:item.performId,orderId:item.id,fromPage:'rebook'})
 			},
+			viewOldOrder(item){
+				uni.$u.route('/center/orderdetails', {
+					id: item.orgOrderId
+				});
+			},
+			viewNewOrder(item){
+				console.log('viewNewOrder',item.newOrderId);
+				uni.$u.route('/center/orderdetails', {
+					id: item.newOrderId
+				});
+			},
 			// 设置小程序订阅消息
 			setTemplate(orderId) {
 				let that = this;

+ 8 - 2
center/orderdetails.vue

@@ -98,7 +98,8 @@
 						<text class="btn" v-if="orderDetails.status==3&&orderDetails.allowReSubmit==1" @click="rebook">改签</text>
 						<text class="btn" v-if="orderDetails.status==3&&orderDetails.ifReSubmit!==1" @click="refund">申请退款</text>
 						<text class="btn" v-if="orderDetails.status==7" @click="invoice">申请发票</text>
-						<text class="btn" v-if="orderDetails.ifReSubmit===1" @click="viewOldOrder">查看原订单</text>
+						<text class="btn" v-if="orderDetails.orgOrderId" @click="viewOldOrder">查看原订单</text>
+						<text class="btn" v-if="orderDetails.newOrderId" @click="viewNewOrder">查看新订单</text>
 					</view>
 				</view>
 				<view class="order-info-item" v-for="(item,index) in orderInfo[orderDetails.status]" :key="index">
@@ -726,7 +727,12 @@
 			},
 			viewOldOrder(){
 				uni.$u.route('/center/orderdetails', {
-					id: this.orderDetails.resubmit.orgOrderId
+					id: this.orderDetails.orgOrderId
+				});
+			},
+			viewNewOrder(){
+				uni.$u.route('/center/orderdetails', {
+					id: this.orderDetails.newOrderId
 				});
 			}
 		}