Commit d1b83af4 authored by linxin's avatar linxin

add

parent 1881a25e
'use strict' // 'use strict'
const merge = require('webpack-merge') // const merge = require('webpack-merge')
const prodEnv = require('./prod.env') // const prodEnv = require('./prod.env')
module.exports = merge(prodEnv, { // module.exports = merge(prodEnv, {
NODE_ENV: '"development"', // NODE_ENV: '"development"',
CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV), // CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
debug: true, // debug: true,
isMobilePlatform: false, // isMobilePlatform: false,
loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ', // loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="', // basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
rootPath: '"http://180.104.121.66:8088/r/api"', // rootPath: '"http://180.104.121.66:8088/r/api"',
filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"', // filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="', // fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
ocrPath: '"http://180.104.121.66:8088/r/api"', // ocrPath: '"http://180.104.121.66:8088/r/api"',
appId: '"com.xcmg.app.uat"', // appId: '"com.xcmg.app.uat"',
currentVersion: '"1.9.5"', // currentVersion: '"1.9.5"',
}) // })
'use strict'
module.exports = {
NODE_ENV: '"production"',
CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
debug: true,
isMobilePlatform: true,
loginPath: '"http://www.xcmgfs.com:8087/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
basePath: '"http://www.xcmgfs.com:8087/r/api/interface?sysName=XCMG_PROD&apiName="',
rootPath: '"http://www.xcmgfs.com:8087/r/api"',
filePath: '"http://www.xcmgfs.com:8087/r/api/app/fileViewSvc?sysName=XCMG_PROD&apiName=file_view&"',
ocrPath:'"http://www.xcmgfs.com:8087/r/api"',
fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
appId: '"com.xcmg.app"',
currentVersion: '"0.1.1"'
}
......
...@@ -327,6 +327,7 @@ export default { ...@@ -327,6 +327,7 @@ export default {
vm.office_name = res.info.bp_agent_name vm.office_name = res.info.bp_agent_name
vm.salesInfo.office_id = res.info.bp_agent_id vm.salesInfo.office_id = res.info.bp_agent_id
vm.salesInfo.bp_id_agent = '' vm.salesInfo.bp_id_agent = ''
vm.factoryQuery()
} else { } else {
vm.salesInfo.bp_id_agent = res.info.bp_agent_id vm.salesInfo.bp_id_agent = res.info.bp_agent_id
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment