Merge branch 'feature/dev_stat' into dev

# Conflicts:
#	src/mixins/view-module.js

src/mixins/view-module.js

@@ -42,17 +42,18 @@ export default {
   methods: {
     // 获取数据列表
     query () {
-      const params = {
+      this.dataListLoading = true
-        order: this.order,
+      this.$http.get(
-        orderField: this.orderField,
+          this.mixinViewModuleOptions.getDataListURL,
-        page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
+          {
-        limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
+            params: {
-        ...this.dataForm
+              order: this.order,
-      }
+              orderField: this.orderField,
-      this.post = true
+              page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
-      this.$http.post(
+              limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
-        this.mixinViewModuleOptions.getDataListURL,
+              ...this.dataForm
-        params
+            }
+          }
       ).then(({ data: res }) => {
         this.dataListLoading = false
         if (res.code !== 0) {