diff --git a/common/MyRequest.js b/common/MyRequest.js index 50adab6..7431f43 100644 --- a/common/MyRequest.js +++ b/common/MyRequest.js @@ -3,12 +3,14 @@ // const baseurl ='http://172.22.10.218:22202 // const baseurl = 'http://172.22.10.206:8096' // const baseurl ='http://172.22.10.207:22202' -// const baseurl = 'http://172.22.54.217:17878' //ip连接 +// const baseurl = 'http://20.20.30.15:18878' //ip连接 // const baseurl = 'http://172.22.10.218:22252' 8 // const baseurl = 'http://192.168.1.73:32202' // 测试环境 // const baseurl = 'http://172.22.10.217:22202' // 正式环境1 // const baseurl = 'http://172.22.10.225:22202' // SAP测试环境 -const baseurl = 'http://localhost:18878' +// const baseurl = 'http://172.22.10.226:22202' // SAP 226测试环境 +const baseurl = "http://172.22.10.218:12202" // SAP 225环境改218测试环境 +// const baseurl = 'http://localhost:18878' //--------------------------------------------------开始封装 import service from './service'; diff --git a/common/config.js b/common/config.js index 7172856..91dc24c 100644 --- a/common/config.js +++ b/common/config.js @@ -12,12 +12,14 @@ export default { // 本地真机调试1 // url: "http://172.22.10.206:8096", // url: "http://172.20.10.10:17878", - // url: "http://172.22.54.217:17878", //ip连接 + // url: "http://20.20.30.15:18878", //ip连接 // url: "http://172.22.10.218:22252", 22258 // url: "http://192.168.1.73:32202", // 测试环境 // url: "http://172.22.10.217:22202", // 正式环境1 // url: "http://172.22.10.225:22202", // SAP测试环境 - url: "http://localhost:18878", + // url: "http://172.22.10.226:22202", // SAP 226测试环境 + url: "http://172.22.10.218:12202", // SAP 225环境改218测试环境 + // url: "http://localhost:18878", // 测试服务器接口URL // url: "http://10.4.2.109:90/WMS/WMS_Webservice.asmx", // 请求的参数 diff --git a/components/stomprabbitmq-stomprabbitmq/stomprabbitmq-stomprabbitmq.js b/components/stomprabbitmq-stomprabbitmq/stomprabbitmq-stomprabbitmq.js index 473ed00..b16a73b 100644 --- a/components/stomprabbitmq-stomprabbitmq/stomprabbitmq-stomprabbitmq.js +++ b/components/stomprabbitmq-stomprabbitmq/stomprabbitmq-stomprabbitmq.js @@ -4,7 +4,7 @@ let cashierInfo = uni.getStorageSync('cashierInfo') export default { client: null, - baseURL: 'ws://localhost:17878/socket', + baseURL: 'ws://localhost:18878/socket', storeId:'', cashierId:'', header: { diff --git a/pages/material/index.vue b/pages/material/index.vue index 92412a2..5d718f3 100644 --- a/pages/material/index.vue +++ b/pages/material/index.vue @@ -234,7 +234,7 @@ // let url = location.host // console.log('WebSocket_url',url) // ip连接模拟器联调地址ws://172.22.54.217:17878/socket/ - WebSocketsss.init("ws://172.22.10.217:22202/socket/" + userid, { + WebSocketsss.init("ws://localhost:18878/socket/" + userid, { login: userid, passcode: ut, })