升级avue版本

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",

src/crud/admin/form.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   selection: true,
   index: false,

src/crud/admin/indexImg.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   selection: true,
   index: false,

src/crud/admin/message.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   index: false,
   indexLabel: '序号',

src/crud/prod/prodComm.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   index: true,
   indexLabel: '序号',

src/crud/prod/prodList.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   selection: true,
   index: false,

src/crud/prod/prodTag.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   index: true,
   indexLabel: '序号',

src/crud/prod/spec.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   index: true,
   indexLabel: '序号',

src/crud/shop/hotSearch.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   index: false,
   selection: true,

src/crud/shop/notice.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   index: true,
   indexLabel: '序号',

src/crud/shop/pickAddr.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   index: false,
   selection: true,

src/crud/shop/transport.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   index: false,
   selection: true,

src/crud/sys/area.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   index: true,
   indexLabel: '序号',

src/crud/sys/config.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   selection: true,
   index: false,

src/crud/sys/log.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   menu: false, // 移除操作栏
   selection: true,

src/crud/sys/role.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   selection: true,
   index: false,

src/crud/sys/user.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   selection: true,
   index: false,

src/crud/user/addr.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   index: true,
   indexLabel: '序号',

src/crud/user/user.js

@@ -1,4 +1,6 @@
 export const tableOption = {
+  searchMenuSpan: 6,
+  columnBtn: false,
   border: true,
   // selection: true,
   index: false,

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) {
+    searchChange (params, done) {
-      this.getDataList(this.page, params)
+      this.getDataList(this.page, params, done)
     },
     // 多选变化
     selectionChange (val) {

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) {
+    searchChange (params, done) {
-      this.getDataList(this.page, params)
+      this.getDataList(this.page, params, done)
     },
     // 多选变化
     selectionChange (val) {

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()
+        }
       })
     },
     // 清除数据

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) {
+    searchChange (params, done) {
-      this.getDataList(this.page, params)
+      this.getDataList(this.page, params, done)
     }
   }
 }

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) {
+    searchChange (params, done) {
-      this.getDataList(this.page, params)
+      this.getDataList(this.page, params, done)
     },
     // 多选变化
     selectionChange (val) {

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) {
+    searchChange (params, done) {
-      this.getDataList(this.page, params)
+      this.getDataList(this.page, params, done)
     }
   }
 }

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) {
+    searchChange (params, done) {
-      this.getDataList(this.page, params)
+      this.getDataList(this.page, params, done)
     }
   }
 }

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) {
+    searchChange (params, done) {
-      this.getDataList(this.page, params)
+      this.getDataList(this.page, params, done)
     },
     // 删除
     deleteHandle (row, index) {

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) {
+    searchChange (params, done) {
-      this.getDataList(this.page, params)
+      this.getDataList(this.page, params, done)
     }
   }
 }

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) {
+    searchChange (params, done) {
-      this.getDataList(this.page, params)
+      this.getDataList(this.page, params, done)
     },
     // 多选变化
     selectionChange (val) {

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) {
+    searchChange (params, done) {
-      this.getDataList(this.page, params)
+      this.getDataList(this.page, params, done)
     },
     // 刷新回调用
     refreshChange () {

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',

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) {
+    searchChange (params, done) {
-      this.getDataList(this.page, params)
+      this.getDataList(this.page, params, done)
     },
     // 多选变化
     selectionChange (val) {

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) {
+    searchChange (params, done) {
-      this.getDataList(this.page, params)
+      this.getDataList(this.page, params, done)
     }
   }
 }

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) {
+    searchChange (params, done) {
-      this.getDataList(this.page, params)
+      this.getDataList(this.page, params, done)
     },
     // 多选变化
     selectionChange (val) {

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) {
+    searchChange (params, done) {
-      this.getDataList(this.page, params)
+      this.getDataList(this.page, params, done)
     },
     // 多选变化
     selectionChange (val) {

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) {
+    searchChange (params, done) {
-      this.getDataList(this.page, params)
+      this.getDataList(this.page, params, done)
     }
   }
 }

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) {
+    searchChange (params, done) {
-      this.getDataList(this.page, params)
+      this.getDataList(this.page, params, done)
     },
     // 多选变化
     selectionChange (val) {