升舱

center/order.vue

@@ -93,7 +93,12 @@
 					0:[{name:'取消订单',fun:'cancelOrder',class:''},{name:'去支付',fun:'pay',class:'red'}],
 					1:[],
 					2:[],
-					3:[{name:'改签',fun:'rebook',class:'',condition: (item) => item.allowReSubmit === 1},{name:'查看原订单',fun:'viewOldOrder',class:'',condition: (item) => !!item.orgOrderId},{name:'出示二维码',fun:'goOrderDetails',class:'red'}],
+					3:[
+						{name:'改签',fun:'rebook',class:'',condition: (item) => item.allowReSubmit === 1},
+						{name:'升舱',fun:'upgrade',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:[],
@@ -255,6 +260,7 @@
 				  confirmReceipt:this.confirmReceipt,
 				  viewEvaluate:this.viewEvaluate,
 				  rebook:this.rebook,
+				  upgrade:this.upgrade,
 				  viewNewOrder:this.viewNewOrder,
 				  viewOldOrder:this.viewOldOrder,
 				};
@@ -378,6 +384,9 @@
 				// console.log('rebook',item);
 				uni.$u.route('pages/ticketlist',{performId:item.performId,orderId:item.id,fromPage:'rebook'})
 			},
+			upgrade(item){
+				uni.$u.route('pages/ticketlist',{performId:item.performId,orderId:item.id,fromPage:'rebook',isUpgrade:true})
+			},
 			viewOldOrder(item){
 				console.log('viewOldOrder',item.orgOrderId);
 				uni.$u.route('/center/orderdetails', {

center/orderdetails.vue

@@ -96,6 +96,7 @@
 					订单信息
 					<view class="btn-box">
 						<text class="btn" v-if="orderDetails.status==3&&orderDetails.allowReSubmit==1" @click="rebook">改签</text>
+						<text class="btn" v-if="orderDetails.status==3&&orderDetails.allowReSubmit==1" @click="upgrade">升舱</text>
 						<text class="btn" v-if="orderDetails.status==3&&orderDetails.ifReSubmit!==1" @click="refund">申请退款</text>
 						<text class="btn" v-if="orderDetails.status==7||orderDetails.newOrderId" @click="invoice">申请发票</text>
 						<text class="btn" v-if="orderDetails.orgOrderId" @click="viewOldOrder">查看原订单</text>
@@ -722,6 +723,9 @@
 			rebook(){
 				uni.$u.route('pages/ticketlist',{performId:this.orderDetails.performId,orderId:this.orderDetails.id,fromPage:'rebook'})
 			},
+			upgrade(item){
+				uni.$u.route('pages/ticketlist',{performId:item.orderDetails.performId,orderId:item.orderDetails.id,fromPage:'rebook',isUpgrade:true})
+			},
 			// 显示退款信息弹窗
 			showRefundInfoPopup(item) {
 				this.hideMainQR = true;

common/apiurl.js

@@ -132,6 +132,11 @@ const apiurl = {
 		url: '/order/orderResubmit/resubmitInfo',
 		type: 'get'
 	},
+	// 选择区域(获取改签信息)
+	selectRegionUpgrade: {
+		url: '/merchantPerformTime/getTimeSeatTypeAll',
+		type: 'get'
+	},
 	// 订单改签
 	rebookApi: {
 		url: '/order/orderResubmit/reSubmit',

pages/ticketlist.vue

@@ -74,12 +74,14 @@
 								{{ performDateList.find(item => item.performDate === date.fullDay ) !== undefined?'有演出':'无演出' }}
 							</view> -->
 							<view class="name">
-								{{date.fullDay|checkWeekDate}}
+								{{checkWeekDate(date.fullDay)}}
 							</view>
 							<view class="date">{{ date.month }} - {{ date.day }}</view>
 							<image class="selected-img" :src="staticUrl+'/img/selected.png'"></image>
 						</view>
-						<view class="date-item more-date u-flex u-row-center" @click="calendarShow = true">
+						<view class="date-item more-date u-flex u-row-center" 
+							v-if="!isUpgrade"
+							@click="calendarShow = true">
 							<view class="text">
 								<view class="">更多</view>
 								<view class="">日期</view>
@@ -207,7 +209,7 @@
 							</view>
 						</view>
 						<view class="submit-btn" :class="{active: hasSelectedTicket}" @click="handelRebook">
-							{{hasSelectedTicket ? '确认改签' : '请选择票'}}
+							{{hasSelectedTicket ? (isUpgrade ? '确认升舱' : '确认改签') : '请选择票'}}
 						</view>
 					</view>
 					<view class="inner" v-else>
@@ -385,6 +387,7 @@
 				newOrderId:'',
 				originOrderInfo:{},
 				reSubmitInfo:null,
+				isUpgrade:false,
 			}
 		},
 		onShow() {
@@ -423,15 +426,15 @@
 				this.performId = page.performId;
 				this.orderId = page.orderId;
 				this.fromPage = page.fromPage;
-				sharePath=`/pages/ticketlist?id=${page.id}`;
+				this.isUpgrade = page.isUpgrade;
+				
+				// 先获取订单信息
+				this.getOrderInfo();
+				
+				// 其他初始化
 				this.getPerformData();
-				// this.getSystemInfo();
-				let today = new Date();
-				this.setDate(today);
 				this.getPerformInfo();
 				this.getPerformerNotice();
-				//获取订单信息
-				this.getOrderInfo();
 			} 
 			else{
 				this.performId = page.id;
@@ -470,8 +473,16 @@
 				this.$u.api.orderDetails({id:this.orderId}).then(res=>{
 					console.log('getOrderInfo',res.data);
 					this.originOrderInfo = res.data||{};
+					// 在获取到订单信息后再设置日期
+					if(this.isUpgrade) {
+						this.setDate();
+					}
 				}).catch(err=>{
 					console.log('getOrderInfo',err);
+					uni.showToast({
+						title: '获取订单信息失败',
+						icon: 'none'
+					});
 				})
 			},
 			getPerformData(){
@@ -520,12 +531,24 @@
 				})
 			},
 			getTimes(){
-				// this.firstGet++;
-				uni.showLoading();
-				let auditoriumId= this.auditoriumList[this.auditoriumIndex]?.id;
-				if(!auditoriumId){return}
-				// console.log('this.dateList',this.dateList);
-				// console.log('this.dateIndex',this.dateIndex);
+				// uni.showLoading();
+				let auditoriumId = this.auditoriumList[this.auditoriumIndex]?.id;
+				if(!auditoriumId) return;
+
+				// 如果是升舱，只显示原订单的场次
+				if (this.isUpgrade && this.originOrderInfo && this.originOrderInfo.performTimeId) {
+					this.sessionList = [{
+						id: this.originOrderInfo.performTimeId,
+						performTimeStart: this.originOrderInfo.performTimeStart || '',
+						performTimeEnd: this.originOrderInfo.performTimeEnd || '',
+						ifVaild: 1
+					}];
+					this.sessionIndex = 0;
+					this.getPositionData();
+					uni.hideLoading();
+					return;
+				}
+
 				let dateOBJ = this.dateList[this.dateIndex];
 				let param = {
 					auditoriumId:auditoriumId,//演艺厅ID(演艺厅列表)
@@ -559,7 +582,7 @@
 				 day.date = moment(day.date).format("YYYY-MM-DD HH:mm:ss")
 				 
 				 // console.log('day',day);
-				 // console.log('thisthisthisthisthisthisthisthisthis',parentThis);
+				 // console.log('thisthisthisthisthisthisthisthisthisthisthis',parentThis);
 				 // console.log('==================================',day.date.toISOString().split('T')[0]);
 				let ticket = parentThis.performDateList.find(item => item.performDate === day.date.split(' ')[0]);
 				if(ticket){
@@ -574,7 +597,22 @@
 			    return day
 			  },
 			setDate(firstDay,isSelect){
-				// console.log('this.performDateList',this.performDateList);
+				// 如果是升舱，只显示原订单的日期
+				if (this.isUpgrade && this.originOrderInfo && this.originOrderInfo.performDate) {
+					const orderDate = this.originOrderInfo.performDate.split('-');
+					this.dateList = [{
+						year: orderDate[0],
+						month: orderDate[1],
+						day: orderDate[2],
+						name: '日期',
+						fullDay: this.originOrderInfo.performDate
+					}];
+					this.dateIndex = 0;
+					this.getTimes();
+					return;
+				}
+
+				// 原有的日期设置逻辑
 				if(this.performDateList[0]?.performDate&&!isSelect){
 					// firstDay = new Date(this.performDateList[0].performDate);
 					const uniquePerformDateList = Array.from(new Set(this.performDateList.map(JSON.stringify))).map(JSON.parse);//去重
@@ -627,6 +665,13 @@
 				// console.log('this.dateList ',this.dateList);
 			},
 			dateClick(index){
+				if (this.isUpgrade) {
+					uni.showToast({
+						title: '升舱不可更改日期',
+						icon: 'none'
+					});
+					return;
+				}
 				this.dateIndex = index;
 				this.ticketTypeIndex = 0;
 				this.positionIndex = 0;
@@ -655,6 +700,13 @@
 			sessionClick(index,data){
 				// console.log('sessionClick index',index);
 				console.log('sessionClick data',data);
+				if (this.isUpgrade) {
+					uni.showToast({
+						title: '升舱不可更改场次',
+						icon: 'none'
+					});
+					return;
+				}
 				if(!data.ifVaild){
 					uni.showToast({
 						title:'该场次不可用',
@@ -678,7 +730,7 @@
 			},
 			async getPositionData() {
 				try {
-					uni.showLoading();
+					// uni.showLoading();
 					
 					// 获取 retailId
 					let retailId = null;
@@ -692,22 +744,42 @@
 
 					// 构建请求参数
 					const session = this.sessionList[this.sessionIndex] || {};
+					const ticketType = this.ticketTypeList[this.ticketTypeIndex] || {};
 					const params = {
 						performId: this.performId,
 						auditoriumId: this.auditoriumList[this.auditoriumIndex].id,
 						performTimeId: session.id,
+						seatTypeId: ticketType.seatTypeId,
 						label: this.label,
 						retailId: this.retailId,
 						timeId: session.id,
 						orderId: this.orderId
 					};
 
-					// 根据不同场景调用不同接口
-					const api = this.fromPage === 'rebook' ? 
-						this.$u.api.selectRegionRebook : 
-						this.$u.api.selectRegionV2;
-					
-					const res = await api(params,{custom:{toast:false,noload:true}});
+					// 如果是升舱，添加固定日期和场次
+					if (this.isUpgrade && this.originOrderInfo) {
+						// params.performDate = this.originOrderInfo.performDate;
+						params.performTimeId = this.originOrderInfo.performTimeId;
+						params.resubmitType = 2; // 改签类型: 1-改签 2-升舱
+					}
+
+					// 根据不同场景选择对应的接口
+					let api;
+					if (this.fromPage === 'rebook') {
+						api = this.$u.api.selectRegionRebook;
+						// api = this.isUpgrade ? 
+						// 	this.$u.api.selectRegionUpgrade : 
+						// 	this.$u.api.selectRegionRebook;
+					} else {
+						api = this.$u.api.selectRegionV2;
+					}
+					//如果是升舱
+					if(this.isUpgrade){
+						// resubmitType 改签类型: 1-改签 2-升舱 不传默认为改签改签
+						params.resubmitType = 2;
+					}
+					const res = await api(params, {custom:{toast:false,noload:false}});
+					// const res = await api(params);
 					
 					// 处理响应数据
 					this.positionData = res.data;
@@ -727,7 +799,9 @@
 							...obj,
 							saleNum: obj.saleNum||0 // 初始化选择数量为0
 						}));
-
+					if(this.isUpgrade){
+						this.getReSubmitInfo();
+					}
 				} catch (error) {
 					console.error('获取座位数据失败:', error);
 					uni.showModal({
@@ -746,6 +820,24 @@
 					uni.hideLoading();
 				}
 			},
+			async getReSubmitInfo(){
+				// 构建请求参数
+				const session = this.sessionList[this.sessionIndex] || {};
+				const ticketType = this.ticketTypeList[this.ticketTypeIndex] || {};
+				const params = {
+					performId: this.performId,
+					auditoriumId: this.auditoriumList[this.auditoriumIndex].id,
+					performTimeId: session.id,
+					seatTypeId: ticketType.seatTypeId,
+					label: this.label,
+					retailId: this.retailId,
+					timeId: session.id,
+					orderId: this.orderId
+				};
+				const res = await this.$u.api.selectRegionRebook(params, {custom:{toast:false,noload:false}});
+				this.reSubmitInfo = res.data.reSubmitInfo;
+
+			},
 			// 改变票数
 			changeTicketNum(item, type) {
 				// console.log('changeTicketNum===',item, type);
@@ -767,6 +859,7 @@
 				console.log('this.positionArr',this.positionArr)
 			},
 			ticketTypeClick(index,date){
+				// console.log('date',date)
 				if(this.ticketTypeIndex==index){
 					// console.log('不变');
 					return
@@ -783,12 +876,15 @@
 				this.positionArr = this.positionArr.map(obj => {
 					return {
 						...obj, // 保留原有的字段
-						saleNum: 0 // 新增的字段
+						saleNum: this.isUpgrade?this.reSubmitInfo.saleNum:0 // 新增的字段
 					};
 				});
 				// let sellableProductIndex = this.findFirstSellableProductIndex();
 				// this.positionIndex = sellableProductIndex;
 				// this.getPositionData()
+				if(this.isUpgrade){
+					this.getReSubmitInfo();
+				}
 			},
 			positionClick(index,date){
 				if(this.positionIndex==index){
@@ -918,7 +1014,9 @@
 				console.log('handelRebook params',params);
 				uni.showModal({
 				  title: '温馨提示',
-				  content: '仅限改签一次,且改签后禁止退款,确定要继续改签吗?',
+				  content: this.isUpgrade ? 
+					  '仅限升舱一次,且升舱后禁止退款,确定要继续升舱吗?' : 
+					  '仅限改签一次,且改签后禁止退款,确定要继续改签吗?',
 				  success: res => {
 				    if (res.confirm) {
 						this.cansubmit = false;
@@ -1257,8 +1355,12 @@
 					urls: urls,
 					current:index
 				})
-			}
-
+			},
+			checkWeekDate(date) {
+				const weekDay = new Date(date).getDay();
+				const weekDayMap = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+				return weekDayMap[weekDay];
+			},
 		},
 		computed: {
 			// 是否已选择票