From 7432faa301ca004d2972c74bbfa3d7786cc2f2e1 Mon Sep 17 00:00:00 2001 From: dong_bo0602 <358256383@qq.com> Date: Tue, 14 Jul 2020 16:14:54 +0800 Subject: [PATCH] 0714 --- build/webpack.base.conf.js | 3 + index.html | 12 +- package-lock.json | 5 + package.json | 3 +- src/assets/images/qr-code-app.jpg | Bin 0 -> 13157 bytes src/assets/images/qr-code-gzh.jpg | Bin 0 -> 8724 bytes src/assets/images/qr-code-xcx.jpg | Bin 0 -> 73821 bytes src/assets/images/venue-active.png | Bin 0 -> 1618 bytes src/common/components/Footer.vue | 18 +- src/common/components/Header.vue | 7 +- src/main.js | 3 + src/pages/ArtTrain/ArtTrain.vue | 77 ++++--- src/pages/Broadcast/Broadcast.vue | 53 +++-- src/pages/BroadcastDetail/BroadcastDetail.vue | 2 +- src/pages/CultureActivity/CultureActivity.vue | 59 ++++-- src/pages/CultureDynamics/CultureDynamics.vue | 56 +++-- src/pages/CultureMap/CultureMap.vue | 195 ++++++++++++++++++ src/pages/CultureVenue/CultureVenue.vue | 81 ++++---- .../CultureVenueDetail/CultureVenueDetail.vue | 2 +- src/pages/Exhibition/Exhibition.vue | 49 +++-- src/pages/Index/Index.vue | 5 +- src/pages/Index/components/Swiper.vue | 10 +- .../IntangibleHeritage/IntangibleHeritage.vue | 34 ++- src/pages/Resource/Resource.vue | 54 +++-- src/pages/SearchResult/SearchResult.vue | 68 ++++-- src/pages/Travel/Travel.vue | 20 +- src/pages/Volunteer/Volunteer.vue | 53 +++-- src/router/index.js | 11 + 28 files changed, 673 insertions(+), 207 deletions(-) create mode 100644 src/assets/images/qr-code-app.jpg create mode 100644 src/assets/images/qr-code-gzh.jpg create mode 100644 src/assets/images/qr-code-xcx.jpg create mode 100644 src/assets/images/venue-active.png create mode 100644 src/pages/CultureMap/CultureMap.vue diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 2122789..ed14706 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -23,6 +23,9 @@ module.exports = { context: path.resolve(__dirname, '../'), entry: { app: './src/main.js' + }, + externals:{ + "BMap": "BMap", }, devServer: { historyApiFallback: true, diff --git a/index.html b/index.html index 425ef04..709cc5b 100644 --- a/index.html +++ b/index.html @@ -7,22 +7,14 @@ xz_culture + + + diff --git a/src/pages/CultureVenue/CultureVenue.vue b/src/pages/CultureVenue/CultureVenue.vue index 87e1cba..2ac7240 100644 --- a/src/pages/CultureVenue/CultureVenue.vue +++ b/src/pages/CultureVenue/CultureVenue.vue @@ -13,32 +13,33 @@ -
- 选择城市> - - -
+ + + + +
选择区域> -
+
-
请选择城市
- -
- +
+
    + + +
    +

    {{list.venueName}}

    +
    +     +
+
+ +
@@ -66,6 +67,9 @@ /{{page.totalPage}}页
+
+ +
@@ -96,13 +100,11 @@ export default { venueCity: '', venueArea: '' }, - url: common.url + url: common.url, + isLoading: false } }, computed: { - hasArea: function () { - return this.page.venueCity !== '' - }, hasData () { return this.venueList.length > 0 }, @@ -141,25 +143,21 @@ export default { self.typeList = res.data.data }) }, - getCityList: function () { + // getCityList: function () { + // var self = this + // axios.get(self.url + 'venuebooking/app/venuedictionary/listvenuedictionarybyparentidrelease/5f61c256-2c91-4065-b8f3-0ccbd535e582').then(function (res) { + // self.cityList = res.data.data + // }) + // }, + getAreaList: function () { var self = this - axios.get(self.url + 'venuebooking/app/venuedictionary/listvenuedictionarybyparentidrelease/5f61c256-2c91-4065-b8f3-0ccbd535e582').then(function (res) { - self.cityList = res.data.data - }) - }, - getAreaList: function (id) { - var self = this - if (id) { - self.page.venueCity = id - } else { - self.page.venueCity = '' - } - axios.get(self.url + 'venuebooking/app/venuedictionary/listvenuedictionarybyparentidrelease/' + id).then(function (res) { + axios.get(self.url + 'venuebooking/app/venuedictionary/listvenuedictionarybyparentidrelease/fbd845d6-a74b-457a-8da1-fec66ab0d400').then(function (res) { self.areaList = res.data.data }) }, getVenueList: function () { var self = this + self.isLoading = true axios.get(self.url + 'venuebooking/app/venuesinfo/listpagevenuesinforelease', { params: self.page }).then(function (res) { @@ -170,12 +168,14 @@ export default { self.page.page = res.data.page self.changePage = res.data.page self.page.totalPage = Math.ceil(res.data.total / self.page.rows) + self.isLoading = false }) } }, mounted () { this.getTypeList() - this.getCityList() + // this.getCityList() + this.getAreaList() this.getVenueList() } } @@ -205,6 +205,8 @@ export default { font-size 14px span color #565656 + vertical-align top + line-height 30px button font-family 'zangwen' width 80px @@ -325,4 +327,13 @@ export default { vertical-align middle color #fff font-size 14px +.loading + position fixed + top 50% + left 50% + transform translate(-50%, -50%) + background rgba(255,255,255,0.6) + padding 30px + border-radius 10px + box-shadow 0 0 17px #DEDEDE diff --git a/src/pages/CultureVenueDetail/CultureVenueDetail.vue b/src/pages/CultureVenueDetail/CultureVenueDetail.vue index 7d2e63d..2816ed4 100644 --- a/src/pages/CultureVenueDetail/CultureVenueDetail.vue +++ b/src/pages/CultureVenueDetail/CultureVenueDetail.vue @@ -33,7 +33,7 @@
- + diff --git a/src/pages/Exhibition/Exhibition.vue b/src/pages/Exhibition/Exhibition.vue index 17120f0..8ff235b 100644 --- a/src/pages/Exhibition/Exhibition.vue +++ b/src/pages/Exhibition/Exhibition.vue @@ -7,17 +7,22 @@
- +
+ +
+ +
+
首页 @@ -44,6 +49,9 @@ /{{page.totalPage}}页
+
+ +
@@ -69,7 +77,8 @@ export default { totalPage: 1, newsDirectoriesId: 'f1d5d313-f728-4dda-9843-1116d97e17b0' }, - url: common.url + url: common.url, + isLoading: false } }, computed: { @@ -94,12 +103,14 @@ export default { }, getList: function () { var self = this + self.isLoading = true axios.get(self.url + 'news/app/newscontent/listpagenewscontentrelease', { params: self.page }).then(function (res) { for (var i = 0; i < res.data.rows.length; i++) { res.data.rows[i].newsContentCoverList = res.data.rows[i].newsContentCoverList[0].contentCoverId } + self.isLoading = false self.exhibition = res.data.rows self.page.page = res.data.page self.page.totalPage = Math.ceil(res.data.total / self.page.rows) @@ -114,6 +125,20 @@ export default { diff --git a/src/router/index.js b/src/router/index.js index 0d1564d..209fce7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -29,6 +29,8 @@ import SearchResult from '@/pages/SearchResult/SearchResult' import ArtTrainList from '@/pages/ArtTrainList/ArtTrainList' import SearchList from '@/pages/SearchList/SearchList' import PersonCenter from '@/pages/PersonCenter/PersonCenter' +import CultureMap from '@/pages/CultureMap/CultureMap' + Vue.use(Router) export default new Router({ @@ -293,6 +295,15 @@ export default new Router({ title: '日喀则市公共文化数字云平台', keepAlive: false } + }, + { + path: '/cultureMap', + name: 'CultureMap', + component: CultureMap, + meta: { + title: '日喀则市公共文化数字云平台', + keepAlive: false + } } ] })