zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

整理

Browse Source
This commit is contained in:
zjf committed 2025-01-07 14:24:16 +08:00
1 parent f6ecec24b1
commit d9e5d86a68
5 files changed
+60 -106
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.env.development
+4 -4
View File
@@ -8,12 +8,12 @@ VITE_OPEN = true
ENV = 'development' ENV = 'development'
# ADMIN 服务地址 # ADMIN 服务地址
VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ #VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
# VITE_ADMIN_PROXY_PATH = http://localhost:9999 VITE_ADMIN_PROXY_PATH = http://localhost:9999
# 图片访问基础地址 # 图片访问基础地址
VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api #VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
# VITE_IMAGE_BASE_PATH = http://localhost:9999 VITE_IMAGE_BASE_PATH = http://localhost:9999
# 代码生成服务地址 # 代码生成服务地址
VITE_GEN_PROXY_PATH = http://192.168.110.156:5003 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
src/views/canteen/canteenOnlineCategory/form.vue
+19 -19
View File
@@ -3,11 +3,11 @@
:close-on-click-modal="false" draggable> :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading"> <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12" class="mb20"> <!-- <el-col :span="12" class="mb20">-->
<el-form-item label="父分类编号" prop="parentId"> <!-- <el-form-item label="父分类编号" prop="parentId">-->
<el-input v-model="form.parentId" placeholder="请输入父分类编号"/> <!-- <el-input v-model="form.parentId" placeholder="请输入父分类编号"/>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="分类名称" prop="name"> <el-form-item label="分类名称" prop="name">
@@ -15,7 +15,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20"> <el-col :span="24" class="mb20">
<el-form-item label="分类图" prop="picUrl"> <el-form-item label="分类图" prop="picUrl">
<upload-img v-model="form.picUrl"></upload-img> <upload-img v-model="form.picUrl"></upload-img>
</el-form-item> </el-form-item>
@@ -23,23 +23,23 @@
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="分类排序" prop="sort"> <el-form-item label="分类排序" prop="sort">
<el-input v-model="form.sort" placeholder="请输入分类排序"/> <el-input-number v-model="form.sort" placeholder="请输入分类排序"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20"> <!-- <el-col :span="12" class="mb20">-->
<el-form-item label="开启状态" prop="status"> <!-- <el-form-item label="开启状态" prop="status">-->
<el-radio-group v-model="form.status"> <!-- <el-radio-group v-model="form.status">-->
<el-radio label="开启状态" border>开启状态</el-radio> <!-- <el-radio label="开启状态" border>开启状态</el-radio>-->
</el-radio-group> <!-- </el-radio-group>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12" class="mb20"> <!-- <el-col :span="12" class="mb20">-->
<el-form-item label="部门id" prop="deptId"> <!-- <el-form-item label="部门id" prop="deptId">-->
<el-input v-model="form.deptId" placeholder="请输入部门id"/> <!-- <el-input v-model="form.deptId" placeholder="请输入部门id"/>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
</el-form> </el-form>
src/views/canteen/canteenOnlineCategory/index.vue
+2 -3
View File
@@ -35,12 +35,11 @@
@sort-change="sortChangeHandle"> @sort-change="sortChangeHandle">
<el-table-column type="selection" width="40" align="center" /> <el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="40" /> <el-table-column type="index" label="#" width="40" />
<el-table-column prop="parentId" label="父分类编号" show-overflow-tooltip/>
<el-table-column prop="name" label="分类名称" show-overflow-tooltip/> <el-table-column prop="name" label="分类名称" show-overflow-tooltip/>
<el-table-column prop="picUrl" label="分类图" show-overflow-tooltip/> <el-table-column prop="picUrl" label="分类图" show-overflow-tooltip/>
<el-table-column prop="sort" label="分类排序" show-overflow-tooltip/> <el-table-column prop="sort" label="分类排序" show-overflow-tooltip/>
<el-table-column prop="status" label="开启状态" show-overflow-tooltip/> <!-- <el-table-column prop="status" label="开启状态" show-overflow-tooltip/>-->
<el-table-column prop="deptId" label="部门id" show-overflow-tooltip/> <!-- <el-table-column prop="deptId" label="部门id" show-overflow-tooltip/>-->
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150">
<template #default="scope"> <template #default="scope">
<el-button icon="edit-pen" text type="primary" v-auth="'canteen_canteenOnlineCategory_edit'" <el-button icon="edit-pen" text type="primary" v-auth="'canteen_canteenOnlineCategory_edit'"
src/views/canteen/canteenOnlineSpu/form.vue
+31 -66
View File
@@ -3,6 +3,12 @@
:close-on-click-modal="false" draggable> :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading"> <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12" class="mb20">
<el-form-item label="商户编号" prop="merchantId">
<el-input v-model="form.merchantId" placeholder="请输入商户编号"/>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="商品名称" prop="name"> <el-form-item label="商品名称" prop="name">
<el-input v-model="form.name" placeholder="请输入商品名称"/> <el-input v-model="form.name" placeholder="请输入商品名称"/>
@@ -10,35 +16,26 @@
</el-col> </el-col>
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="商品简介" prop="introduction"> <el-form-item label="商品分类" prop="categoryId">
<el-input type="textarea" v-model="form.introduction" placeholder="请输入商品简介"/> <el-select v-model="form.categoryId" placeholder="请选择商品分类">
</el-form-item>
</el-col>
<el-col :span="12" 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="12" class="mb20">
<el-form-item label="商品分类编号" prop="categoryId">
<el-select v-model="form.categoryId" placeholder="请选择商品分类编号">
<el-option label="请选择">0</el-option> <el-option label="请选择">0</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商品价格" prop="price">
<el-input v-model="form.price" placeholder="请输入商品价格"/>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20"> <el-col :span="24" class="mb20">
<el-form-item label="商品封面图" prop="picUrl"> <el-form-item label="商品封面图" prop="picUrl">
<upload-img v-model="form.picUrl"></upload-img> <upload-img v-model="form.picUrl"></upload-img>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20"> <el-col :span="24" class="mb20">
<el-form-item label="商品轮播图地址 <el-form-item label="商品轮播图" prop="sliderPicUrls">
数组，以逗号分隔
最多上传15张" prop="sliderPicUrls">
<upload-img v-model="form.sliderPicUrls"></upload-img> <upload-img v-model="form.sliderPicUrls"></upload-img>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -50,7 +47,7 @@
</el-col> </el-col>
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="商品状态: 1 上架（开启） 0 下架（禁用） -1 回收" prop="status"> <el-form-item label="商品状态" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio :label="item.value" v-for="(item, index) in spu_status" border :key="index">{{ item.label }} <el-radio :label="item.value" v-for="(item, index) in spu_status" border :key="index">{{ item.label }}
</el-radio> </el-radio>
@@ -59,14 +56,8 @@
</el-col> </el-col>
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="商品价格，单位使用：分" prop="price"> <el-form-item label="市场价" prop="marketPrice">
<el-input v-model="form.price" placeholder="请输入商品价格，单位使用：分"/> <el-input v-model="form.marketPrice" placeholder="请输入市场价"/>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="市场价，单位使用：分" prop="marketPrice">
<el-input v-model="form.marketPrice" placeholder="请输入市场价，单位使用：分"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -76,42 +67,16 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20"> <!-- <el-col :span="12" class="mb20">-->
<el-form-item label="赠送积分" prop="giveIntegral"> <!-- <el-form-item label="部门id" prop="deptId">-->
<el-input v-model="form.giveIntegral" placeholder="请输入赠送积分"/> <!-- <el-input v-model="form.deptId" placeholder="请输入部门id"/>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="24" class="mb20">
<el-col :span="12" class="mb20"> <el-form-item label="商品详情" prop="description">
<el-form-item label="商品销量" prop="salesCount"> <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
<el-input v-model="form.salesCount" placeholder="请输入商品销量"/> </el-form-item>
</el-form-item> </el-col>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="虚拟销量" prop="virtualSalesCount">
<el-input v-model="form.virtualSalesCount" placeholder="请输入虚拟销量"/>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商品点击量" prop="browseCount">
<el-input v-model="form.browseCount" placeholder="请输入商品点击量"/>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商户编号" prop="merchantId">
<el-input v-model="form.merchantId" placeholder="请输入商户编号"/>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="部门id" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入部门id"/>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<template #footer> <template #footer>
@@ -163,8 +128,8 @@ const form = reactive({
const dataRules = ref({ const dataRules = ref({
name: [{required: true, message: '商品名称不能为空', trigger: 'blur'}], name: [{required: true, message: '商品名称不能为空', trigger: 'blur'}],
picUrl: [{required: true, message: '商品封面图不能为空', trigger: 'blur'}], picUrl: [{required: true, message: '商品封面图不能为空', trigger: 'blur'}],
price: [{required: true, message: '商品价格，单位使用：分不能为空', trigger: 'blur'}], price: [{required: true, message: '商品价格', trigger: 'blur'}],
marketPrice: [{required: true, message: '市场价，单位使用：分不能为空', trigger: 'blur'}], marketPrice: [{required: true, message: '市场价', trigger: 'blur'}],
stock: [{ validator: rule.number, trigger: 'blur' }], stock: [{ validator: rule.number, trigger: 'blur' }],
}) })
src/views/canteen/canteenOnlineSpu/index.vue
+4 -14
View File
@@ -41,28 +41,18 @@
<el-table-column type="selection" width="40" align="center" /> <el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="40" /> <el-table-column type="index" label="#" width="40" />
<el-table-column prop="name" label="商品名称" show-overflow-tooltip/> <el-table-column prop="name" label="商品名称" show-overflow-tooltip/>
<el-table-column prop="introduction" label="商品简介" show-overflow-tooltip/> <el-table-column prop="categoryId" label="商品分类" show-overflow-tooltip/>
<el-table-column prop="description" label="商品详情" show-overflow-tooltip/>
<el-table-column prop="categoryId" label="商品分类编号" show-overflow-tooltip/>
<el-table-column prop="picUrl" label="商品封面图" show-overflow-tooltip/> <el-table-column prop="picUrl" label="商品封面图" show-overflow-tooltip/>
<el-table-column prop="sliderPicUrls" label="商品轮播图地址
数组，以逗号分隔
最多上传15张" show-overflow-tooltip/>
<el-table-column prop="sort" label="排序字段" show-overflow-tooltip/> <el-table-column prop="sort" label="排序字段" show-overflow-tooltip/>
<el-table-column prop="status" label="商品状态: 1 上架（开启） 0 下架（禁用） -1 回收" show-overflow-tooltip> <el-table-column prop="status" label="商品上下架" show-overflow-tooltip>
<template #default="scope"> <template #default="scope">
<dict-tag :options="spu_status" :value="scope.row.status"></dict-tag> <dict-tag :options="spu_status" :value="scope.row.status"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="price" 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="marketPrice" label="市场价" show-overflow-tooltip/>
<el-table-column prop="stock" 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="salesCount" 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="browseCount" label="商品点击量" show-overflow-tooltip/>
<el-table-column prop="merchantId" label="商户编号" show-overflow-tooltip/>
<el-table-column prop="deptId" label="部门id" show-overflow-tooltip/>
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip/> <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip/>
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150">
<template #default="scope"> <template #default="scope">