diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 6664e34..4313401 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -19,13 +19,13 @@ const install = (Vue, vm) => { // }, // }); - uni.setStorageSync('deptId', 101); + uni.setStorageSync('deptId', 100); Vue.prototype.$u.http.setConfig({ // baseUrl: 'http://61.174.243.28:15861', // baseUrl: 'http://192.168.2.14:8080', // baseUrl: 'http://124.221.246.124:2289', - baseUrl: 'https://dianche.chuantewulian.cn/prod-api', - // baseUrl: 'https://dche.ccttiot.com/prod-api', + // baseUrl: 'https://dianche.chuantewulian.cn/prod-api', + baseUrl: 'https://dche.ccttiot.com/prod-api', loadingText: '努力加载中~', // loadingTime: 2000, // 设置自定义头部content-type diff --git a/page_fix/repair/repair_detail.vue b/page_fix/repair/repair_detail.vue index 2802ff8..c7100bb 100644 --- a/page_fix/repair/repair_detail.vue +++ b/page_fix/repair/repair_detail.vue @@ -340,7 +340,7 @@ - + 返回 @@ -442,6 +442,9 @@ } }, methods: { + closemask(){ + this.maskloading=false + }, bulebtn(num) { if (num == 1) { if (this.carstause) { diff --git a/pages_admin/order/device_detail.vue b/pages_admin/order/device_detail.vue index 402e45b..4b524c4 100644 --- a/pages_admin/order/device_detail.vue +++ b/pages_admin/order/device_detail.vue @@ -249,7 +249,7 @@ - + 返回 @@ -329,7 +329,8 @@ buleclose: false, buleopen: false, bulering: false, - bulerebort: false + bulerebort: false, + getnum:0, } @@ -364,7 +365,9 @@ }, methods: { - + closemask(){ + this.maskloading=false + }, statuss() { if (this.deviceInfos.etOrders[0]) { if (this.deviceInfos.etOrders[0].status == 0) { @@ -1029,6 +1032,11 @@ this.$u.get('/app/device/info?sn=' + this.sn).then((res) => { if (res.code === 200) { this.deviceInfos = res.data + if(this.getnum==0){ + this.getArea() + } + this.getnum=1 + this.mac = res.data.mac // this.deviceInfos.onlineStatus=0 // if (this.deviceInfos.onlineStatus == 0) { @@ -1036,7 +1044,7 @@ // } this.latitude = parseFloat(this.deviceInfos.latitude) this.longitude = parseFloat(this.deviceInfos.longitude) - this.getArea() + if (this.deviceInfos.status == 0) { this.markers.push({ id: parseFloat(this.deviceInfos.sn),