diff --git a/package.json b/package.json index dfada6c..5ef6b91 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "lint": "eslint --ext .js,.vue src" }, "dependencies": { - "@smallwei/avue": "2.0.2", + "@smallwei/avue": "^2.8.27", "axios": "0.18.1", "core-js": "3.6.5", "crypto-js": "^4.1.1", diff --git a/src/crud/admin/form.js b/src/crud/admin/form.js index 3206920..728b735 100644 --- a/src/crud/admin/form.js +++ b/src/crud/admin/form.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, selection: true, index: false, diff --git a/src/crud/admin/indexImg.js b/src/crud/admin/indexImg.js index 5468b4b..942e582 100644 --- a/src/crud/admin/indexImg.js +++ b/src/crud/admin/indexImg.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, selection: true, index: false, diff --git a/src/crud/admin/message.js b/src/crud/admin/message.js index 4138819..ea9b033 100644 --- a/src/crud/admin/message.js +++ b/src/crud/admin/message.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, index: false, indexLabel: '序号', diff --git a/src/crud/prod/prodComm.js b/src/crud/prod/prodComm.js index 7f39734..6b44ce5 100644 --- a/src/crud/prod/prodComm.js +++ b/src/crud/prod/prodComm.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, index: true, indexLabel: '序号', diff --git a/src/crud/prod/prodList.js b/src/crud/prod/prodList.js index 81f60df..b2e3c4a 100644 --- a/src/crud/prod/prodList.js +++ b/src/crud/prod/prodList.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, selection: true, index: false, diff --git a/src/crud/prod/prodTag.js b/src/crud/prod/prodTag.js index e08947a..12dd910 100644 --- a/src/crud/prod/prodTag.js +++ b/src/crud/prod/prodTag.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, index: true, indexLabel: '序号', diff --git a/src/crud/prod/spec.js b/src/crud/prod/spec.js index 396e613..06790c6 100644 --- a/src/crud/prod/spec.js +++ b/src/crud/prod/spec.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, index: true, indexLabel: '序号', diff --git a/src/crud/shop/hotSearch.js b/src/crud/shop/hotSearch.js index 1a171f4..a7bf942 100644 --- a/src/crud/shop/hotSearch.js +++ b/src/crud/shop/hotSearch.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, index: false, selection: true, diff --git a/src/crud/shop/notice.js b/src/crud/shop/notice.js index 738260f..6284d24 100644 --- a/src/crud/shop/notice.js +++ b/src/crud/shop/notice.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, index: true, indexLabel: '序号', diff --git a/src/crud/shop/pickAddr.js b/src/crud/shop/pickAddr.js index bc1e6a1..d884de6 100644 --- a/src/crud/shop/pickAddr.js +++ b/src/crud/shop/pickAddr.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, index: false, selection: true, diff --git a/src/crud/shop/transport.js b/src/crud/shop/transport.js index 91760e4..7a02c0b 100644 --- a/src/crud/shop/transport.js +++ b/src/crud/shop/transport.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, index: false, selection: true, diff --git a/src/crud/sys/area.js b/src/crud/sys/area.js index 6d22453..027da3d 100644 --- a/src/crud/sys/area.js +++ b/src/crud/sys/area.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, index: true, indexLabel: '序号', diff --git a/src/crud/sys/config.js b/src/crud/sys/config.js index f8d846b..eb807f7 100644 --- a/src/crud/sys/config.js +++ b/src/crud/sys/config.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, selection: true, index: false, diff --git a/src/crud/sys/log.js b/src/crud/sys/log.js index b2d4764..e9d3081 100644 --- a/src/crud/sys/log.js +++ b/src/crud/sys/log.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, menu: false, // 移除操作栏 selection: true, diff --git a/src/crud/sys/role.js b/src/crud/sys/role.js index c417713..682aef0 100644 --- a/src/crud/sys/role.js +++ b/src/crud/sys/role.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, selection: true, index: false, diff --git a/src/crud/sys/user.js b/src/crud/sys/user.js index f65620e..a2a61a3 100644 --- a/src/crud/sys/user.js +++ b/src/crud/sys/user.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, selection: true, index: false, diff --git a/src/crud/user/addr.js b/src/crud/user/addr.js index 33e5b78..8d62154 100644 --- a/src/crud/user/addr.js +++ b/src/crud/user/addr.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, index: true, indexLabel: '序号', diff --git a/src/crud/user/user.js b/src/crud/user/user.js index 79306e4..0005481 100644 --- a/src/crud/user/user.js +++ b/src/crud/user/user.js @@ -1,4 +1,6 @@ export const tableOption = { + searchMenuSpan: 6, + columnBtn: false, border: true, // selection: true, index: false, diff --git a/src/views/modules/admin/indexImg.vue b/src/views/modules/admin/indexImg.vue index f0eb8dc..c19b9bf 100644 --- a/src/views/modules/admin/indexImg.vue +++ b/src/views/modules/admin/indexImg.vue @@ -82,7 +82,7 @@ export default { }, methods: { // 获取数据列表 - getDataList (page, params) { + getDataList (page, params, done) { this.dataListLoading = true this.$http({ url: this.$http.adornUrl('/admin/indexImg/page'), @@ -103,6 +103,9 @@ export default { this.dataList = data.records this.page.total = data.total this.dataListLoading = false + if (done) { + done() + } }) }, @@ -140,8 +143,8 @@ export default { }) }, // 条件查询 - searchChange (params) { - this.getDataList(this.page, params) + searchChange (params, done) { + this.getDataList(this.page, params, done) }, // 多选变化 selectionChange (val) { diff --git a/src/views/modules/admin/message.vue b/src/views/modules/admin/message.vue index 1955b72..b2e7ccb 100644 --- a/src/views/modules/admin/message.vue +++ b/src/views/modules/admin/message.vue @@ -90,7 +90,7 @@ export default { }, methods: { // 获取数据列表 - getDataList (page, params) { + getDataList (page, params, done) { this.dataListLoading = true this.$http({ url: this.$http.adornUrl('/admin/message/page'), @@ -108,6 +108,9 @@ export default { this.dataList = data.records this.page.total = data.total this.dataListLoading = false + if (done) { + done() + } }) }, @@ -193,8 +196,8 @@ export default { .catch(() => { }) }, // 条件查询 - searchChange (params) { - this.getDataList(this.page, params) + searchChange (params, done) { + this.getDataList(this.page, params, done) }, // 多选变化 selectionChange (val) { diff --git a/src/views/modules/order/order.vue b/src/views/modules/order/order.vue index cdca3a2..0748a84 100644 --- a/src/views/modules/order/order.vue +++ b/src/views/modules/order/order.vue @@ -228,7 +228,7 @@ export default { }, methods: { // 获取数据列表 - getDataList (page, params) { + getDataList (page, params, done) { page = (page === undefined ? this.page : page) this.dataListLoading = true this.$http({ @@ -251,6 +251,9 @@ export default { this.dataList = data.records this.page.total = data.total this.dataListLoading = false + if (done) { + done() + } }) }, // 清除数据 diff --git a/src/views/modules/prod/prodComm.vue b/src/views/modules/prod/prodComm.vue index 7633840..e2ea6a2 100644 --- a/src/views/modules/prod/prodComm.vue +++ b/src/views/modules/prod/prodComm.vue @@ -63,7 +63,7 @@ export default { mounted () { }, methods: { - getDataList (page, params) { + getDataList (page, params, done) { this.dataListLoading = true this.$http({ url: this.$http.adornUrl('/prod/prodComm/page'), @@ -76,6 +76,9 @@ export default { this.dataList = data.records this.page.total = data.total this.dataListLoading = false + if (done) { + done() + } }) }, // 新增 / 修改 @@ -113,8 +116,8 @@ export default { refreshChange () { this.getDataList(this.page) }, - searchChange (params) { - this.getDataList(this.page, params) + searchChange (params, done) { + this.getDataList(this.page, params, done) } } } diff --git a/src/views/modules/prod/prodList.vue b/src/views/modules/prod/prodList.vue index 6a4e3b2..7d3c4b3 100644 --- a/src/views/modules/prod/prodList.vue +++ b/src/views/modules/prod/prodList.vue @@ -74,7 +74,7 @@ export default { }, methods: { // 获取数据列表 - getDataList (page, params) { + getDataList (page, params, done) { this.dataListLoading = true this.$http({ url: this.$http.adornUrl('/prod/prod/page'), @@ -98,6 +98,9 @@ export default { } this.page.total = data.total this.dataListLoading = false + if (done) { + done() + } }) }, // 新增 / 修改 @@ -137,8 +140,8 @@ export default { .catch(() => { }) }, // 条件查询 - searchChange (params) { - this.getDataList(this.page, params) + searchChange (params, done) { + this.getDataList(this.page, params, done) }, // 多选变化 selectionChange (val) { diff --git a/src/views/modules/prod/prodTag.vue b/src/views/modules/prod/prodTag.vue index 7bc2fa0..9549bb8 100644 --- a/src/views/modules/prod/prodTag.vue +++ b/src/views/modules/prod/prodTag.vue @@ -82,7 +82,7 @@ export default { mounted () { }, methods: { - getDataList (page, params) { + getDataList (page, params, done) { this.dataListLoading = true this.$http({ url: this.$http.adornUrl('/prod/prodTag/page'), @@ -95,6 +95,9 @@ export default { this.dataList = data.records this.page.total = data.total this.dataListLoading = false + if (done) { + done() + } }) }, // 新增 / 修改 @@ -132,8 +135,8 @@ export default { refreshChange () { this.getDataList(this.page) }, - searchChange (params) { - this.getDataList(this.page, params) + searchChange (params, done) { + this.getDataList(this.page, params, done) } } } diff --git a/src/views/modules/prod/spec.vue b/src/views/modules/prod/spec.vue index d974dda..c28e7dc 100644 --- a/src/views/modules/prod/spec.vue +++ b/src/views/modules/prod/spec.vue @@ -84,7 +84,7 @@ export default { }, methods: { // 获取数据列表 - getDataList (page, params) { + getDataList (page, params, done) { this.dataListLoading = true this.$http({ url: this.$http.adornUrl('/prod/spec/page'), @@ -102,6 +102,9 @@ export default { this.dataList = data.records this.page.total = data.total this.dataListLoading = false + if (done) { + done() + } }) }, // 新增 / 修改 @@ -142,8 +145,8 @@ export default { .catch(() => { }) }, - searchChange (params) { - this.getDataList(this.page, params) + searchChange (params, done) { + this.getDataList(this.page, params, done) } } } diff --git a/src/views/modules/shop/hotSearch.vue b/src/views/modules/shop/hotSearch.vue index 7d6654b..7a9ac25 100644 --- a/src/views/modules/shop/hotSearch.vue +++ b/src/views/modules/shop/hotSearch.vue @@ -81,7 +81,7 @@ export default { }, methods: { // 获取数据列表 - getDataList (page, params) { + getDataList (page, params, done) { this.dataListLoading = true this.$http({ url: this.$http.adornUrl('/admin/hotSearch/page'), @@ -96,6 +96,9 @@ export default { this.page.currentPage = data.current this.dataList = data.records this.dataListLoading = false + if (done) { + done() + } }) }, // 多选回调 @@ -110,8 +113,8 @@ export default { }) }, // 点击查询 - searchChange (params) { - this.getDataList(this.page, params) + searchChange (params, done) { + this.getDataList(this.page, params, done) }, // 删除 deleteHandle (row, index) { diff --git a/src/views/modules/shop/notice.vue b/src/views/modules/shop/notice.vue index 91192f8..c568996 100644 --- a/src/views/modules/shop/notice.vue +++ b/src/views/modules/shop/notice.vue @@ -81,7 +81,7 @@ export default { mounted () { }, methods: { - getDataList (page, params) { + getDataList (page, params, done) { this.dataListLoading = true this.$http({ url: this.$http.adornUrl('/shop/notice/page'), @@ -94,6 +94,9 @@ export default { this.dataList = data.records this.page.total = data.total this.dataListLoading = false + if (done) { + done() + } }) }, // 新增 / 修改 @@ -131,8 +134,8 @@ export default { refreshChange () { this.getDataList(this.page) }, - searchChange (params) { - this.getDataList(this.page, params) + searchChange (params, done) { + this.getDataList(this.page, params, done) } } } diff --git a/src/views/modules/shop/pickAddr.vue b/src/views/modules/shop/pickAddr.vue index 57c6ddb..056328f 100644 --- a/src/views/modules/shop/pickAddr.vue +++ b/src/views/modules/shop/pickAddr.vue @@ -74,7 +74,7 @@ export default { }, methods: { // 获取数据列表 - getDataList (page, params) { + getDataList (page, params, done) { this.dataListLoading = true this.$http({ url: this.$http.adornUrl('/shop/pickAddr/page'), @@ -92,6 +92,9 @@ export default { this.dataList = data.records this.page.total = data.total this.dataListLoading = false + if (done) { + done() + } }) }, // 新增 / 修改 @@ -136,8 +139,8 @@ export default { }, // 条件查询 - searchChange (params) { - this.getDataList(this.page, params) + searchChange (params, done) { + this.getDataList(this.page, params, done) }, // 多选变化 selectionChange (val) { diff --git a/src/views/modules/shop/transport.vue b/src/views/modules/shop/transport.vue index 8da248c..06e0b70 100644 --- a/src/views/modules/shop/transport.vue +++ b/src/views/modules/shop/transport.vue @@ -75,7 +75,7 @@ export default { }, methods: { // 获取数据列表 - getDataList (page, params) { + getDataList (page, params, done) { this.dataListLoading = true this.$http({ url: this.$http.adornUrl('/shop/transport/page'), @@ -93,6 +93,9 @@ export default { this.dataList = data.records this.page.total = data.total this.dataListLoading = false + if (done) { + done() + } }) }, // 新增 / 修改 @@ -135,8 +138,8 @@ export default { }, // 条件查询 - searchChange (params) { - this.getDataList(this.page, params) + searchChange (params, done) { + this.getDataList(this.page, params, done) }, // 刷新回调用 refreshChange () { diff --git a/src/views/modules/sys/area.vue b/src/views/modules/sys/area.vue index ad634d2..84593be 100644 --- a/src/views/modules/sys/area.vue +++ b/src/views/modules/sys/area.vue @@ -85,7 +85,7 @@ export default { } }, methods: { - getDataList (page, params) { + getDataList (page, params, done) { this.$http({ url: this.$http.adornUrl('/admin/area/list'), method: 'get', diff --git a/src/views/modules/sys/config.vue b/src/views/modules/sys/config.vue index 906c632..0df08ef 100644 --- a/src/views/modules/sys/config.vue +++ b/src/views/modules/sys/config.vue @@ -61,7 +61,7 @@ export default { }, methods: { // 获取数据列表 - getDataList (page, params) { + getDataList (page, params, done) { this.dataListLoading = true this.$http({ url: this.$http.adornUrl('/sys/config/page'), @@ -79,11 +79,14 @@ export default { this.dataList = data.records this.page.total = data.total this.dataListLoading = false + if (done) { + done() + } }) }, // 条件查询 - searchChange (params) { - this.getDataList(this.page, params) + searchChange (params, done) { + this.getDataList(this.page, params, done) }, // 多选变化 selectionChange (val) { diff --git a/src/views/modules/sys/log.vue b/src/views/modules/sys/log.vue index 5c70aaa..832a651 100644 --- a/src/views/modules/sys/log.vue +++ b/src/views/modules/sys/log.vue @@ -31,7 +31,7 @@ export default { }, methods: { // 获取数据列表 - getDataList (page, params) { + getDataList (page, params, done) { this.dataListLoading = true this.$http({ url: this.$http.adornUrl('/sys/log/page'), @@ -49,11 +49,14 @@ export default { this.dataList = data.records this.page.total = data.total this.dataListLoading = false + if (done) { + done() + } }) }, // 条件查询 - searchChange (params) { - this.getDataList(this.page, params) + searchChange (params, done) { + this.getDataList(this.page, params, done) } } } diff --git a/src/views/modules/sys/role.vue b/src/views/modules/sys/role.vue index 9b5e19c..cb9fdb1 100644 --- a/src/views/modules/sys/role.vue +++ b/src/views/modules/sys/role.vue @@ -66,7 +66,7 @@ export default { }, methods: { // 获取数据列表 - getDataList (page, params) { + getDataList (page, params, done) { this.dataListLoading = true this.$http({ url: this.$http.adornUrl('/sys/role/page'), @@ -84,11 +84,14 @@ export default { this.dataList = data.records this.page.total = data.total this.dataListLoading = false + if (done) { + done() + } }) }, // 条件查询 - searchChange (params) { - this.getDataList(this.page, params) + searchChange (params, done) { + this.getDataList(this.page, params, done) }, // 多选变化 selectionChange (val) { diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue index b28deb0..d8be71b 100644 --- a/src/views/modules/sys/user.vue +++ b/src/views/modules/sys/user.vue @@ -65,7 +65,7 @@ export default { }, methods: { // 获取数据列表 - getDataList (page, params) { + getDataList (page, params, done) { this.dataListLoading = true this.$http({ url: this.$http.adornUrl('/sys/user/page'), @@ -83,11 +83,14 @@ export default { this.dataList = data.records this.page.total = data.total this.dataListLoading = false + if (done) { + done() + } }) }, // 条件查询 - searchChange (params) { - this.getDataList(this.page, params) + searchChange (params, done) { + this.getDataList(this.page, params, done) }, // 多选变化 selectionChange (val) { diff --git a/src/views/modules/user/addr.vue b/src/views/modules/user/addr.vue index c76f341..b71041d 100644 --- a/src/views/modules/user/addr.vue +++ b/src/views/modules/user/addr.vue @@ -64,7 +64,7 @@ export default { AddOrUpdate }, methods: { - getDataList (page, params) { + getDataList (page, params, done) { this.dataListLoading = true this.$http({ url: this.$http.adornUrl('/user/addr/page'), @@ -77,6 +77,9 @@ export default { this.dataList = data.records this.page.total = data.total this.dataListLoading = false + if (done) { + done() + } }) }, // 新增 / 修改 @@ -114,8 +117,8 @@ export default { refreshChange () { this.getDataList(this.page) }, - searchChange (params) { - this.getDataList(this.page, params) + searchChange (params, done) { + this.getDataList(this.page, params, done) } } } diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue index 65b41b6..749b79b 100644 --- a/src/views/modules/user/user.vue +++ b/src/views/modules/user/user.vue @@ -70,7 +70,7 @@ export default { }, methods: { // 获取数据列表 - getDataList (page, params) { + getDataList (page, params, done) { this.dataListLoading = true this.$http({ url: this.$http.adornUrl('/admin/user/page'), @@ -88,6 +88,9 @@ export default { this.dataList = data.records this.page.total = data.total this.dataListLoading = false + if (done) { + done() + } }) }, // 新增 / 修改 @@ -126,8 +129,8 @@ export default { .catch(() => { }) }, // 条件查询 - searchChange (params) { - this.getDataList(this.page, params) + searchChange (params, done) { + this.getDataList(this.page, params, done) }, // 多选变化 selectionChange (val) {