Food/food
3
0
Fork 0
Code Issues 60 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Food:04e64c5a21816c348af8f7fb48709bd6066eaf8a
Branches Tags
Food:master
...
compare: Food:51160514d9827803d4fdf555428d13de93415bb3
Branches Tags
Food:master

2 Commits
04e64c5a21 ... 51160514d9

Author SHA1 Message Date
air
51160514d9 【类 型】：factor 
【原  因】：列表样式  按钮组宽度修改
【过  程】：
【影  响】：
 2025-06-13 12:26:14 +08:00
air
873c1a2995 【类 型】：factor 
【原  因】：ui  顶部按钮组 换行问题
【过  程】：更改容器宽度
【影  响】：
 2025-06-12 20:00:53 +08:00
9 changed files with 39 additions and 25 deletions
Show Stats Expand all files Collapse all files

4
src/styles/index.scss
View File

@ -175,6 +175,10 @@ label {
top: 30px !important; top: 30px !important;
} }
.mapboxgl-ctrl-top-left {
top: 30px !important;
}
//public //public
.borderLN { .borderLN {

1
src/views/layout/components/headbar.vue
View File

@ -306,6 +306,7 @@ export default {
this.$store.dispatch('fetchRouteList') // 获取航线列表 this.$store.dispatch('fetchRouteList') // 获取航线列表
this.$store.dispatch('fetchCategoryList') // 获取分类列表（小程序） this.$store.dispatch('fetchCategoryList') // 获取分类列表（小程序）
this.$store.dispatch('fetchPaidOrderList') // 获取订单列表 this.$store.dispatch('fetchPaidOrderList') // 获取订单列表
this.$store.dispatch('fetchMessageList')// 获取管理员公告列表 并弹出公告框
}, },
/** /**
* @description: 登出 * @description: 登出

6
src/views/layout/components/main/admin/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 组合按钮 --> <!-- 组合按钮 -->
<el-button-group> <el-button-group class="m-b-20 m-r-20">
<el-button type="primary" icon="el-icon-plus" @click="$router.replace('/admin/add')">添加</el-button> <el-button type="primary" icon="el-icon-plus" @click="$router.replace('/admin/add')">添加</el-button>
<el-button type="danger" icon="el-icon-delete" @click="deleteAdmin(countSelIdArr($refs.myTable.selection))">删除 <el-button type="danger" icon="el-icon-delete" @click="deleteAdmin(countSelIdArr($refs.myTable.selection))">删除
</el-button> </el-button>
@ -9,11 +9,11 @@
<el-button type="success" icon="el-icon-microphone" @click="toMessagePage(countSelIdArr($refs.myTable.selection))">发布公告</el-button> <el-button type="success" icon="el-icon-microphone" @click="toMessagePage(countSelIdArr($refs.myTable.selection))">发布公告</el-button>
</el-button-group> </el-button-group>
<!-- 用户select选项 --> <!-- 用户select选项 -->
<el-button-group class="m-l-20"> <el-button-group class="m-b-20">
<SelectionShopId v-model="form.shop_id" :allSel="true" /> <SelectionShopId v-model="form.shop_id" :allSel="true" />
</el-button-group> </el-button-group>
<!-- 管理员列表 --> <!-- 管理员列表 -->
<el-table class="m-t-20 w-100" ref="myTable" <el-table class="w-100" ref="myTable"
:data="adminListArr.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border tooltip-effect="dark"> :data="adminListArr.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border tooltip-effect="dark">
<el-table-column align="center" type="selection" width="40"> <el-table-column align="center" type="selection" width="40">
</el-table-column> </el-table-column>

2
src/views/layout/components/main/admin/message.vue
View File

@ -79,7 +79,7 @@ export default {
return return
} }
const endTime = Math.floor(new Date(this.form.date).getTime() / 1000 + 86400) const endTime = Math.floor(new Date(this.form.date).setHours(23, 59, 59, 999) / 1000)// 取日历选择的 当天最后一秒
const res = await pubMessage(this.form.tit, this.form.message, this.idArr, endTime) const res = await pubMessage(this.form.tit, this.form.message, this.idArr, endTime)

8
src/views/layout/components/main/product/sku/index.vue
View File

@ -1,18 +1,18 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 组合按钮 --> <!-- 组合按钮 -->
<el-button-group> <el-button-group class="m-b-20 m-r-20">
<el-button type="primary" icon="el-icon-plus" @click="$router.replace('/sku/add')">添加</el-button> <el-button type="primary" icon="el-icon-plus" @click="$router.replace('/sku/add')">添加</el-button>
<el-button type="danger" icon="el-icon-delete" @click="deleteSku(countSelIdArr($refs.myTable.selection))">删除 <el-button type="danger" icon="el-icon-delete" @click="deleteSku(countSelIdArr($refs.myTable.selection))">删除
</el-button> </el-button>
<el-button type="warning" icon="el-icon-edit" @click="toEditPage()">编辑</el-button> <el-button type="warning" icon="el-icon-edit" @click="toEditPage()">编辑</el-button>
</el-button-group> </el-button-group>
<!-- 用户select选项 --> <!-- 用户select选项 -->
<el-button-group class="m-l-20"> <el-button-group class="m-b-20">
<SelectionShopId v-model="form.shop_id" :allSel="true" /> <SelectionShopId v-model="form.shop_id" :allSel="true" />
</el-button-group> </el-button-group>
<!-- 商品sku表格 --> <!-- 商品sku表格 -->
<el-table class="m-t-20 w-100" ref="myTable" <el-table class="w-100" ref="myTable"
:data="skuListArr.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border tooltip-effect="dark"> :data="skuListArr.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border tooltip-effect="dark">
<el-table-column align="center" type="selection" width="40"> <el-table-column align="center" type="selection" width="40">
</el-table-column> </el-table-column>
@ -38,7 +38,7 @@
</el-image> </el-image>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="controler" label="操作" width="200" min-width="200"> <el-table-column prop="controler" label="操作" width="280" min-width="280">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button-group> <el-button-group>
<el-button type="warning" icon="el-icon-edit" <el-button type="warning" icon="el-icon-edit"

10
src/views/layout/components/main/product/spu/index.vue
View File

@ -1,22 +1,22 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 组合按钮 --> <!-- 组合按钮 -->
<el-button-group> <el-button-group class="m-b-20 m-r-20">
<el-button type="primary" icon="el-icon-plus" @click="$router.replace('/spu/add')">添加</el-button> <el-button type="primary" icon="el-icon-plus" @click="$router.replace('/spu/add')">添加</el-button>
<el-button type="danger" icon="el-icon-delete" @click="deleteSpu(countSelIdArr($refs.myTable.selection))">删除 <el-button type="danger" icon="el-icon-delete" @click="deleteSpu(countSelIdArr($refs.myTable.selection))">删除
</el-button> </el-button>
<el-button type="warning" icon="el-icon-edit" @click="toEditPage()">编辑</el-button> <el-button type="warning" icon="el-icon-edit" @click="toEditPage()">编辑</el-button>
</el-button-group> </el-button-group>
<!-- 用户select选项 --> <!-- 用户select选项 -->
<el-button-group class="m-l-20"> <el-button-group class="m-b-20 m-r-20">
<SelectionShopId v-model="form.shop_id" :allSel="true" /> <SelectionShopId v-model="form.shop_id" :allSel="true" />
</el-button-group> </el-button-group>
<!-- 分类select选项 --> <!-- 分类select选项 -->
<el-button-group class="m-l-20"> <el-button-group class="m-b-20">
<SelectionPath v-model="form.path" :shop_id="form.shop_id" :allSel="true" /> <SelectionPath v-model="form.path" :shop_id="form.shop_id" :allSel="true" />
</el-button-group> </el-button-group>
<!-- 商品spu表格 --> <!-- 商品spu表格 -->
<el-table class="m-t-20 w-100" ref="myTable" <el-table class="w-100" ref="myTable"
:data="spuListArr.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border tooltip-effect="dark"> :data="spuListArr.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border tooltip-effect="dark">
<el-table-column align="center" type="selection" width="40"> <el-table-column align="center" type="selection" width="40">
</el-table-column> </el-table-column>
@ -42,7 +42,7 @@
</el-image> </el-image>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="controler" label="操作" width="380" min-width="380"> <el-table-column prop="controler" label="操作" width="420" min-width="420">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button-group> <el-button-group>
<el-button :type="scope.row.recommend == '1' ? 'success' : 'info'" class="iconfont icon-tuijian" <el-button :type="scope.row.recommend == '1' ? 'success' : 'info'" class="iconfont icon-tuijian"

25
src/views/layout/components/main/register/index.vue
View File

@ -1,18 +1,18 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 组合按钮 --> <!-- 组合按钮 -->
<el-button-group> <el-button-group class="m-r-20 m-b-20">
<el-button type="primary" icon="el-icon-plus" @click="$router.replace('/register/add')">添加</el-button> <el-button type="primary" icon="el-icon-plus" @click="$router.replace('/register/add')">添加</el-button>
<el-button type="danger" icon="el-icon-delete" @click="deleteAir(countSelIdArr($refs.myTable.selection))">删除 <el-button type="danger" icon="el-icon-delete" @click="deleteAir(countSelIdArr($refs.myTable.selection))">删除
</el-button> </el-button>
<el-button type="warning" icon="el-icon-edit" @click="toEditPage()">编辑</el-button> <el-button type="warning" icon="el-icon-edit" @click="toEditPage()">编辑</el-button>
</el-button-group> </el-button-group>
<!-- 用户select选项 --> <!-- 用户select选项 -->
<el-button-group class="m-l-20"> <el-button-group class="m-b-20">
<SelectionShopId v-model="form.shop_id" :allSel="true" /> <SelectionShopId v-model="form.shop_id" :allSel="true" />
</el-button-group> </el-button-group>
<!-- 飞机表格 --> <!-- 飞机表格 -->
<el-table class="m-t-20 w-100" ref="myTable" <el-table class="w-100" ref="myTable"
:data="airListArr.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border tooltip-effect="dark"> :data="airListArr.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border tooltip-effect="dark">
<el-table-column align="center" type="selection" width="40"> <el-table-column align="center" type="selection" width="40">
</el-table-column> </el-table-column>
@ -43,7 +43,7 @@
{{ scope.row.apply_time | parseTime('{y}-{m}-{d}') }} {{ scope.row.apply_time | parseTime('{y}-{m}-{d}') }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="controler" label="操作" width="290"> <el-table-column prop="controler" label="操作" width="380" min-width="380">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button-group> <el-button-group>
<el-button type="primary" class="iconfont icon-youxishoubing" <el-button type="primary" class="iconfont icon-youxishoubing"
@ -142,4 +142,13 @@ export default {
vertical-align: middle vertical-align: middle
} }
} }
.no-wrap-btn-group {
white-space: nowrap;
/* 禁止换行 */
overflow-x: auto;
/* 超出时可横向滚动 */
display: inline-block;
/* 或者用 flex 布局 */
}
</style> </style>

6
src/views/layout/components/main/route/index.vue
View File

@ -1,18 +1,18 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 组合按钮 --> <!-- 组合按钮 -->
<el-button-group> <el-button-group class="m-r-20 m-b-20">
<el-button type="primary" icon="el-icon-plus" @click="$router.replace('/route/add')">添加</el-button> <el-button type="primary" icon="el-icon-plus" @click="$router.replace('/route/add')">添加</el-button>
<el-button type="danger" icon="el-icon-delete" @click="deleteRoute(countSelIdArr($refs.myTable.selection))">删除 <el-button type="danger" icon="el-icon-delete" @click="deleteRoute(countSelIdArr($refs.myTable.selection))">删除
</el-button> </el-button>
<el-button type="warning" icon="el-icon-edit" @click="toEditPage()">编辑</el-button> <el-button type="warning" icon="el-icon-edit" @click="toEditPage()">编辑</el-button>
</el-button-group> </el-button-group>
<!-- 用户select选项 --> <!-- 用户select选项 -->
<el-button-group class="m-l-20"> <el-button-group class="m-b-20">
<SelectionShopId v-model="form.shop_id" :allSel="true" /> <SelectionShopId v-model="form.shop_id" :allSel="true" />
</el-button-group> </el-button-group>
<!-- 航线表格 --> <!-- 航线表格 -->
<el-table class="m-t-20 w-100" ref="myTable" <el-table class="w-100" ref="myTable"
:data="routeListArr.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border tooltip-effect="dark"> :data="routeListArr.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border tooltip-effect="dark">
<el-table-column align="center" type="selection" width="40"> <el-table-column align="center" type="selection" width="40">
</el-table-column> </el-table-column>

2
src/views/layout/index.vue
View File

@ -69,7 +69,7 @@ export default {
this.$store.dispatch('fetchSpuList')// 获取商品spu列表 this.$store.dispatch('fetchSpuList')// 获取商品spu列表
this.$store.dispatch('fetchSkuList')// 获取商品sku列表 this.$store.dispatch('fetchSkuList')// 获取商品sku列表
this.$store.dispatch('fetchPaidOrderList')// 获取订单列表 this.$store.dispatch('fetchPaidOrderList')// 获取订单列表
this.$store.dispatch('fetchMessageList')// 获取管理员公告列表 this.$store.dispatch('fetchMessageList')// 获取管理员公告列表 并弹出公告框
}, },
watch: { watch: {
/** /**