diff --git a/components/bussiness-components/packingStationItem.vue b/components/bussiness-components/packingStationItem.vue index bf9e782..5fe24e4 100644 --- a/components/bussiness-components/packingStationItem.vue +++ b/components/bussiness-components/packingStationItem.vue @@ -1,229 +1,240 @@ diff --git a/components/qn-map/qn-map.nvue b/components/qn-map/qn-map.nvue index 04bfc72..9ba587b 100644 --- a/components/qn-map/qn-map.nvue +++ b/components/qn-map/qn-map.nvue @@ -7,7 +7,7 @@ :longitude="centerPoint.longitude" :latitude="centerPoint.latitude" :markers="markers" - :show-location="true" + :show-location="true" :scale="scale" @labeltap="labeltap" @regionchange="regionchange" @@ -45,26 +45,30 @@ export default { }, mounted() { this.mapContext = uni.createMapContext('qnMap', this) + this.mapContext.onstatuschanged = function (e) { + console('change:', e) + } + console.log('mapContetxt:', this.mapContext.onstatuschanged) }, watch: { // 只监听items一层变化 items(val) { - console.log('val:',val) + console.log('val:', val) this.markers = val.map((item) => { return this.causeMarker(item) }) - console.log('res:',this.markers) + console.log('res:', this.markers) this.mapContext.addMarkers({ markers: this.markers, clear: true, success: (res) => { - console.log('success', res) - }, + console.log('success', res) + }, fail: (err) => { console.log('fail', err) } }) - }, + } }, methods: { // 生成markers @@ -124,8 +128,10 @@ export default { this.selectedId = e.detail.markerId }, dragMap() { + console.log('drag begin') this.mapContext.getCenterLocation({ success: (res) => { + console.log('dragMap success:', res) // 抛出移动事件 this.$emit('dragMap', { longitude: res.longitude, @@ -134,6 +140,9 @@ export default { }) this.centerPoint.longitude = res.longitude this.centerPoint.latitude = res.latitude + }, + fail: (err) => { + console.log('dragMap err:', err) } }) }, @@ -156,8 +165,10 @@ export default { clearTimeout(this.timer) this.timer = null } + console.log('e timer after:', e) + let eventName = e.causedBy || e.detail.causedBy this.timer = setTimeout(() => { - switch (e.causedBy) { + switch (eventName) { case 'drag': this.dragMap() break @@ -169,35 +180,35 @@ export default { } }, 500) }, - // 移动到当前坐标 - moveTo({longitude,latitude,scale}) { - scale = Math.ceil(scale) - if(!isNaN(scale)) { - this.scale = scale - }else { - scale = null - } - let data = { - longitude: longitude, - latitude: latitude, - scale: scale || this.scale - } - if (this.mapContext) { - this.mapContext.moveToLocation({ - longitude: longitude, - latitude: latitude, - success:res => { - console.log('移动success',res) - }, - fail:err => { - console.log('移动fail',err) - } - }) - } - setTimeout(() => { - this.$emit('reset', data) - },100) - } + // 移动到当前坐标 + moveTo({ longitude, latitude, scale }) { + scale = Math.ceil(scale) + if (!isNaN(scale)) { + this.scale = scale + } else { + scale = null + } + let data = { + longitude: longitude, + latitude: latitude, + scale: scale || this.scale + } + if (this.mapContext) { + this.mapContext.moveToLocation({ + longitude: longitude, + latitude: latitude, + success: (res) => { + console.log('移动success', res) + }, + fail: (err) => { + console.log('移动fail', err) + } + }) + } + setTimeout(() => { + this.$emit('reset', data) + }, 100) + } } } diff --git a/pages/client-detail/base-paper-deals.vue b/pages/client-detail/base-paper-deals.vue index 8c8356e..6fc6c69 100644 --- a/pages/client-detail/base-paper-deals.vue +++ b/pages/client-detail/base-paper-deals.vue @@ -1,50 +1,52 @@ diff --git a/pages/client-detail/basic-information.vue b/pages/client-detail/basic-information.vue index d1cd486..08c2c1e 100644 --- a/pages/client-detail/basic-information.vue +++ b/pages/client-detail/basic-information.vue @@ -8,7 +8,7 @@ - + {{ info.name }} diff --git a/pages/client-detail/index.vue b/pages/client-detail/index.vue index 59e5694..43e7e9d 100644 --- a/pages/client-detail/index.vue +++ b/pages/client-detail/index.vue @@ -1,33 +1,40 @@ diff --git a/pages/client/index.nvue b/pages/client/index.nvue index 6c21556..0c0d21d 100644 --- a/pages/client/index.nvue +++ b/pages/client/index.nvue @@ -133,7 +133,9 @@ export default { type: 'wgs84', success: (res) => { console.log('location success', res) - const { lat, lon } = wgs84togcj02(res.latitude, res.longitude) + let result = wgs84togcj02(res.latitude, res.longitude) + console.log('result:',result) + const { lat, lon } = result this.$refs.qnMap.moveTo({ latitude: lat, longitude: lon }) }, fail: (err) => { diff --git a/pages/mall/index.vue b/pages/mall/index.vue index 60071f8..184943b 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -1,64 +1,64 @@ + diff --git a/pages/search/index.vue b/pages/search/index.vue index 9c22c08..24fe7be 100644 --- a/pages/search/index.vue +++ b/pages/search/index.vue @@ -37,7 +37,7 @@ - + {{ transformBusiness(item.business) }} diff --git a/static/imgs/client/client-default.png b/static/imgs/client/client-default.png new file mode 100644 index 0000000..37557b5 Binary files /dev/null and b/static/imgs/client/client-default.png differ