Merge branch 'master-copy' into 'master'

全局配置

See merge request spfm/spfm-market-front!411

config/dev.env.js

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

src/pages/main/leader/demand/demandHome.vue

@@ -198,9 +198,9 @@ export default {
         processDefinitionKey: "request_form_process",
       },
       requestForm: {
-        // fresourceId: "0d94de8a-0281-11ed-a302-4ae7da54db39", // 本地环境
+        fresourceId: "0d94de8a-0281-11ed-a302-4ae7da54db39", // 本地环境
         // fresourceId: "bf79721c-33f3-11ed-ba0b-00505687dcd3", //测试环境
-        fresourceId:'81455799-600d-11ed-b399-e00084564cce',//生产环境
+        // fresourceId:'81455799-600d-11ed-b399-e00084564cce',//生产环境
         processDefinitionKey: "request_form_process",
       },
       treeList: [], //候选人列表