From d317241d30d871a3af2087979a645cc9f7ac0220 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sun, 2 Mar 2025 20:07:25 +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/cart/CardList.vue | 5 +++--
 pages/index/cart.vue         | 7 +------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/components/cart/CardList.vue b/components/cart/CardList.vue
index a301a9e..612b10f 100644
--- a/components/cart/CardList.vue
+++ b/components/cart/CardList.vue
@@ -3,7 +3,8 @@
 		<view class="container" @click="toOrderDetails(item)" v-for="(item, index) in cardListData" :key="index">
 			<view class="head">
 				<text class="orderTime">下单时间：{{item.createTime}}</text>
-				<text class="orderStatus" :class="item.state === 'U' ? 'active' : ''">{{item.stateText}}</text>
+				<text class="orderStatus" class="active">{{ stateText[item.state] }}</text>
+				<!-- <text class="orderStatus" :class="item.state === 'U' ? 'active' : ''">{{item.stateText}}</text> -->
 			</view>
 			<view class="content cardStyle_" :class="['U','S'].includes(item.state) ? 'content_border' : ''">
 				<view class="left">
@@ -51,7 +52,7 @@
 		},
 		data() {
 			return {
-
+				stateText : ['', '待参加', '已完成', '已取消'],
 			};
 		},
 		components: {
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index d850d34..8d4382b 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -13,11 +13,7 @@
 			<cardList :cardListData="cardListData" @btnClick="btnClick" @toOrderDetails="toOrderDetails" />
 			<uv-load-more :status="status" fontSize="24rpx" dashed line />
 		</view>
-		<uv-modal 
-		ref="modal" 
-		align="center" 
-		content='是否取消订单？' 
-		@confirm="confirm"></uv-modal>
+		
 		
 		<signInQrcodePopup ref="signInQrcodePopup"/>
 		
@@ -132,7 +128,6 @@
 				this.orderId = item.id;
 				
 				if (type == 0) {
-					// this.$refs.modal.open();
 					uni.showModal({
 						title: '是否取消订单?',
 						success : res => {