From cbe03a8b96edc80a93e0b42ba7801f7071d69bb5 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Fri, 16 Dec 2022 15:57:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E7=85=A7=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=8C=BA=E5=9F=9F=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/components/common.js | 9 ++--- src/pages/CultureMap/CultureMap.vue | 2 +- .../IntangibleHeritage/IntangibleHeritage.vue | 34 +++++++------------ src/pages/Resource/Resource.vue | 13 ++++--- src/pages/SearchList/SearchList.vue | 4 +-- src/pages/SearchResult/SearchResult.vue | 4 +-- src/pages/Volunteer/Volunteer.vue | 2 +- 7 files changed, 29 insertions(+), 39 deletions(-) diff --git a/src/common/components/common.js b/src/common/components/common.js index f5987d6..5413403 100644 --- a/src/common/components/common.js +++ b/src/common/components/common.js @@ -1,15 +1,16 @@ -// const url = 'http://127.0.0.1:8081/xzszwhy/' -const url = 'http://49.233.36.36:58099/xzszwhy/' +const url = 'http://127.0.0.1:8081/xzszwhy/' +// const url = 'http://49.233.36.36:58099/xzszwhy/' const liveUrl = 'https://www.xzszwhy.cn/' const shopUrl = 'http://175.24.42.217:9016/xzshop/' /** * 基础区域ID、编码 * 日喀则：640675, 540200000000 * 南木林县: 640865, 540221000000 + * 桑珠孜区: 640676, 540202000000 */ const area = { - areaId: '640675', - areaCode: '540200000000' + areaId: '640865', + areaCode: '540221000000' } const phoneSafe = (phone) => { diff --git a/src/pages/CultureMap/CultureMap.vue b/src/pages/CultureMap/CultureMap.vue index 38c4f72..5d713b4 100644 --- a/src/pages/CultureMap/CultureMap.vue +++ b/src/pages/CultureMap/CultureMap.vue @@ -123,7 +123,7 @@ export default { }, getPointe: function () { var self = this - axios.get(self.url + 'app/venuesmap/listrangevenuesinforelease').then(function (res) { + axios.get(self.url + 'app/venuesmap/listrangevenuesinforelease/' + common.area.areaCode).then(function (res) { for (var i = 0; i < res.data.data.length; i++) { var p = new BMap.Point(res.data.data[i].longitude, res.data.data[i].latitude) self.arrayList.push(p) diff --git a/src/pages/IntangibleHeritage/IntangibleHeritage.vue b/src/pages/IntangibleHeritage/IntangibleHeritage.vue index 2cb9dde..4ce9616 100644 --- a/src/pages/IntangibleHeritage/IntangibleHeritage.vue +++ b/src/pages/IntangibleHeritage/IntangibleHeritage.vue @@ -20,8 +20,8 @@
选择区域>
- - + +
@@ -61,18 +61,18 @@ 首页 上一页 @@ -112,7 +112,8 @@ export default { url: common.url, isLoading: false, areaList: [], - area: '' + defaultArea: common.area.areaCode, + area: common.area.areaCode } }, computed: { @@ -127,7 +128,7 @@ export default { getHeritageInfo () { var self = this self.isLoading = true - axios.get(self.url + 'app/intangiblelibrary/listpageintangiblelibraryrelease', { + axios.get(self.url + 'app/intangiblelibrary/listpageintangiblelibraryrelease/' + self.area, { params: self.page }).then(function (res) { if (res.status === 200) { @@ -144,25 +145,14 @@ export default { }, getAreaList: function () { var self = this - axios.get(self.url + 'app/area/listbyparentidrelease/640675').then(function (res) { + axios.get(self.url + 'app/area/listbyparentidrelease/' + common.area.areaId).then(function (res) { self.areaList = res.data }) }, - changeArea: function (area, lv) { + changeArea: function (code) { this.page.page = 1 this.changePage = 1 - if (area) { - var level = 'area' + (parseInt(lv) + 1) - this.$set(this.page, level, area) - this.area = area - } else { - this.area = '' - this.page = { - page: 1, - rows: 8, - totalPage: 1 - } - } + this.area = code this.getHeritageInfo() } }, diff --git a/src/pages/Resource/Resource.vue b/src/pages/Resource/Resource.vue index 6b1bc57..3642a11 100644 --- a/src/pages/Resource/Resource.vue +++ b/src/pages/Resource/Resource.vue @@ -10,8 +10,8 @@
类型：
@@ -40,18 +40,18 @@ 首页 上一页 @@ -153,7 +153,6 @@ export default { self.isLoading = false self.resource = res.data.rows self.page.totalPage = Math.ceil(res.data.total / self.page.rows) - console.log(self.resource) }) } }, diff --git a/src/pages/SearchList/SearchList.vue b/src/pages/SearchList/SearchList.vue index a17719d..07e577c 100644 --- a/src/pages/SearchList/SearchList.vue +++ b/src/pages/SearchList/SearchList.vue @@ -312,7 +312,7 @@ export default { // 查询志愿活动 searchVolunteer: function () { var self = this - axios.get(self.url + 'app/volunteerservice/listpagevolunteerservicerelease', { + axios.get(self.url + 'app/volunteerservice/listpagevolunteerservicerelease/' + common.area.areaCode, { params: self.page }).then(function (res) { for (var i = 0; i < res.data.rows.length; i++) { @@ -417,7 +417,7 @@ export default { // 查询非遗清单 searchHeritage: function () { var self = this - axios.get(self.url + 'app/intangiblelibrary/listpageintangiblelibraryrelease', { + axios.get(self.url + 'app/intangiblelibrary/listpageintangiblelibraryrelease/' + common.area.areaCode, { params: self.page }).then(function (res) { self.pageList = res.data.rows diff --git a/src/pages/SearchResult/SearchResult.vue b/src/pages/SearchResult/SearchResult.vue index c1f1762..ef97bee 100644 --- a/src/pages/SearchResult/SearchResult.vue +++ b/src/pages/SearchResult/SearchResult.vue @@ -305,7 +305,7 @@ export default { // 查询志愿活动 searchVolunteer: function () { var self = this - axios.get(self.url + 'app/volunteerservice/listpagevolunteerservicerelease', { + axios.get(self.url + 'app/volunteerservice/listpagevolunteerservicerelease/' + common.area.areaCode, { params: self.page }).then(function (res) { for (var i = 0; i < res.data.rows.length; i++) { @@ -420,7 +420,7 @@ export default { // 查询非遗清单 searchHeritage: function () { var self = this - axios.get(self.url + 'app/intangiblelibrary/listpageintangiblelibraryrelease', { + axios.get(self.url + 'app/intangiblelibrary/listpageintangiblelibraryrelease/' + common.area.areaCode, { params: self.page }).then(function (res) { self.heritageList = res.data.rows diff --git a/src/pages/Volunteer/Volunteer.vue b/src/pages/Volunteer/Volunteer.vue index e771fdc..053aeb2 100644 --- a/src/pages/Volunteer/Volunteer.vue +++ b/src/pages/Volunteer/Volunteer.vue @@ -105,7 +105,7 @@ export default { getVolunteerList: function () { var self = this self.isLoading = true - axios.get(self.url + 'app/volunteerservice/listpagevolunteerservicerelease', { + axios.get(self.url + 'app/volunteerservice/listpagevolunteerservicerelease/' + common.area.areaCode, { params: self.page }).then(function (res) { for (var i = 0; i < res.data.rows.length; i++) {