Merge branch 'Branch_1' of https://git.u8t.cn/tangxinyue/alipay-emulator into Branch_1

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: '已关闭' }
 ]);
 

pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue

@@ -247,7 +247,8 @@
 						<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 :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>
@@ -272,8 +273,7 @@
 					</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>