diff --git a/components/bottom/bottomBtn.vue b/components/bottom/bottomBtn.vue deleted file mode 100644 index eb9ddf1..0000000 --- a/components/bottom/bottomBtn.vue +++ /dev/null @@ -1,81 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/config/configPopup.vue b/components/config/configPopup.vue index 4f70dd3..ef2d21c 100644 --- a/components/config/configPopup.vue +++ b/components/config/configPopup.vue @@ -40,6 +40,9 @@ .configPopup { .content{ padding: 30rpx 20rpx; + overflow: scroll; + height: 100%; + box-sizing: border-box; } } \ No newline at end of file diff --git a/components/tourGuide/locations.vue b/components/tourGuide/locations.vue index 05ce150..f03f880 100644 --- a/components/tourGuide/locations.vue +++ b/components/tourGuide/locations.vue @@ -10,9 +10,19 @@ :markers="spotGuideMarkers" :scale="scale" @markertap="markertap" + id="mapId" @callouttap='callouttap'> + + @@ -147,13 +158,24 @@ // '路径定制', '找美食' , '找民宿', '找厕所'], + areaList : [], + currentArea : 0, } }, computed : { // ...mapGetters(['spotGuide', 'spotGuideMarkers']), - ...mapState(['position', 'spotGuideIndex']), + ...mapState(['position', 'spotGuideIndex', 'areaId']), + }, + created() { + this.queryAreaList() }, methods: { + //点击tab栏 + clickTabs({ index, name }) { + this.currentArea = index + this.$store.commit('setAreaId', this.areaList[index].id) + this.$emit('getData') + }, // 修改前选择的菜单,0-景点 1-美食店铺 2-民宿 3-厕所 setSpotGuideIndex(index){ this.$store.commit('setSpotGuideIndex', index) @@ -205,6 +227,35 @@ this.$utils.navigateTo(`/pages_order/service/articleDetail?id=${item.id}&type=Inheritance`) } }, + queryAreaList(){ + this.$api('queryAreaList', res => { + if(res.code == 200){ + this.areaList = res.result.records + + this.areaList.forEach((n, i) => { + if(this.areaId == n.id){ + this.currentArea = i + } + }) + } + }) + }, + // 点击按钮将地图中心移动到指定定位点 + moveTolocation(latitude, longitude){ + let mapObjs = uni.createMapContext('mapId', this) + mapObjs.moveToLocation( + { + latitude, + longitude + }, + { + complete: res=>{ + console.log('移动完成:', res) + } + }) + // this.onRegionChange('',true) + }, + } } diff --git a/components/tourGuide/selectionPopup.vue b/components/tourGuide/selectionPopup.vue new file mode 100644 index 0000000..1662cf9 --- /dev/null +++ b/components/tourGuide/selectionPopup.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/components/userShop/userShopCommission.vue b/components/userShop/userShopCommission.vue deleted file mode 100644 index be66e89..0000000 --- a/components/userShop/userShopCommission.vue +++ /dev/null @@ -1,130 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages.json b/pages.json index 9aeff32..0a95375 100644 --- a/pages.json +++ b/pages.json @@ -33,12 +33,6 @@ "enablePullDownRefresh" : true } }, - { - "path": "mine/purse" - }, - { - "path": "mine/runningWater" - }, { "path": "mine/address", "style": { @@ -51,18 +45,12 @@ "enablePullDownRefresh" : true } }, - { - "path": "order/refundsOrExchange" - }, { "path": "auth/wxLogin" }, { "path": "auth/wxUserInfo" }, - { - "path": "auth/loginAndRegisterAndForgetPassword" - }, { "path": "order/order" }, diff --git a/pages/index/tourGuide.vue b/pages/index/tourGuide.vue index b511766..52b40f1 100644 --- a/pages/index/tourGuide.vue +++ b/pages/index/tourGuide.vue @@ -16,6 +16,7 @@ :spotGuide="spotGuide" :spotGuideMarkers="spotGuideMarkers" :area="area" + @getData="queryAreaListById" /> diff --git a/pages_order/mine/purse.vue b/pages_order/mine/purse.vue index fe7dd19..3101713 100644 --- a/pages_order/mine/purse.vue +++ b/pages_order/mine/purse.vue @@ -4,7 +4,7 @@ - + @@ -37,10 +37,10 @@ - - \ No newline at end of file diff --git a/pages_order/service/situation.vue b/pages_order/service/situation.vue index 187cd95..cc571fc 100644 --- a/pages_order/service/situation.vue +++ b/pages_order/service/situation.vue @@ -2,6 +2,15 @@ + + + + + diff --git a/pages_order/static/applyRelic/2.png b/pages_order/static/applyRelic/2.png index dffdba1..75710f9 100644 Binary files a/pages_order/static/applyRelic/2.png and b/pages_order/static/applyRelic/2.png differ diff --git a/pages_order/static/applyRelic/jdz.png b/pages_order/static/applyRelic/jdz.png deleted file mode 100644 index 2d18297..0000000 Binary files a/pages_order/static/applyRelic/jdz.png and /dev/null differ diff --git a/store/store.js b/store/store.js index 0a1a319..1955352 100644 --- a/store/store.js +++ b/store/store.js @@ -23,6 +23,7 @@ const store = new Vuex.Store({ areaId : 0,//景区id }, getters: { + // 当前分区景点 spotGuide(state){ return state.spotList.filter(n => { @@ -40,6 +41,7 @@ const store = new Vuex.Store({ return true }) }, + // 地图点位 spotGuideMarkers(state){ let list = []