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

---
 src/views/InformationQuery.vue | 52 +++++++++++++++++++++++-----------
 src/views/home/ApplyFor.vue    |  2 +-
 src/views/home/HomePage.vue    | 33 ++++++++++++---------
 src/views/home/NewsDetails.vue |  5 ++--
 src/views/home/NewsList.vue    |  3 +-
 src/views/personal/Declare.vue | 11 +++----
 src/views/project/Project.vue  | 10 ++++---
 7 files changed, 72 insertions(+), 44 deletions(-)

diff --git a/src/views/InformationQuery.vue b/src/views/InformationQuery.vue
index 4a7407f..66707d2 100644
--- a/src/views/InformationQuery.vue
+++ b/src/views/InformationQuery.vue
@@ -14,22 +14,22 @@
       </div>
       <!-- 分类搜索 -->
       <div class="select-box">
-        <select name="type" v-model="screeOut.society_type" @change="scree()">
-          <option value="类型" disabled style="display:none;">类型</option>
-          <option value="社会">社会</option>
-          <option value="团体">团体</option>
+        <select name="type" @change="scree()">
+          <template v-for="(list,index) in society_type">
+            <option :key="index" :value="index">{{list}}</option>
+          </template>
         </select>
-        <select name="time" v-model="screeOut.reg_time0" @change="scree()">
+        <select name="time" v-model="reg_time0" @change="scree()">
           <option value="登记时间" disabled style="display:none;">登记时间</option>
           <option value="09-18">09-18</option>
           <option value="09-19">09-19</option>
         </select>
-        <select name="year" v-model="screeOut.reg_time1" @change="scree()">
+        <select name="year" v-model="reg_time1" @change="scree()">
           <option value="年检年份" disabled style="display:none;">年检年份</option>
           <option value="2017">2017</option>
           <option value="2019">2019</option>
         </select>
-        <select name="condition" v-model="screeOut.status" @change="scree()">
+        <select name="condition" v-model="status" @change="scree()">
           <option value="年检情况" disabled style="display:none;">年检情况</option>
           <option value="正常">正常</option>
           <option value="异常">异常</option>
@@ -125,12 +125,10 @@ export default {
       searchVal: "",
       searchValue: [],
       record: [],
-      screeOut: {
-        society_type: '类型',
-        reg_time0: '登记时间',
-        reg_time1: '年检年份',
-        status: '年检情况'
-      },
+      society_type: [],
+      reg_time0: [],
+      reg_time1: [],
+      status: [],
       bgData: [],
       arr1: [],
       arr0: [],
@@ -207,6 +205,24 @@ export default {
           console.log(err)
         })
     },
+    getDataG() {
+      let _this = this
+      this.$http({
+        method: 'get',
+        url: 'v1/society/get-type',
+        params: {}
+      }).then(res => {
+        if (res.data.code !== 200) {
+          return;
+        }
+        console.log(res)
+        _this.society_type = res.data.data
+      })
+        // eslint-disable-next-line handle-callback-err
+        .catch(err => {
+          console.log(err)
+        })
+    },
     getDataZ() {
       let _this = this
       this.$http({
@@ -217,7 +233,7 @@ export default {
         }
       }).then(res => {
         if (res.data.data.code !== 200) {
-         alert('数据请求失败！')
+          alert('数据请求失败！')
         }
         _this.bgData = res.data.data.data.info
         _this.conversion = _this.bgData
@@ -246,10 +262,12 @@ export default {
         .catch(err => {
           console.log(err)
         })
-    }
+    },
+    scree() { }
   },
   created() {
     this.getData()
+    this.getDataG()
   },
   mounted() {
   }
@@ -479,9 +497,9 @@ export default {
           -moz-appearance: none;
           -webkit-appearance: none;
           /* 右侧添加小箭头的背景图 */
-          background: url("../../static/img/xa.png") 90px center no-repeat;
+          background: url("../../static/img/xa.png") 126px center no-repeat;
           background-size: 14px 8px;
-          width: 134px;
+          width: 170px;
           height: 38px;
           background-color: #f9f8f8;
           border-radius: 4px;
diff --git a/src/views/home/ApplyFor.vue b/src/views/home/ApplyFor.vue
index 3e32e28..4fa172f 100644
--- a/src/views/home/ApplyFor.vue
+++ b/src/views/home/ApplyFor.vue
@@ -322,7 +322,7 @@ export default {
               }
               _this.sub = s
             } else {
-              _this.$message.error('请求数据有问题！')
+              _this.$message.warning(res.data.message)
             }
           })
             // eslint-disable-next-line handle-callback-err
diff --git a/src/views/home/HomePage.vue b/src/views/home/HomePage.vue
index 110e138..e1e8792 100644
--- a/src/views/home/HomePage.vue
+++ b/src/views/home/HomePage.vue
@@ -9,7 +9,11 @@
           <div class="swiper-container swiper-one">
             <div class="swiper-wrapper">
               <template v-for="(banner,index) in bgData.banner">
-                <div class="swiper-slide" :key="index" @click="$jParams('newsDetails',{id:banner.id})">
+                <div
+                  class="swiper-slide"
+                  :key="index"
+                  @click="$jParams('newsDetails',{id:banner.id})"
+                >
                   <img :src="banner.cover" alt />
                   <div class="box">{{banner.title}}</div>
                 </div>
@@ -58,7 +62,7 @@
             <ul class="ult">
               <template v-for="(build,index) in bgData.build">
                 <li :key="index" v-if="index < 3" @click="$jParams('newsDetails',{id:build.id})">
-                  <a href="javascript:void(0);">{{build.text}}</a>
+                  <a href="javascript:void(0);">{{build.title}}</a>
                 </li>
               </template>
             </ul>
@@ -74,7 +78,7 @@
                 <template v-for="(party,index) in bgData.party">
                   <li :key="index" v-if="index < 3">
                     <!-- <a href="javascript:void(0);">{{party.party_name}}</a> -->
-                   {{party.party_name}}
+                    {{party.party_name}}
                   </li>
                 </template>
               </ul>
@@ -202,7 +206,7 @@ export default {
   computed: {},
   watch: {},
   methods: {
-    link(href){
+    link(href) {
       window.location.href = href
     },
     initSwiper() {
@@ -252,9 +256,9 @@ export default {
       }).then(res => {
         if (res.data.code === 200) {
           _this.bgData = res.data.data
-           _this.$nextTick(() => {   //修改数据之后立即使用这个方法，获取更新后的 DOM
-              _this.initSwiper()
-            })
+          _this.$nextTick(() => {   //修改数据之后立即使用这个方法，获取更新后的 DOM
+            _this.initSwiper()
+          })
         } else {
           _this.$message.error('请求数据有问题！')
         }
@@ -279,16 +283,16 @@ export default {
   height: auto !important;
 }
 
-.more{
-  cursor: pointer!important;
+.more {
+  cursor: pointer !important;
 }
 
-li{
-  a:hover{
-    color:cornflowerblue !important;
+li {
+  a:hover {
+    color: cornflowerblue !important;
   }
-  span:hover{
-    color:cornflowerblue !important;
+  span:hover {
+    color: cornflowerblue !important;
   }
 }
 
@@ -410,6 +414,7 @@ li{
           justify-content: space-between;
           border-bottom: 1px solid #f8f8f8;
           border-top: 1px solid #f8f8f8;
+          background-color: #ffffff;
 
           &:nth-last-child(1) {
             border-bottom: 0px solid #f8f8f8;
diff --git a/src/views/home/NewsDetails.vue b/src/views/home/NewsDetails.vue
index bbfa7c1..adbba51 100644
--- a/src/views/home/NewsDetails.vue
+++ b/src/views/home/NewsDetails.vue
@@ -5,7 +5,7 @@
       <div class="left">
         <dl>
           <dt>
-            <img class="one" :src="bgData.cover" alt />
+            <img class="one" :src="bgData.cover ? bgData.cover : imgUrl.moren" alt />
             <span
               @click="collection(bgData.id)"
               class="iconfont icon-changyongtubiao-mianxing-"
@@ -33,7 +33,7 @@
           <template v-for="(hotArticle,index) in bgDataZ">
             <dl :key="index" v-if="index < 4" @click="news(hotArticle.id)">
               <dt>
-                <img :src="hotArticle.cover" alt />
+                <img :src="hotArticle.cover ? hotArticle.cover : imgUrl.moren" alt />
               </dt>
               <dd>
                 <span class="dd">{{hotArticle.title}}</span>
@@ -67,6 +67,7 @@ export default {
       coll: Number,
       imgUrl: {
         img4: require("../../../static/img/img4.png"),
+        moren: require("../../../static/img/default.jpg"),
         img5: require("../../../static/img/img5.png"),
         wjx: require("../../../static/img/wjx.png")
       },
diff --git a/src/views/home/NewsList.vue b/src/views/home/NewsList.vue
index 2fb67d1..faa85fb 100644
--- a/src/views/home/NewsList.vue
+++ b/src/views/home/NewsList.vue
@@ -112,7 +112,8 @@ export default {
   },
   mounted() { },
   destroyed() {
-    localStorage.clear()
+   localStorage.setItem('pagination', this.currentPage)
+    localStorage.setItem('getType', this.getType)
   }
 };
 </script>
diff --git a/src/views/personal/Declare.vue b/src/views/personal/Declare.vue
index bd9384a..6e83a05 100644
--- a/src/views/personal/Declare.vue
+++ b/src/views/personal/Declare.vue
@@ -6,8 +6,8 @@
         <div class="top">
           <img :src="imgUrl.xlb" alt />
           <div>
-            <span>世界婚博会已通过初审</span>
-            <time>[2019-07-31]</time>
+          <span>{{bgValue.announcement.name + bgValue.announcement.pro_content}}</span>
+          <time>{{bgValue.announcement.protime}}</time>
           </div>
         </div>
         <!-- 表格 -->
@@ -51,9 +51,9 @@
               <option :key="index" :value="index">{{type}}</option>
             </template>
           </select>
-          <select class="two" name="type">
-            <template v-for="(type,index) in bgValue.type">
-              <option :key="index" :value="index">{{type}}</option>
+         <select class="two" name="type">
+            <template v-for="(status,index) in bgValue.status">
+              <option :key="index" :value="index">{{status}}</option>
             </template>
           </select>
           <select class="three" name="area">
@@ -527,6 +527,7 @@ export default {
 
         .two {
           padding-left: 30px;
+          padding-right: 48px;
           box-sizing: border-box;
           /* 清除默认的箭头样式 */
           appearance: none;
diff --git a/src/views/project/Project.vue b/src/views/project/Project.vue
index 9c946b1..84cada9 100644
--- a/src/views/project/Project.vue
+++ b/src/views/project/Project.vue
@@ -6,8 +6,8 @@
       <div class="top">
         <img :src="imgUrl.xlb" alt />
         <div>
-          <span>世界婚博会已通过初审</span>
-          <time>[2019-07-31]</time>
+          <span>{{bgValue.announcement.name + bgValue.announcement.pro_content}}</span>
+          <time>{{bgValue.announcement.protime}}</time>
         </div>
       </div>
       <div class="bottom">
@@ -53,8 +53,8 @@
             </template>
           </select>
           <select class="two" name="type">
-            <template v-for="(type,index) in bgValue.type">
-              <option :key="index" :value="index">{{type}}</option>
+            <template v-for="(status,index) in bgValue.status">
+              <option :key="index" :value="index">{{status}}</option>
             </template>
           </select>
           <select class="three" name="area">
@@ -172,6 +172,7 @@ export default {
       }).then(res => {
         if (res.data.code === 200) {
           _this.bgValue = res.data.data
+          console.log(_this.bgValue)
         } else {
           _this.$message.error('请求数据有问题！')
         }
@@ -554,6 +555,7 @@ export default {
 
         .two {
           padding-left: 30px;
+          padding-right: 48px;
           box-sizing: border-box;
           /* 清除默认的箭头样式 */
           appearance: none;