|
|
|
|
@ -92,7 +92,7 @@
|
|
|
|
|
</u-row> |
|
|
|
|
</view> |
|
|
|
|
|
|
|
|
|
<view class="map-container" :style="{display:(tabCheck === 'room'?'flex':'none')}" v-if="(tabCheck === 'room')"> |
|
|
|
|
<view class="map-container" :style="{display:(tabCheck === 'room'?'flex':'none')}" > |
|
|
|
|
<view class="top-map" :style="{marginTop:size.height+'px'}"> |
|
|
|
|
<view id="map" class="map"> |
|
|
|
|
<map id="shopMap" style="width:100%;height:1000rpx;" class="map" :show-location="true" :latitude="lat" |
|
|
|
|
@ -106,18 +106,18 @@
|
|
|
|
|
<view class="pop-container row"> |
|
|
|
|
<view class="title row"> |
|
|
|
|
<view class="value"> |
|
|
|
|
<u-text text="北新国际二期" color="#020B18" size="32"></u-text> |
|
|
|
|
<u-text :text="mapData.name" color="#020B18" size="32"></u-text> |
|
|
|
|
</view> |
|
|
|
|
<view class="button"> |
|
|
|
|
<u-image mode="widthFix" width="=50" height="50"></u-image> |
|
|
|
|
<view class="button" style="width:50rpx;height:50rpx;"> |
|
|
|
|
<u-image mode="widthFix" width="=50" height="50" :src="staticImage.mapClose" @click="popMapShow = false"></u-image> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<view class="address row"> |
|
|
|
|
<view class="value"> |
|
|
|
|
<u-text text="成都市新都区互惠大道158号" color="#AFB5BE" size="28"></u-text> |
|
|
|
|
<u-text :text="mapData.street" color="#AFB5BE" size="28"></u-text> |
|
|
|
|
</view> |
|
|
|
|
<view class="button"> |
|
|
|
|
<u-image mode="widthFix" width="=50" height="50"></u-image> |
|
|
|
|
<view class="button" style="width:50rpx;height:50rpx;"> |
|
|
|
|
<u-image mode="widthFix" width="=50" height="50" :src="staticImage.position" @click="callPostion"></u-image> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<view class="pop-add"></view> |
|
|
|
|
@ -126,7 +126,7 @@
|
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
|
|
|
|
|
<view class="room-container" :style="{display:(tabCheck === 'room'?'block':'none')}" v-if="(tabCheck === 'room')"> |
|
|
|
|
<view class="room-container" :style="{display:(tabCheck === 'room'?'block':'none')} "> |
|
|
|
|
<uv-waterfall ref="waterfall" |
|
|
|
|
v-model="listWater" |
|
|
|
|
left-gap="26rpx" |
|
|
|
|
@ -220,7 +220,7 @@
|
|
|
|
|
</uv-waterfall> |
|
|
|
|
|
|
|
|
|
</view> |
|
|
|
|
<view class="room-container item-container" :style="{display:(tabCheck === 'item'?'block':'none')}" v-if="(tabCheck === 'item')"> |
|
|
|
|
<view class="room-container item-container" :style="{display:(tabCheck === 'item'?'block':'none')}" > |
|
|
|
|
<uv-waterfall ref="waterfallItem" |
|
|
|
|
v-model="listWaterItem" |
|
|
|
|
left-gap="26rpx" |
|
|
|
|
@ -362,6 +362,7 @@ import api from "@/utils/functions.js";
|
|
|
|
|
import {goodsList, goodsType, roomList, streetList} from "@/api/shop"; |
|
|
|
|
import MzCard from "@/components/MzCard/index.vue"; |
|
|
|
|
import {imghost} from "@/config/host"; |
|
|
|
|
import shop from "@/pages/Shop/index.vue"; |
|
|
|
|
|
|
|
|
|
const img = 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/logo.png'; |
|
|
|
|
export default { |
|
|
|
|
@ -436,24 +437,32 @@ export default {
|
|
|
|
|
popMapShow: false, |
|
|
|
|
isGetLocal:false, |
|
|
|
|
roomCoordinate:[ |
|
|
|
|
{ |
|
|
|
|
latitude:30.810122, |
|
|
|
|
longitude:104.194078, |
|
|
|
|
},{ |
|
|
|
|
latitude:30.57447, |
|
|
|
|
longitude:103.92377, |
|
|
|
|
}, |
|
|
|
|
// { |
|
|
|
|
// latitude:30.810122, |
|
|
|
|
// longitude:104.194078, |
|
|
|
|
// },{ |
|
|
|
|
// latitude:30.57447, |
|
|
|
|
// longitude:103.92377, |
|
|
|
|
// }, |
|
|
|
|
], |
|
|
|
|
mapIcon:imghost+'/static/image/map-icon.png' |
|
|
|
|
mapIcon:imghost+'/static/image/map-icon.png', |
|
|
|
|
staticImage:{ |
|
|
|
|
position:imghost+'/static/image/map-position.png', |
|
|
|
|
mapClose:imghost+'/static/image/map-close.png', |
|
|
|
|
}, |
|
|
|
|
mapData:{}, |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
onLoad(option) { |
|
|
|
|
console.log('shop', option) |
|
|
|
|
if (option.tabCheck) { |
|
|
|
|
this.tabCheck = option.tabCheck; |
|
|
|
|
if(this.tabCheck === 'item'){ |
|
|
|
|
this.current = 1; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
console.log('shopPage123') |
|
|
|
|
this.getStreet(); |
|
|
|
|
// this.getStreet(); |
|
|
|
|
}, |
|
|
|
|
onReady() { |
|
|
|
|
this.size.height = api.navHeight().navigationBar + api.navHeight().systemBar |
|
|
|
|
@ -489,7 +498,7 @@ export default {
|
|
|
|
|
this.getLocal(); |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
getRoomList(clear) { |
|
|
|
|
getRoomList(clear = false) { |
|
|
|
|
if (clear) { |
|
|
|
|
this.status = 'loadmore' |
|
|
|
|
this.pages.page = 1; |
|
|
|
|
@ -503,9 +512,12 @@ export default {
|
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
roomList(this.pages).then(res => { |
|
|
|
|
res.data.forEach(item => { |
|
|
|
|
// const {lat,lng} = item.coordinate.split(','); |
|
|
|
|
// this.roomCoordinate.push({latitude:lat,longitude:lng}); |
|
|
|
|
console.log('roomCoordinate',this.roomCoordinate) |
|
|
|
|
res.data.map(item => { |
|
|
|
|
const coordinate = item.coordinate.split(','); |
|
|
|
|
this.roomCoordinate.push({latitude:parseFloat(coordinate[1]),longitude:parseFloat(coordinate[0])}); |
|
|
|
|
console.log('roomCoordinate',this.roomCoordinate) |
|
|
|
|
return item; |
|
|
|
|
}); |
|
|
|
|
this.addMarkers(); |
|
|
|
|
this.listWater.push.apply(this.listWater, res.data); |
|
|
|
|
@ -514,8 +526,9 @@ export default {
|
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
this.pages.page++; |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
getItemList(clear) { |
|
|
|
|
getItemList(clear = false) { |
|
|
|
|
if (clear) { |
|
|
|
|
this.statusItem = 'loadmore' |
|
|
|
|
this.pagesItem.page = 1; |
|
|
|
|
@ -586,17 +599,19 @@ export default {
|
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
initMap(){ |
|
|
|
|
let that = this; |
|
|
|
|
console.log(this.lat,this.lng) |
|
|
|
|
this.mapContext = uni.createMapContext("shopMap", this); |
|
|
|
|
|
|
|
|
|
// // 仅调用初始化，才会触发 on.("markerClusterCreate", (e) => {}) |
|
|
|
|
|
|
|
|
|
that.isInitMap = true; |
|
|
|
|
this.mapContext.initMarkerCluster({ |
|
|
|
|
enableDefaultStyle: false, |
|
|
|
|
zoomOnClick: true, |
|
|
|
|
gridSize: 60, |
|
|
|
|
complete(res) { |
|
|
|
|
console.log('initMarkerCluster', res) |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
@ -607,11 +622,14 @@ export default {
|
|
|
|
|
latitude: this.lat, |
|
|
|
|
longitude: this.lng, |
|
|
|
|
}) |
|
|
|
|
this.addMarkers(); |
|
|
|
|
this.afterCreateMap(); |
|
|
|
|
this.getRoomList(); |
|
|
|
|
// this.addMarkers(); |
|
|
|
|
}, |
|
|
|
|
addMarkers() { |
|
|
|
|
let that = this; |
|
|
|
|
if(!that.isInitMap){ |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
let positions = this.roomCoordinate; |
|
|
|
|
|
|
|
|
|
const markers = [] |
|
|
|
|
@ -649,6 +667,8 @@ export default {
|
|
|
|
|
//根据项目调用请求方法或uni.request方法 |
|
|
|
|
//弹框控制与<uni-popup ref="popup" type="bottom">对应 |
|
|
|
|
// this.$refs.popup.open('bottom') |
|
|
|
|
this.mapData = that.listWater[id-1]; |
|
|
|
|
console.log('mapData',this.mapData) |
|
|
|
|
this.popMapShow = true; |
|
|
|
|
this.mapContext.moveToLocation({ |
|
|
|
|
latitude: coordinate.latitude, |
|
|
|
|
@ -659,7 +679,17 @@ export default {
|
|
|
|
|
this.popMapShow = false; |
|
|
|
|
}, |
|
|
|
|
afterCreateMap(){ |
|
|
|
|
this.getRoomList(); |
|
|
|
|
this.getRoomList(true); |
|
|
|
|
}, |
|
|
|
|
callPostion(){ |
|
|
|
|
const coordinate = this.mapData.coordinate.split(','); |
|
|
|
|
const latitude=parseFloat(coordinate[1]); |
|
|
|
|
const longitude=parseFloat(coordinate[0]); |
|
|
|
|
uni.openLocation({ |
|
|
|
|
latitude:latitude, |
|
|
|
|
longitude:longitude, |
|
|
|
|
name:this.mapData.name, |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
onPageScroll(res) { |
|
|
|
|
@ -669,10 +699,16 @@ export default {
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
mounted() { |
|
|
|
|
|
|
|
|
|
let shopMore = uni.getStorageSync('shopMore'); |
|
|
|
|
if(shopMore){ |
|
|
|
|
this.current = 1; |
|
|
|
|
this.tabCheck = 'item'; |
|
|
|
|
uni.setStorageSync('shopMore',false); |
|
|
|
|
} |
|
|
|
|
this.getItemList(); |
|
|
|
|
this.getStreet(); |
|
|
|
|
this.getGoodsType(); |
|
|
|
|
|
|
|
|
|
if(this.tabCheck === 'room'){ |
|
|
|
|
this.getLocal(); |
|
|
|
|
} |
|
|
|
|
|
