From 8116423becf31229cb80e9a276063a10c51f33a5 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 13 Feb 2025 18:42:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/active/active-item.vue |  8 +++++++-
 pages/index/index.vue             |  5 ++---
 pages_order/lvyou-detail.vue      |  2 +-
 pages_order/payOrder.vue          | 12 ++++++++++++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/components/active/active-item.vue b/components/active/active-item.vue
index 2268454..c6d7fa6 100644
--- a/components/active/active-item.vue
+++ b/components/active/active-item.vue
@@ -54,7 +54,13 @@
 					url: '/pages_order/orderDetails'
 				})
 			},
-			toDetail({ id }) {
+			toDetail({ id, ntype }) {
+				if(ntype == 1){
+					uni.navigateTo({
+						url:`/pages_order/lvyou-detail?travelId=${id}`
+					})
+					return
+				}
 				uni.navigateTo({
 					url:`/pages_order/huodong-detail?activityId=${id}`
 				})
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3b435d3..24a37c2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -99,8 +99,7 @@
 				
 				<view v-for="(item, index) in cardListData"
 				:key="item.id">
-					<active-item :cardListData="[item]" v-if="item.ntype == 0"/>
-					<travelList :cardListData="[item]" v-else/>
+					<active-item :cardListData="[item]"/>
 				</view>
 				
 				<uv-load-more :status="status" fontSize="24rpx" dashed line />
@@ -288,7 +287,7 @@
 				this.cardListData = [...this.cardListData, ...list1, ...list2]
 				
 				this.cardListData.sort((a, b) => {
-					return new Date(b.startTime).getTime() - new Date(a.startTime).getTime()
+					return this.$dayjs(a.startTime).valueOf() - this.$dayjs(b.startTime).valueOf()
 				})
 			},
 			getApi(api){
diff --git a/pages_order/lvyou-detail.vue b/pages_order/lvyou-detail.vue
index 691356b..9b92c3a 100644
--- a/pages_order/lvyou-detail.vue
+++ b/pages_order/lvyou-detail.vue
@@ -354,7 +354,7 @@
 			}
 		}
 		.lv-miaoshu {
-			margin-top: 250rpx;
+			margin-top: 400rpx;
 			.value-box {
 				background: #1B1713;
 				border-radius: 27rpx;
diff --git a/pages_order/payOrder.vue b/pages_order/payOrder.vue
index b16e23d..f356e1e 100644
--- a/pages_order/payOrder.vue
+++ b/pages_order/payOrder.vue
@@ -43,6 +43,16 @@
 					
 					<uv-cell :border="false"
 					title="订单状态" :value="orderStatus"></uv-cell>
+					
+					<uv-cell :border="false"
+					v-if="dataInfo.type == 0"
+					title="邀请码">
+						<template #value>
+							<input type="text" 
+							style="color: #fff;"
+							placeholder="请输入邀请码" v-model="code"/>
+						</template>
+					</uv-cell>
 				</view>
 
 			</view>
@@ -84,6 +94,7 @@
 					color:'#FF5858'
 				},
 				num : 1,
+				code : '',//邀请码
 				typeList:[
 					{
 						name:'早鸟票',
@@ -144,6 +155,7 @@
 				this.$api('createOrderPay',{
 					id:this.orderId,
 					num : this.num,
+					code : this.code,
 				},res=>{
 					if(res.code === 200) {
 						uni.requestPaymentWxPay(res)