Merge branch 'dev' of xiongzhu/imt into master

src/main/pc/src/mixins/pageableList.js

@@ -91,6 +91,9 @@ export default {
             });
         },
         getData() {
+            if(!this.url){
+                return
+            }
             this.loading = true;
             this.empty = false;
             let data = {

src/main/pc/src/views/Search.vue

@@ -126,7 +126,7 @@ export default {
                     name: item[1]
                 };
             }),
-            url: '/vendorInfo/show1',
+            url: '',
             formType: {},
             fixed: false,
             pageSize: 30