From b02dd30336afae38cc9cdefeea7a917cc45df88c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E5=AD=A6=E5=9D=A4?= <1107410514@qq.com>
Date: Tue, 15 Oct 2019 09:21:20 +0800
Subject: [PATCH] kun 19/10/15 9:22

---
 src/App.vue                       |  5 ----
 src/views/home/HomePage.vue       |  5 ++--
 src/views/project/Application.vue |  2 +-
 src/views/project/Project.vue     | 46 +++++++++++++++++++++++++++----
 4 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 5fa56e5..9274a05 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,11 +27,6 @@ body {
   }
 }
 
-@font-face {
-  font-family: "MicrosoftYaHei";
-  src: url("../static/fontFile/MicrosoftYaHei.ttf");
-}
-
 @font-face {
   font-family: "HanWangKaiBold-Gb5";
   src: url("../static/fontFile/HanWangKaiBold-Gb5.ttf");
diff --git a/src/views/home/HomePage.vue b/src/views/home/HomePage.vue
index e11e1f2..e580a90 100644
--- a/src/views/home/HomePage.vue
+++ b/src/views/home/HomePage.vue
@@ -14,7 +14,7 @@
                   :key="index"
                   @click="$jParams('newsDetails',{id:banner.id})"
                 >
-                  <img :src="banner.cover" alt />
+                  <img :src="banner.cover ? banner.cover : moren" alt />
                   <div class="box">{{banner.title}}</div>
                 </div>
               </template>
@@ -201,7 +201,8 @@ export default {
         wjx: require("../../../static/img/wjx.png"),
         img3: require("../../../static/img/img3.png"),
         right: require("../../../static/img/right.png"),
-        left: require("../../../static/img/left.png")
+        left: require("../../../static/img/left.png"),
+        moren: require('../../../static/img/default.jpg'),
       },
       bgData: [],
     };
diff --git a/src/views/project/Application.vue b/src/views/project/Application.vue
index 4f2845a..bfc6b9b 100644
--- a/src/views/project/Application.vue
+++ b/src/views/project/Application.vue
@@ -602,7 +602,7 @@ export default {
           plcode: _this.plcode,
           pname: _this.pname,
           poster: _this.poster,
-          respoophone: _this.poffice_tel,
+          poffice_tel: _this.poffice_tel,
           aphone: _this.aphone,
           cname: _this.cname,
           cpost: _this.cpost,
diff --git a/src/views/project/Project.vue b/src/views/project/Project.vue
index 915caf8..fbb55da 100644
--- a/src/views/project/Project.vue
+++ b/src/views/project/Project.vue
@@ -5,11 +5,13 @@
       <!-- 公告 -->
       <div class="top">
         <img :src="imgUrl.xlb" alt />
-        <div v-if="cd !== 0">
-          <!-- <aside v-for="(list,index) in bgValue.announcement" :key="index"> -->
+        <div class="div-v" v-if="cd !== 0">
+          <!-- <aside class="animation" v-for="(list,index) in bgValue.announcement" :key="index">
+            <span>{{list.name + list.pro_content}}</span>
+            <time>{{list.protime}}</time>
+          </aside>-->
           <span>{{bgValue.announcement[0].name + bgValue.announcement[0].pro_content}}</span>
           <time>{{bgValue.announcement[0].protime}}</time>
-          <!-- </aside> -->
         </div>
         <div v-else>
           <span>暂无项目申报内容</span>
@@ -627,7 +629,7 @@ export default {
           outline: none;
           font-size: 18px;
           color: #666;
-          text-align: center
+          text-align: center;
         }
 
         .three {
@@ -648,7 +650,7 @@ export default {
           outline: none;
           font-size: 18px;
           color: #666;
-          text-align: center
+          text-align: center;
         }
         span {
           display: inline-block;
@@ -752,6 +754,30 @@ export default {
       justify-content: space-between;
       align-items: center;
 
+      /*
+
+      .div-v {
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+        display: flex;
+        flex-direction: column;
+        justify-content: flex-start;
+        align-items: flex-start;
+      }
+
+      .animation {
+        display: flex;
+        justify-content: space-between;
+        animation: myMove 15s linear infinite;
+        animation-fill-mode: forwards;
+        width: 95%;
+        height: 100%;
+        margin-bottom: 25px;
+        margin-left: 25px;
+      }
+      */
+
       img {
         width: 33px;
         height: 27px;
@@ -783,4 +809,14 @@ export default {
     }
   }
 }
+
+/*文字无缝滚动*/
+@keyframes myMove {
+  0% {
+    transform: translateY(0);
+  }
+  100% {
+    transform: translateY(-150px);
+  }
+}
 </style>
\ No newline at end of file