From ce4a66ac3cd6cff0ff6a90f8253d2c4f3a11ac2f Mon Sep 17 00:00:00 2001
From: tangxinyue <524779910@qq.com>
Date: Thu, 21 May 2026 17:30:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B0=B4=E5=8D=B0=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=BF=9B=E8=A1=8C=E4=B8=AD=E9=97=AA=E8=B4=AD?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shopping/taobao/list-index.vue          | 10 ++-
 .../shangou-order-detail.vue                  | 61 +++++++++++--------
 2 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/pages/shopping/taobao/list-index.vue b/pages/shopping/taobao/list-index.vue
index 2f21f86..a680420 100644
--- a/pages/shopping/taobao/list-index.vue
+++ b/pages/shopping/taobao/list-index.vue
@@ -72,7 +72,7 @@
 				<view class="left flex-align-center">
 					<image style="width: 64rpx;height: 28rpx;margin-right: 8rpx;"
 						src="/static/image/shopping/taobao/shangou-logo.png"></image>
-					<text>暂无进行中订单</text>
+					<text>{{ ongoingWaimaiCount > 0 ? `${ongoingWaimaiCount}个进行中订单` : '暂无进行中订单' }}</text>
 				</view>
 				<view class="right">
 					<text>查看全部</text>
@@ -273,6 +273,10 @@ const buttonGroup = [
 	},
 ]
 
+const ongoingWaimaiCount = computed(() => {
+	return mockList.value.filter(item => item.orderType === 'waimai' && (item.statusType === 'wait_recv')).length;
+});
+
 const displayList = computed(() => {
 	let list = JSON.parse(JSON.stringify(mockList.value));
 
@@ -291,7 +295,7 @@ const displayList = computed(() => {
 			'待发货': ['wait_send'],
 			'待收货': ['wait_recv'],
 			'退款/售后': ['refunding'],
-			'评价': ['success'],
+			'待评价': ['success'],
 			'已关闭': ['closed']
 
 		};
@@ -325,7 +329,7 @@ const filterList = ref([
 	{ name: '待发货' },
 	{ name: '待收货' },
 	{ name: '退款/售后' },
-	{ name: '评价' },
+	{ name: '待评价' },
 	{ name: '已关闭' }
 ]);
 
diff --git a/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue b/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue
index 890cb11..ab66d80 100644
--- a/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue
+++ b/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue
@@ -244,36 +244,36 @@
 				<template v-for="(info, index) in order.orderInfo" :key="'info-' + index">
 					<view class="order-item flex" v-if="isOrderInfoExpanded || info.isFoldDisplay"
 						:style="info.label === '收货信息' ? 'align-items: flex-start;' : ''">
-					<text class="label" :style="info.label === '收货信息' ? 'line-height:36rpx;' : ''">{{ info.label
-					}}</text>
-					<view class="val flex-1 flex-align-center" style="justify-content: flex-end;">
-						<text :style="info.label === '收货信息' ? 'text-align: right;line-height:36rpx;' : ''">{{ info.value
+						<text class="label" :style="info.label === '收货信息' ? 'line-height:36rpx;' : ''">{{ info.label
 						}}</text>
-						<template v-if="info.hasModify">
-							<text class="split" style="margin-left: 8rpx; margin-right: 8rpx;">|</text>
-							<text class="copy-btn">修改</text>
-						</template>
-						<template v-if="info.hasSetting">
-							<text class="split" style="margin-left: 8rpx; margin-right: 8rpx;">|</text>
-							<text class="copy-btn">设置</text>
-						</template>
-						<template v-if="info.hasArrow">
-							<uni-icons type="right" size="12" color="#7C8495"></uni-icons>
-						</template>
-						<template v-if="info.hasCopy">
-							<text class="split" style="margin-left: 8rpx; margin-right: 8rpx;">|</text>
-							<text class="copy-btn">复制</text>
-						</template>
-						<template v-if="info.hasApply">
-							<text class="split" style="margin-left: 8rpx; margin-right: 8rpx;">|</text>
-							<text class="copy-btn">申请</text>
-						</template>
-					</view>
+						<view class="val flex-1 flex-align-center" style="justify-content: flex-end;">
+							<text :style="info.label === '收货信息' ? 'text-align: right;line-height:36rpx;' : ''">{{
+								info.value
+							}}</text>
+							<template v-if="info.hasModify">
+								<text class="split" style="margin-left: 8rpx; margin-right: 8rpx;">|</text>
+								<text class="copy-btn">修改</text>
+							</template>
+							<template v-if="info.hasSetting">
+								<text class="split" style="margin-left: 8rpx; margin-right: 8rpx;">|</text>
+								<text class="copy-btn">设置</text>
+							</template>
+							<template v-if="info.hasArrow">
+								<uni-icons type="right" size="12" color="#7C8495"></uni-icons>
+							</template>
+							<template v-if="info.hasCopy">
+								<text class="split" style="margin-left: 8rpx; margin-right: 8rpx;">|</text>
+								<text class="copy-btn">复制</text>
+							</template>
+							<template v-if="info.hasApply">
+								<text class="split" style="margin-left: 8rpx; margin-right: 8rpx;">|</text>
+								<text class="copy-btn">申请</text>
+							</template>
+						</view>
 					</view>
 				</template>
 
-				<view class="order-bottom-title flex-align-center"
-					@click="isOrderInfoExpanded = !isOrderInfoExpanded">
+				<view class="order-bottom-title flex-align-center" @click="isOrderInfoExpanded = !isOrderInfoExpanded">
 					<text>订单信息</text>
 					<uni-icons :type="isOrderInfoExpanded ? 'up' : 'down'" size="14" color="#7C8495"
 						style="margin-left: 8rpx;margin-top: 6rpx;"></uni-icons>
@@ -294,6 +294,15 @@
 	<view>
 		<image style="width: 100%;" :src="screenshotImage" mode="widthFix"></image>
 	</view>
+
+
+	<!-- 水印 -->
+	<view v-if="$isVip()">
+		<watermark dark="light" source="uni_alipay_shopping_taobao" />
+		<liu-drag-button :canDocking="false" @clickBtn="$goRechargePage('watermark', 'uni_alipay_shopping_taobao')">
+			<c-lottie ref="cLottieRef" :src='$watermark()' width="94px" height='74px' :loop="true"></c-lottie>
+		</liu-drag-button>
+	</view>
 </template>
 
 <script setup>