From f77d0c3cef6da6e674178bae895fd526308531d5 Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Fri, 8 Jan 2021 17:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/portrait.styl                   |  5 ++++
 src/components/Banner/Banner.vue           |  2 +-
 src/views/Activity/Activity.vue            | 28 ++++++++++++++++++----
 src/views/ItInformation/ItInformation.vue  |  3 ++-
 src/views/Policy/components/PolicyList.vue |  3 ++-
 5 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/common/portrait.styl b/src/common/portrait.styl
index b19d1ea..b686457 100644
--- a/src/common/portrait.styl
+++ b/src/common/portrait.styl
@@ -442,6 +442,11 @@ h2{
   color: rgba(0, 0, 0, 0.25)!important;
 }
 
+.ant-btn-disabled, .ant-btn.disabled, .ant-btn[disabled], .ant-btn-disabled:hover, .ant-btn.disabled:hover, .ant-btn[disabled]:hover, .ant-btn-disabled:focus, .ant-btn.disabled:focus, .ant-btn[disabled]:focus, .ant-btn-disabled:active, .ant-btn.disabled:active, .ant-btn[disabled]:active, .ant-btn-disabled.active, .ant-btn.disabled.active, .ant-btn[disabled].active{
+  color: rgba(0, 0, 0, 0.25)!important;
+  border-color: #d9d9d9!important;
+}
+
 .base-bg{
   background: #13ACC4
 }
diff --git a/src/components/Banner/Banner.vue b/src/components/Banner/Banner.vue
index c2a01a4..f7b0870 100644
--- a/src/components/Banner/Banner.vue
+++ b/src/components/Banner/Banner.vue
@@ -46,7 +46,7 @@ export default {
 <style lang="stylus" scoped>
 .head {
   background: white;
-  max-height: 360px;
+  max-height: 250px;
   overflow: hidden;
   position: relative;
 }
diff --git a/src/views/Activity/Activity.vue b/src/views/Activity/Activity.vue
index 6a1a50c..6fd42ec 100644
--- a/src/views/Activity/Activity.vue
+++ b/src/views/Activity/Activity.vue
@@ -37,8 +37,8 @@
           <span class="source">地点：{{ item.address }}</span>
         </p>
         <p class="original">
-          <enroll :fnval="item.activityId" />
-          <!-- <a-button type="primary">立即报名</a-button> -->
+          <enroll :fnval="item.activityId" v-if="item.closeTime < nowData" />
+          <a-button disabled v-else>报名已结束</a-button>
         </p>
       </div>
     </div>
@@ -76,9 +76,11 @@ export default {
       aList: [],
       lists: [],
       monthEnglish: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Spt', 'Oct', 'Nov', 'Dec'],
+      nowData: '',
     };
   },
   computed: mapState('home', ['actList', 'actIpCon', 'actCurrent']),
+
   created() {
     this.iptCon = this.actIpCon;
     this.aList = this.actList;
@@ -94,6 +96,23 @@ export default {
       }
     }
     this.getData();
+
+    // 获取当前时间
+    var aData = new Date();
+    console.log(aData); //Wed Aug 21 2019 10:00:58 GMT+0800 (中国标准时间)
+    this.nowData =
+      aData.getFullYear() +
+      '-' +
+      (aData.getMonth() + 1) +
+      '-' +
+      aData.getDate() +
+      ' ' +
+      aData.getHours() +
+      ':' +
+      aData.getMinutes() +
+      ':' +
+      aData.getSeconds();
+    console.log(this.nowData); //2019-8-20
   },
   methods: {
     ...mapMutations('home', ['setActList', 'setActIpCon', 'setActCurrent', 'setActDetail']),
@@ -106,7 +125,7 @@ export default {
             activityType: this.actList,
             pageNum: this.actCurrent,
             pageSize: 5,
-            title: this.iptCon,
+            titleKey: this.iptCon,
           },
         };
         const res = await front(params);
@@ -205,11 +224,12 @@ export default {
   margin-left: 200px;
   text-indent: 2em;
   font-size: 16px;
+  line-height: 36px;
   color: rgba(0, 0, 0, 0.35);
   font-family: Microsoft YaHei;
   overflow: hidden;
   display: -webkit-box;
-  -webkit-line-clamp: 4;
+  -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
 }
 
diff --git a/src/views/ItInformation/ItInformation.vue b/src/views/ItInformation/ItInformation.vue
index f55468c..2abb836 100644
--- a/src/views/ItInformation/ItInformation.vue
+++ b/src/views/ItInformation/ItInformation.vue
@@ -127,10 +127,11 @@ export default {
   text-indent: 2em;
   font-size: 16px;
   color: rgba(0, 0, 0, 0.35);
+  line-height: 36px;
   font-family: Microsoft YaHei;
   overflow: hidden;
   display: -webkit-box;
-  -webkit-line-clamp: 4;
+  -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
 }
 
diff --git a/src/views/Policy/components/PolicyList.vue b/src/views/Policy/components/PolicyList.vue
index f3a1b96..e0efdfd 100644
--- a/src/views/Policy/components/PolicyList.vue
+++ b/src/views/Policy/components/PolicyList.vue
@@ -217,11 +217,12 @@ export default {
   margin-left: 200px;
   text-indent: 2em;
   font-size: 16px;
+  line-height: 36px;
   color: rgba(0, 0, 0, 0.35);
   font-family: Microsoft YaHei;
   overflow: hidden;
   display: -webkit-box;
-  -webkit-line-clamp: 4;
+  -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
 }