菜品列表管理交互、退款文案

pages/merchantDish/dish/list.vue

@@ -120,7 +120,7 @@
 								</view>
 							</view>
 							<view class="check" v-if="batchMode">
-								<view :class="['dot', selectedIds.includes(item.id) ? 'on' : '']">
+								<view :class="['dot', selectionDisabled ? 'disabled' : '', selectedIds.includes(item.id) ? 'on' : '']">
 									<u-icon v-if="selectedIds.includes(item.id)" name="checkmark" color="#fff" size="20"></u-icon>
 								</view>
 							</view>
@@ -135,8 +135,8 @@
 			<view class="primary-btn" @click="goCreate">新建菜品</view>
 		</view>
 		<view class="batch-footer" v-else>
-			<view class="all" @click="toggleAll">
-				<view :class="['dot', isAllSelected ? 'on' : '']">
+			<view :class="['all', selectionDisabled ? 'disabled' : '']" @click="toggleAll">
+				<view :class="['dot', selectionDisabled ? 'disabled' : '', isAllSelected ? 'on' : '']">
 					<u-icon v-if="isAllSelected" name="checkmark" color="#fff" size="20"></u-icon>
 				</view>
 				全选
@@ -144,7 +144,7 @@
 			<view class="batch-btns">
 				<template v-if="filterStatus === '' || filterStatus === 'reviewing'">
 					<view class="b-btn disabled">批量删除</view>
-					<view :class="['b-btn', selectedOffIds.length ? 'danger' : 'disabled']" @click="batchOff">批量下架</view>
+					<view class="b-btn disabled">批量下架</view>
 					<view class="b-btn disabled">批量上架</view>
 				</template>
 				<template v-else-if="filterStatus === 'selling' || filterStatus === 'soldout'">
@@ -260,10 +260,8 @@ export default {
 			const ids = list.map((i) => i.id);
 			return ids.length > 0 && ids.every((id) => this.selectedIds.includes(id));
 		},
-		selectedOffIds() {
-			return this.currentList
-				.filter((item) => this.selectedIds.includes(item.id) && (item.status === 'selling' || item.status === 'soldout'))
-				.map((item) => item.id);
+		selectionDisabled() {
+			return this.filterStatus === '';
 		},
 		bannerVisible() {
 			return this.applyStatus !== 1;
@@ -354,7 +352,6 @@ export default {
 			this.reloadList();
 		},
 		openPicker(type) {
-			if (this.batchMode) return;
 			if (this.pickerShow && this.pickerType === type) {
 				this.closePicker();
 				return;
@@ -398,12 +395,13 @@ export default {
 			this.selectedIds = [];
 		},
 		toggleSelect(item) {
-			if (!this.batchMode) return;
+			if (!this.batchMode || this.selectionDisabled) return;
 			const i = this.selectedIds.indexOf(item.id);
 			if (i >= 0) this.selectedIds.splice(i, 1);
 			else this.selectedIds.push(item.id);
 		},
 		toggleAll() {
+			if (this.selectionDisabled) return;
 			if (this.isAllSelected) this.selectedIds = [];
 			else this.selectedIds = this.currentList.map((i) => i.id);
 		},
@@ -478,7 +476,7 @@ export default {
 			return true;
 		},
 		async batchOff() {
-			const ids = this.filterStatus === '' ? this.selectedOffIds : this.selectedIds;
+			const ids = this.selectedIds;
 			if (!ids.length) {
 				uni.showToast({ title: '请先选择在售菜品', icon: 'none' });
 				return;
@@ -677,6 +675,10 @@ export default {
 			background: #449aff;
 			border-color: #449aff;
 		}
+		&.disabled {
+			background: #f0f0f0;
+			border-color: #ddd;
+		}
 	}
 	.thumb-wrap {
 		width: 160rpx;
@@ -821,6 +823,9 @@ export default {
 		align-items: center;
 		font-size: 26rpx;
 		margin-right: 20rpx;
+		&.disabled {
+			color: #bbb;
+		}
 		.dot {
 			width: 36rpx;
 			height: 36rpx;
@@ -835,6 +840,10 @@ export default {
 				background: #449aff;
 				border-color: #449aff;
 			}
+			&.disabled {
+				background: #f0f0f0;
+				border-color: #ddd;
+			}
 		}
 	}
 	.batch-btns {

pages/merchantDish/orders/refund-details.vue

@@ -41,7 +41,7 @@
 						<text class="refund-label">退款金额</text>
 						<text class="refund-currency">￥</text>
 						<text class="refund-value">{{ formatMoney(refundAmount) }}</text>
-						<text class="refund-note">不包含餐盒费</text>
+						<text class="refund-note">{{ refundFeeNote }}</text>
 					</view>
 				</view>
 			</view>
@@ -154,6 +154,18 @@ export default {
 			const orderText = String(this.product.orderStatusName || '')
 			return orderText && !orderText.includes('退款') && !orderText.includes('售后') ? orderText : '待送达'
 		},
+		refundFeeNote() {
+			const statusText = [
+				this.product.deliveryStatusName,
+				this.product.packageOrderStatusName,
+				this.product.merchantOrderStatusName,
+				this.product.statusName,
+				this.deliveryStatusText
+			].filter(Boolean).join(' ')
+			const servedStatusTexts = ['已出餐', '已送达', '已到达', '已取餐']
+			const isServed = servedStatusTexts.some((text) => statusText.includes(text))
+			return isServed ? '不包含餐盒费' : '包含餐盒费'
+		},
 		dishDescription() {
 			return this.product.dishName || this.product.packageContent || this.product.dishNames || '暂无菜品信息'
 		},