feat:提交代码，对接完电影模块

src/pages/payment/index.vue

@@ -26,8 +26,8 @@ onLoad((options) => {
     state.payPrice = options.pay_price
     state.orderId = options.order_id
 	state.initType =options.initType //3 电影购票 1充值话费
-	state.orderSn = options.orderSn
-	console.log("===options.pay_price",options.pay_price);
+	state.orderSn = options.order_sn
+	console.log("===options.pay_price",options);
 
     if (options.tabIndex)
       state.tabIndex = options.tabIndex
@@ -51,7 +51,14 @@ function handleConfirm() {
     duration: 3000,
   })
   console.log("====state.orderId",state.orderId);
-   console.log("====state.orderId",state.orderList);
+   
+   let params =  {
+      oid: state.orderId,
+      OrderLists: state.orderList?state.orderList:[],
+      type: state.initType==1?'xfbspzfHF':(state.initType==3?'dyxfbzh':'xfbspzf'),// 商品--xfbspzf  话费--xfbspzfHF
+    }
+	
+	console.log("====state.params",params);
   uni.navigateToMiniProgram({
     // appid  写你要跳转的小程序的 appid
     // appId: 'wxfb755febdb800f23',
@@ -59,14 +66,11 @@ function handleConfirm() {
     // 路径写  src下的路径,假如你跳转的是pages下的页面,就可以写pages/index
     // path: 'pagesA/oderPay/oder_nian',
     path: 'pages/payment/payment',
-    extraData: {
-      oid: state.orderId,
-      OrderLists: state.orderList?state.orderList:[],
-      type: state.initType==1?'xfbspzfHF':(state.initType==3?'dyxfbzh':'xfbspzf'),// 商品--xfbspzf  话费--xfbspzfHF
-    },
+    extraData: params,
     envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
     // envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
     success(res) {
+		console.log("res===",res);
       // 打开成功
       uni.showToast({
         title: '跳转成功',
@@ -91,8 +95,8 @@ function onClickLeft() {
 	}
 	
 	if(state.initType==3){
-		uni.navigateBack({
-		  delta: 1,
+		uni.redirectTo({
+			url:`/subPages/pages/movies/orderDetail?orderSn=${state.orderSn}`
 		})
 		return
 	}

src/subPages/pages/movies/chooseSeat - 副本.vue

@@ -1,619 +0,0 @@
-<template>
-	<view class="w-100">
-		<view class="bg-f1 h-100vh">
-			<view class="pt-f left-0 w-100 p-0-32 bg-white z1000" :style="'height: 132rpx;top:0'">
-				<view>
-					<view class="fz-34 fw-b pt-20">
-						{{initInfo.film_name}}
-					</view>
-					<view class="mt-10 fz-28 color-666">
-						{{initInfo.show_des}}
-					</view>
-				</view>
-			</view>
-			<movable-area :style="'height:'+(seatRow*40+350)+'rpx;width: 100vw;top:'+(rpxNum*132)+'px'" class="pt-f left-0">
-				<movable-view :style="'width: 100vw;height:'+(seatRow*40+350)+'rpx;'" :inertia="true" :scale="true" :scale-min="0.95"
-				 :scale-max="2" direction="all" @change="onMove" @scale="onScale">
-					<view class="Stage dp-f jc-c ai-c fz-22 color-333">
-						{{initInfo.hall_name}}
-					</view>
-					<view style="width: 100rpx;height: 30rpx;" class="m-0-a mt-48 dp-f jc-c ai-c fz-20 color-999 b-1 br-5">银幕中央</view>
-					
-					<view class="pt-f pa-v-2 b-d-1" :style="'height:'+seatRow*(20+seatSize*pxNum)+'rpx;top:165rpx;width:0'"></view>
-					
-					<view v-for="(item,index) in seatArray" :key="index" class="dp-f jc-c mt-20" :style="'width:'+boxWidth+'px;height:'+seatSize+'px'">
-						<view v-for="(seat,col) in item" :key="col" class="dp-ib" :style="'width:'+seatSize+'px;height:'+seatSize+'px'"
-						 @click="handleChooseSeat(index,col)">
-							<image v-if="seat.status===1" class="w-100 h-100" src="../../static/unselected.png" mode="aspectFit"></image>
-							<image v-else-if="seat.status===2" class="w-100 h-100" src="../../static/selected.png" mode="aspectFit"></image>
-							<image v-else-if="seat.status===0" class="w-100 h-100" src="../../static/bought.png" mode="aspectFit"></image>
-						</view>
-					</view>
-					
-					<view class="pt-f bg-line br-15 over-h" :style="'left: '+(10-moveX/scale)+'px;top:109rpx;width:30rpx;'">
-						<view class="w-100 dp-f ai-c jc-c fz-22 color-fff" :style="'height:'+seatSize+'px;margin-top:20rpx;'" v-for="(m,mindex) in mArr"
-						 :key="mindex">{{m}}</view>
-						<view :style="'height: 20rpx;'"></view>
-					</view>
-
-				</movable-view>
-			</movable-area>
-			<view class="pt-f bottom-bar left-0 dp-f fd-cr z1000">
-				<view class="bg-white p-all-32">
-					<!-- <view class="dp-f ai-c jc-c fz-28 color-333 mb-20" v-if="SelectNum===0">
-						推荐选座
-						<view style="width: 106rpx;height: 60rpx;" class="b-1 br-5 dp-f ai-c jc-c fz-28 ml-20" v-for="(n,numindex) in 4"
-						 :key="n" @click="smartChoose(numindex+1)">
-							{{numindex+1}}人
-						</view>
-					</view> -->
-					<view class="dp-f ai-c fw-w fz-28 color-333 mb-20" v-if="SelectNum>0">
-						<text>已选</text>
-						<view class="p-all-10 b-1 br-5 dp-f ai-c jc-c fz-28 ml-20" v-for="(optItem,optindex) in optArr" :key="optindex">
-							{{optItem.seatNo}}
-						</view>
-					</view>
-					<view style="width: 686rpx;height: 90rpx;" class="dp-f jc-c ai-c br-10 fz-34 color-fff" :class="SelectNum>0?'bg-red-1':'bg-unbtn'"
-					 @click="buySeat">
-						{{SelectNum>0?('￥ '+totalPrice+' 确认座位'):'请选座位'}}
-					</view>
-				</view>
-				<view class="dp-f jc-c ai-c mb-20 fz-28" v-if="showTis && seatSize!=0">
-					<view class="dp-f jc-c ai-c m-0-10">
-						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/unselected.png" mode="aspectFit"></image><span
-						 class="ml-10">可选</span>
-					</view>
-					<view class="dp-f jc-c ai-c m-0-10">
-						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/bought.png" mode="aspectFit"></image><span
-						 class="ml-10">不可选</span>
-					</view>
-					<view class="dp-f jc-c ai-c m-0-10">
-						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/selected.png" mode="aspectFit"></image><span
-						 class="ml-10">选中</span>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-	
-	import {
-		seatData
-	} from '@/utils/seat-data.js'
-	
-	import {
-		apiGetSchedSeatList,
-		apiSubmitOrder
-	} from '~/apis/movies'
-	export default {
-		data() {
-			return {
-				scaleMin:1,//h5端为解决1无法缩小问题，设为0.95
-				boxWidth: 400, //屏幕宽度px
-				space: ' ', //空格
-				seatArray: [], //影院座位的二维数组,-1为非座位，0为未购座位，1为已选座位(绿色),2为已购座位(红色),一维行，二维列
-				seatRow: 0, //影院座位行数
-				seatCol: 0, //影院座位列数
-				seatSize: 0, //座位尺寸
-				SelectNum: 0, //选择座位数
-				moveX: 0, //水平移动偏移量
-				scale: 1, //放大倍数
-				minRow: 0, //从第几行开始排座位
-				minCol: 0, //从第几列开始排座位
-				showTis: true, //显示选座提示
-				seatList: [], //接口获取的原始位置
-				mArr: [], //排数提示
-				optArr: [], //选中的座位数组。
-				isWXAPP:false,
-				relation_id:'',
-				sched_sign:'',
-				initInfo:'',
-				orgSeatList:[],
-				siginPrice:'',
-				channelSn:'',
-				totalPrice:0,
-				isFirstInit:true,
-				isCanClick:true
-			};
-		},
-		computed: {
-			// aPrice() {
-			// 	return (this.SelectNum * (this.siginPrice*100))/100
-			// },
-			rpxNum() {
-				return this.boxWidth / 750
-			},
-			pxNum() {
-				return 750 / this.boxWidth
-			},
-		},
-		
-		onLoad(e) {
-			this.initWidth()
-			if(e.info){
-				this.initInfo  = JSON.parse(decodeURIComponent(e.info))
-				this.getSeatList()
-			}
-		},
-		
-		onShow() {
-			if(!this.isFirstInit){
-				this.resetSeat()
-				this.getSeatList()
-			}
-			this.isFirstInit =false
-		},
-	
-		
-		methods: {
-			
-			initWidth(){
-				//获取宽度
-				let _this =this
-				uni.getSystemInfo({
-					success: function(e) {
-						_this.boxWidth = e.screenWidth
-						//#ifdef H5
-						_this.scaleMin = 0.95
-						//#endif
-					}
-				})
-			},
-			
-			 completeSeats(originalData) {
-			  // 1. 确定最大行号和列号
-			  let maxRow = 0, maxColumn = 0;
-			  originalData.forEach(rowArray => {
-			    rowArray.forEach(seat => {
-			      maxRow = Math.max(maxRow, parseInt(seat.rowNo));
-			      maxColumn = Math.max(maxColumn, parseInt(seat.columnNo));
-			    });
-			  });
-			   this.seatRow  = maxRow//数组长度
-			   this.seatCol  = maxColumn//子数组中长度最大的
-			  // 2. 按行号整理原始数据
-			  const rowMap = new Map();
-			  originalData.forEach(rowArray => {
-			    if (rowArray.length === 0) return;
-			    const rowNo = rowArray[0].rowNo;
-			    rowMap.set(rowNo, rowArray);
-			  });
-			
-			  // 3. 生成完整的行和列
-			  const result = [];
-			  for (let row = 1; row <= maxRow; row++) {
-			    const rowNo = row.toString();
-			    const currentRow = rowMap.get(rowNo) || [];
-			    const columnMap = new Map(currentRow.map(seat => [seat.columnNo, seat]));
-			
-			    // 生成当前排的完整列数据
-			    const completedColumns = Array.from({ length: maxColumn }, (_, colIdx) => {
-			      const columnNo = (colIdx + 1).toString();
-			      return columnMap.has(columnNo) 
-			        ? columnMap.get(columnNo) 
-			        : { 
-			            supplier_id: null, 
-			            seatNo: `${rowNo}排${columnNo.padStart(2, '0')}座`, 
-			            rowNo, 
-			            columnNo ,
-						status:-1
-			          };
-			    });
-				
-			    result.push(completedColumns);
-			  }
-			
-			  return result;
-			},
-		
-			getSeatList(){
-				uni.showLoading()
-				let params = `relation_id=${this.initInfo.relation_id}&sched_sign=${this.initInfo.sched_sign}`
-				apiGetSchedSeatList(params).then(res => {
-					this.orgSeatList = res
-					if(res.length!=0){
-						this.seatArray = this.completeSeats(this.orgSeatList)
-						this.initSeatArray()
-						uni.hideLoading()
-					}else{
-						uni.showToast({
-							title:'未获取到座位数据',
-							icon:'none'
-						})
-					}
-			     
-				})
-			},
-			
-			submitOrder(){
-				if(!this.isCanClick){
-					return
-				}
-				this.isCanClick=false
-				uni.showLoading({
-					title:'处理中...',
-					mask:true
-				})
-			let _newArr=this.optArr.map((res)=>{
-					return {seat_no:res.seatNo,seat_sign:res.seatSign,channel_sn:res.channel_sn}
-				})
-				
-				let params ={
-					sched_sign:this.initInfo.sched_sign,
-					channel_sn:_newArr[0].channel_sn,
-					sched_seat:JSON.stringify(_newArr),
-					hall_sign:this.initInfo.hall_sign,
-					hall_name:this.initInfo.hall_name,
-					show_date:this.initInfo.show_date,
-					show_time:this.initInfo.show_time,
-					cinema_sign:this.initInfo.cinema_sign,
-					phone:uni.getStorageSync('USER_INFO_PHONE'),
-					
-					film_sign:this.initInfo.film_sign,
-					relation_id:this.initInfo.relation_id,
-				}
-				apiSubmitOrder(params).then(res => {
-					uni.hideLoading()
-					uni.navigateTo({
-						url:`/subPages/pages/movies/moviesOrder?order_sn=${res.order_sn}&oid=${res.oid}&code=${res.code}&type=${res.type}`
-					})
-				}).catch((e)=>{
-					console.log("===e",e);
-					this.isCanClick=true
-			    uni.showToast({
-				title:e ||'接口异常!',
-				icon:'none'
-			})
-		})
-			},
-			
-			//初始座位数组
-			initSeatArray() {
-				this.seatSize = this.boxWidth > 0 ?
-					parseInt(parseInt(this.boxWidth, 10) / (this.seatCol + 3), 10) :
-					parseInt(parseInt(414, 10) / (this.seatCol + 3), 10)
-				   this.initNonSeatPlace();
-			},
-			
-			//初始化是座位的地方
-			initNonSeatPlace() {
-				let mArr = []
-				for (var i = 0; i <this.seatArray.length; i++) {
-					let _item = this.seatArray[i]
-					let _name =''
-					for (var j = 0; j < _item.length; j++) {
-						let childItem = _item[j]
-						if (childItem.status!=-1 ) {
-							//this.siginPrice = childItem.price
-							this.channelSn =childItem.channel_sn
-							if(childItem.seatNo.indexOf('排')!= -1){
-								_name= childItem.seatNo.split('排')[0]
-							}else{
-								_name= childItem.rowNo
-							}
-							break
-						} 
-					}
-					mArr.push(_name)
-				}
-				this.mArr = mArr
-			},
-			//放大缩小事件
-			onScale(e) {
-				this.showTis = false
-				// this.moveX=-e.detail.x
-				let w = this.boxWidth * 0.5
-				let s = 1 - e.detail.scale
-				this.moveX = w * s
-				this.scale = e.detail.scale
-				if (s > 0 || s === 0) {
-					this.showTis = true
-				}
-			},
-			//移动事件
-			onMove(e) {
-				this.showTis = false
-				this.moveX = e.detail.x
-			},
-			//重置座位
-			resetSeat() {
-				this.totalPrice=0
-				this.SelectNum = 0
-				this.optArr = []
-				//将所有已选座位的值变为0
-				let oldArray = this.seatArray.slice();
-				for (let i = 0; i < this.seatRow; i++) {
-					for (let j = 0; j < this.seatCol; j++) {
-						if (oldArray[i][j].status === 2) {
-							oldArray[i][j].status = 1
-						}
-					}
-				}
-				this.seatArray = oldArray;
-			},
-			//选定且购买座位
-			buySeat() {
-				if (this.SelectNum === 0) {
-					return
-				}
-				let _this =this
-				for (let i = 0; i < this.optArr.length; i++) {
-					let _price = this.optArr[0].price
-					if(_price != this.optArr[i].price){
-						uni.showModal({
-							title:'温馨提示',
-							content:'请选择相同价格的座位,暂不支持不同价格的座位同时下单，如有需要请单独选择座位下单~',
-							complete: (res) => {
-								_this.resetSeat()
-							}
-						})
-						return
-					}
-				}
-				this.submitOrder()
-			},
-			
-			
-			//处理座位选择逻辑
-			handleChooseSeat(row, col) {
-				let seatValue = this.seatArray[row][col].status;
-				let newArray = this.seatArray;
-				//情侣座处理，基数加1 偶数减1
-				//如果是已购座位，直接返回
-				if (seatValue === 0 || seatValue === -1) return
-				//如果是已选座位点击后变未选
-				if (seatValue === 2) {
-					newArray[row][col].status = 1
-					this.SelectNum--
-					this.getOptArr(newArray[row][col], 0)
-					this.totalPrice = (parseFloat(this.totalPrice )*100- parseFloat(newArray[row][col].price)*100)/100
-				} else if (seatValue === 1) {
-					if(this.SelectNum==4){
-						uni.showToast({
-							title:'每次最多只能选择4个座位',
-							icon:'none'
-						})
-						return
-					}
-					newArray[row][col].status =2
-					this.totalPrice = ( parseFloat(this.totalPrice )*100 +  parseFloat(newArray[row][col].price)*100)/100
-					this.SelectNum++
-					this.getOptArr(newArray[row][col], 1)
-				}
-				//必须整体更新二维数组，Vue无法检测到数组某一项更新,必须slice复制一个数组才行
-				this.seatArray = newArray.slice();
-			
-			},
-			//处理已选座位数组
-			getOptArr(item, type) {
-				let optArr = this.optArr
-				if (type === 1) {
-					optArr.push(item)
-				} else if (type === 0) {
-					let arr = []
-					optArr.forEach(v => {
-						if (v.seatSign !== item.seatSign) {
-							arr.push(v)
-						}
-					})
-					optArr = arr
-				}
-				this.optArr = optArr.slice()
-			},
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.p-all-10{
-		padding: 10rpx;
-	}
-	.ml-10 {
-		margin-left: 10rpx;
-	}
-
-	.m-0-10 {
-		margin: 0 10rpx;
-	}
-
-	.bg-unbtn {
-		background-color: #f9abb3;
-	}
-
-	.bg-red-1 {
-		background-color: #F45664;
-	}
-
-	.br-10 {
-		border-radius: 10rpx;
-	}
-
-	.ml-20 {
-		margin-left: 20rpx;
-	}
-
-	.mb-20 {
-		margin-bottom: 20rpx;
-	}
-
-	.p-all-32 {
-		padding: 32rpx;
-	}
-
-	.fd-cr {
-		flex-direction: column-reverse;
-		/* 主轴方向从下到上,默认从左到右 */
-	}
-
-	.bottom-bar {
-		bottom: var(--window-bottom);
-	}
-
-	.color-fff {
-		color: #fff
-	}
-
-	.br-15 {
-		border-radius: 15rpx;
-	}
-
-	.over-h {
-		overflow: hidden;
-	}
-
-	.dp-ib {
-		display: inline-block;
-	}
-
-	.mt-20 {
-		margin-top: 20rpx;
-	}
-
-	.pa-v-2 {
-		/* 定位垂直对齐 */
-		left: 50%;
-		transform: translateX(-50%)
-	}
-
-	.b-d-1 {
-		border: 1px dashed #e5e5e5;
-	}
-
-	.w-100 {
-		width: 100%;
-	}
-
-	.h-100 {
-		height: 100%;
-	}
-
-	.bg-f1 {
-		background-color: #f1f1f1;
-	}
-
-	.h-100vh {
-		height: 100vh;
-	}
-
-	.pt-f {
-		position: fixed;
-	}
-
-	.left-0 {
-		left: 0;
-	}
-
-	.p-0-32 {
-		padding: 0 32rpx;
-	}
-
-	.pt-20 {
-		padding-top: 20rpx;
-	}
-
-	.bg-white {
-		background-color: #fff;
-	}
-
-	.z1000 {
-		z-index: 1000;
-	}
-
-	.fz-34 {
-		font-size: 34rpx;
-	}
-
-	.fw-b {
-		font-weight: bold;
-	}
-
-	.mt-10 {
-		margin-top: 10rpx;
-	}
-
-	.fz-28 {
-		font-size: 28rpx;
-	}
-
-	.color-666 {
-		color: #666666
-	}
-
-	.dp-f {
-		display: flex;
-	}
-
-	.jc-c {
-		justify-content: center;
-	}
-
-	.ai-c {
-		align-items: center;
-	}
-
-	.fz-22 {
-		font-size: 22rpx;
-	}
-
-	.color-333 {
-		color: #333333
-	}
-
-	.m-0-a {
-		margin: 0 auto;
-	}
-
-	.mt-48 {
-		margin-top: 48rpx;
-	}
-
-	.fz-20 {
-		font-size: 20rpx;
-	}
-
-	.color-999 {
-		color: #999999
-	}
-
-	.b-1 {
-		border: 1px solid #CCCCCC;
-	}
-
-	.br-5 {
-		border-radius: 5rpx;
-	}
-
-	.Stage {
-		background-color: #dddddd;
-		width: 380rpx;
-		height: 50rpx;
-		transform: perspective(50rpx) rotateX(-10deg);
-		margin: 0 auto;
-	}
-
-	.bg-line {
-		background-color: rgba(0, 0, 0, 0.3);
-	}
-
-	.sel-seat {
-		background: url('/static/selected.png') center center no-repeat;
-		background-size: 100% 100%;
-	}
-	
-	.unsel-seat {
-		background: url('/static/unselected.png') center center no-repeat;
-		background-size: 100% 100%;
-	}
-	
-	.bought-seat {
-		background: url('/static/bought.png') center center no-repeat;
-		background-size: 100% 100%;
-	}
-</style>
-<route lang="yaml">
-style:
-  navigationBarTitleText: 选择座位
-  enablePullDownRefresh: true
-</route>

src/subPages/pages/movies/chooseSeat.vue

@@ -11,28 +11,37 @@
 					</view>
 				</view>
 			</view>
-			<movable-area :style="'height:'+(seatRow*40+350)+'rpx;width: 100vw;top:'+(rpxNum*132)+'px'" class="pt-f left-0">
-				<movable-view :style="'width: 100vw;height:'+(seatRow*40+350)+'rpx;'" :inertia="true" :scale="true" :scale-min="0.95"
-				 :scale-max="2" direction="all" @change="onMove" @scale="onScale">
+			<movable-area :style="'height:'+(seatRow*40+350)+'rpx;width: 100vw;top:'+(rpxNum*132)+'px'"
+				class="pt-f left-0">
+				<movable-view :style="'width: 100vw;height:'+(seatRow*40+350)+'rpx;'" :inertia="true" :scale="true"
+					:scale-min="0.95" :scale-max="2" direction="all" @change="onMove" @scale="onScale">
 					<view class="Stage dp-f jc-c ai-c fz-22 color-333">
 						{{initInfo.hall_name}}
 					</view>
-					<view style="width: 100rpx;height: 30rpx;" class="m-0-a mt-48 dp-f jc-c ai-c fz-20 color-999 b-1 br-5">银幕中央</view>
-					
-					<view class="pt-f pa-v-2 b-d-1" :style="'height:'+seatRow*(20+seatSize*pxNum)+'rpx;top:165rpx;width:0'"></view>
-					
-					<view v-for="(item,index) in seatArray" :key="index" class="dp-f jc-c mt-20" :style="'width:'+boxWidth+'px;height:'+seatSize+'px'">
-						<view v-for="(seat,col) in item" :key="col" class="dp-ib" :style="'width:'+seatSize+'px;height:'+seatSize+'px'"
-						 @click="handleChooseSeat(index,col)">
-							<image v-if="seat.status===1" class="w-100 h-100" src="../../static/unselected.png" mode="aspectFit"></image>
-							<image v-else-if="seat.status===2" class="w-100 h-100" src="../../static/selected.png" mode="aspectFit"></image>
-							<image v-else-if="seat.status===0" class="w-100 h-100" src="../../static/bought.png" mode="aspectFit"></image>
+					<view style="width: 100rpx;height: 30rpx;"
+						class="m-0-a mt-48 dp-f jc-c ai-c fz-20 color-999 b-1 br-5">银幕中央</view>
+
+					<view class="pt-f pa-v-2 b-d-1"
+						:style="'height:'+seatRow*(20+seatSize*pxNum)+'rpx;top:165rpx;width:0'"></view>
+
+					<view v-for="(item,index) in seatArray" :key="index" class="dp-f jc-c mt-20"
+						:style="'width:'+boxWidth+'px;height:'+seatSize+'px'">
+						<view v-for="(seat,col) in item" :key="col" class="dp-ib"
+							:style="'width:'+seatSize+'px;height:'+seatSize+'px'" @click="handleChooseSeat(index,col)">
+							<image v-if="seat.status===1" class="w-100 h-100" src="../../static/unselected.png"
+								mode="aspectFit"></image>
+							<image v-else-if="seat.status===2" class="w-100 h-100" src="../../static/selected.png"
+								mode="aspectFit"></image>
+							<image v-else-if="seat.status===0" class="w-100 h-100" src="../../static/bought.png"
+								mode="aspectFit"></image>
 						</view>
 					</view>
-					
-					<view class="pt-f bg-line br-15 over-h" :style="'left: '+(10-moveX/scale)+'px;top:109rpx;width:30rpx;'">
-						<view class="w-100 dp-f ai-c jc-c fz-22 color-fff" :style="'height:'+seatSize+'px;margin-top:20rpx;'" v-for="(m,mindex) in mArr"
-						 :key="mindex">{{m}}</view>
+
+					<view class="pt-f bg-line br-15 over-h"
+						:style="'left: '+(10-moveX/scale)+'px;top:109rpx;width:30rpx;'">
+						<view class="w-100 dp-f ai-c jc-c fz-22 color-fff"
+							:style="'height:'+seatSize+'px;margin-top:20rpx;'" v-for="(m,mindex) in mArr" :key="mindex">
+							{{m}}</view>
 						<view :style="'height: 20rpx;'"></view>
 					</view>
 
@@ -49,27 +58,28 @@
 					</view> -->
 					<view class="dp-f ai-c fw-w fz-28 color-333 mb-20" v-if="SelectNum>0">
 						<text>已选</text>
-						<view class="p-all-10 b-1 br-5 dp-f ai-c jc-c fz-28 ml-20" v-for="(optItem,optindex) in optArr" :key="optindex">
+						<view class="p-all-10 b-1 br-5 dp-f ai-c jc-c fz-28 ml-20" v-for="(optItem,optindex) in optArr"
+							:key="optindex">
 							{{optItem.seatNo}}
 						</view>
 					</view>
-					<view style="width: 686rpx;height: 90rpx;" class="dp-f jc-c ai-c br-10 fz-34 color-fff" :class="SelectNum>0?'bg-red-1':'bg-unbtn'"
-					 @click="buySeat">
+					<view style="width: 686rpx;height: 90rpx;" class="dp-f jc-c ai-c br-10 fz-34 color-fff"
+						:class="SelectNum>0?'bg-red-1':'bg-unbtn'" @click="buySeat">
 						{{SelectNum>0?('￥ '+totalPrice+' 确认座位'):'请选座位'}}
 					</view>
 				</view>
 				<view class="dp-f jc-c ai-c mb-20 fz-28" v-if="showTis && seatSize!=0">
 					<view class="dp-f jc-c ai-c m-0-10">
-						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/unselected.png" mode="aspectFit"></image><span
-						 class="ml-10">可选</span>
+						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/unselected.png"
+							mode="aspectFit"></image><span class="ml-10">可选</span>
 					</view>
 					<view class="dp-f jc-c ai-c m-0-10">
-						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/bought.png" mode="aspectFit"></image><span
-						 class="ml-10">不可选</span>
+						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/bought.png"
+							mode="aspectFit"></image><span class="ml-10">不可选</span>
 					</view>
 					<view class="dp-f jc-c ai-c m-0-10">
-						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/selected.png" mode="aspectFit"></image><span
-						 class="ml-10">选中</span>
+						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/selected.png"
+							mode="aspectFit"></image><span class="ml-10">选中</span>
 					</view>
 				</view>
 			</view>
@@ -77,19 +87,17 @@
 	</view>
 </template>
 <script>
-	
 	import {
 		seatData
 	} from '@/utils/seat-data.js'
-	
+
 	import {
 		apiGetSchedSeatList,
-		apiSubmitOrder
 	} from '~/apis/movies'
 	export default {
 		data() {
 			return {
-				scaleMin:1,//h5端为解决1无法缩小问题，设为0.95
+				scaleMin: 1, //h5端为解决1无法缩小问题，设为0.95
 				boxWidth: 400, //屏幕宽度px
 				space: ' ', //空格
 				seatArray: [], //影院座位的二维数组,-1为非座位，0为未购座位，1为已选座位(绿色),2为已购座位(红色),一维行，二维列
@@ -105,16 +113,16 @@
 				seatList: [], //接口获取的原始位置
 				mArr: [], //排数提示
 				optArr: [], //选中的座位数组。
-				isWXAPP:false,
-				relation_id:'',
-				sched_sign:'',
-				initInfo:'',
-				orgSeatList:[],
-				siginPrice:'',
-				channelSn:'',
-				totalPrice:0,
-				isFirstInit:true,
-				isCanClick:true
+				isWXAPP: false,
+				relation_id: '',
+				sched_sign: '',
+				initInfo: '',
+				orgSeatList: [],
+				siginPrice: '',
+				channelSn: '',
+				totalPrice: 0,
+				isFirstInit: true,
+				isCanClick: true
 			};
 		},
 		computed: {
@@ -128,29 +136,29 @@
 				return 750 / this.boxWidth
 			},
 		},
-		
+
 		onLoad(e) {
 			this.initWidth()
-			if(e.info){
-				this.initInfo  = JSON.parse(decodeURIComponent(e.info))
+			if (e.info) {
+				this.initInfo = JSON.parse(decodeURIComponent(e.info))
 				this.getSeatList()
 			}
 		},
-		
+
 		onShow() {
-			if(!this.isFirstInit){
+			if (!this.isFirstInit) {
 				this.resetSeat()
 				this.getSeatList()
 			}
-			this.isFirstInit =false
+			this.isFirstInit = false
 		},
-	
-		
+
+
 		methods: {
-			
-			initWidth(){
+
+			initWidth() {
 				//获取宽度
-				let _this =this
+				let _this = this
 				uni.getSystemInfo({
 					success: function(e) {
 						_this.boxWidth = e.screenWidth
@@ -160,140 +168,123 @@
 					}
 				})
 			},
-			
-			 completeSeats(originalData) {
-			  // 1. 确定最大行号和列号
-			  let maxRow = 0, maxColumn = 0;
-			  originalData.forEach(rowArray => {
-			    rowArray.forEach(seat => {
-			      maxRow = Math.max(maxRow, parseInt(seat.rowNo));
-			      maxColumn = Math.max(maxColumn, parseInt(seat.columnNo));
-			    });
-			  });
-			   this.seatRow  = maxRow//数组长度
-			   this.seatCol  = maxColumn//子数组中长度最大的
-			  // 2. 按行号整理原始数据
-			  const rowMap = new Map();
-			  originalData.forEach(rowArray => {
-			    if (rowArray.length === 0) return;
-			    const rowNo = rowArray[0].rowNo;
-			    rowMap.set(rowNo, rowArray);
-			  });
-			
-			  // 3. 生成完整的行和列
-			  const result = [];
-			  for (let row = 1; row <= maxRow; row++) {
-			    const rowNo = row.toString();
-			    const currentRow = rowMap.get(rowNo) || [];
-			    const columnMap = new Map(currentRow.map(seat => [seat.columnNo, seat]));
-			
-			    // 生成当前排的完整列数据
-			    const completedColumns = Array.from({ length: maxColumn }, (_, colIdx) => {
-			      const columnNo = (colIdx + 1).toString();
-			      return columnMap.has(columnNo) 
-			        ? columnMap.get(columnNo) 
-			        : { 
-			            supplier_id: null, 
-			            seatNo: `${rowNo}排${columnNo.padStart(2, '0')}座`, 
-			            rowNo, 
-			            columnNo ,
-						status:-1
-			          };
-			    });
-				
-			    result.push(completedColumns);
-			  }
-			
-			  return result;
+
+			completeSeats(originalData) {
+				// 1. 确定最大行号和列号
+				let maxRow = 0,
+					maxColumn = 0;
+				originalData.forEach(rowArray => {
+					rowArray.forEach(seat => {
+						maxRow = Math.max(maxRow, parseInt(seat.rowNo));
+						maxColumn = Math.max(maxColumn, parseInt(seat.columnNo));
+					});
+				});
+				this.seatRow = maxRow //数组长度
+				this.seatCol = maxColumn //子数组中长度最大的
+				// 2. 按行号整理原始数据
+				const rowMap = new Map();
+				originalData.forEach(rowArray => {
+					if (rowArray.length === 0) return;
+					const rowNo = rowArray[0].rowNo;
+					rowMap.set(rowNo, rowArray);
+				});
+
+				// 3. 生成完整的行和列
+				const result = [];
+				for (let row = 1; row <= maxRow; row++) {
+					const rowNo = row.toString();
+					const currentRow = rowMap.get(rowNo) || [];
+					const columnMap = new Map(currentRow.map(seat => [seat.columnNo, seat]));
+
+					// 生成当前排的完整列数据
+					const completedColumns = Array.from({
+						length: maxColumn
+					}, (_, colIdx) => {
+						const columnNo = (colIdx + 1).toString();
+						return columnMap.has(columnNo) ?
+							columnMap.get(columnNo) :
+							{
+								supplier_id: null,
+								seatNo: `${rowNo}排${columnNo.padStart(2, '0')}座`,
+								rowNo,
+								columnNo,
+								status: -1
+							};
+					});
+
+					result.push(completedColumns);
+				}
+
+				return result;
 			},
-		
-			getSeatList(){
-				uni.showLoading()
+
+			getSeatList() {
+				uni.showLoading({title:'加载中...',mask:true})
 				let params = `relation_id=${this.initInfo.relation_id}&sched_sign=${this.initInfo.sched_sign}`
 				apiGetSchedSeatList(params).then(res => {
 					this.orgSeatList = res
-					if(res.length!=0){
+					if (res.length != 0) {
 						this.seatArray = this.completeSeats(this.orgSeatList)
 						this.initSeatArray()
 						uni.hideLoading()
-					}else{
+					} else {
 						uni.showToast({
-							title:'未获取到座位数据',
-							icon:'none'
+							title: '未获取到座位数据',
+							icon: 'none'
 						})
 					}
-			     
+
 				})
 			},
-			
-			submitOrder(){
-				if(!this.isCanClick){
-					return
-				}
-				this.isCanClick=false
-				uni.showLoading({
-					title:'处理中...',
-					mask:true
-				})
-			let _newArr=this.optArr.map((res)=>{
-					return {seat_no:res.seatNo,seat_sign:res.seatSign,channel_sn:res.channel_sn}
+
+			submitOrder() {
+				
+				let _newArr = this.optArr.map((res) => {
+					return {
+						seat_no: res.seatNo,
+						seat_sign: res.seatSign,
+					}
 				})
 				
-				let params ={
-					sched_sign:this.initInfo.sched_sign,
-					channel_sn:_newArr[0].channel_sn,
-					sched_seat:JSON.stringify(_newArr),
-					hall_sign:this.initInfo.hall_sign,
-					hall_name:this.initInfo.hall_name,
-					show_date:this.initInfo.show_date,
-					show_time:this.initInfo.show_time,
-					cinema_sign:this.initInfo.cinema_sign,
-					phone:uni.getStorageSync('USER_INFO_PHONE'),
-					
-					film_sign:this.initInfo.film_sign,
-					relation_id:this.initInfo.relation_id,
+				let params = {
+					channel_sn: this.optArr[0].channel_sn,
+					sched_seat: _newArr,
+					detailInfo:this.initInfo ,
+					totalPrice:this.totalPrice
 				}
-				apiSubmitOrder(params).then(res => {
-					uni.hideLoading()
-					uni.navigateTo({
-						url:`/subPages/pages/movies/moviesOrder?order_sn=${res.order_sn}&oid=${res.oid}&code=${res.code}&type=${res.type}`
-					})
-				}).catch((e)=>{
-					console.log("===e",e);
-					this.isCanClick=true
-			    uni.showToast({
-				title:e ||'接口异常!',
-				icon:'none'
-			})
-		})
+				
+				uni.navigateTo({
+					url: `/subPages/pages/movies/moviesOrder?params=${encodeURIComponent(JSON.stringify(params))}`
+				})
+
 			},
-			
+
 			//初始座位数组
 			initSeatArray() {
 				this.seatSize = this.boxWidth > 0 ?
 					parseInt(parseInt(this.boxWidth, 10) / (this.seatCol + 3), 10) :
 					parseInt(parseInt(414, 10) / (this.seatCol + 3), 10)
-				   this.initNonSeatPlace();
+				this.initNonSeatPlace();
 			},
-			
+
 			//初始化是座位的地方
 			initNonSeatPlace() {
 				let mArr = []
-				for (var i = 0; i <this.seatArray.length; i++) {
+				for (var i = 0; i < this.seatArray.length; i++) {
 					let _item = this.seatArray[i]
-					let _name =''
+					let _name = ''
 					for (var j = 0; j < _item.length; j++) {
 						let childItem = _item[j]
-						if (childItem.status!=-1 ) {
+						if (childItem.status != -1) {
 							//this.siginPrice = childItem.price
-							this.channelSn =childItem.channel_sn
-							if(childItem.seatNo.indexOf('排')!= -1){
-								_name= childItem.seatNo.split('排')[0]
-							}else{
-								_name= childItem.rowNo
+							this.channelSn = childItem.channel_sn
+							if (childItem.seatNo.indexOf('排') != -1) {
+								_name = childItem.seatNo.split('排')[0]
+							} else {
+								_name = childItem.rowNo
 							}
 							break
-						} 
+						}
 					}
 					mArr.push(_name)
 				}
@@ -318,7 +309,7 @@
 			},
 			//重置座位
 			resetSeat() {
-				this.totalPrice=0
+				this.totalPrice = 0
 				this.SelectNum = 0
 				this.optArr = []
 				//将所有已选座位的值变为0
@@ -337,13 +328,13 @@
 				if (this.SelectNum === 0) {
 					return
 				}
-				let _this =this
+				let _this = this
 				for (let i = 0; i < this.optArr.length; i++) {
 					let _price = this.optArr[0].price
-					if(_price != this.optArr[i].price){
+					if (_price != this.optArr[i].price) {
 						uni.showModal({
-							title:'温馨提示',
-							content:'请选择相同价格的座位,暂不支持不同价格的座位同时下单，如有需要请单独选择座位下单~',
+							title: '温馨提示',
+							content: '请选择相同价格的座位,暂不支持不同价格的座位同时下单，如有需要请单独选择座位下单~',
 							complete: (res) => {
 								_this.resetSeat()
 							}
@@ -353,8 +344,8 @@
 				}
 				this.submitOrder()
 			},
-			
-			
+
+
 			//处理座位选择逻辑
 			handleChooseSeat(row, col) {
 				let seatValue = this.seatArray[row][col].status;
@@ -367,23 +358,25 @@
 					newArray[row][col].status = 1
 					this.SelectNum--
 					this.getOptArr(newArray[row][col], 0)
-					this.totalPrice = (parseFloat(this.totalPrice )*100- parseFloat(newArray[row][col].price)*100)/100
+					this.totalPrice = (parseFloat(this.totalPrice) * 100 - parseFloat(newArray[row][col].price) * 100) /
+						100
 				} else if (seatValue === 1) {
-					if(this.SelectNum==4){
+					if (this.SelectNum == 4) {
 						uni.showToast({
-							title:'每次最多只能选择4个座位',
-							icon:'none'
+							title: '每次最多只能选择4个座位',
+							icon: 'none'
 						})
 						return
 					}
-					newArray[row][col].status =2
-					this.totalPrice = ( parseFloat(this.totalPrice )*100 +  parseFloat(newArray[row][col].price)*100)/100
+					newArray[row][col].status = 2
+					this.totalPrice = (parseFloat(this.totalPrice) * 100 + parseFloat(newArray[row][col].price) * 100) /
+						100
 					this.SelectNum++
 					this.getOptArr(newArray[row][col], 1)
 				}
 				//必须整体更新二维数组，Vue无法检测到数组某一项更新,必须slice复制一个数组才行
 				this.seatArray = newArray.slice();
-			
+
 			},
 			//处理已选座位数组
 			getOptArr(item, type) {
@@ -401,15 +394,16 @@
 				}
 				this.optArr = optArr.slice()
 			},
-			
+
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.p-all-10{
+	.p-all-10 {
 		padding: 10rpx;
 	}
+
 	.ml-10 {
 		margin-left: 10rpx;
 	}
@@ -601,12 +595,12 @@
 		background: url('/static/selected.png') center center no-repeat;
 		background-size: 100% 100%;
 	}
-	
+
 	.unsel-seat {
 		background: url('/static/unselected.png') center center no-repeat;
 		background-size: 100% 100%;
 	}
-	
+
 	.bought-seat {
 		background: url('/static/bought.png') center center no-repeat;
 		background-size: 100% 100%;

src/subPages/pages/movies/moviesOrder.vue

@@ -2,16 +2,17 @@
 	<view class="movies-oder-container" v-if="orderDetail">
 		<view class="card-content">
 			<view class="list-item">
-				<image class="item-img" :src="orderDetail.film.cover_img" mode="aspectFill"></image>
+				<image class="item-img" :src="orderDetail.cover_img" mode="aspectFill"></image>
 				<view class="info-item">
 					<text class="item-title">{{orderDetail.film_name}}</text>
-					<text class="file-des mb-24-x">{{orderDetail.sched_time}} </text>
+					<text class="file-des mb-24-x">{{orderDetail.show_des}} </text>
 					<text class="file-des mb-24-x">{{orderDetail.cinema_name}}</text>
 					<view class="title-content ">
 						<text class="file-des">{{orderDetail.hall_name}}</text>
 						<text class="file-des-x" :key="'seat-item-'+index"
-							v-for="(item,index) in orderDetail.sched_seat">{{item.seat_no}}</text>
+							v-for="(item,index) in schedSeat">{{item.seat_no}}</text>
 					</view>
+					
 				</view>
 				<view class="timer-content">
 					<image class="timer-icon" src="/static/icon/timer_icon.png" mode="widthFix"></image>
@@ -24,7 +25,7 @@
 				<text class="hint-tx">不支持退票</text>
 				<image class="close-icon" src="/static/icon/red_close.png" mode="widthFix"></image>
 				<text class="hint-tx-1">不支持改签</text>
-				<text class="hint-tx">共{{orderDetail.sched_seat.length}}张</text>
+				<text class="hint-tx">共{{schedSeat.length}}张</text>
 				<!-- <text class="hint-tx">原价￥60</text> -->
 			</view>
 
@@ -38,14 +39,14 @@
 			<view class="discount-info">
 				<text class="fare-tx">票价合计</text>
 				<text class="fare-price-unit">￥</text>
-				<text class="fare-price">{{orderDetail.order_price}}</text>
+				<text class="fare-price">{{totalPrice}}</text>
 			</view>
 		</view>
 
 		<view class="card-content">
 			<view class="discount-info">
 				<text class="discount-tx">手机号码</text>
-				<input class="phone-value" type="text" v-model="userPhone" placeholder="请先填写手机号码" />
+				<input  class="phone-value" type="text" v-model="userPhone" placeholder="请先填写手机号码" />
 			</view>
 			<view class="card-line"></view>
 			<text class="discount-tx-hine">仅用于出票异常时联系,取票码不会通过短信发送</text>
@@ -90,9 +91,8 @@
 			<view class="left-content">
 				<view class="left-top-info">
 					<text class="pay-price-title">应付：</text>
-					<text class="pay-price">￥{{orderDetail.order_price}}</text>
+					<text class="pay-price">￥{{totalPrice}}</text>
 				</view>
-				<!-- <text class="price-hint">总计优惠：2.7元</text> -->
 			</view>
 			<view class="right-btn" @click="onPayClick">立即付款</view>
 		</view>
@@ -114,13 +114,14 @@
 	} from '~/config/app'
 	import {
 		apiGetOrderInfo,
-		apiConfirmOrder
+		apiConfirmOrder,
+		apiSubmitOrder
 	} from '~/apis/movies'
 	import {
 		useUserStore
 	} from '~/stores/userStore'
 
-	const totalTime = 600 // 5分钟=300秒
+	const totalTime = 300 // 5分钟=300秒
 	const count = ref(totalTime)
 	const minutes = ref(0)
 	const seconds = ref(0)
@@ -129,24 +130,28 @@
 	const isCheck = ref(false)
 	let timer = null
 	let order_sn = ''
-	let oid =''
-	let type =''
-	let code =''
+	let oid = ''
+	let type = ''
+	let code = ''
 	const orderDetail = ref()
 	const userPhone = ref('')
+	const schedSeat=ref([])
+	const totalPrice=ref(0)
+	let channel_sn=''
 
 	// 格式化时间补零
 	const formatTime = (num) => num < 10 ? `0${num}` : num
 	onLoad((option) => {
-		console.log("===option.order_sn",option.oid);
-		if (option.order_sn) {
-			order_sn = option.order_sn
-			oid = option.oid
-			type = option.type
-			code = option.code
+		if(option.params){
+			orderDetail.value = JSON.parse(decodeURIComponent(option.params)).detailInfo
+			schedSeat.value =  JSON.parse(decodeURIComponent(option.params)).sched_seat
+			channel_sn=  JSON.parse(decodeURIComponent(option.params)).channel_sn
+			totalPrice.value = JSON.parse(decodeURIComponent(option.params)).totalPrice
+			console.log("===orderDetail.value",schedSeat.value);
+			console.log("===orderDetail.value",schedSeat.value.length);
 			initTimer()
-			getDetailInfo()
 		}
+		
 		userPhone.value = uni.getStorageSync('USER_INFO_PHONE')
 	})
 
@@ -217,30 +222,43 @@
 			})
 			return
 		}
-
 		uni.showLoading({
-			title: '请求中...'
+			title:'处理中...',
+			mask:true
 		})
-
-
-
 		let params = {
+			sched_sign: orderDetail.value.sched_sign,
+			channel_sn:channel_sn,
+			sched_seat: JSON.stringify(schedSeat.value ),
+			hall_sign: orderDetail.value.hall_sign,
+			hall_name: orderDetail.value.hall_name,
+			show_date: orderDetail.value.show_date,
+			show_time: orderDetail.value.show_time,
+			cinema_sign: orderDetail.value.cinema_sign,
 			phone: userPhone.value,
-			oid : oid,
-			type :type,
-			code :code,
+			film_sign: orderDetail.value.film_sign,
+			relation_id: orderDetail.value.relation_id,
 		}
-		apiConfirmOrder(params).then(res => {
+		console.log("===params",params);
+		
+		apiSubmitOrder(params).then(res => {
+			uni.hideLoading()
 			uni.redirectTo({
-				url: `/pages/payment/index?pay_price=${orderDetail.value.order_price}&order_id=${oid}&initType=3&order_sn=${order_sn}&type=${res.pay_channel}`
+				url: `/pages/payment/index?pay_price=${totalPrice.value}&order_id=${res.oid}&initType=3&order_sn=${res.order_sn}&type=${res.type}`
 			})
-			uni.hideLoading()
 		}).catch((e) => {
 			uni.showToast({
 				title: e || '接口异常!',
 				icon: 'none'
 			})
 		})
+		
+		
+		
+		
+
+	
+		
 	}
 </script>
 
@@ -481,6 +499,7 @@
 				.title-content {
 					display: flex;
 					flex-direction: row;
+					flex-wrap: wrap;
 					align-items: center;
 					width: 100%;
 				}
@@ -503,11 +522,12 @@
 				.file-des {
 					font-size: 24rpx;
 					color: #999;
+					margin-right: 10rpx;
 				}
 
 				.file-des-x {
 					font-size: 26rpx;
-					margin-left: 10rpx;
+					margin-right: 10rpx;
 					color: #000;
 					font-weight: bolder;
 				}

src/subPages/pages/movies/moviesTicketList.vue

@@ -145,16 +145,18 @@
 	
 	function onChooseSeatClick(item){
 		let params ={
+			cover_img:moviesList.value[currentMoviesIndex.value].cover_img,
 			relation_id:item.relation_id,
 			sched_sign:item.sched_sign,
 			show_date:item.show_date,
 			show_time:item.show_time,
+			cinema_name:item.cinema_name,
 			film_name:moviesList.value[currentMoviesIndex.value].film_name,
 			hall_name:item.hall_name,
 			hall_sign:item.hall_sign,
 			film_sign:moviesList.value[currentMoviesIndex.value].film_sign,
 			cinema_sign:initInfo.value.cinema_sign,
-			show_des:`${formatDate(item.show_date,7,'-')} ${item.show_time}-${item.end_time} (${item.film.language=='汉语普通话'?'国语':item.film.language} ${item.film.version})`
+			show_des:`${formatDate(dateList.value[currentIndex.value].date_timestamp,7,'-')} ${item.show_time}-${item.end_time} (${item.film.language=='汉语普通话'?'国语':item.film.language} ${item.film.version})`
 		}
 		uni.navigateTo({
 			url:`/subPages/pages/movies/chooseSeat?info=${encodeURIComponent(JSON.stringify(params))}`

src/subPages/pages/movies/orderDetail.vue

@@ -5,27 +5,28 @@
 			<view class="top-info-content">
 				<view class="info-content">
 					<text class="info-title">{{detailInfo.film_name}}</text>
-					<text class="info-des" v-if="detailInfo&&detailInfo.film">{{detailInfo.sched_time}} ~ {{detailInfo.schedend_time}}({{detailInfo.film.language=='汉语普通话'?'国语':detailInfo.film.language}}{{detailInfo.film.version}})</text>
+					<text class="info-des" v-if="detailInfo&&detailInfo.film">{{detailInfo.sched_time}} ~
+						{{detailInfo.schedend_time}}({{detailInfo.film.language=='汉语普通话'?'国语':detailInfo.film.language}}{{detailInfo.film.version}})</text>
 					<text class="info-des">{{detailInfo.cinema_name}}{{detailInfo.hall_name}}</text>
-					
+
 					<view class="seat-content">
 						<text :key="'info-seat-'+index" class="info-seat"
 							v-for="(item,index) in detailInfo.sched_seat">{{item.seat_no}}</text>
 					</view>
-				
-						
+
+
 				</view>
 				<image v-if="detailInfo && detailInfo.film" class="info-img" :src="detailInfo.film.cover_img"
 					mode="aspectFill"></image>
 			</view>
 			<view class="order-line"></view>
 
-			<view class="order-status-content" v-if="detailInfo.status==0">
+			<view class="order-status-content" v-if="detailInfo.status==0 && isShowTimer">
 				<text class="status-title">支付剩余 {{ formatTime(minutes) }}:{{ formatTime(seconds) }}</text>
 				<text class="status-hint"> 请尽快支付,否则订单将在10分钟后失效</text>
 			</view>
 			<view class="order-status-content"
-				v-if="detailInfo.status==3 || detailInfo.status==2|| detailInfo.status==5">
+				v-if="detailInfo.status==3 || detailInfo.status==2|| detailInfo.status==5 ||(detailInfo.status==0 && !isShowTimer)">
 				<text class="status-title"> 订单已取消</text>
 				<text class="status-hint"> 订单超时未支付,系统已自动关闭！</text>
 			</view>
@@ -104,13 +105,16 @@
 	let orderSn = ''
 	const formatTime = (num) => num < 10 ? `0${num}` : num
 	const detailInfo = ref({})
-	let totalTime = 600 // 5分钟=300秒
+	let totalTime = 300 // 5分钟=300秒
 	const count = ref(0)
 	const minutes = ref(0)
 	const seconds = ref(0)
+	const isShowTimer = ref(false)
 	let timer = null
+	let initType = 0
 	onLoad((option) => {
 		orderSn = option.orderSn
+		initType = option.initType
 		if (orderSn != 'undefined') {
 			getorderDetailInfo()
 		}
@@ -118,7 +122,7 @@
 
 	function onAddressClick() {
 		uni.navigateTo({
-			url:`/subPages/pages/movies/moviesTicketList?info=${encodeURIComponent(JSON.stringify(detailInfo.value.cinema))}&film_sign=${detailInfo.value.film.film_sign}`
+			url: `/subPages/pages/movies/moviesTicketList?info=${encodeURIComponent(JSON.stringify(detailInfo.value.cinema))}&film_sign=${detailInfo.value.film.film_sign}`
 		})
 	}
 
@@ -130,7 +134,7 @@
 	}
 
 	function onPayClick() {
-		console.log("===detailInfo",detailInfo.value.oid);
+		console.log("===detailInfo", detailInfo.value.oid);
 		uni.redirectTo({
 			url: `/pages/payment/index?pay_price=${detailInfo.value.order_price}&order_id=${detailInfo.value.oid}&initType=3&order_sn=${detailInfo.value.order_sn}`
 		})
@@ -192,15 +196,20 @@
 		apiGetOrderInfo(orderSn).then(res => {
 			detailInfo.value = res
 			if (detailInfo.value.status == 0) {
-	     	totalTime = parseInt((detailInfo.value.create_time*1000+600000 -	new Date().getTime())/1000)
-			count.value = totalTime+2
-				initTimer()
+				totalTime = parseInt((detailInfo.value.create_time * 1000 + 300000 - new Date().getTime()) / 1000)
+				count.value = totalTime + 2
+				if (count.value > 0) {
+					initTimer()
+					isShowTimer.value = true
+				} else {
+					isShowTimer.value = false
+				}
 			}
 			uni.hideLoading()
-		}).catch((e)=>{
+		}).catch((e) => {
 			uni.showToast({
-				title:e.message ||'接口异常!',
-				icon:'none'
+				title: e.message || '接口异常!',
+				icon: 'none'
 			})
 		})
 	}
@@ -209,15 +218,15 @@
 <style lang="scss" scoped>
 	.order-detail-container {
 		display: flex;
-		padding-bottom: 60rpx;
+		padding-bottom: 100rpx;
 		flex-direction: column;
 		min-height: 100VH;
 		background-color: #f8f8f8;
 		box-sizing: border-box;
 		position: relative;
 		padding-top: 24rpx;
-		
-		.seat-content{
+
+		.seat-content {
 			display: flex;
 			flex-direction: row;
 			align-items: center;

src/subPages/pages/movies/orderList.vue

@@ -53,7 +53,7 @@
 				
 				<view class="card-bottom-content">
 					<text class="card-date">{{item.create_time}}</text>
-					<text class="card-status">{{dealStatus(item.status)}}</text>
+					<text class="card-status">{{dealStatus(item)}}</text>
 				</view>
 			</view>
 		</view>
@@ -95,6 +95,10 @@
 
 	onLoad((option) => {
 		currentIndex.value = option.type
+		
+	})
+	
+	onShow(()=>{
 		getmoviesOrderList()
 	})
 
@@ -104,15 +108,24 @@
 		})
 	}
 	
-	function dealStatus(status){
+	function dealStatus(item){
 		let name 
-		if(status==0){
+		let status =item.status
+		let isShowTimer=true
+	    let totalTime = parseInt((item.create_time * 1000 + 300000 - new Date().getTime()) / 1000)
+		if (totalTime > 0) {
+			isShowTimer = true
+		} else {
+			isShowTimer = false
+		}
+		
+		if(status==0 && isShowTimer){
 			name='待支付'
+		}else if(status==0 && !isShowTimer){
+			name='未支付'
 		}else if(status==1){
-			name='已支付'
-		}else if(status==2){
-			name='已超时'
-		}else if(status==3 || status==5){
+			name='已出票'
+		}else if(status==2 ||status==3 || status==5){
 			name='已取消'
 		}else if(status==4){
 			name='已成功'
@@ -124,7 +137,7 @@
 	function getmoviesOrderList() {
 		uni.showLoading()
 		let params =
-			`page=${state.page}&limit=${state.limit}&type=${currentIndex.value==0?-1:(currentIndex.value==2?5:1)}`
+			`page=${state.page}&limit=${state.limit}&type=${currentIndex.value==0?-1:(currentIndex.value==2?3:1)}`
 		apiGetOrderList(params).then(res => {
 			state.count = res.count
 			if (state.page === 1) {

uni-pages.d.ts

@@ -104,7 +104,6 @@ interface NavigateToOptions {
        "/subPages/pages/mine-top/qianbao" |
        "/subPages/pages/mine-top/repurchase" |
        "/subPages/pages/mine-top/vr" |
-       "/subPages/pages/movies/chooseSeat - 副本" |
        "/subPages/pages/movies/chooseSeat" |
        "/subPages/pages/movies/chooseSeat1" |
        "/subPages/pages/movies/cityList" |