From ec438815ef60377512c1c22b05ce9d84336b1f98 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 31 Dec 2024 13:59:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=93=81=E9=9A=90=E8=97=8F=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/canteen/canteenSpu/form.vue  | 50 +++++++++++++-------------
 src/views/canteen/canteenSpu/index.vue | 10 +++---
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/views/canteen/canteenSpu/form.vue b/src/views/canteen/canteenSpu/form.vue
index 2047269..55c67db 100644
--- a/src/views/canteen/canteenSpu/form.vue
+++ b/src/views/canteen/canteenSpu/form.vue
@@ -21,17 +21,17 @@
 						<upload-img v-model:imageUrl="form.picUrl"></upload-img>
 					</el-form-item>
 				</el-col>
-				<el-col :span="12" class="mb20">
-					<el-form-item label="商品简介" prop="introduction">
-						<el-input type="textarea" v-model="form.introduction" placeholder="请输入商品简介" />
-					</el-form-item>
-				</el-col>
+<!--				<el-col :span="12" class="mb20">-->
+<!--					<el-form-item label="商品简介" prop="introduction">-->
+<!--						<el-input type="textarea" v-model="form.introduction" placeholder="请输入商品简介" />-->
+<!--					</el-form-item>-->
+<!--				</el-col>-->
 
-				<el-col :span="24" class="mb20">
-					<el-form-item label="商品轮播图" prop="sliderPicUrls">
-						<upload-imgs v-model:imageUrls="form.sliderPicUrls"></upload-imgs>
-					</el-form-item>
-				</el-col>
+<!--				<el-col :span="24" class="mb20">-->
+<!--					<el-form-item label="商品轮播图" prop="sliderPicUrls">-->
+<!--						<upload-imgs v-model:imageUrls="form.sliderPicUrls"></upload-imgs>-->
+<!--					</el-form-item>-->
+<!--				</el-col>-->
 
 				<el-col :span="8" class="mb20">
 					<el-form-item label="排序" prop="sort">
@@ -65,23 +65,23 @@
 					</el-form-item>
 				</el-col>
 
-				<el-col :span="8" class="mb20">
-					<el-form-item label="赠送积分" prop="giveIntegral">
-						<el-input v-model="form.giveIntegral" placeholder="请输入赠送积分" />
-					</el-form-item>
-				</el-col>
+<!--				<el-col :span="8" class="mb20">-->
+<!--					<el-form-item label="赠送积分" prop="giveIntegral">-->
+<!--						<el-input v-model="form.giveIntegral" placeholder="请输入赠送积分" />-->
+<!--					</el-form-item>-->
+<!--				</el-col>-->
 
-				<el-col :span="8" class="mb20">
-					<el-form-item label="虚拟销量" prop="virtualSalesCount">
-						<el-input v-model="form.virtualSalesCount" placeholder="请输入虚拟销量" />
-					</el-form-item>
-				</el-col>
+<!--				<el-col :span="8" class="mb20">-->
+<!--					<el-form-item label="虚拟销量" prop="virtualSalesCount">-->
+<!--						<el-input v-model="form.virtualSalesCount" placeholder="请输入虚拟销量" />-->
+<!--					</el-form-item>-->
+<!--				</el-col>-->
 
-				<el-col :span="24" class="mb20">
-					<el-form-item label="商品详情" prop="description">
-						<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
-					</el-form-item>
-				</el-col>
+<!--				<el-col :span="24" class="mb20">-->
+<!--					<el-form-item label="商品详情" prop="description">-->
+<!--						<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>-->
+<!--					</el-form-item>-->
+<!--				</el-col>-->
 			</el-row>
 		</el-form>
 		<template #footer>
diff --git a/src/views/canteen/canteenSpu/index.vue b/src/views/canteen/canteenSpu/index.vue
index 0698924..a17b979 100644
--- a/src/views/canteen/canteenSpu/index.vue
+++ b/src/views/canteen/canteenSpu/index.vue
@@ -60,13 +60,13 @@
 						<dict-tag :options="spu_status" :value="scope.row.status"></dict-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="price" label="商品价格，单位使用：分" show-overflow-tooltip />
-				<el-table-column prop="marketPrice" label="市场价，单位使用：分" show-overflow-tooltip />
-				<el-table-column prop="costPrice" label="成本价，单位： 分" show-overflow-tooltip />
+				<el-table-column prop="price" label="商品价格" show-overflow-tooltip />
+				<el-table-column prop="marketPrice" label="市场价" show-overflow-tooltip />
+				<el-table-column prop="costPrice" label="成本价" show-overflow-tooltip />
 				<el-table-column prop="stock" label="库存" show-overflow-tooltip />
-				<el-table-column prop="giveIntegral" label="赠送积分" show-overflow-tooltip />
+<!--				<el-table-column prop="giveIntegral" label="赠送积分" show-overflow-tooltip />-->
 				<el-table-column prop="salesCount" label="商品销量" show-overflow-tooltip />
-				<el-table-column prop="virtualSalesCount" label="虚拟销量" show-overflow-tooltip />
+<!--				<el-table-column prop="virtualSalesCount" label="虚拟销量" show-overflow-tooltip />-->
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
 				<el-table-column label="操作" width="150" fixed="right">
 					<template #default="scope">