0715

index.html

@@ -7,8 +7,7 @@
     <title>xz_culture</title>
     <script src="./static/ckplayer/ckplayer/ckplayer.js"></script>
     <script src="./static/laydate/laydate.js"></script>
-    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=RrkB6G1UWWnGW2VN3ce9znbpWIfgRG4g">
+    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=RrkB6G1UWWnGW2VN3ce9znbpWIfgRG4g&s=1"><script>
-    <script>
       (function(window) {
         var theUA = window.navigator.userAgent.toLowerCase();
         if ((theUA.match(/msie\s\d+/) && theUA.match(/msie\s\d+/)[0]) || (theUA.match(/trident\s?\d+/) && theUA.match(/trident\s?\d+/)[0])) {

src/pages/CultureMap/CultureMap.vue

@@ -14,7 +14,7 @@
             <ul>
               <li v-for="(venue,idx) in venueList" :key="idx" @click="initMap(venue.longitude, venue.latitude, 16, idx)" :id="'list' + idx">
                 <img src="@/assets/images/venue-active.png" alt="" class="selected" v-if="selectedVenue == idx">
-                <img :src="url + '/route/file/downloadfile/false/' + venue.venuePanorama" alt="">
+                <img :src="url + 'venuebooking/route/file/downloadfile/false/' + venue.venuePanorama" alt="">
                 <p>{{venue.venueName}}</p>
               </li>
             </ul>
@@ -52,7 +52,7 @@ export default {
       },
       arrayList: [],
       venueList: [],
-      url: 'http://192.168.1.3:8082/venuebooking',
+      url: common.url,
       lng: '88.886487',
       lat: '29.276981',
       mapLevel: 14,
@@ -93,9 +93,10 @@ export default {
           var marker = new BMap.Marker(pointList[c])
           var markers = pointList[c]
           map.addOverlay(marker)
-          var html = '<div><a href="http://192.168.1.150:8080/#/cultureVenueDetail/' + self.venueList[c].venuesInfoId + '" style="display: block">'
+          var html = '<div><a href="' + self.url + '#/cultureVenueDetail/' + self.venueList[c].venuesInfoId + '" style="display: block">'
+          console.log(html)
           html += '<h3 style="">' + self.venueList[c].venueName + '</h3>'
-          html += '<img src="' + self.url + '/route/file/downloadfile/false/' + self.venueList[c].venuePanorama + '" style="width: 100%;height: 130px">'
+          html += '<img src="' + self.url + 'venuebooking/route/file/downloadfile/false/' + self.venueList[c].venuePanorama + '" style="width: 100%;height: 130px">'
           html += '<p style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><span title="' + self.venueList[c].venuePosition + '">' + self.venueList[c].venuePosition + '</span></p></a></div>'
           let infoWindow = new BMap.InfoWindow('', {
             width: 180, // 信息窗口宽度
@@ -122,7 +123,7 @@ export default {
     },
     getPointe: function () {
       var self = this
-      axios.get('http://192.168.1.3:8082/venuebooking/app/venuesmap/listrangevenuesinforelease').then(function (res) {
+      axios.get(self.url + '/venuebooking/app/venuesmap/listrangevenuesinforelease').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)

src/pages/Exhibition/Exhibition.vue

@@ -6,6 +6,15 @@
           您的位置：<router-link to="/">首页</router-link> > 展览展示
         </div>
       </div>
+      <div class="type">
+        <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>
+          </ul>
+        </div>
+      </div>
       <div class="exhibition">
         <div v-if="!isLoading">
           <ul v-if="hasData">
@@ -69,13 +78,15 @@ export default {
   },
   data () {
     return {
+      typeList: [],
       changePage: 1,
       exhibition: [],
       page: {
         page: 1,
         rows: 8,
         totalPage: 1,
-        newsDirectoriesId: 'f1d5d313-f728-4dda-9843-1116d97e17b0'
+        newsDirectoriesId: '',
+        newsDirectoriesParentId: 'f1d5d313-f728-4dda-9843-1116d97e17b0'
       },
       url: common.url,
       isLoading: false
@@ -90,6 +101,24 @@ export default {
     }
   },
   methods: {
+    changeType: function (type) {
+      if (type) {
+        this.page.newsDirectoriesId = type
+      } else {
+        this.page.newsDirectoriesId = ''
+      }
+      this.getList()
+    },
+    getTypeList: function () {
+      var self = this
+      axios.get(self.url + 'news/app/newsdirectories/listnewsdirectoriesrelease', {
+        params: {
+          directoriesParentId: 'f1d5d313-f728-4dda-9843-1116d97e17b0'
+        }
+      }).then(function (res) {
+        self.typeList = res.data
+      })
+    },
     goDetail: function (url) {
       window.location.href = this.url + url
     },
@@ -118,6 +147,7 @@ export default {
     }
   },
   mounted: function () {
+    this.getTypeList()
     this.getList()
   }
 }
@@ -125,6 +155,33 @@ export default {
 
 <style lang="stylus" rel="stylesheet/stylus" scoped>
 @import "~styles/public.styl"
+.type
+  padding 15px 0
+  background #f0f0f0
+  .type-container
+    width 1200px
+    margin 0 auto
+    overflow hidden
+    font-size 14px
+    color #565656
+    span
+      float left
+      line-height 30px
+    ul
+      overflow hidden
+      float left
+      margin-left 20px
+      li
+        float left
+        width 80px
+        height: 30px
+        text-align center
+        line-height 30px
+        cursor pointer
+        &.active
+          background $main-color
+          border-radius 4px
+          color #fff
 .no-data
   padding 80px 0
   text-align center
@@ -181,7 +238,10 @@ export default {
   min-height 400px
   margin 20px auto
   ul
-    overflow hidden
+    &:after
+      content ''
+      display block
+      clear both
     li
       width 280px
       box-shadow 0px 0px 10px 0px rgba(176,176,176,0.3)

src/pages/Index/Index.vue

@@ -57,7 +57,8 @@ export default {
         page: 1,
         rows: 8,
         totalPage: 1,
-        newsDirectoriesId: 'f1d5d313-f728-4dda-9843-1116d97e17b0'
+        newsDirectoriesId: '',
+        newsDirectoriesParentId: 'f1d5d313-f728-4dda-9843-1116d97e17b0'
       },
       swiperList: [],
       url: common.url

src/pages/Index/components/Swiper.vue

@@ -38,7 +38,7 @@ export default {
 .index-swiper
   width 100%
   min-width 1200px
-  height 400px
+  height 500px
   position relative
   min-height 375px
   box-sizing border-box

src/pages/Volunteer/Volunteer.vue

@@ -7,7 +7,7 @@
         </div>
       </div>
       <div class="banner">
-        <img src="@/assets/images/volunteer.png" alt="">
+        <img src="@/assets/images/volunteer.jpg" alt="">
       </div>
       <div class="volunteer">
         <div v-if="!isLoading">