fix:修复bug

pages/my/card.vue

@@ -3,7 +3,7 @@
 		<!-- 会员卡列表 -->
 		<view class="card-list" v-if="cardList.length > 0">
 			<view v-for="card in cardList" :key="card.id" style="position: relative;background-color: #f5f5f5;"
-				@click="viewCardDetail(card)" :style="card.cardType==='COUNT'?'height: 240rpx;':'height: 200rpx;'">
+				@click="viewCardDetail(card)" :style="card.cardType==='COUNT'?'height: 240rpx;':'height: 240rpx;'">
 				<view
 					style="height: 120rpx;background-color: #ffffff;z-index: 999;border-radius: 25rpx;padding: 32rpx;position: absolute;top: 0;left: 0;right: 0;">
 					<!-- 卡片头部：标题和日期 -->
@@ -22,9 +22,9 @@
 							class="region-text">{{ $t('myCard.onlyForRegionBefore') }}{{ card.positionName }}{{ $t('myCard.onlyForRegionAfter') }}</text>
 						<!-- 状态标签 / 去使用按钮 -->
 						<view v-if="card.status !== 'expired'" class="status-tag active"
-							style="display: flex; align-items: center; gap: 4rpx; background-color: #FFE2B8; border-radius: 26rpx; padding: 6rpx 20rpx;"
+							style="display: flex; align-items: center; gap: 4rpx; background-color: #FFE2B8; border-radius: 20rpx; padding: 6rpx 20rpx;"
 							@click.stop="handleUseCard(card)">
-							<text class="status-text" style="color: #D4A574;">{{ $t('myCard.toUse') }}</text>
+							<text class="status-text" style="color: #A16300;">{{ $t('myCard.toUse') }}</text>
 							<!-- <uv-icon name="scan" size="12" color="#D4A574"></uv-icon> -->
 						</view>
 						<view v-else class="status-tag" :class="getStatusClass(card.status)">
@@ -33,8 +33,7 @@
 					</view>
 				</view>
 				<!-- 使用情况和操作按钮 -->
-				<view style="position: absolute; bottom: -10rpx; left: 0; right: 0; padding: 20rpx;z-index:1;"
-					v-if="card.cardType==='COUNT'">
+				<view style="position: absolute; bottom: -20rpx; left: 0; right: 0; padding: 20rpx;z-index:1;">
 					<view class="card-footer">
 						<!-- 次卡信息 -->
 						<view v-if="card.cardType === 'COUNT'" class="card-usage-info">
@@ -42,8 +41,8 @@
 								$t('myCard.times') }}</text>
 						</view>
 						<!-- 时长卡信息 -->
-						<view v-if="card.cardType === 'TIME'" class="card-usage-info">
-							<text class="usage-text">{{ $t('myCard.durationCard') }}</text>
+						<view v-else class="card-usage-info">
+							<text class="usage-text">每日限用次数：{{card.dailyLimitCount}}次</text>
 						</view>
 
 						<!-- 操作按钮 -->
@@ -52,7 +51,10 @@
 							<view v-if="card.cardType === 'COUNT'" class="renew-btn" @click.stop="renewCard(card)">
 								<text class="renew-text">{{ $t('myCard.renew') }}</text>
 								<uv-icon name="arrow-right" size="14" color="#D4A574"></uv-icon>
-								<!-- <text class="arrow">{{ '>' }}</text> -->
+
+							</view>
+							<view v-else class="renew-btn">
+								<text class="renew-text">单次限时：{{card.singleLimitMinutes}}分钟</text>
 							</view>
 
 						</view>
@@ -356,7 +358,8 @@
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		/* padding-top: 24rpx ; */
+		padding: 20rpx;
+		padding-top: 50rpx;
 		position: absolute;
 		background: rgba(255, 244, 227, 1);
 		z-index: 1;
@@ -364,7 +367,7 @@
 		bottom: 0;
 		left: 0;
 		border-radius: 0 0 25rpx 25rpx;
-		padding: 20rpx;
+		
 		/* text-align: 30rpx ; */
 	}
 

pages/my/coupon.vue

@@ -40,7 +40,7 @@
 							style="font-size: 22rpx; color: #999; margin-top: 4rpx;">
 							{{ $t('myCoupon.onlyForRegionBefore') }}{{ coupon.positionName }}{{ $t('myCoupon.onlyForRegionAfter') }}
 						</text> -->
-						<view class="use-btn" v-if="coupon.status === 'available'" @click="useCoupon(coupon)">
+						<view class="use-btn" v-if="coupon.status == 'unused'" @click="useCoupon(coupon)">
 							<text class="use-text">{{ $t('myCoupon.useNow') }}</text>
 						</view>
 						<text class="coupon-status" v-else>{{ getStatusText(coupon.status) }}</text>
@@ -85,7 +85,7 @@ const couponList = ref([])
 
 // 过滤后的优惠券
 const filteredCoupons = computed(() => {
-	return couponList.value.filter(coupon => coupon.status === currentTab.value)
+	return couponList.value;
 })
 
 // 获取优惠券列表
@@ -114,6 +114,7 @@ const getCouponList = async () => {
 				} else if (item.couponEndTime) {
 					validity = `于 ${item.couponEndTime.split(' ')[0]} 过期`
 				}
+				console.log(item.status);
 
 				return {
 					id: item.id,
@@ -123,7 +124,7 @@ const getCouponList = async () => {
 					discount: item.discountRate ? parseFloat(item.discountRate) * 10 : null,
 					condition: condition,
 					validity: validity,
-					status: currentTab.value,
+					status: item.status,
 					positionName: item.positionName
 				}
 			})
@@ -148,15 +149,17 @@ const switchTab = (tab) => {
 
 // 获取优惠券样式类名
 const getCouponClass = (status) => {
-	return status === 'available' ? '' : 'disabled'
+	return status === 'unused' ? '' : 'disabled'
 }
 
 // 获取状态文本
 const getStatusText = (status) => {
 	const statusMap = {
 		'used': t('myCoupon.usedStatus'),
-		'expired': t('myCoupon.expiredStatus')
+		'expired': t('myCoupon.expiredStatus'),
+		'refunded':t('myCoupon.refundedStatus')
 	}
+	console.log("获取状态文本："+statusMap[status]);
 	return statusMap[status] || ''
 }