Merge branch 'master' of http://git.ycjcjy.com/welcome/screen

config/index.js

@@ -12,11 +12,11 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/api': {
-        target: 'http://192.168.0.11', 
+        target: 'http://192.168.0.11:8080', 
         changeOrigin: true,
-        // pathRewrite: {
-        //   '^/api': '/'
-        // },
+        pathRewrite: {
+          '^/api': '/'
+        },
       },
     },
 

src/components/userList/index.vue

@@ -1,9 +1,7 @@
 <template>
   <div class="components">
     <ul class="centerLabel userList">
-      <item></item>
-      <item></item>
-      <item></item>
+      <item v-for="(user, k) in userList" :key="k" :item="user"></item>
     </ul>
   </div>
 </template>

src/components/userList/userItem.vue

@@ -16,42 +16,42 @@ export default {
       showTimeTamp: 0
     }
   },
-  watch: {
-    item (newVal, oldVal) {
-      if (!oldVal) {
-        this.resetTime()
-        return
-      }
-      window.clearInterval(this.timer)
-      this.timer = null
-      this.showTimeTamp = 0
-      this.resetTime()
-    }
-  },
+  // watch: {
+  //   item (newVal, oldVal) {
+  //     if (!oldVal) {
+  //       this.resetTime()
+  //       return
+  //     }
+  //     window.clearInterval(this.timer)
+  //     this.timer = null
+  //     this.showTimeTamp = 0
+  //     this.resetTime()
+  //   }
+  // },
   computed: {
   },
   components: {
   },
   created () {
-    this.resetTime()
+    // this.resetTime()
   },
   mounted () {
     this.$nextTick(() => {
     })
   },
   methods: {
-    resetTime () {
-      this.show = true
-      this.timer = window.setInterval(() => {
-        this.showTimeTamp += 100
-        if (this.showTimeTamp >= 5000) {
-          window.clearInterval(this.timer)
-          this.timer = null
-          this.showTimeTamp = 0
-          this.show = false
-        }
-      }, 100)
-    }
+    // resetTime () {
+    //   this.show = true
+    //   this.timer = window.setInterval(() => {
+    //     this.showTimeTamp += 100
+    //     if (this.showTimeTamp >= 5000) {
+    //       window.clearInterval(this.timer)
+    //       this.timer = null
+    //       this.showTimeTamp = 0
+    //       this.show = false
+    //     }
+    //   }, 100)
+    // }
   }
 }
 </script>

src/pages/page3.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="projectIndex">
     <img src="../assets/images/bg.jpg" class="centerLabel cover bg" alt>
-    <div class="content flex-h" v-if="pageDetail !== null">
-      <div class="left flex-v">
+    <div class="content flex-h">
+      <div class="left flex-v" v-if="pageDetail !== null">
         <div class="weather">
           <div class="date flex-h">
             <span>{{currentDate}}</span>
@@ -43,8 +43,8 @@
           </div>
         </div>
       </div>
-      <div class="flex-item" v-if="pageDetail !== null">
-        <div :hidden="!showSlide">
+      <div class="flex-item">
+        <div :hidden="!showSlide" v-if="pageDetail !== null">
           <swiper :options="swiperOption" ref="mySwiper">
             <swiper-slide class="swiper-slide" v-for="(item, index) in pageDetail.content" :key="index">
               <img v-if="pageDetail.detail.contentType === 'image'" class="centerLabel" width="100%" height="100%" :src="item.content" alt>

src/pages/test.vue

@@ -0,0 +1,78 @@
+<template>
+<div>
+  <img src="../assets/images/bg.jpg" class="centerLabel cover bg" alt>
+  <div style="position: relative;z-index: 101;color: #fff;" @click="newData(newinfo)"><span>增加新用户</span></div>
+  <div style="position: relative;z-index: 101;color: #fff;" @click="newData(vipAinfo)"><span>增加张先生</span></div>
+  <div style="position: relative;z-index: 101;color: #fff;" @click="newData(vipBinfo)"><span>增加王女士</span></div>
+  <div style="position: relative;z-index: 101;color: #fff;" @click="newData(vipCinfo)"><span>增加许女士</span></div>
+  <div v-if="users.length>0"  style="position: relative;z-index: 101;">
+    <ul class="centerLabel userList">
+      <!-- <userList :user-list='users'></userList> -->
+      <div v-for="(user, k) in users" :key="k" :item="user">
+        <span>{{user.firstName}}</span>
+        <span>{{user.words}}</span>
+      </div>
+    </ul>
+  </div>
+</div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      users: [],
+      newinfo: {
+        firstName: '',
+        classId: '1',
+        words: '欢迎光临'
+      },
+      vipAinfo: {
+        firstName: '张先生',
+        classId: '2',
+        words: '您好'
+      },
+      vipBinfo: {
+        firstName: '王女士',
+        classId: '2',
+        words: '您好~'
+      },
+      vipCinfo: {
+        firstName: '许女士',
+        classId: '2',
+        words: 'hello'
+      }
+    }
+  },
+  methods: {
+    newData (info) {
+      if (info.classId === '1' && this.users.filter(x => x.classId === '1').length > 0) {
+        this.users = this.users.map((x) => {
+          if (x.classId === '1') {
+            return {...x, createdata: Date.parse(new Date())}
+          } else {
+            return x
+          }
+        })
+      } else {
+        if (this.users.length >= 3) {
+          this.users.splice(0, 1)
+        }
+        this.users = [...this.users, {...info, createdata: Date.parse(new Date())}]
+      }
+    }
+  },
+  created () {
+    const _that = this
+    window.setInterval(() => {
+      let dels = _that.users.filter(x => Date.parse(new Date()) - x.createdata > 5000)
+      dels.map(x => {
+        _that.users.splice(this.users.findIndex(i => i.createdata === x.createdata), 1)
+      })
+    }, 100)
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

src/router/index.js

@@ -1,7 +1,7 @@
 /* eslint-disable */
 import Vue from 'vue'
 import Router from 'vue-router'
-import page3 from '../pages/page3'
+import test from '../pages/test'
 
 Vue.use(Router)
 
@@ -9,7 +9,7 @@ let router = new Router({
   routes: [{
     path: '/',
     name: 'index',
-    component: page3,
+    component: test,
     children: []
   }]
 })