diff --git a/common/js/config.js b/common/js/config.js index 479c4fa..93daeaf 100644 --- a/common/js/config.js +++ b/common/js/config.js @@ -1,7 +1,7 @@ -const debug = false // true 是连地服务端本地,false 是连接线上 +const debug = true // true 是连地服务端本地,false 是连接线上 const development = { - domain: 'http://192.168.1.22:10215', + domain: 'http://192.168.1.62:10215', } const production = { diff --git a/common/js/mqtt.js b/common/js/mqtt.js index f344c48..f2b0376 100644 --- a/common/js/mqtt.js +++ b/common/js/mqtt.js @@ -1,5 +1,5 @@ -export const MQTT_IP = 'pqmcn.com:8085/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt -// export const MQTT_IP = '192.168.1.24:8085/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt +// export const MQTT_IP = 'pqmcn.com:8085/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt +export const MQTT_IP = '192.168.1.24:8085/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt const MQTT_USERNAME = 't_user'//mqtt用户名 const MQTT_PASSWORD = 'njcnpqs'//密码 diff --git a/manifest.json b/manifest.json index 535385b..ae15d6e 100644 --- a/manifest.json +++ b/manifest.json @@ -25,7 +25,6 @@ }, /* 模块配置 */ "modules" : { - "Maps" : {}, "Barcode" : {}, "Camera" : {}, "Push" : {} @@ -73,6 +72,7 @@ "ad" : {}, "maps" : { "amap" : { + "name" : "", "appkey_ios" : "73262624599d79ee4ad8bba2ab4a0958", "appkey_android" : "c93dd87e087f3686a9d4463ce5ebcbe1" } @@ -144,8 +144,8 @@ "proxy" : { "/api" : { "https" : true, - "target" : "https://pqmcn.com:8092/api", - // "target" : "http://192.168.1.62:10215", + // "target" : "https://pqmcn.com:8092/api", + "target" : "http://192.168.1.62:10215", "changOrigin" : true, "pathRewrite" : { "/api" : "" diff --git a/pages/device/edit.vue b/pages/device/edit.vue index 1f678e7..53cf2e5 100644 --- a/pages/device/edit.vue +++ b/pages/device/edit.vue @@ -284,17 +284,17 @@ export default { }) }) }, - chooseLocation() { - uni.chooseLocation({ - success: function (res) { - this.address = res.name - console.log('位置名称:' + res.name) - console.log('详细地址:' + res.address) - console.log('纬度:' + res.latitude) - console.log('经度:' + res.longitude) - }, - }) - }, + // chooseLocation() { + // uni.chooseLocation({ + // success: function (res) { + // this.address = res.name + // console.log('位置名称:' + res.name) + // console.log('详细地址:' + res.address) + // console.log('纬度:' + res.latitude) + // console.log('经度:' + res.longitude) + // }, + // }) + // }, chooseGplot() { this.$refs.gplot.open() }, diff --git a/pages/device/new.vue b/pages/device/new.vue index cf13d12..1aa2063 100644 --- a/pages/device/new.vue +++ b/pages/device/new.vue @@ -23,7 +23,7 @@ -