Merge branch 'dev'

src/apis/service/search/table/index.js

@@ -1,5 +1,6 @@
 // 企业客户/供应商账号相关
-import http from "@/apis/service/search/table/axios";
+// import http from "@/apis/service/search/table/axios";
+import http from "@/apis/axios";
 const api = "Stats/";
 export default {
   // 退货统计

src/apis/url-config.js

@@ -6,5 +6,5 @@ export default {
   corpId: ding.CorpId,
   //应用凭证
   agentId: ding.AgentId,
-  tableURL: 'http://inv.sit.wanyuhengtong.com/',
+  // tableURL: api.tableApi,
 }

src/config/env.development.js

@@ -4,6 +4,7 @@ module.exports = {
   baseUrl: 'http://localhost:8080',
   api: {
     baseApi: 'http://inv.sit.wanyuhengtong.com/',
+    // tableApi: 'http://inv.sit.wanyuhengtong.com/',
   },
   fileURL: `https://api2.edusit.zretchome.com`,
   appId: 'wx5ac3a2c2d72b6f26',

src/config/env.production.js

@@ -4,6 +4,7 @@ module.exports = {
   baseUrl: 'http://wx.wxhr.sit.futurelab.tv',
   api: {
     baseApi: 'http://inv.sitw.wanyuhengtong.com/',
+    // tableApi: 'http://inv.sit.wanyuhengtong.com/',
   },
   fileURL: `https://api2.edu.futurelab.tv`,
   appId: 'wx5ac3a2c2d72b6f26',

src/config/env.staging.js

@@ -4,6 +4,7 @@ module.exports = {
   baseUrl: 'http://mobile.recruit.sit.zretchome.com',
   api: {
     baseApi: 'http://inv.sitw.wanyuhengtong.com/',
+    // tableApi: 'http://inv.sit.wanyuhengtong.com/',
   },
   fileURL: `https://api2.edusit.zretchome.com`,
   appId: 'wx5ac3a2c2d72b6f26',

src/styles/index.scss

@@ -488,4 +488,10 @@ aside {
 }
   
  
- 
+ 
+.el-table__fixed-right {
+  height: 100% !important;
+}
+.el-table__fixed-left {
+  height: 100% !important;
+}