Merge branch 'master' into feature/Feature-supply

src/main.js

@@ -32,6 +32,10 @@ Vue.component('ExportButton', ExportButton);
 import ImportButton from '@/components/Common/import-button.vue'
 Vue.component('ImportButton', ImportButton);
 
+
+Vue.prototype.$fileUrl = process.env.VUE_APP_BASE_API + 'common/file/get?key=';
+Vue.prototype.$imageUrl = process.env.VUE_APP_BASE_API + 'common/img/get?key=';
+
 /**
  * If you don't want to use mock-server
  * you want to use MockJs for mock api

src/views/setting/role.vue

@@ -96,7 +96,7 @@ export default {
   },
   data() {
     return {
-      baseURL: process.env.VUE_APP_BASE_API,
+      imageURL: this.$imageUrl,
       dataList: null, // 列表数据
       listLoading: true, // 列表加载loading
       currentPage: 1, // 当前页码