diff --git a/components/car/barrier-gate-control.vue b/components/car/barrier-gate-control.vue index 895e40f..b20edbe 100644 --- a/components/car/barrier-gate-control.vue +++ b/components/car/barrier-gate-control.vue @@ -168,7 +168,7 @@ import { getCommunityId } from '../../api/community/community.js'; this.cancel(); uni.navigateTo({ url: '/pages/car/carInParkingArea?machineId=' + _curMachine.machineId + - '&machineCode=' + _curMachine.machineCode + 'paNum=' + _that.paNum + "&boxId=" + + '&machineCode=' + _curMachine.machineCode + '&paNum=' + _that.paNum + "&boxId=" + _curMachine.boxId }) }, @@ -185,7 +185,7 @@ import { getCommunityId } from '../../api/community/community.js'; this.cancel(); uni.navigateTo({ url: '/pages/car/carOutParkingArea?machineId=' + _curMachine.machineId + - "&machineCode=" + _curMachine.machineCode + "paNum=" + this.paNum + "&boxId=" + + "&machineCode=" + _curMachine.machineCode + "&paNum=" + this.paNum + "&boxId=" + _curMachine.boxId }) } diff --git a/conf/config.js b/conf/config.js index 7b71f46..08de270 100644 --- a/conf/config.js +++ b/conf/config.js @@ -17,12 +17,12 @@ let baseUrl = '/'; // 腾讯地图Key, h5使用 let QQMapKey = ''; -let commonBaseUrl= 'https://wuye.guanghuawuye.com/'; +let commonBaseUrl= 'http://wuye.bazhuayuwulianwang.cn/'; // #ifndef H5 //服务器域名 小程序 或者 app 时 后端地址 //let baseUrl = 'http://demo.homecommunity.cn/'; -let baseUrl = 'https://wuye.guanghuawuye.com/'; +let baseUrl = 'http://wuye.bazhuayuwulianwang.cn/'; // #endif //app支付时这里需要填写支付秘钥 diff --git a/manifest.json b/manifest.json index c2240d8..61c662b 100644 --- a/manifest.json +++ b/manifest.json @@ -87,12 +87,12 @@ "disableHostCheck" : true, "proxy" : { "/app" : { - "target" : "http://127.0.0.1:8008", //目标接口域名http://192.168.1.16:8012 + "target" : "http://property.x2wl.com", //目标接口域名http://192.168.1.16:8012 "changeOrigin" : true, //是否跨域 "secure" : true // 设置支持https协议的代理 }, "/callComponent" : { - "target" : "http://127.0.0.1:8008", //目标接口域名http://192.168.1.16:8012 + "target" : "http://property.x2wl.com", //目标接口域名http://192.168.1.16:8012 "changeOrigin" : true, //是否跨域 "secure" : true // 设置支持https协议的代理 }