文件收集与审批上线

config/dev.env.js

@@ -7,9 +7,9 @@ module.exports = merge(prodEnv, {
   ENV_CONFIG: '"dev"',
   ctx:'"http://127.0.0.1:8080"',
   // ctxForm: '"http://10.149.85.91:8000/api"',//dev
-  ctxForm: '"http://43.138.50.94:8880/api"',//test
-  // ctxForm: '"http://192.168.2.124:8880/api"',//test
-  // ctxForm: '"http://10.230.26.15:8000/api"',//生产
+  // ctxForm: '"http://43.138.50.94:8880"',//test
+  // ctxForm: '"http://192.168.2.44:8880"',//test
+  ctxForm: '"http://10.230.26.15:8000/api"',//生产
 
   excludeMeWhenSelectNextHandler:false,
   excludeFormerHanlder:false,

public/static/js/api.config.js

@@ -1,6 +1,6 @@
 // api config
 var apiConfig = {
-  ctx: window.top.staticHost ? window.top.staticHost : "http://114.215.71.182:29600/spfm", //不知道干啥的
+  ctx: window.top.staticHost ? window.top.staticHost : "http://114.215.71.182:29600/spfm/",
   // http://114.215.71.182:29600/spfm/
   // ctx: "http://localhost:9601",//接口地址http://192.168.1.76:8090/ api-gateway
   // ctx: "http://192.168.2.192:9600/",//接口地址http://192.168.1.76:8090/ api-gateway

src/assets/js/common.js

@@ -263,29 +263,16 @@ let common = {
                     if (!obj.disableLoading) {
                         loading.close()
                     }
-<<<<<<< .mine
-                    // if (response.data.code === 1 ||response.data.code == '1') {
-                    //     bus.$message.success(response.data.message)
-                    //      loading.close()
-                    //      success(response.data.data)
-                    //      return response
-                        if (response.code === 1 ||response.code == '1') {
-                            bus.$message.success(response.message)
-                             loading.close()
-                             success(response.data?response.data:response)
-                             return response
-=======
                     if (response.data.code === 1 ||response.data.code == '1') {
-                        bus.$message.success(response.data.data.message)
+                        bus.$message.success(response.data.message)
                          loading.close()
                          success(response.data.data)
                          return response
                         // if (response.code === 1 ||response.code == '1') {
-                        //     bus.$message.success(response.data.message)
+                        //     bus.$message.success(response.message)
                         //      loading.close()
                         //      success(response.data)
                         //      return response
->>>>>>> .theirs
                     } else {
                         if (obj.printMsg) {
                             if (response.message) {