From e8401b6130660303fcfe0d2632d51d82e62a0999 Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Wed, 6 Jan 2021 17:21:28 +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/components/Index/IndexNewList.vue      | 12 ++++-------
 src/views/Activity/Activity.vue            | 21 +++++++++++---------
 src/views/Community/Community.vue          | 12 ++++-------
 src/views/Policy/Policy.vue                | 17 ++++++++--------
 src/views/Policy/PolicyDetails.vue         | 16 +++++----------
 src/views/Policy/components/PolicyList.vue | 23 +++++++++++++++++-----
 6 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/src/components/Index/IndexNewList.vue b/src/components/Index/IndexNewList.vue
index ca2ecd7..4a758b0 100644
--- a/src/components/Index/IndexNewList.vue
+++ b/src/components/Index/IndexNewList.vue
@@ -35,9 +35,9 @@
     <div class="policy-box" v-if="lists && lists[i].news && lists[i].news.length>0">
       <div :key="index" class="div-box" v-for="(item, index) in lists[i].news">
         <div @click="jumpDetails(item)" class="d-flex flex-nowrap" style="cursor: pointer">
-          <div class="time d-flex flex-column align-center mr-3">
-            <span class="font-20">Dec.</span>
-            <span class="font-bold-32 day">03</span>
+          <div class="time d-flex flex-column align-center mr-3" v-if="item.releaseTime">
+            <span class="font-20">{{ monthEnglish[item.releaseTime.split('-')[1] - 1] }}.</span>
+            <span class="font-bold-32 day">{{ item.releaseTime.split(' ')[0].split('-')[2] }}</span>
           </div>
           <div class="d-flex flex-1 flex-column">
             <div class="item-title">{{ item.title }}</div>
@@ -66,11 +66,7 @@ export default {
     },
   },
   data() {
-    return {};
-  },
-
-  created() {
-    console.log('lists: ', this.lists);
+    return { monthEnglish: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Spt', 'Oct', 'Nov', 'Dec'] };
   },
 
   methods: {
diff --git a/src/views/Activity/Activity.vue b/src/views/Activity/Activity.vue
index 4472a9d..59e9340 100644
--- a/src/views/Activity/Activity.vue
+++ b/src/views/Activity/Activity.vue
@@ -5,14 +5,21 @@
   -->
 
 <template>
-  <div class="wrap">
+  <div class="inner">
     <div class="search-list">
       <span>
         <a-checkbox :checked="sta.ly === 1" @click="cSta('ly')">路演</a-checkbox>
         <a-checkbox :checked="sta.jz === 1" @click="cSta('jz')">讲座</a-checkbox>
         <a-checkbox :checked="sta.sl === 1" @click="cSta('sl')">沙龙</a-checkbox>
       </span>
-      <a-input-search @search="getData" class="search" enter-button="搜索" placeholder="请输入..." style="width: 381px" v-model="iptCon" />
+      <a-input-search
+        @search="getData"
+        class="search"
+        enter-button="搜索"
+        placeholder="请输入..."
+        style="width: 381px"
+        v-model="iptCon"
+      />
     </div>
     <div class="policy-box">
       <div :key="index" class="div-box" v-for="(item, index) in lists">
@@ -32,10 +39,10 @@
     </div>
     <a-pagination
       :current="actCurrent"
+      :page-size="pageSize"
       :total="total"
       @change="onShowSizeChange"
       class="pagination"
-      :page-size="pageSize"
       show-less-items
       show-quick-jumper
     />
@@ -142,12 +149,8 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-.wrap {
-  width: 1260px;
-  min-height: 1037px;
-  margin: 80px auto 28px auto;
-  overflow: hidden;
-  opacity: 1;
+.inner {
+  margin: 40px auto;
 }
 
 .search-list {
diff --git a/src/views/Community/Community.vue b/src/views/Community/Community.vue
index b0cef64..3e3e3a3 100644
--- a/src/views/Community/Community.vue
+++ b/src/views/Community/Community.vue
@@ -5,7 +5,7 @@
   -->
 
 <template>
-  <div class="wrap">
+  <div class="inner">
     <div class="search-list">
       <a-radio-group v-model="value">
         <a-radio :style="radioStyle" :value="1">主题论坛</a-radio>
@@ -41,7 +41,7 @@
         <img :src="item.visitLocation" alt class="post-img" v-if="item.visitLocation" />
         <div class="post-content" v-dompurify-html="item.content"></div>
       </div>
-      <p class="look-down">
+      <p class="look-down baseColor">
         <span @click="getDet(item.id, index)">
           查看详情
           <a-icon type="arrow-right" />
@@ -154,12 +154,8 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-.wrap {
-  width: 1260px;
-  min-height: 1037px;
-  margin: 80px auto 28px auto;
-  overflow: hidden;
-  opacity: 1;
+.inner {
+  margin: 40px auto;
 }
 
 .post-title {
diff --git a/src/views/Policy/Policy.vue b/src/views/Policy/Policy.vue
index 4d26020..d1b47a4 100644
--- a/src/views/Policy/Policy.vue
+++ b/src/views/Policy/Policy.vue
@@ -5,18 +5,20 @@
   -->
 
 <template>
-  <div class="wrap">
-    <policy-list />
+  <div class="inner">
+    <bread-crumb :arr="arr" />
+    <policy-list class="py-5 my-5" />
     <!-- <policy-details v-else/> -->
   </div>
 </template>
 
 <script>
-// import PolicyDetails from './components/PolicyDetails.vue';
+import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
 import PolicyList from './components/PolicyList.vue';
 export default {
   name: 'Policy',
   components: {
+    BreadCrumb,
     PolicyList,
     // PolicyDetails,
   },
@@ -24,6 +26,7 @@ export default {
     return {
       showType: 1,
       list: [],
+      arr: [{ name: '创新政策', url: '' }],
     };
   },
   methods: {},
@@ -31,11 +34,7 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-.wrap {
-  width: 1260px;
-  min-height: 1037px;
-  margin: 80px auto 28px auto;
-  overflow: hidden;
-  opacity: 1;
+.inner {
+  margin: 40px auto;
 }
 </style>
diff --git a/src/views/Policy/PolicyDetails.vue b/src/views/Policy/PolicyDetails.vue
index a7a0ddb..cc538d2 100644
--- a/src/views/Policy/PolicyDetails.vue
+++ b/src/views/Policy/PolicyDetails.vue
@@ -5,7 +5,7 @@
   -->
 
 <template>
-  <div class="box">
+  <div class="white inner">
     <div class="policy-title">
       <span>{{ obj.title }}</span>
     </div>
@@ -14,7 +14,7 @@
         <a-icon class="baseColor" type="clock-circle" />&nbsp;&nbsp;&nbsp;&nbsp;
         <span>{{ obj.time }}</span>
       </span>
-      <span style="margin-left: 140px">
+      <span class="ml-8">
         <!-- <a-icon type="form" />&nbsp;&nbsp;&nbsp;&nbsp; -->
         <a-icon style="color: #ff1857" type="tag" />&nbsp;&nbsp;&nbsp;&nbsp;
         <span>{{ obj.source }}</span>
@@ -66,14 +66,8 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-.box {
-  width: 1260px;
-  position: relative;
-  margin: 80px auto;
-  background: #fff;
-  min-height: 1037px;
-  overflow: hidden;
-  opacity: 1;
+.inner {
+  margin: 40px auto;
 }
 
 .back-btn {
@@ -104,7 +98,7 @@ export default {
 }
 
 .policy-content {
-  padding: 0 25px;
+  padding: 0 25px 25px;
   font-size: 16px;
   color: rgba(0, 0, 0, 0.65);
   font-weight: 400;
diff --git a/src/views/Policy/components/PolicyList.vue b/src/views/Policy/components/PolicyList.vue
index 7faf4a0..e884360 100644
--- a/src/views/Policy/components/PolicyList.vue
+++ b/src/views/Policy/components/PolicyList.vue
@@ -14,12 +14,22 @@
         <a-checkbox :checked="pStatus.zg - 0 === 1" @click="changeStatus('zg')">山西转型综改示范区</a-checkbox>
       </span>
       <a-input-group class="search" compact>
-        <a-select @change="changeCode" style="width: 120px; height: 40px" v-model="pStatus.policyText[pStatus.value - 1]">
+        <a-select
+          @change="changeCode"
+          style="width: 120px; height: 40px"
+          v-model="pStatus.policyText[pStatus.value - 1]"
+        >
           <a-select-option value="1">标题</a-select-option>
           <a-select-option value="2">地区</a-select-option>
           <a-select-option value="3">发布部门</a-select-option>
         </a-select>
-        <a-input-search @search="getPolicy" enter-button="搜索" placeholder="请输入..." style="width: 76.2%" v-model="pStatus.iptCon" />
+        <a-input-search
+          @search="getPolicy"
+          enter-button="搜索"
+          placeholder="请输入..."
+          style="width: 76.2%"
+          v-model="pStatus.iptCon"
+        />
       </a-input-group>
     </div>
     <div class="policy-box">
@@ -32,7 +42,10 @@
         <p class="item-content">{{ item.intro }}</p>
         <!-- <p class="item-content" v-html="item.content"></p> -->
         <p class="source-time">
-          <span @click="openWin(item.titleUrl)" class="baseColor source">来源：{{ item.publishDepartName }}</span>
+          <span
+            @click="openWin(item.titleUrl)"
+            class="baseColor source"
+          >来源：{{ item.publishDepartName }}</span>
           <span class="time">{{ item.publishTime }}</span>
         </p>
         <p class="original baseColor">
@@ -45,10 +58,10 @@
     </div>
     <a-pagination
       :current="current"
+      :page-size="pageSize"
       :total="total"
       @change="onShowSizeChange"
       class="pagination"
-      :page-size="pageSize"
       show-less-items
       show-quick-jumper
     />
@@ -153,7 +166,7 @@ export default {
 
 <style scoped lang="stylus">
 .box {
-  width: 1260px;
+  width: 100%;
   min-height: 1037px;
   overflow: hidden;
   opacity: 1;