From ad1c767b245a4c5a6d5213f9868498a14d548e38 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 12 Aug 2025 14:35:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E5=A0=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/canteen/boxesBooking/index.vue     |  8 ++++----
 src/views/canteen/boxesInfo/index.vue        | 18 +++++++++---------
 src/views/canteen/canteenOnlineSpu/form.vue  | 10 +++++-----
 src/views/canteen/canteenOnlineSpu/index.vue | 10 +++++-----
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/views/canteen/boxesBooking/index.vue b/src/views/canteen/boxesBooking/index.vue
index d9a4c74..94bda80 100644
--- a/src/views/canteen/boxesBooking/index.vue
+++ b/src/views/canteen/boxesBooking/index.vue
@@ -3,8 +3,8 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row v-show="showSearch">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-					<el-form-item label="包厢" prop="boxesName">
-            <el-input placeholder="请输入包厢" v-model="state.queryForm.boxesName" />
+					<el-form-item label="餐桌" prop="boxesName">
+            <el-input placeholder="请输入餐桌" v-model="state.queryForm.boxesName" />
 					</el-form-item>
 					<el-form-item label="用户" prop="userId">
 						<el-input placeholder="请输入用户" v-model="state.queryForm.userName" />
@@ -51,7 +51,7 @@
 			>
 				<el-table-column type="selection" width="40" align="center" />
 				<el-table-column type="index" label="#" width="50" />
-				<el-table-column prop="boxesName" label="包厢名称" show-overflow-tooltip />
+				<el-table-column prop="boxesName" label="餐桌名称" show-overflow-tooltip />
 				<el-table-column prop="startTime" label="开始时间" show-overflow-tooltip min-width="160" />
 				<el-table-column prop="endTime" label="结束时间" show-overflow-tooltip min-width="160" />
 				<el-table-column prop="checkStatus" label="审核状态" show-overflow-tooltip min-width="160">
@@ -126,7 +126,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/canteen/boxesBooking/export", Object.assign(state.queryForm, { ids: selectObjs }), "包厢预约管理.xlsx")
+	downBlobFile("/canteen/boxesBooking/export", Object.assign(state.queryForm, { ids: selectObjs }), "餐桌预约管理.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/canteen/boxesInfo/index.vue b/src/views/canteen/boxesInfo/index.vue
index 6f7dfb4..1896ff5 100644
--- a/src/views/canteen/boxesInfo/index.vue
+++ b/src/views/canteen/boxesInfo/index.vue
@@ -3,8 +3,8 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row v-show="showSearch">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-					<el-form-item label="包厢名称" prop="name">
-						<el-input placeholder="请输入包厢名称" v-model="state.queryForm.name" />
+					<el-form-item label="餐桌名称" prop="name">
+						<el-input placeholder="请输入餐桌名称" v-model="state.queryForm.name" />
 					</el-form-item>
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
@@ -49,21 +49,21 @@
 			>
 				<el-table-column type="selection" width="40" align="center" />
 				<el-table-column type="index" label="#" width="50" />
-				<el-table-column prop="name" label="包厢名称" show-overflow-tooltip />
+				<el-table-column prop="name" label="餐桌名称" show-overflow-tooltip />
 				<el-table-column prop="capacity" label="容纳人数" show-overflow-tooltip />
-				<el-table-column prop="description" label="包厢描述" show-overflow-tooltip />
-				<el-table-column prop="address" label="包厢地址" show-overflow-tooltip />
-				<el-table-column prop="images" label="包厢图片" show-overflow-tooltip>
+				<el-table-column prop="description" label="餐桌描述" show-overflow-tooltip />
+				<el-table-column prop="address" label="餐桌摆放样式" show-overflow-tooltip />
+				<el-table-column prop="images" label="餐桌图片" show-overflow-tooltip>
 					<template #default="scope">
 						<preview-image :src="scope.row.images" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="status" label="包厢状态" show-overflow-tooltip>
+				<el-table-column prop="status" label="餐桌状态" show-overflow-tooltip>
 					<template #default="scope">
 						<dict-tag :options="boxes_status" :value="scope.row.status" />
 					</template>
 				</el-table-column>
-<!--				<el-table-column prop="price" label="包厢价格单位分" show-overflow-tooltip />-->
+<!--				<el-table-column prop="price" label="餐桌价格单位分" show-overflow-tooltip />-->
 				<el-table-column label="操作" width="150" fixed="right">
 					<template #default="scope">
 						<el-button
@@ -131,7 +131,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/canteen/boxesInfo/export", Object.assign(state.queryForm, { ids: selectObjs }), "包厢列表.xlsx")
+	downBlobFile("/canteen/boxesInfo/export", Object.assign(state.queryForm, { ids: selectObjs }), "餐桌列表.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/canteen/canteenOnlineSpu/form.vue b/src/views/canteen/canteenOnlineSpu/form.vue
index 911bd51..3ac6bb8 100644
--- a/src/views/canteen/canteenOnlineSpu/form.vue
+++ b/src/views/canteen/canteenOnlineSpu/form.vue
@@ -22,11 +22,11 @@
 						<el-input-number v-model="form.price" :min="0" :precision="2" placeholder="请输入商品价格" />
 					</el-form-item>
 				</el-col>
-				<el-col :span="14" class="mb20">
-					<el-form-item label="市场价" prop="marketPrice">
-						<el-input-number v-model="form.marketPrice" :min="0" :precision="2" placeholder="请输入市场价" />
-					</el-form-item>
-				</el-col>
+<!--				<el-col :span="14" class="mb20">-->
+<!--					<el-form-item label="市场价" prop="marketPrice">-->
+<!--						<el-input-number v-model="form.marketPrice" :min="0" :precision="2" placeholder="请输入市场价" />-->
+<!--					</el-form-item>-->
+<!--				</el-col>-->
 				<el-col :span="14" class="mb20">
 					<el-form-item label="库存" prop="stock">
 						<el-input-number v-model="form.stock" :min="0" :precision="0" placeholder="请输入库存" />
diff --git a/src/views/canteen/canteenOnlineSpu/index.vue b/src/views/canteen/canteenOnlineSpu/index.vue
index 0a1f9f0..a3aba02 100644
--- a/src/views/canteen/canteenOnlineSpu/index.vue
+++ b/src/views/canteen/canteenOnlineSpu/index.vue
@@ -79,11 +79,11 @@
 						{{ displayPrice(scope.row.price) }}
 					</template>
 				</el-table-column>
-				<el-table-column prop="marketPrice" label="市场价" show-overflow-tooltip min-width="100">
-					<template #default="scope">
-						{{ displayPrice(scope.row.marketPrice) }}
-					</template>
-				</el-table-column>
+<!--				<el-table-column prop="marketPrice" label="市场价" show-overflow-tooltip min-width="100">-->
+<!--					<template #default="scope">-->
+<!--						{{ displayPrice(scope.row.marketPrice) }}-->
+<!--					</template>-->
+<!--				</el-table-column>-->
 				<el-table-column prop="stock" label="库存" show-overflow-tooltip min-width="100" />
 				<el-table-column prop="salesCount" label="商品销量" show-overflow-tooltip min-width="100" />
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />