code update

config/index.js

@@ -11,15 +11,18 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: {
-      '/app-api': {
-        target: 'http://101.132.102.231:8085',
+      '/api': {
+        target: 'http://localhost:8080',
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
+        pathRewrite: {
+          '^/api': '/'
+        },
       },
     },
 
     // Various Dev Server settings
     host: '0.0.0.0', // can be overwritten by process.env.HOST
-    port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    port: 8082, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,
     notifyOnErrors: true,

src/pages/index.vue

@@ -38,11 +38,11 @@
         <div class="flex-item">
           <div>
             <div class="centerLabel notice">
-              <h1>{{timeNum}}</h1>
-              <span>阿克苏娜LDNA索拉卡DNASDLK安山东济南加上大陆上的那家里电脑安静店里看到埃里克的加快了升级卡了多久啊啦拉开觉得苦辣加大了肯德基案例卡的昆仑决ad卡拉胶的拉客的加快了升级阿卡丽</span>
+              <span v-html="(showNew.content || '').replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/\s/g, ' ')">
+              </span>
               <div>
-                <span>通知人</span>
-                <span>2019年2月22日</span>
+                <span>{{showNew.publisher}}</span>
+                <span>{{FormatDate(showNew.publishDate, 'yyyy年MM月dd日')}}</span>
               </div>
             </div>
           </div>
@@ -50,15 +50,24 @@
       </div>
       <div class="flex-item">
         <div :hidden="!showSlide">
-          <swiper :options="swiperOption" ref="mySwiper">
-            <swiper-slide class="swiper-slide" v-for="(item, index) in 5" :key="index">
+          <!-- <swiper :options="swiperOption" ref="mySwiper">
+            <swiper-slide class="swiper-slide" v-for="(item, index) in 1" :key="index">
               <img
                 class="centerLabel cover"
                 src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1550835899076&di=3f786b46cffb6956608e66421b2ec859&imgtype=0&src=http%3A%2F%2Fimgsrc.baidu.com%2Fimgad%2Fpic%2Fitem%2Fe4dde71190ef76c66c3378239716fdfaae5167d1.jpg"
                 alt
               >
             </swiper-slide>
-          </swiper>
+          </swiper> -->
+          <img
+            v-if="showPage.showType === 'image'"
+            class="centerLabel cover"
+            :src="'api' + showPage.showContent"
+            alt
+          >
+          <video v-if="showPage.showType === 'video'" width="100%" height="100%" controls="controls" autoplay muted loop>
+            <source :src="'api' + showPage.showContent" type="video/mp4" />
+          </video>
         </div>
         <div :hidden="showSlide">
           <ul class="centerLabel userList">
@@ -79,6 +88,10 @@ import 'swiper/dist/css/swiper.css'
 import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import solarLunar from 'solarLunar'
 const { mapState: mapUserState, mapActions: mapUserActions } = createNamespacedHelpers('user')
+
+const { mapState: mapPageState, mapActions: mapPageActions } = createNamespacedHelpers('page')
+
+const { mapState: mapNewsState, mapActions: mapNewsActions } = createNamespacedHelpers('news')
 export default {
   name: 'projectIndex',
   data () {
@@ -108,6 +121,18 @@ export default {
     ...mapUserState({
       weatherInfo: x => x.weatherInfo // 天气信息
     }),
+    ...mapPageState({
+      pages: x => x.pages
+    }),
+    ...mapNewsState({
+      news: x => x.news
+    }),
+    showNew () {
+      return ((this.news.data || {}).records || []).filter(x => x.status === 1)[0] || {}
+    },
+    showPage () {
+      return ((this.pages.data || {}).records || []).filter(x => x.status === 1)[0] || {}
+    },
     mySwiper () {
       return this.$refs.mySwiper.swiper
     },
@@ -124,73 +149,17 @@ export default {
     window.setInterval(() => {
       this.init()
     }, 1000)
-    // this.getWeatherInfo({
-    //   city: '110101',
-    //   key: '1c57a8a9ba3fd1a2afcac167dec97be1'
-    // })
-    window.setTimeout(() => {
-      this.returnUserList({
-        firstName: '111',
-        gender: '0',
-        show: false
-      })
-    }, 1000)
-    window.setTimeout(() => {
-      this.returnUserList({
-        firstName: '222',
-        gender: '1',
-        show: false
-      })
-    }, 4000)
-    window.setTimeout(() => {
-      this.returnUserList({
-        firstName: '333',
-        gender: '1',
-        show: false
-      })
-    }, 8000)
-    window.setTimeout(() => {
-      this.returnUserList({
-        firstName: '444',
-        gender: '1',
-        show: false
-      })
-    }, 12000)
-    window.setTimeout(() => {
-      this.returnUserList({
-        firstName: '555',
-        gender: '1',
-        show: false
-      })
-    }, 14000)
-    window.setTimeout(() => {
-      this.returnUserList({
-        firstName: '666',
-        gender: '1',
-        show: false
-      })
-    }, 16000)
-    window.setTimeout(() => {
-      this.returnUserList({
-        firstName: '777',
-        gender: '1',
-        show: false
-      })
-    }, 19000)
-    window.setTimeout(() => {
-      this.returnUserList({
-        firstName: '888',
-        gender: '1',
-        show: false
-      })
-    }, 21000)
-    window.setTimeout(() => {
-      this.returnUserList({
-        firstName: '999',
-        gender: '1',
-        show: false
-      })
-    }, 24000)
+    this.getInitData()
+    window.setInterval(() => {
+      this.getInitData()
+    }, 3600)
+    // window.setTimeout(() => {
+    //   this.returnUserList({
+    //     firstName: '999',
+    //     gender: '1',
+    //     show: false
+    //   })
+    // }, 24000)
   },
   mounted () {
     this.$nextTick(() => {
@@ -200,6 +169,12 @@ export default {
     ...mapUserActions([
       'getWeatherInfo'
     ]),
+    ...mapPageActions([
+      'getPagesList'
+    ]),
+    ...mapNewsActions([
+      'getNewsList'
+    ]),
     returnUserList (item) { // 返回用户信息
       this.showSlide = false
       window.clearInterval(this.timer)
@@ -229,6 +204,44 @@ export default {
         this.currentTimeTamp = Date.now()
       }
     },
+    getInitData () {
+      this.getPagesList({
+        pageNum: 1,
+        pageSize: 100
+      })
+      this.getNewsList({
+        pageNum: 1,
+        pageSize: 100
+      })
+    },
+    FormatDate (timestamp, fmt) {
+      if (timestamp === '0001-01-01T00:00:00Z') {
+        return ''
+      }
+      if (!fmt) {
+        fmt = 'yyyy-MM-dd hh:mm'
+      }
+
+      let date = new Date(timestamp)
+      var o = {
+        'M+': date.getMonth() + 1,
+        'd+': date.getDate(),
+        'h+': date.getHours(),
+        'm+': date.getMinutes(),
+        's+': date.getSeconds(),
+        'q+': Math.floor((date.getMonth() + 3) / 3),
+        'S': date.getMilliseconds()
+      }
+      if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+      }
+      for (var k in o) {
+        if (new RegExp('(' + k + ')').test(fmt)) {
+          fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+        }
+      }
+      return fmt
+    },
     getDate () { // 获取当前时间
       let currentTime = Date.now()
       let weekday = ['日', '一', '二', '三', '四', '五', '六']

src/store/index.js

@@ -32,7 +32,9 @@ const store = new Vuex.Store({
   }
 })
 export const modules = {
-  user: () => require('./user/index').default
+  user: () => require('./user/index').default,
+  news: () => require('./news/index').default,
+  page: () => require('./page/index').default
 }
 
 Object.keys(modules).forEach((modKey) => {

src/store/news/index.js

@@ -0,0 +1,29 @@
+import Ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    news: {}
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.news = payload
+    }
+  },
+  actions: {
+    getNewsList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        Ajax(api.news.url, {
+          method: api.news.method,
+          queryData: { ...payload }
+        }).then(res => {
+          commit('updateList', res)
+          resolve(res)
+        }).catch((res) => {
+          reject(res)
+        })
+      })
+    }
+  }
+}

src/store/page/index.js

@@ -0,0 +1,29 @@
+import Ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    pages: {}
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.pages = payload
+    }
+  },
+  actions: {
+    getPagesList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        Ajax(api.pages.url, {
+          method: api.pages.method,
+          queryData: { ...payload }
+        }).then(res => {
+          commit('updateList', res)
+          resolve(res)
+        }).catch((res) => {
+          reject(res)
+        })
+      })
+    }
+  }
+}

src/util/ajax.js

@@ -9,7 +9,8 @@ const Axios = axios.create({
   urlData: {},
   headers: {
     'Content-Type': 'application/json',
-    'X-Auth-Token': ''
+    'X-Auth-Token': '',
+    'hk-from': 'DP'
   }
 })
 

src/util/api.js

@@ -3,6 +3,14 @@ const $api = {
   getWeatherInfo: { // 获取天气信息
     method: 'get',
     url: `https://restapi.amap.com/v3/weather/weatherInfo?parameters`
+  },
+  news: {
+    method: 'get',
+    url: `/api/notices`
+  },
+  pages: {
+    method: 'get',
+    url: `/api/firsts`
   }
 }