Commit 15c12204 authored by QA-董 美凤's avatar QA-董 美凤

解决translate配置冲突

parent 7bced7fb
...@@ -2,13 +2,8 @@ const protocol = window.location.protocol ...@@ -2,13 +2,8 @@ const protocol = window.location.protocol
const qiniuHost = 'https://oic74zs8j.qnssl.com/' const qiniuHost = 'https://oic74zs8j.qnssl.com/'
// const opapiHost = 'http://192.168.29.39:9012' //开发环境 // const opapiHost = 'http://192.168.29.39:9012' //开发环境
const opapiHost = 'http://pinja-cr-api-dongmeifeng.q-gp.com' //测试环境 const opapiHost = 'http://pinja-cr-api-dongmeifeng.q-gp.com' //测试环境
<<<<<<< Updated upstream
const translateHost = 'http://192.168.165.155:12001' //开发环境 本地起
// const translateHost = 'http://192.168.166.187:12001' //测试环境环境
=======
// const translateHost = 'http://192.168.165.177:12001' //开发环境 本地起 // const translateHost = 'http://192.168.165.177:12001' //开发环境 本地起
const translateHost = 'http://translate-dongmeifeng.q-gp.com' //测试环境环境 const translateHost = 'http://translate-dongmeifeng.q-gp.com' //测试环境环境
>>>>>>> Stashed changes
let LoginUrl = `${protocol}#/login` // 登录页 let LoginUrl = `${protocol}#/login` // 登录页
let domain = '' let domain = ''
......
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