修改按照账号区域查询数据

This commit is contained in:
wanggeng 2022-12-14 18:05:12 +08:00
parent fa5461d937
commit bbe4ac25b2
13 changed files with 82 additions and 102 deletions

View File

@ -3,12 +3,14 @@ const url = 'http://49.233.36.36:58099/xzszwhy/'
const liveUrl = 'https://www.xzszwhy.cn/'
const shopUrl = 'http://175.24.42.217:9016/xzshop/'
/**
* 基础区域编码
* 日喀则540200000000
* 南木林县: 540221000000
* @type {string}
* 基础区域ID编码
* 日喀则640675, 540200000000
* 南木林县: 640865, 540221000000
*/
const areaCode = '540221000000'
const area = {
areaId: '640675',
areaCode: '540200000000'
}
const phoneSafe = (phone) => {
if (phone.length === 11) {
@ -21,6 +23,6 @@ export default {
url,
liveUrl,
shopUrl,
areaCode: areaCode,
area: area,
phoneSafe
}

View File

@ -90,7 +90,7 @@ export default {
getNewsList: function (item) {
var self = this
self.isLoading = true
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease', {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: {
page: 1,
rows: 8,

View File

@ -138,7 +138,7 @@ export default {
},
getList: function () {
var self = this
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease', {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: self.page
}).then(function (res) {
for (var i = 0; i < res.data.rows.length; i++) {

View File

@ -10,14 +10,14 @@
<div class="select-container">
<div class="select-line">
<span>活动类别> </span>
<button :class="{active: page.activityType == ''}" @click="loadAll">全部</button>
<button v-for="(btn,idx) in typeList" :key="idx" :class="{active: page.activityType == btn.dataId}" @click="changeTab(btn.dataId)">{{btn.dataName}}</button>
<button :class="{active: page.activityType === ''}" @click="loadAll">全部</button>
<button v-for="(btn,idx) in typeList" :key="idx" :class="{active: page.activityType === btn.dataId}" @click="changeTab(btn.dataId)">{{btn.dataName}}</button>
</div>
<div class="select-line">
<span>选择区域></span>
<div style="display: inline-block;width: 94%;">
<button :class="{active: page.county == ''}" @click="changeArea(null)">全部</button>
<button v-for="(btn,idx) in areaList" :key="idx" @click="changeArea(btn.areaId, btn.areaLevel)" :class="{active: page.county == btn.areaId}">{{btn.areaName}}</button>
<button :class="{active: area === defaultArea}" @click="changeArea(defaultArea)">全部</button>
<button v-for="(btn,idx) in areaList" :key="btn.areaId" @click="changeArea(btn.areaCode)" :class="{active: area === btn.areaCode}">{{btn.areaName}}</button>
</div>
</div>
</div>
@ -33,12 +33,12 @@
<h3 class="service-name">{{list.activityTitle}}</h3>
<p class="time">{{list.activityStartTime}}{{list.activityEndTime}}</p>
<p class="activity-location">{{list.activityAddress}}</p>
<button class="sign-btn" v-if="list.activityState == 3">报名中</button>
<button class="sign-btn" v-else-if="list.activityState == 4">报名人数已满</button>
<button class="sign-btn" v-else-if="list.activityState == 5">报名结束</button>
<button class="sign-btn" v-else-if="list.activityState == 6">进行中</button>
<button class="sign-btn" v-else-if="list.activityState == 7">进入查看</button>
<button class="sign-btn" v-else-if="list.activityState == 99">已结束</button>
<button class="sign-btn" v-if="list.activityState === 3">报名中</button>
<button class="sign-btn" v-else-if="list.activityState === 4">报名人数已满</button>
<button class="sign-btn" v-else-if="list.activityState === 5">报名结束</button>
<button class="sign-btn" v-else-if="list.activityState === 6">进行中</button>
<button class="sign-btn" v-else-if="list.activityState === 7">进入查看</button>
<button class="sign-btn" v-else-if="list.activityState === 99">已结束</button>
</div>
</router-link>
</ul>
@ -51,18 +51,18 @@
<span @click="paging(1)">首页</span>
<span @click="paging(page.page - 1)" v-if="page.page > 1">上一页</span>
<ul v-if="page.totalPage > 0 && page.totalPage <= 5">
<li v-for="cpage in page.totalPage" :class="{'active': page.page == cpage}" :key="cpage" @click="paging(cpage)">
<li v-for="cpage in page.totalPage" :class="{'active': page.page === cpage}" :key="cpage" @click="paging(cpage)">
{{cpage}}
</li>
</ul>
<ul v-if="page.totalPage > 5">
<li v-if="page.page < 3" v-for="cpage in 5" :class="{'active': page.page == cpage}" :key="cpage" @click="paging(cpage)">
<li v-if="page.page < 3" v-for="cpage in 5" :class="{'active': page.page === cpage}" :key="cpage" @click="paging(cpage)">
{{cpage}}
</li>
<li v-if="page.page > page.totalPage - 2" v-for="cpage in 5" :class="{'active': page.page == (page.totalPage - 5 + cpage)}" :key="cpage" @click="paging(cpage)">
<li v-if="page.page > page.totalPage - 2" v-for="cpage in 5" :class="{'active': page.page === (page.totalPage - 5 + cpage)}" :key="cpage" @click="paging(cpage)">
{{page.totalPage - 5 + cpage}}
</li>
<li v-if="page.page >= 3 && page.page <= page.totalPage - 2" v-for="cpage in 5" :class="{'active': page.page == (page.page - (3 - cpage))}" :key="cpage" @click="paging(cpage)">
<li v-if="page.page >= 3 && page.page <= page.totalPage - 2" v-for="cpage in 5" :class="{'active': page.page === (page.page - (3 - cpage))}" :key="cpage" @click="paging(cpage)">
{{page.page - (3 - cpage)}}
</li>
</ul>
@ -104,6 +104,8 @@ export default {
activityType: '',
county: ''
},
defaultArea: common.area.areaCode,
area: common.area.areaCode,
url: common.url,
isLoading: false
}
@ -117,16 +119,10 @@ export default {
}
},
methods: {
changeArea: function (area, lv) {
changeArea: function (code) {
this.page.page = 1
this.changePage = 1
if (area) {
this.page.county = area
var areaLv = 'area' + (parseInt(lv) + 1)
console.log(areaLv)
} else {
this.page.county = ''
}
this.area = code
this.getActivityList()
},
doJumpPage: function () {
@ -147,7 +143,7 @@ export default {
getActivityList: function () {
var self = this
self.isLoading = true
axios.get(self.url + 'app/activitylibrary/listpageactivitylibraryfornetrelease', {
axios.get(self.url + 'app/activitylibrary/listpageactivitylibraryfornetrelease/' + self.area, {
params: self.page
}).then(function (res) {
var result = res.data.rows
@ -170,7 +166,7 @@ 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
})
}

View File

@ -10,15 +10,15 @@
<div class="type-container">
<span>类型</span>
<ul>
<li :class="{active: page.newsDirectoriesId == ''}" @click="changeType(null)">全部</li>
<li v-for="(btn,idx) in typeList" :key="idx" :class="{active: page.newsDirectoriesId == btn.newsDirectoriesId}" @click="changeType(btn.newsDirectoriesId)">{{btn.directoriesName}}</li>
<li :class="{active: page.newsDirectoriesId === ''}" @click="changeType(null)">全部</li>
<li v-for="(btn,idx) in typeList" :key="btn.newsDirectoriesId" :class="{active: page.newsDirectoriesId === btn.newsDirectoriesId}" @click="changeType(btn.newsDirectoriesId)">{{btn.directoriesName}}</li>
</ul>
</div>
<div class="type-container">
<span>区域</span>
<ul style="display: inline-block;width: 95%;">
<li :class="{active: area == ''}" @click="changeArea">全部</li>
<li v-for="(btn,idx) in areaList" :key="idx" :class="{active: area == btn.areaId}" @click="changeArea(btn.areaId, btn.areaLevel)">{{btn.areaName}}</li>
<li :class="{active: area === defaultArea}" @click="changeArea(defaultArea)">全部</li>
<li v-for="(btn,idx) in areaList" :key="btn.areaId" :class="{active: area === btn.areaCode}" @click="changeArea(btn.areaCode)">{{btn.areaName}}</li>
</ul>
</div>
</div>
@ -47,18 +47,18 @@
<span @click="paging(1)">首页</span>
<span @click="paging(page.page - 1)" v-if="page.page > 1">上一页</span>
<ul v-if="page.totalPage > 0 && page.totalPage <= 5">
<li v-for="cpage in page.totalPage" :class="{'active': page.page == cpage}" :key="cpage" @click="paging(cpage)">
<li v-for="cpage in page.totalPage" :class="{'active': page.page === cpage}" :key="cpage" @click="paging(cpage)">
{{cpage}}
</li>
</ul>
<ul v-if="page.totalPage > 5">
<li v-if="page.page < 3" v-for="cpage in 5" :class="{'active': page.page == cpage}" :key="cpage" @click="paging(cpage)">
<li v-if="page.page < 3" v-for="cpage in 5" :class="{'active': page.page === cpage}" :key="cpage" @click="paging(cpage)">
{{cpage}}
</li>
<li v-if="page.page > page.totalPage - 2" v-for="cpage in 5" :class="{'active': page.page == (page.totalPage - 5 + cpage)}" :key="cpage" @click="paging(cpage)">
<li v-if="page.page > page.totalPage - 2" v-for="cpage in 5" :class="{'active': page.page === (page.totalPage - 5 + cpage)}" :key="cpage" @click="paging(cpage)">
{{page.totalPage - 5 + cpage}}
</li>
<li v-if="page.page >= 3 && page.page <= page.totalPage - 2" v-for="cpage in 5" :class="{'active': page.page == (page.page - (3 - cpage))}" :key="cpage" @click="paging(cpage)">
<li v-if="page.page >= 3 && page.page <= page.totalPage - 2" v-for="cpage in 5" :class="{'active': page.page === (page.page - (3 - cpage))}" :key="cpage" @click="paging(cpage)">
{{page.page - (3 - cpage)}}
</li>
</ul>
@ -98,10 +98,10 @@ export default {
page: 1,
rows: 8,
totalPage: 1,
newsDirectoriesId: '',
newsDirectoriesParentId: 'f497904b-7727-4832-891c-604c36ae4167'
newsDirectoriesId: ''
},
area: '',
defaultArea: common.area.areaCode,
area: common.area.areaCode,
url: common.url,
isLoading: false
}
@ -115,23 +115,10 @@ export default {
}
},
methods: {
changeArea: function (area, lv) {
changeArea: function (code) {
this.page.page = 1
this.changePage = 1
this.area = area
if (area) {
var level = 'area' + (parseInt(lv) + 1)
this.$set(this.page, level, area)
} else {
this.area = ''
this.page = {
page: 1,
rows: 8,
totalPage: 1,
newsDirectoriesId: '',
newsDirectoriesParentId: 'f497904b-7727-4832-891c-604c36ae4167'
}
}
this.area = code
this.getNews()
},
doJumpPage: function () {
@ -141,7 +128,7 @@ export default {
getNews: function () {
var self = this
self.isLoading = true
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease', {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + self.area, {
params: self.page
}).then(function (res) {
for (var i = 0; i < res.data.rows.length; i++) {
@ -187,7 +174,7 @@ 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
})
}

View File

@ -10,14 +10,14 @@
<div class="select-container">
<div class="select-line">
<span>活动类别></span>
<button :class="{active: page.venueType == ''}" @click="changeType(null)">全部</button>
<button v-for="(btn,idx) in typeList" :key="idx" @click="changeType(btn.dictionaryId)" :class="{active: page.venueType == btn.dictionaryId}">{{btn.dictionaryName}}</button>
<button :class="{active: page.venueType === ''}" @click="changeType(null)">全部</button>
<button v-for="(btn,idx) in typeList" :key="btn.dictionaryId" @click="changeType(btn.dictionaryId)" :class="{active: page.venueType === btn.dictionaryId}">{{btn.dictionaryName}}</button>
</div>
<div class="select-line">
<span>选择区域></span>
<div style="display: inline-block;width: 95%;">
<button :class="{active: page.venueArea == ''}" @click="changeArea(null)">全部</button>
<button v-for="(btn,idx) in areaList" :key="idx" @click="changeArea(btn.areaId, btn.areaLevel)" :class="{active: page.venueArea == btn.areaId}">{{btn.areaName}}</button>
<button :class="{active: area === defaultArea}" @click="changeArea(defaultArea)">全部</button>
<button v-for="(btn,idx) in areaList" :key="btn.areaId" @click="changeArea(btn.areaCode)" :class="{active: area === btn.areaCode}">{{btn.areaName}}</button>
</div>
</div>
</div>
@ -41,18 +41,18 @@
<span @click="paging(1)">首页</span>
<span @click="paging(page.page - 1)" v-if="page.page > 1">上一页</span>
<ul v-if="page.totalPage > 0 && page.totalPage <= 5">
<li v-for="cpage in page.totalPage" :class="{'active': page.page == cpage}" :key="cpage" @click="paging(cpage)">
<li v-for="cpage in page.totalPage" :class="{'active': page.page === cpage}" :key="cpage" @click="paging(cpage)">
{{cpage}}
</li>
</ul>
<ul v-if="page.totalPage > 5">
<li v-if="page.page < 3" v-for="cpage in 5" :class="{'active': page.page == cpage}" :key="cpage" @click="paging(cpage)">
<li v-if="page.page < 3" v-for="cpage in 5" :class="{'active': page.page === cpage}" :key="cpage" @click="paging(cpage)">
{{cpage}}
</li>
<li v-if="page.page > page.totalPage - 2" v-for="cpage in 5" :class="{'active': page.page == (page.totalPage - 5 + cpage)}" :key="cpage" @click="paging(cpage)">
<li v-if="page.page > page.totalPage - 2" v-for="cpage in 5" :class="{'active': page.page === (page.totalPage - 5 + cpage)}" :key="cpage" @click="paging(cpage)">
{{page.totalPage - 5 + cpage}}
</li>
<li v-if="page.page >= 3 && page.page <= page.totalPage - 2" v-for="cpage in 5" :class="{'active': page.page == (page.page - (3 - cpage))}" :key="cpage" @click="paging(cpage)">
<li v-if="page.page >= 3 && page.page <= page.totalPage - 2" v-for="cpage in 5" :class="{'active': page.page === (page.page - (3 - cpage))}" :key="cpage" @click="paging(cpage)">
{{page.page - (3 - cpage)}}
</li>
</ul>
@ -91,10 +91,10 @@ export default {
page: 1,
rows: 8,
totalPage: 1,
venueType: '',
venueArea: '',
areaLevel: ''
venueType: ''
},
defaultArea: common.area.areaCode,
area: common.area.areaCode,
url: common.url,
isLoading: false
}
@ -108,15 +108,10 @@ export default {
}
},
methods: {
changeArea: function (area, lv) {
changeArea: function (code) {
this.page.page = 1
this.changePage = 1
if (area) {
this.page.venueArea = area
this.page.areaLevel = 'area' + (parseInt(lv) + 1)
} else {
this.page.venueArea = ''
}
this.area = code
this.getVenueList()
},
changeType: function (type) {
@ -145,14 +140,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
})
},
getVenueList: function () {
var self = this
self.isLoading = true
axios.get(self.url + 'app/venuesinfo/listpagevenuesinforelease', {
axios.get(self.url + 'app/venuesinfo/listpagevenuesinforelease/' + self.area, {
params: self.page
}).then(function (res) {
for (var i = 0; i < res.data.rows.length; i++) {

View File

@ -139,7 +139,7 @@ export default {
getList: function () {
var self = this
self.isLoading = true
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease', {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: self.page
}).then(function (res) {
for (var i = 0; i < res.data.rows.length; i++) {

View File

@ -73,7 +73,7 @@ export default {
methods: {
getDynamicsList: function () {
var self = this
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.areaCode, {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: self.dynamicsPage
}).then(function (res) {
var picNews = res.data.rows.splice(0, 1)[0]
@ -92,7 +92,7 @@ export default {
},
getActivityList: function () {
var self = this
axios.get(self.url + 'app/activitylibrary/listpageactivitylibraryfornetrelease', {
axios.get(self.url + 'app/activitylibrary/listpageactivitylibraryfornetrelease/' + common.area.areaCode, {
params: self.activityPage
}).then(function (res) {
self.activityList = res.data.rows
@ -100,7 +100,7 @@ export default {
},
getLiterature: function () {
var self = this
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.areaCode, {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: self.literaturePage
}).then(function (res) {
for (var i = 0; i < res.data.rows.length; i++) {
@ -111,7 +111,7 @@ export default {
},
getExhibition: function () {
var self = this
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.areaCode, {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: self.exhibitionPage
}).then(function (res) {
for (var i = 0; i < res.data.rows.length; i++) {
@ -123,7 +123,7 @@ export default {
//
getSwiper: function () {
var self = this
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.areaCode, {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: {
page: 1,
rows: 3,

View File

@ -62,7 +62,7 @@ export default {
},
getLiterature: function () {
var self = this
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease', {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: self.literaturePage
}).then(function (res) {
for (var i = 0; i < res.data.rows.length; i++) {

View File

@ -144,7 +144,7 @@ export default {
},
getList: function () {
var self = this
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease', {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: self.page
}).then(function (res) {
for (var i = 0; i < res.data.rows.length; i++) {

View File

@ -290,7 +290,7 @@ export default {
//
searchVenue: function () {
var self = this
axios.get(self.url + 'app/venuesinfo/listpagevenuesinforelease', {
axios.get(self.url + 'app/venuesinfo/listpagevenuesinforelease/' + common.area.areaCode, {
params: self.page
}).then(function (res) {
self.pageList = res.data.rows
@ -301,7 +301,7 @@ export default {
//
searchActivity: function () {
var self = this
axios.get(self.url + 'app/activitylibrary/listpageactivitylibraryfornetrelease', {
axios.get(self.url + 'app/activitylibrary/listpageactivitylibraryfornetrelease/' + common.area.areaCode, {
params: self.page
}).then(function (res) {
self.pageList = res.data.rows
@ -326,7 +326,7 @@ export default {
//
searchDynamic: function () {
var self = this
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease', {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: {
page: self.page.page,
rows: self.page.rows,
@ -349,7 +349,7 @@ export default {
//
searchArt: function () {
var self = this
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease', {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: {
page: self.page.page,
rows: self.page.rows,
@ -379,7 +379,7 @@ export default {
//
searchExhibition: function () {
var self = this
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease', {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: {
page: self.page.page,
rows: self.page.rows,
@ -398,7 +398,7 @@ export default {
//
searchTravel: function () {
var self = this
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease', {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: {
page: self.page.page,
rows: self.page.rows,

View File

@ -285,7 +285,7 @@ export default {
//
searchVenue: function () {
var self = this
axios.get(self.url + 'app/venuesinfo/listpagevenuesinforelease', {
axios.get(self.url + 'app/venuesinfo/listpagevenuesinforelease/' + common.area.areaCode, {
params: self.page
}).then(function (res) {
self.venueList = res.data.rows
@ -295,7 +295,7 @@ export default {
//
searchActivity: function () {
var self = this
axios.get(self.url + 'app/activitylibrary/listpageactivitylibraryfornetrelease', {
axios.get(self.url + 'app/activitylibrary/listpageactivitylibraryfornetrelease/' + common.area.areaCode, {
params: self.page
}).then(function (res) {
self.activityList = res.data.rows
@ -318,7 +318,7 @@ export default {
//
searchDynamic: function () {
var self = this
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease', {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: {
page: 1,
rows: 4,
@ -345,7 +345,7 @@ export default {
//
searchArt: function () {
var self = this
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease', {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: {
page: 1,
rows: 4,
@ -363,7 +363,7 @@ export default {
//
searchLiterature: function () {
var self = this
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease', {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: {
page: 1,
rows: 4,
@ -383,7 +383,7 @@ export default {
//
searchExhibition: function () {
var self = this
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease', {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: {
page: 1,
rows: 8,
@ -402,7 +402,7 @@ export default {
//
searchTravel: function () {
var self = this
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease', {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: {
page: 1,
rows: 4,

View File

@ -100,7 +100,7 @@ export default {
getTravelList: function () {
var self = this
self.isLoading = true
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease', {
axios.get(self.url + 'app/newscontent/listpagenewscontentrelease/' + common.area.areaCode, {
params: self.page
}).then(function (res) {
for (var i = 0; i < res.data.rows.length; i++) {