diff --git a/package-lock.json b/package-lock.json
index a060b45..f845568 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6401,8 +6401,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -6873,7 +6872,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
diff --git a/src/components/HeaderNav.vue b/src/components/HeaderNav.vue
index 3c78093..1fe08a0 100644
--- a/src/components/HeaderNav.vue
+++ b/src/components/HeaderNav.vue
@@ -13,8 +13,10 @@
       <div @click="$jump('project')" :class="styleNum == 2 ? 'style': ''">政府购买社会组织服务项目管理</div>
       <div @click="$jump('personalZte')" :class="styleNum == 3 ? 'style': ''">个人中心</div>
       <div>
-        <span @click="$jump('login')">登录</span> |
-        <span @click="$jump('registered')">注册</span>
+        <span v-if="enter" @click="$jump('login')">登录&nbsp;|&nbsp;</span>
+        <span v-if="enter" @click="$jump('registered')">注册</span>
+        <span class="three" v-if="!enter">{{name}}</span>
+        <span v-if="!enter" @click="quit()">&nbsp;|&nbsp;退出</span>
       </div>
     </div>
   </div>
@@ -30,18 +32,34 @@ export default {
         home: require('../../static/img/home.png'),
         home1: require('../../static/img/home1.png')
       },
-      styleNum: 0
+      styleNum: 0,
+      enter: true,
+      name: ''
     }
   },
   computed: {},
   watch: {},
-  methods: {},
+  methods: {
+    judge () {
+      if (sessionStorage.token) {
+        this.name = sessionStorage.name
+        this.enter = false
+      }
+    },
+    quit () {
+      sessionStorage.clear()
+      this.enter = true
+    }
+  },
   created () {
     let sub = this.styleNum
     sub = this.$props.index_num
     this.styleNum = sub
+    this.judge()
   },
-  mounted () { }
+  mounted () {
+
+  }
 }
 </script>
 
@@ -62,9 +80,9 @@ export default {
     display: flex;
     justify-content: center;
 
-    img{
+    img {
       // width: 100%;
-      height:100%;
+      height: 100%;
     }
   }
 
@@ -89,6 +107,21 @@ export default {
       color: #333333;
       text-shadow: 2px 2px 5px rgba(0, 0, 0, 0.5);
       cursor: pointer;
+
+      &:last-child {
+        width: 120px;
+        display: flex;
+        align-items: center;
+
+        .three {
+          text-align: right;
+          display: inline-block;
+          width: 58px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          word-break: keep-all;
+        }
+      }
     }
 
     .style {
diff --git a/src/http.js b/src/http.js
index edf16bb..2a0c2e8 100644
--- a/src/http.js
+++ b/src/http.js
@@ -40,10 +40,22 @@ router.beforeEach((to, from, next) => {
     if (sessionStorage.token) {
       // 获取当前的token是否存在
       console.log('token存在')
-      next()
+      if (to.name !== 'application') {
+        next()
+      } else {
+        if (
+          sessionStorage.party_id !== 'null') {
+          next()
+        } else {
+          alert('请先成为党组织！')
+          next({
+            path: '/', // 将跳转的路由path作为参数，登录成功后跳转到该路由
+            query: { redirect: to.fullPath }
+          })
+        }
+      }
     } else {
       alert('请先登录！')
-      console.log('token不存在')
       next({
         path: '/login', // 将跳转的路由path作为参数，登录成功后跳转到该路由
         query: { redirect: to.fullPath }
diff --git a/src/views/InformationQuery.vue b/src/views/InformationQuery.vue
index 31fbafd..4a7407f 100644
--- a/src/views/InformationQuery.vue
+++ b/src/views/InformationQuery.vue
@@ -76,11 +76,8 @@
               <td>{{info.society_type}}</td>
               <td>{{info.legal_person}}</td>
               <td>{{info.reg_time}}</td>
-              <!-- <td v-if="info.status == 1" style="color:#2fd63f">正常</td>
-              <td v-if="info.status == 0" style="color:#e13232">异常</td>-->
-              <td v-if="info.status == '正常'" style="color:#2fd63f">{{info.status}}</td>
-              <td v-if="info.status == '活动异常'" style="color:#e57e1a">{{info.status}}</td>
-              <td v-if="info.status == '违法失信'" style="color:#e13232">{{info.status}}</td>
+              <td v-if="info.status == '正常'" style="color:#2fd63f">正常</td>
+              <td v-if="info.status == '异常'" style="color:#e13232">异常</td>
             </tr>
           </template>
           <template v-if="searchValue.length > 0">
@@ -95,11 +92,8 @@
               <td>{{info.society_type}}</td>
               <td>{{info.legal_person}}</td>
               <td>{{info.reg_time}}</td>
-              <!-- <td v-if="info.status == 1" style="color:#2fd63f">正常</td>
-              <td v-if="info.status == 0" style="color:#e13232">异常</td>-->
-              <td v-if="info.status == '正常'" style="color:#2fd63f">{{info.status}}</td>
-              <td v-if="info.status == '活动异常'" style="color:#e57e1a">{{info.status}}</td>
-              <td v-if="info.status == '违法失信'" style="color:#e13232">{{info.status}}</td>
+              <td v-if="info.status == '正常'" style="color:#2fd63f">正常</td>
+              <td v-if="info.status == '异常'" style="color:#e13232">异常</td>
             </tr>
           </template>
         </table>
@@ -123,7 +117,7 @@ export default {
   data() {
     return {
       index_num: 1,
-      text: ["全部", "异常名单", "信用良好名录"],
+      text: ["全部", "黑名单", "信用良好名录"],
       sub: 0,
       imgUrl: {
         xa: require("../../static/img/xa.png")
@@ -156,64 +150,7 @@ export default {
     searchRecord(str) {
       this.getSearch(str)
     },
-    /** 筛选函数 */
-    // scree() {
-    //   if (this.screeOut.society_type == "类型") {
-    //     this.screeOut.society_type = ''
-    //   } else {
-    //     this.record.push({ category: '类型', nameOf: this.screeOut.society_type })
-    //   }
 
-    //   if (this.screeOut.reg_time == "登记时间") {
-    //     this.screeOut.reg_time = ''
-    //   } else {
-    //     this.record.push({ category: '登记时间', nameOf: this.screeOut.reg_time })
-    //   }
-
-    //   if (this.screeOut.reg_time == "年检年份") {
-    //     this.screeOut.reg_time = ''
-    //   } else {
-    //     this.record.push({ category: '年检年份', nameOf: this.screeOut.reg_time })
-    //   }
-
-    //   if (this.screeOut.status == "年检情况") {
-    //     this.screeOut.status = ''
-    //   } else {
-    //     this.record.push({ category: '年检情况', nameOf: this.screeOut.status })
-    //   }
-
-    //   /**
-    //     let hash = {};
-    //     this.record = this.record.reduce((preVal, curVal) => {
-    //       hash[curVal.nameOf] ? '' : hash[curVal.nameOf] = true && preVal.push(curVal);
-    //       return preVal
-    //     }, [])
-    //   */
-
-    //  console.log(this.record)
-
-    //   this.record = this.$tool.arrayHeavy(this.record, 'nameOf')
-
-    //   let gData = this.$tool.multiFilter(this.bgData, this.screeOut)
-    //   if (gData != undefined && gData != '') {
-    //     this.searchValue = gData
-    //   } else {
-    //     this.$message('您搜索的内容暂无~')
-    //   }
-
-    //   if (this.screeOut.society_type == "") {
-    //     this.screeOut.society_type = '类型'
-    //   }
-    //   if (this.screeOut.reg_time == "") {
-    //     this.screeOut.reg_time = '登记时间'
-    //   }
-    //   if (this.screeOut.reg_time == "") {
-    //     this.screeOut.reg_time = '年检年份'
-    //   }
-    //   if (this.screeOut.status == "") {
-    //     this.screeOut.status = '年检情况'
-    //   }
-    // },
     /** 搜索函数 */
     getSearch(str) {
       this.searchValue = [];
@@ -233,40 +170,21 @@ export default {
       } else {
         this.$message('您搜索的内容暂无~')
       }
-      /*
-        this.sData.forEach((item, index) => {
-          if (
-            item.organization.indexOf(this.searchVal) > -1 ||
-            item.credit.indexOf(this.searchVal) > -1 ||
-            item.type.indexOf(this.searchVal) > -1 ||
-            item.representative.indexOf(this.searchVal) > -1 ||
-            item.date.indexOf(this.searchVal) > -1
-          ) {
-            this.searchValue.push(item);
-          }
-        });
-      */
     },
     /** 名单切换 */
     btn(index) {
       let s = this.sub;
       s = index;
       this.sub = s;
-      let t0 = this.arr0
-      let t1 = this.arr1
-      let t2 = this.bgData
 
       switch (this.sub) {
         case 0:
-          this.conversion = t2;
+          this.getData;
           break;
-        case 1:
-          this.conversion = t0;
+        case 1: this.getDataZ;
           break;
         case 2:
-          this.conversion = t1;
-          break;
-        default:
+          this.getDataO;
           break;
       }
     },
@@ -283,20 +201,46 @@ export default {
         }
         _this.bgData = res.data.data.data.info
         _this.conversion = _this.bgData
-        _this.bgData.forEach((item, index) => {
-
-          switch (item.status) {
-            case '异常':
-              _this.arr0.push(item);
-              break;
-            case '正常':
-              _this.arr1.push(item);
-              break;
-            default:
-              break;
-          }
-
+      })
+        // eslint-disable-next-line handle-callback-err
+        .catch(err => {
+          console.log(err)
         })
+    },
+    getDataZ() {
+      let _this = this
+      this.$http({
+        method: 'post',
+        url: 'v1/society/society',
+        data: {
+          status: 0
+        }
+      }).then(res => {
+        if (res.data.data.code !== 200) {
+         alert('数据请求失败！')
+        }
+        _this.bgData = res.data.data.data.info
+        _this.conversion = _this.bgData
+      })
+        // eslint-disable-next-line handle-callback-err
+        .catch(err => {
+          console.log(err)
+        })
+    },
+    getDataO() {
+      let _this = this
+      this.$http({
+        method: 'post',
+        url: 'v1/society/society',
+        data: {
+          status: 1
+        }
+      }).then(res => {
+        if (res.data.data.code !== 200) {
+          return;
+        }
+        _this.bgData = res.data.data.data.info
+        _this.conversion = _this.bgData
       })
         // eslint-disable-next-line handle-callback-err
         .catch(err => {
@@ -308,7 +252,6 @@ export default {
     this.getData()
   },
   mounted() {
-    this.getData();
   }
 };
 </script>
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 17b64d2..7991543 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wrapper" :style="{'background-image':'url('+imgUrl.login+')'}">
+  <div class="wrapper">
+    <img :src="imgUrl.login" id="img">
+    <!-- :style="{'background-image':'url('+imgUrl.login+')'}" -->
     <div class="box">
       <div class="box-o">
         <h3>歡 迎 登 錄</h3>
@@ -11,7 +13,7 @@
         </div>
         <div class="three">
           <span @click="$jump('registered')">注册</span>
-          <span>忘记密码</span>
+          <span v-show="0">忘记密码</span>
         </div>
         <div class="btn" @click="login()">
           <button type="submit">立即登录</button>
@@ -55,8 +57,11 @@ export default {
           this.$router.push('/')
           // 全局存储token
           window.sessionStorage['token'] = res.data.data.data.id
+          window.sessionStorage['name'] = res.data.data.data.name
+          window.sessionStorage['party_id'] = res.data.data.data.party_id
+          window.sessionStorage['party_name'] = res.data.data.data.party_name
         } else {
-          this.$message.error('请求数据有问题！')
+          alert('登入失败！')
         }
       })
         // eslint-disable-next-line handle-callback-err
@@ -80,7 +85,17 @@ export default {
   justify-content: center;
   align-items: center;
 
+  #img{
+    position: fixed;
+    left: 0%;
+    top: 0%;
+    width: 100vw;
+    height: 100vh;
+    z-index: -1;
+  }
+
   .box {
+    z-index: 999;
     width: 736px;
     height: 489px;
     background-color: rgba($color: #fff, $alpha: 0.5);
@@ -115,7 +130,7 @@ export default {
           font-stretch: normal;
           letter-spacing: 0px;
           color: #ffffff;
-
+          cursor: pointer;
           outline: none;
         }
       }
@@ -134,6 +149,7 @@ export default {
           font-stretch: normal;
           letter-spacing: 0px;
           color: #666666;
+          cursor: pointer;
         }
       }
 
diff --git a/src/views/home/ApplyFor.vue b/src/views/home/ApplyFor.vue
index 5b4bdad..3e32e28 100644
--- a/src/views/home/ApplyFor.vue
+++ b/src/views/home/ApplyFor.vue
@@ -24,7 +24,7 @@
             <div class="o">
               <label>
                 <span>社会组织名称:</span>
-                <input class="input" type="text" name="name" />
+                <input class="input" type="text" name="name" v-model="name" disabled />
               </label>
               <label>
                 <span>社会组织类型:</span>
@@ -41,19 +41,26 @@
                 <input
                   class="input"
                   type="number"
+                  min="0"
                   name="flow_party_person"
                   v-model="flow_party_person"
                 />
               </label>
               <label>
                 <span>已有党员数量:</span>
-                <input class="input" type="number" name="party_person" v-model="party_person" />
+                <input
+                  class="input"
+                  type="number"
+                  min="0"
+                  name="party_person"
+                  v-model="party_person"
+                />
               </label>
             </div>
             <div class="o">
               <label>
                 <span>从业人员总数:</span>
-                <input class="input" type="number" name="work_person" v-model="work_person" />
+                <input class="input" type="number" min="0" name="work_person" v-model="work_person" />
               </label>
               <label>
                 <span>党组织名称:</span>
@@ -75,13 +82,7 @@
               <span>是否建立“功能型”党组织:</span>
               <div>
                 <label for>
-                  <input
-                    type="radio"
-                    name="is_reg_fun_party"
-                    v-model="is_reg_fun_party"
-                    value="1"
-                    checked
-                  />&nbsp;&nbsp;是
+                  <input type="radio" name="is_reg_fun_party" v-model="is_reg_fun_party" value="1" />&nbsp;&nbsp;是
                 </label>&nbsp;&nbsp;&nbsp;&nbsp;
                 <label for>
                   <input type="radio" name="is_reg_fun_party" v-model="is_reg_fun_party" value="2" />&nbsp;&nbsp;否
@@ -90,7 +91,7 @@
             </div>
             <div class="o-o">
               <label>登记管理机关:</label>
-              <input type="text" name="reg_manage" :v-model="reg_manage" />
+              <input type="text" name="reg_manage" v-model="reg_manage" />
             </div>
             <div class="o-o">
               <label>业务主管单位:</label>
@@ -189,7 +190,10 @@
               <input type="text" name="active_year" v-model="active_year" />
             </div>
           </div>
-          <div @click="btn(2)" style="display:flex;justify-content:center;margin-top:35px;">
+          <div
+            @click="btn(2)"
+            style="outline:none;display:flex;justify-content:center;margin-top:35px;"
+          >
             <input type="submit" value="立即提交" />
           </div>
         </div>
@@ -259,59 +263,75 @@ export default {
     btn(n) {
       let s = this.sub;
       s = n;
-      this.sub = s;
-      if (this.sub == 2) {
-        let sid = sessionStorage.token
-        let _this = this
-        // console.log(_this.type,
-        //   _this.reg_manage, _this.supervisor, _this.work_person, _this.flow_party_person,
-        //   _this.party_person, _this.is_reg_party, _this.is_reg_fun_party,
-        //   _this.party_name, _this.party_pname, _this.sec_name,
-        //   _this.sec_sex, _this.sec_job, _this.sec_age,
-        //   _this.sec_study, _this.near_party_person,
-        //   _this.major_party_person, _this.is_reg_group,
-        //   _this.is_choice_instructor, _this.year_money, _this.active_year
-        // )
-        this.$http({
-          method: 'post',
-          url: 'v1/user/apply',
-          data: {
-            sid: sid,
-            type: _this.type,
-            supervisor: _this.supervisor,
-            reg_manage: _this.reg_manage,
-            work_person: _this.work_person,
-            flow_party_person: _this.flow_party_person,
-            party_person: _this.party_person,
-            is_reg_party: _this.is_reg_party,
-            is_reg_fun_party: _this.is_reg_fun_party,
-            party_name: _this.party_name,
-            party_pname: _this.party_pname,
-            sec_name: _this.sec_name,
-            sec_sex: _this.sec_sex,
-            sec_job: _this.sec_job,
-            sec_age: _this.sec_age,
-            sec_study: _this.sec_study,
-            near_party_person: _this.near_party_person,
-            major_party_person: _this.major_party_person,
-            is_reg_group: _this.is_reg_group,
-            is_choice_instructor: _this.is_choice_instructor,
-            year_money: _this.year_money,
-            active_year: _this.active_year
+      if (s == 1) {
+        if (this.type == '' || this.flow_party_person == '' || this.party_person == '' || this.work_person == '' ||
+          this.party_name == '' || this.is_reg_party == '' || this.is_reg_fun_party == '' ||
+          this.reg_manage == '' || this.supervisor == '' || this.party_pname == ''
+        ) {
+          alert('以上内容不可为空！')
+        } else {
+          if(this.flow_party_person < 0 || this.party_person < 0 || this.work_person < 0){
+            alert('不能出现负数呦！')
+          }else{
+            this.sub = s;
           }
-        }).then(res => {
-          console.log(res);
-
-          // if (res.code === 200) {
-          //   console.log(res.data)
-          // } else {
-          //   _this.$message.error('请求数据有问题！')
-          // }
-        })
-          // eslint-disable-next-line handle-callback-err
-          .catch(err => {
-            console.log(err)
+        }
+      }
+      if (s == 2) {
+        if (this.sec_name == '' || this.sec_sex == '' || this.sec_age == '' || this.sec_job == '' ||
+          this.sec_study == '' || this.near_party_person == '' || this.is_reg_group == '' ||
+          this.major_party_person == '' || this.is_choice_instructor == '' || this.year_money == '' ||
+          this.active_year == ''
+        ) {
+          alert('以上内容不可为空！')
+        } else {
+          let sid = sessionStorage.token
+          let _this = this
+          this.$http({
+            method: 'post',
+            url: 'v1/user/apply',
+            data: {
+              sid: sid,
+              type: _this.type,
+              supervisor: _this.supervisor,
+              reg_manage: _this.reg_manage,
+              work_person: _this.work_person,
+              flow_party_person: _this.flow_party_person,
+              party_person: _this.party_person,
+              is_reg_party: _this.is_reg_party,
+              is_reg_fun_party: _this.is_reg_fun_party,
+              party_name: _this.party_name,
+              party_pname: _this.party_pname,
+              sec_name: _this.sec_name,
+              sec_sex: _this.sec_sex,
+              sec_job: _this.sec_job,
+              sec_age: _this.sec_age,
+              sec_study: _this.sec_study,
+              near_party_person: _this.near_party_person,
+              major_party_person: _this.major_party_person,
+              is_reg_group: _this.is_reg_group,
+              is_choice_instructor: _this.is_choice_instructor,
+              year_money: _this.year_money,
+              active_year: _this.active_year
+            }
+          }).then(res => {
+            if (res.data.code === 200) {
+              if (res.data.data.code !== 200) {
+                alert(res.data.data.msg)
+                return
+              }
+              _this.sub = s
+            } else {
+              _this.$message.error('请求数据有问题！')
+            }
           })
+            // eslint-disable-next-line handle-callback-err
+            .catch(err => {
+              console.log(err)
+            })
+        }
+
+
       }
     },
     getData() {
@@ -334,6 +354,7 @@ export default {
     }
   },
   created() {
+    this.name = sessionStorage.name
     this.getData()
   },
   mounted() { }
@@ -400,6 +421,10 @@ export default {
       margin-bottom: 58px;
     }
 
+    input[type="submit"] {
+      outline: none;
+    }
+
     label input[type="radio"] {
       width: 17px;
       height: 17px;
diff --git a/src/views/home/HomePage.vue b/src/views/home/HomePage.vue
index 959df04..110e138 100644
--- a/src/views/home/HomePage.vue
+++ b/src/views/home/HomePage.vue
@@ -9,7 +9,7 @@
           <div class="swiper-container swiper-one">
             <div class="swiper-wrapper">
               <template v-for="(banner,index) in bgData.banner">
-                <div class="swiper-slide" :key="index">
+                <div class="swiper-slide" :key="index" @click="$jParams('newsDetails',{id:banner.id})">
                   <img :src="banner.cover" alt />
                   <div class="box">{{banner.title}}</div>
                 </div>
@@ -26,7 +26,7 @@
           <div class="top">
             <div class="b">
               <span>通知公告</span>
-              <span @click="$jParams('newsList',{type:3})">更多>></span>
+              <span class="more" @click="$jParams('newsList',{type:3})">更多>></span>
             </div>
           </div>
           <!-- 列表显示 -->
@@ -53,7 +53,7 @@
                 <img class="o" :src="imgUrl.dh" alt />
                 <span>区域化党建</span>
               </div>
-              <span @click="$jParams('newsList',{type:4})">更多>></span>
+              <span class="more" @click="$jParams('newsList',{type:4})">更多>></span>
             </div>
             <ul class="ult">
               <template v-for="(build,index) in bgData.build">
@@ -67,13 +67,14 @@
                 <img class="o" :src="imgUrl.gq" alt />
                 <span>党组织信息</span>
               </div>
-              <span @click="$jump('informationQuery')">更多>></span>
+              <span class="more" @click="$jump('informationQuery')">更多>></span>
             </div>
             <div class="p">
               <ul class="ult">
                 <template v-for="(party,index) in bgData.party">
-                  <li :key="index" v-if="index < 3" @click="$jump('informationQuery')">
-                    <a href="javascript:void(0);">{{party.party_name}}</a>
+                  <li :key="index" v-if="index < 3">
+                    <!-- <a href="javascript:void(0);">{{party.party_name}}</a> -->
+                   {{party.party_name}}
                   </li>
                 </template>
               </ul>
@@ -92,7 +93,7 @@
                 <img class="n" :src="imgUrl.ws" alt />
                 <span>统一战线</span>
               </div>
-              <span @click="$jParams('newsList',{type:1})">更多>></span>
+              <span class="more" @click="$jParams('newsList',{type:1})">更多>></span>
             </div>
             <ul class="ulo">
               <template v-for="(battle,index) in bgData.battle">
@@ -109,7 +110,7 @@
                 <img class="e" :src="imgUrl.zz" alt />
                 <span>组织生活</span>
               </div>
-              <span @click="$jParams('newsList',{type:2})">更多>></span>
+              <span class="more" @click="$jParams('newsList',{type:2})">更多>></span>
             </div>
             <ul class="ult">
               <template v-for="(organization,index) in bgData.organization">
@@ -146,7 +147,7 @@
         <div class="swiper-box-list">
           <div id="img-box" class="f-row">
             <template v-for="(links,index) in bgData.links">
-              <div class="img-box" :key="index" v-if="index < 8">
+              <div class="img-box" :key="index" v-if="index < 8" @click="link(links.link)">
                 <img :src="links.url" alt />
                 <p>{{links.name}}</p>
               </div>
@@ -161,18 +162,6 @@
             <img @click="scrollFeeds('right')" class="mv-btn right-side" :src="imgUrl.right" alt />
           </div>
         </div>
-        <!-- <div class="swiper-container swiper-two">
-            <div class="swiper-wrapper">
-              <template v-for="(item,index) in list">
-                <div class="swiper-slide" :key="index" v-if="index < 8">
-                  <img :src="imgUrl.img3" alt />
-                  <span>中国政府网站{{index+1}}</span>
-                </div>
-              </template>
-            </div>
-            <div class="swiper-button-prev"></div>
-            <div class="swiper-button-next"></div>
-        </div>-->
       </div>
     </div>
     <footer-nav class="footer"></footer-nav>
@@ -184,7 +173,7 @@
 import HeaderNav from '../../components/HeaderNav';
 /* eslint-disable */
 import FooterNav from "../../components/FooterNav";
-import Swiper from "swiper";
+import Swiper from 'swiper';
 
 export default {
   components: {
@@ -207,24 +196,26 @@ export default {
         right: require("../../../static/img/right.png"),
         left: require("../../../static/img/left.png")
       },
-      bgData: []
+      bgData: [],
     };
   },
   computed: {},
   watch: {},
   methods: {
+    link(href){
+      window.location.href = href
+    },
     initSwiper() {
-      var mySwiper = new Swiper(".swiper-one", {
+      new Swiper(".swiper-one", {
         loop: true,
         autoplay: {
           delay: 3000
         },
-
-        /** 如果需要前进后退按钮 */
         navigation: {
           nextEl: ".swiper-button-next",
           prevEl: ".swiper-button-prev"
         }
+
       });
     },
     scrollFeeds: function (btn) {
@@ -261,6 +252,9 @@ export default {
       }).then(res => {
         if (res.data.code === 200) {
           _this.bgData = res.data.data
+           _this.$nextTick(() => {   //修改数据之后立即使用这个方法，获取更新后的 DOM
+              _this.initSwiper()
+            })
         } else {
           _this.$message.error('请求数据有问题！')
         }
@@ -270,30 +264,12 @@ export default {
           console.log(err)
         })
     }
-    /*
-    initialSwiper() {
-      var swiper = new Swiper(".swiper-two", {
-        spaceBetween: 20,
-        slidesPerView: 18 / 4,
-        slidesPerGroup: 7 / 4,
-        loopFillGroupWithBlank: true,
-
-        // 如果需要前进后退按钮 
-        navigation: {
-          nextEl: ".swiper-button-next",
-          prevEl: ".swiper-button-prev"
-        },
-
-      });
-    }
-    */
   },
   created() {
     this.getData()
   },
   mounted() {
     this.initSwiper();
-    /*this.initialSwiper();*/
   }
 };
 </script>
@@ -303,9 +279,21 @@ export default {
   height: auto !important;
 }
 
+.more{
+  cursor: pointer!important;
+}
+
+li{
+  a:hover{
+    color:cornflowerblue !important;
+  }
+  span:hover{
+    color:cornflowerblue !important;
+  }
+}
+
 .wrapper {
   min-width: 1280px;
-  // width: 100%;
   box-sizing: border-box;
   position: relative;
 
@@ -387,80 +375,6 @@ export default {
             }
           }
         }
-
-        /*
-      .swiper-button-prev.swiper-button-disabled {
-        opacity: 0;
-        cursor: auto;
-        pointer-events: none;
-      }
-
-      .swiper-button-next.swiper-button-disabled {
-        opacity: 1;
-        cursor: auto;
-        pointer-events: none;
-      }
-
-      .swiper-button-prev {
-        outline: none;
-        position: absolute;
-        top: 50%;
-        left: 0%;
-        width: 60px;
-        height: 60px;
-        margin-top: -22px;
-        z-index: 10;
-        cursor: pointer;
-        background-image: url("../../../static//img/left.png");
-        background-size: 60px 60px;
-        background-position: center;
-        background-repeat: no-repeat;
-      }
-
-      .swiper-button-next {
-        outline: none;
-        position: absolute;
-        top: 50%;
-        right: 0%;
-        width: 60px;
-        height: 60px;
-        margin-top: -22px;
-        z-index: 10;
-        cursor: pointer;
-        background-image: url("../../../static//img/right.png");
-        background-size: 60px 60px;
-        background-position: center;
-        background-repeat: no-repeat;
-      }
-
-      .swiper-slide {
-        width: 239px !important;
-        background-color: #ffffff;
-        box-shadow: 0px 10px 9px 1px rgba(206, 204, 204, 0.12);
-        border-radius: 5px;
-        text-align: center;
-        margin-right: 20px;
-        display: flex;
-        flex-direction: column;
-
-        img {
-          width: 239px;
-          height: 130px;
-          background-color: #ffffff;
-          border-radius: 5px 5px 0px 0px;
-        }
-
-        span {
-          font-family: "MicrosoftYaHei";
-          font-size: 18px;
-          font-weight: bold;
-          font-stretch: normal;
-          line-height: 60px;
-          letter-spacing: 0px;
-          color: #333333;
-        }
-      }
-      */
       }
 
       .title {
@@ -477,14 +391,12 @@ export default {
     /** THREE */
     .container-three {
       width: 100%;
-      // height: 848px;
       padding: 0 40px;
       box-sizing: border-box;
       margin-top: 59px;
 
       .box-list {
         width: 100%;
-        // height: 794px;
         background-color: #ffffff;
         box-sizing: border-box;
         padding: 0 60px 0 8px;
@@ -572,10 +484,6 @@ export default {
 
           .ult {
             margin-top: 29px;
-            /*
-            width: 303px;
-            height: 297px;
-            */
 
             li {
               a {
@@ -678,24 +586,6 @@ export default {
                 white-space: nowrap;
               }
             }
-
-            //   .text {
-            //     width: 309px;
-            //     height: 127px;
-
-            //     p {
-            //       width: 309px;
-            //       height: 92px;
-            //       overflow: hidden;
-            //       font-family: "MicrosoftYaHei";
-            //       font-size: 16px;
-            //       font-weight: normal;
-            //       font-stretch: normal;
-            //       line-height: 33px;
-            //       letter-spacing: 0px;
-            //       color: #333333;
-            //     }
-            //   }
           }
 
           .top-p {
diff --git a/src/views/home/NewsDetails.vue b/src/views/home/NewsDetails.vue
index 7c1bbf6..bbfa7c1 100644
--- a/src/views/home/NewsDetails.vue
+++ b/src/views/home/NewsDetails.vue
@@ -30,16 +30,16 @@
       <div class="right">
         <h3>热点新闻</h3>
         <div>
-          <template v-for="(item,index) in list">
-            <dl :key="index" v-if="index < 4" @click="$jump('newsDetails')">
+          <template v-for="(hotArticle,index) in bgDataZ">
+            <dl :key="index" v-if="index < 4" @click="news(hotArticle.id)">
               <dt>
-                <img :src="imgUrl.img4" alt />
+                <img :src="hotArticle.cover" alt />
               </dt>
               <dd>
-                <span class="dd">活动策划是提高市场占有率的有效行为</span>
+                <span class="dd">{{hotArticle.title}}</span>
               </dd>
               <dd>
-                <time>2019-10-14</time>
+                <time>{{hotArticle.created_at}}</time>
               </dd>
             </dl>
           </template>
@@ -64,26 +64,47 @@ export default {
   data() {
     return {
       index_num: 0,
-      coll: false,
+      coll: Number,
       imgUrl: {
         img4: require("../../../static/img/img4.png"),
         img5: require("../../../static/img/img5.png"),
         wjx: require("../../../static/img/wjx.png")
       },
-      list: [1, 2, 3, 4, 5, 6, 7, 8, 9],
       bgData: [],
+      bgDataZ: [],
       id: Number
     };
   },
   computed: {},
   watch: {},
   methods: {
+    news(new_id) {
+      let _this = this
+      this.$http({
+        method: 'post',
+        url: 'v1/article/details',
+        data: {
+          id: new_id
+        }
+      }).then(res => {
+        if (res.data.data.code === 200) {
+          _this.bgData = res.data.data.data
+          _this.bgDataZ = res.data.data.hotArticle
+          _this.coll = res.data.data.is_collection
+        } else {
+          _this.$message.error('请求数据有问题！')
+        }
+      })
+        // eslint-disable-next-line handle-callback-err
+        .catch(err => {
+          console.log(err)
+        })
+    },
     collection(article_id) {
       if (!sessionStorage.token) {
         alert('请先登录~')
         return;
       }
-      
       let _this = this
       this.$http({
         method: 'post',
@@ -94,7 +115,7 @@ export default {
         }
       }).then(res => {
         if (res.data.data.code === 200) {
-          _this.coll = !_this.coll;
+          _this.coll = _this.coll == 1 ? 0 : 1
         } else {
           _this.$message.error('请求数据有问题！')
         }
@@ -115,6 +136,8 @@ export default {
       }).then(res => {
         if (res.data.data.code === 200) {
           _this.bgData = res.data.data.data
+          _this.bgDataZ = res.data.data.hotArticle
+          _this.coll = res.data.data.is_collection
         } else {
           _this.$message.error('请求数据有问题！')
         }
@@ -162,6 +185,7 @@ export default {
         box-sizing: border-box;
 
         dd {
+          width: 95%;
           .d-o {
             display: inline-block;
             margin: 28px 0 23px;
@@ -171,6 +195,13 @@ export default {
             font-stretch: normal;
             letter-spacing: 0px;
             color: #333333;
+            display: -webkit-box;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
+            word-wrap: break-word;
+            white-space: normal;
           }
 
           .d-b {
@@ -222,6 +253,7 @@ export default {
 
         p {
           text-indent: 1em;
+          line-height: 0px !important;
         }
       }
     }
diff --git a/src/views/home/NewsList.vue b/src/views/home/NewsList.vue
index f31aea8..2fb67d1 100644
--- a/src/views/home/NewsList.vue
+++ b/src/views/home/NewsList.vue
@@ -1,11 +1,11 @@
 <template>
-  <div class="wrapper" v-if="bgData">
+  <div class="wrapper">
     <header-nav :index_num="index_num"></header-nav>
     <div id="box">
       <template v-for="(info,index) in bgData.info">
         <div id="news" :key="index" @click="$jParams('newsDetails',{id:info.id,type:getType})">
           <div class="news-box">
-            <img :src="info.cover" />
+            <img :src="info.cover ? info.cover : moren" />
             <section>
               <h3>{{info.title}}</h3>
               <aside>
@@ -25,7 +25,6 @@
           @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-size="pageSize"
-          :pager-count="7"
           background
           layout="prev, pager, next"
           :total="totalCount"
@@ -49,18 +48,17 @@ export default {
   props: {},
   data() {
     return {
+      moren: require('../../../static/img/default.jpg'),
       index_num: 0,
       pageSize: 1,
-      currentPage: 1,
+      currentPage: 0,
       totalCount: 1,
       bgData: [],
       getType: null
     };
   },
   computed: {},
-  watch: {
-
-  },
+  watch: {},
   methods: {
     getData() {
       let _this = this
@@ -102,7 +100,6 @@ export default {
     this.getType = this.getType || Number(localStorage.getItem("getType"));
     this.handleCurrentChange(this.currentPage);
     this.getData()
-
   },
   beforeUpdate() {
     localStorage.setItem('pagination', this.currentPage)
@@ -113,7 +110,10 @@ export default {
     localStorage.setItem('pagination', this.currentPage)
     localStorage.setItem('getType', this.getType)
   },
-  mounted() { }
+  mounted() { },
+  destroyed() {
+    localStorage.clear()
+  }
 };
 </script>
 
diff --git a/src/views/personal/Apply.vue b/src/views/personal/Apply.vue
index 3745d0b..0500abb 100644
--- a/src/views/personal/Apply.vue
+++ b/src/views/personal/Apply.vue
@@ -1,10 +1,9 @@
 <template>
   <div class="w" :style="{height:num + 'px'}">
     <div class="img-box">
-      <img class="img" :src="imgUrl.tg" v-if="state == 0" />
-      <img class="img" :src="imgUrl.btg" v-if="state == 1" />
-      <img class="img" :src="imgUrl.shz" v-if="state == 2" />
-      <img class="img" :src="imgUrl.zxz" v-if="state == 3" />
+      <img class="img" :src="imgUrl.tg" v-if="bgData.examine == 1" />
+      <img class="img" :src="imgUrl.btg" v-if="bgData.examine == 2" />
+      <img class="img" :src="imgUrl.dsh" v-if="bgData.examine == 0" />
     </div>
     <form>
       <div class="items" v-if="!zhuangtai">
@@ -12,48 +11,58 @@
         <!-- start -->
         <div class="item">
           <label for>社会组织名称:</label>
-          <input class="input0" type="text" value="劳动组织" />
+          <input class="input0" type="text" value />
         </div>
         <!-- end -->
         <!-- start -->
         <div class="item">
           <label for>社会组织类型:</label>
-          <select class="input1" name id>
-            <option value>劳动</option>
-            <option value>团体</option>
+          <select class="input1" name id disabled>
+            <option :value="bgData.type">{{bgData.type}}</option>
           </select>
         </div>
         <!-- end -->
         <!-- start -->
         <div class="item">
           <label for>流动党员数量:</label>
-          <input class="input0" type="text" value="20" />
+          <input class="input0" type="text" disabled :value="bgData.flow_party_person" />
         </div>
         <!-- end -->
         <!-- start -->
         <div class="item">
           <label for>已有党员数量:</label>
-          <input class="input0" type="text" value="20" />
+          <input class="input0" type="text" disabled :value="bgData.party_person" />
         </div>
         <!-- end -->
         <!-- start -->
         <div class="item">
           <label for>从业人员总数:</label>
-          <input class="input0" type="text" value="20" />
+          <input class="input0" type="text" :value="bgData.work_person" disabled />
         </div>
         <!-- end -->
         <!-- start -->
         <div class="item">
           <label for>党组织名称:</label>
-          <input class="input0" type="text" value="劳动组织" />
+          <input class="input0" type="text" :value="bgData.party_name" />
         </div>
         <!-- end -->
         <!-- start -->
         <div class="item">
           <label for>是否建立党组织:</label>
           <label class="label" for>
-            <input type="radio" name="q" />&nbsp;&nbsp;是&nbsp;&nbsp;&nbsp;&nbsp;
-            <input type="radio" name="q" />&nbsp;&nbsp;否
+            <template v-if="bgData.is_reg_party == 1">
+              <input type="radio" name="is_reg_party" checked disabled />&nbsp;&nbsp;是&nbsp;&nbsp;&nbsp;&nbsp;
+              <input type="radio" name="is_reg_party" disabled />&nbsp;&nbsp;否
+            </template>
+            <template v-else>
+              <input type="radio" name="is_reg_party" disabled />&nbsp;&nbsp;是&nbsp;&nbsp;&nbsp;&nbsp;
+              <input
+                type="radio"
+                name="is_reg_party"
+                disabled
+                checked
+              />&nbsp;&nbsp;否
+            </template>
           </label>
         </div>
         <!-- end -->
@@ -61,27 +70,42 @@
         <div class="item">
           <label for>是否建立“功能型”党组织:</label>
           <label class="label" for>
-            <input type="radio" name="q" />&nbsp;&nbsp;是&nbsp;&nbsp;&nbsp;&nbsp;
-            <input type="radio" name="q" />&nbsp;&nbsp;否
+            <template v-if="bgData.is_reg_fun_party == 1">
+              <input type="radio" name="is_reg_fun_party" checked disabled />&nbsp;&nbsp;是&nbsp;&nbsp;&nbsp;&nbsp;
+              <input
+                type="radio"
+                name="is_reg_fun_party"
+                disabled
+              />&nbsp;&nbsp;否
+            </template>
+            <template v-else>
+              <input type="radio" name="is_reg_fun_party" disabled />&nbsp;&nbsp;是&nbsp;&nbsp;&nbsp;&nbsp;
+              <input
+                type="radio"
+                name="is_reg_fun_party"
+                disabled
+                checked
+              />&nbsp;&nbsp;否
+            </template>
           </label>
         </div>
         <!-- end -->
         <!-- start -->
         <div class="item">
           <label for>登记管理机关:</label>
-          <input class="input2" type="text" value="劳动管理机关" />
+          <input class="input2" type="text" :value="bgData.reg_manage" disabled />
         </div>
         <!-- end -->
         <!-- start -->
         <div class="item">
           <label for>业务主管单位:</label>
-          <input class="input2" type="text" value="劳动管理机关" />
+          <input class="input2" type="text" :value="bgData.supervisor" disabled />
         </div>
         <!-- end -->
         <!-- start -->
         <div class="item">
           <label for>隶属的上一级党组织名称:</label>
-          <input class="input2" type="text" value="劳动组织" />
+          <input class="input2" type="text" :value="bgData.party_pname" disabled />
         </div>
         <!-- end -->
         <div class="btn" @click="anNui()">下一页</div>
@@ -92,34 +116,45 @@
           <!-- start -->
           <div class="it">
             <label for>姓名:</label>
-            <input class="input0" type="text" value />
+            <input class="input0" type="text" :value="bgData.sec_name" disabled />
           </div>
           <!-- end -->
           <!-- start -->
           <div class="it">
             <label for>性别:</label>
             <label class="label" for>
-              <input type="radio" name="sex" />&nbsp;&nbsp;男&nbsp;&nbsp;&nbsp;&nbsp;
-              <input type="radio" name="sex" />&nbsp;&nbsp;女
+              <template v-if="bgData.sec_sex == 1">
+                <input type="radio" name="sec_sex" checked disabled />&nbsp;&nbsp;男&nbsp;&nbsp;&nbsp;&nbsp;
+                <input type="radio" name="sec_sex" disabled />&nbsp;&nbsp;女
+              </template>
+              <template v-else>
+                <input type="radio" name="sec_sex" disabled />&nbsp;&nbsp;男&nbsp;&nbsp;&nbsp;&nbsp;
+                <input
+                  type="radio"
+                  name="sec_sex"
+                  disabled
+                  checked
+                />&nbsp;&nbsp;女
+              </template>
             </label>
           </div>
           <!-- end -->
           <!-- start -->
           <div class="it">
             <label for>年龄:</label>
-            <input class="input0" type="text" value />
+            <input class="input0" type="text" :value="bgData.sec_age" disabled />
           </div>
           <!-- end -->
           <!-- start -->
           <div class="it">
             <label for>行政职务:</label>
-            <input class="input0" type="text" value />
+            <input class="input0" type="text" :value="bgData.sec_job" disabled />
           </div>
           <!-- end -->
           <!-- start -->
           <div class="it">
             <label for>近三年参加上级党组织培训次数:</label>
-            <input class="input0" type="text" value />
+            <input class="input0" type="text" disabled :value="bgData.sec_study" />
           </div>
           <!-- end -->
         </div>
@@ -128,43 +163,73 @@
           <!-- start -->
           <div class="it">
             <label for>近三年发展党员数:</label>
-            <input class="input0" type="text" value />
+            <input class="input0" type="text" disabled :value="bgData.near_party_person" />
           </div>
           <!-- end -->
           <!-- start -->
           <div class="it">
             <label for>是否建立群团组织:</label>
             <label class="label" for>
-              <input type="radio" name="zz" />&nbsp;&nbsp;是&nbsp;&nbsp;&nbsp;&nbsp;
-              <input type="radio" name="zz" />&nbsp;&nbsp;否
+              <template v-if="bgData.is_reg_group == 1">
+                <input type="radio" name="is_reg_group" checked disabled />&nbsp;&nbsp;是&nbsp;&nbsp;&nbsp;&nbsp;
+                <input
+                  type="radio"
+                  name="is_reg_group"
+                  disabled
+                />&nbsp;&nbsp;否
+              </template>
+              <template v-else>
+                <input type="radio" name="is_reg_group" disabled />&nbsp;&nbsp;是&nbsp;&nbsp;&nbsp;&nbsp;
+                <input
+                  type="radio"
+                  name="is_reg_group"
+                  disabled
+                  checked
+                />&nbsp;&nbsp;否
+              </template>
             </label>
           </div>
           <!-- end -->
           <!-- start -->
           <div class="it">
             <label for>专职党务工作者人数:</label>
-            <input class="input0" type="text" value />
+            <input class="input0" type="text" disabled :value="bgData.major_party_person" />
           </div>
           <!-- end -->
           <!-- start -->
           <div class="it">
             <label for>是否选派党建工作指导员:</label>
             <label class="label" for>
-              <input type="radio" name="zd" />&nbsp;&nbsp;是&nbsp;&nbsp;&nbsp;&nbsp;
-              <input type="radio" name="zd" />&nbsp;&nbsp;否
+              <template v-if="bgData.is_choice_instructor == 1">
+                <input type="radio" name="is_choice_instructor" checked disabled />&nbsp;&nbsp;是&nbsp;&nbsp;&nbsp;&nbsp;
+                <input
+                  type="radio"
+                  name="is_choice_instructor"
+                  disabled
+                />&nbsp;&nbsp;否
+              </template>
+              <template v-else>
+                <input type="radio" name="is_choice_instructor" disabled />&nbsp;&nbsp;是&nbsp;&nbsp;&nbsp;&nbsp;
+                <input
+                  type="radio"
+                  name="is_choice_instructor"
+                  disabled
+                  checked
+                />&nbsp;&nbsp;否
+              </template>
             </label>
           </div>
           <!-- end -->
           <!-- start -->
           <div class="it">
             <label for>党组织年度活动经费(万元):</label>
-            <input class="input0" type="text" value />
+            <input class="input0" type="text" disabled :value="bgData.year_money" />
           </div>
           <!-- end -->
           <!-- start -->
           <div class="it">
             <label for>党组织年度活动场所面积(平米):</label>
-            <input class="input0" type="text" value />
+            <input class="input0" type="text" disabled :value="bgData.active_year" />
           </div>
           <!-- end -->
         </div>
@@ -182,13 +247,13 @@ export default {
       imgUrl: {
         tg: require('../../../static/img/tg.png'),
         btg: require('../../../static/img/btg.png'),
-        shz: require('../../../static/img/shz.png'),
-        zxz: require('../../../static/img/zxz.png'),
+        dsh: require('../../../static/img/dsh.png'),
         xa: require('../../../static/img/xa.png')
       },
       state: 0,
       zhuangtai: false,
-      num: 1050
+      num: 1050,
+      bgData: []
     }
   },
   computed: {},
@@ -198,6 +263,29 @@ export default {
     }
   },
   methods: {
+    getData () {
+      let sid = sessionStorage.id
+      let _this = this
+      this.$http({
+        method: 'get',
+        url: 'v1/user/get-info',
+        params: {
+          sid: sid
+        }
+      }).then(res => {
+        if (res.data.code === 200) {
+          _this.bgData = res.data.data
+          console.log(_this.bgData)
+        } else {
+          _this.$message.error('请求数据有问题！')
+        }
+      })
+        // eslint-disable-next-line handle-callback-err
+        .catch(err => {
+          console.log(err)
+        })
+    },
+
     anNui () {
       this.zhuangtai = !this.zhuangtai
       this.num = 1073
@@ -206,7 +294,9 @@ export default {
       this.$emit('listenToChildExen', this.num)
     }
   },
-  created () {},
+  created () {
+    this.getData()
+  },
   mounted () {
     this.sendMsgToParent()
   }
diff --git a/src/views/personal/Collection.vue b/src/views/personal/Collection.vue
index bae5826..d46dd5d 100644
--- a/src/views/personal/Collection.vue
+++ b/src/views/personal/Collection.vue
@@ -55,6 +55,27 @@ export default {
   computed: {},
   watch: {},
   methods: {
+    getData () {
+      let id = sessionStorage.id
+      let _this = this
+      this.$http({
+        method: 'post',
+        url: 'v1/user/collection',
+        data: {
+          id: id
+        }
+      }).then(res => {
+        if (res.data.data.code === 200) {
+          console.log(res.data.data)
+        } else {
+          _this.$message.error('请求数据有问题！')
+        }
+      })
+        // eslint-disable-next-line handle-callback-err
+        .catch(err => {
+          console.log(err)
+        })
+    },
     sendMsgToParent () {
       this.$emit('listenToChildExen', this.num)
     },
@@ -71,6 +92,7 @@ export default {
   created () {
     this.currentPage = Number(localStorage.getItem('pagination')) || 1
     this.handleCurrentChange(this.currentPage)
+    this.getData()
   },
   mounted () {
     this.sendMsgToParent()
diff --git a/src/views/personal/Declare.vue b/src/views/personal/Declare.vue
index 482155f..bd9384a 100644
--- a/src/views/personal/Declare.vue
+++ b/src/views/personal/Declare.vue
@@ -51,11 +51,18 @@
               <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>
+            </template>
+          </select>
           <select class="three" name="area">
             <template v-for="(area,index) in bgValue.area">
               <option :key="index" :value="index">{{area}}</option>
             </template>
           </select>
+        </div>
+        <div class="reporting">
           <span @click="$jump('application')">项目申报</span>
         </div>
         <!-- container -->
@@ -139,7 +146,8 @@ export default {
         shz: require('../../../static/img/shz.png'),
         zxz: require('../../../static/img/zxz.png')
       },
-      text: ['全部', '项目初筛', '项目立项'],
+      // text: ['全部', '项目初筛', '项目立项'],
+      text: ['全部'],
       sub: 0,
       bgData: [],
       bgValue: []
@@ -189,7 +197,8 @@ export default {
           console.log(err)
         })
     },
-    getDataThree () {
+    /*
+    getDataThree() {
       let _this = this
       this.$http({
         method: 'get',
@@ -212,7 +221,7 @@ export default {
           console.log(err)
         })
     },
-    getDataFour () {
+    getDataFour() {
       let _this = this
       this.$http({
         method: 'get',
@@ -235,10 +244,12 @@ export default {
           console.log(err)
         })
     },
+    */
     btn (index) {
       let s = this.sub
       s = index
       this.sub = s
+      /*
       switch (this.sub) {
         case 0:
           this.getDataTwo()
@@ -249,9 +260,8 @@ export default {
         case 2:
           this.getDataFour()
           break
-        default:
-          break
       }
+      */
     },
     sendMsgToParent () {
       this.$emit('listenToChildExen', this.num)
@@ -262,6 +272,7 @@ export default {
     },
     handleCurrentChange (val) {
       this.currentPage = val
+      /*
       switch (this.sub) {
         case 0:
           this.getDataTwo()
@@ -272,11 +283,9 @@ export default {
         case 2:
           this.getDataFour()
           break
-
-        default:
-          break
       }
-
+      */
+      this.getDataTwo()
       this.getPackData()
     },
     getPackData () { }
@@ -555,6 +564,12 @@ export default {
           font-size: 18px;
           color: #666 !important;
         }
+      }
+
+      .reporting {
+        width: 100%;
+        text-align: right;
+
         span {
           display: inline-block;
           text-align: center;
diff --git a/src/views/personal/PersonalZte.vue b/src/views/personal/PersonalZte.vue
index c53666f..6049e18 100644
--- a/src/views/personal/PersonalZte.vue
+++ b/src/views/personal/PersonalZte.vue
@@ -81,7 +81,7 @@ export default {
     // padding: 0 40px;
     display: flex;
     justify-content: space-between;
-    align-items: center;
+    align-items: flex-start;
 
     .left {
       width: 241px;
diff --git a/src/views/project/Application.vue b/src/views/project/Application.vue
index 2958204..4949426 100644
--- a/src/views/project/Application.vue
+++ b/src/views/project/Application.vue
@@ -352,6 +352,9 @@
               </div>
             </div>
           </div>
+          <template v-if="file">
+            <img class="img-img" :src="file" alt />
+          </template>
           <div class="ll">
             <button type="button" @click="submit(0)">保存</button>
             <button type="submit" @click="submit(1)">提交</button>
@@ -525,8 +528,10 @@ export default {
           proimages: _this.proimages
         }
       }).then(res => {
+        console.log(res)
         if (res.data.code === 200) {
           alert(res.data.message)
+          _this.file = ''
         } else {
           _this.$message.error('请求数据有问题！')
         }
@@ -564,6 +569,11 @@ export default {
 </script>
 
 <style lang='scss' scoped>
+.img-img{
+  margin-top: 25px;
+  width: 150px;
+  height: 250px;
+}
 .wrapper {
   min-width: 1280px;
   box-sizing: border-box;
diff --git a/src/views/project/Project.vue b/src/views/project/Project.vue
index 2f9fb30..9c946b1 100644
--- a/src/views/project/Project.vue
+++ b/src/views/project/Project.vue
@@ -52,6 +52,11 @@
               <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>
+            </template>
+          </select>
           <select class="three" name="area">
             <template v-for="(area,index) in bgValue.area">
               <option :key="index" :value="index">{{area}}</option>
@@ -73,7 +78,7 @@
           <!-- 主题内容 -->
           <div class="cc">
             <template v-for="(item,index) in bgData.info">
-              <div class="list" :key="index"  @click="$jump('schedule')">
+              <div class="list" :key="index" @click="$jParams('schedule',{id:item.id})">
                 <div class="div">
                   <div class="bb">
                     <h3>{{item.name}}</h3>
@@ -148,7 +153,8 @@ export default {
         shz: require("../../../static/img/shz.png"),
         zxz: require("../../../static/img/zxz.png")
       },
-      text: ["全部", "项目初筛", "项目立项"],
+      // text: ["全部", "项目初筛", "项目立项"],
+      text: ["全部"],
       sub: 0,
       bgData: [],
       bgValue: []
@@ -199,6 +205,7 @@ export default {
           console.log(err)
         })
     },
+    /*
     getDataThree() {
       let _this = this
       this.$http({
@@ -245,10 +252,13 @@ export default {
           console.log(err)
         })
     },
+    */
     btn(index) {
       let s = this.sub;
       s = index;
       this.sub = s;
+
+      /*
       switch (this.sub) {
         case 0:
           this.getDataTwo();
@@ -259,10 +269,8 @@ export default {
         case 2:
           this.getDataFour();
           break;
-
-        default:
-          break;
       }
+      */
     },
     handleSizeChange(val) {
       this.pageNum = val;
@@ -270,6 +278,7 @@ export default {
     },
     handleCurrentChange(val) {
       this.currentPage = val;
+      /*
       switch (this.sub) {
         case 0:
           this.getDataTwo();
@@ -280,11 +289,9 @@ export default {
         case 2:
           this.getDataFour();
           break;
-
-        default:
-          break;
       }
-
+      */
+      this.getDataTwo();
       this.getPackData();
     },
     getPackData() { }
diff --git a/src/views/project/Schedule.vue b/src/views/project/Schedule.vue
index 417bd37..224fdb9 100644
--- a/src/views/project/Schedule.vue
+++ b/src/views/project/Schedule.vue
@@ -5,29 +5,20 @@
       <!-- 导航 -->
       <div class="top">
         <div class="span">
-          <span @click="btn(0)"
-                :class="sub == 0 ? 'style' : ''">项目进度</span>
-          <span @click="btn(1)"
-                :class="sub == 1 ? 'style' : ''">项目信息</span>
+          <span @click="btn(0)" :class="sub == 0 ? 'style' : ''">项目进度</span>
+          <span @click="btn(1)" :class="sub == 1 ? 'style' : ''">项目信息</span>
         </div>
-        <div class="daochu"
-             v-if="sub == 1">项目导出</div>
+        <div class="daochu" v-if="sub == 1">项目导出</div>
       </div>
       <!-- 进度 -->
-      <div class="img"
-           v-if="sub == 0">
-        <img :src="imgUrl.tg"
-             v-if="state == 0" />
-        <img :src="imgUrl.btg"
-             v-if="state == 1" />
-        <img :src="imgUrl.shz"
-             v-if="state == 2" />
-        <img :src="imgUrl.zxz"
-             v-if="state == 3" />
+      <div class="img" v-if="sub == 0">
+        <img :src="imgUrl.tg" v-if="state == 0" />
+        <img :src="imgUrl.btg" v-if="state == 1" />
+        <img :src="imgUrl.shz" v-if="state == 2" />
+        <img :src="imgUrl.zxz" v-if="state == 3" />
       </div>
       <!-- 项目流程 -->
-      <div class="bobb"
-           v-if="sub == 0">
+      <div class="bobb" v-if="sub == 0">
         <div class="left">
           <div class="time">
             <span>2019-09-01</span>
@@ -38,78 +29,40 @@
           </div>
           <div class="jdt">
             <!-- 已申报 -->
-            <img class="sx0"
-                 :src="imgUrl.sx0"
-                 alt />
-            <img class="d0"
-                 :src="imgUrl.d0"
-                 v-if="zt != 0" />
-            <img class="d1"
-                 :src="imgUrl.d1"
-                 v-if="zt == 0" />
+            <img class="sx0" :src="imgUrl.sx0" alt />
+            <img class="d0" :src="imgUrl.d0" v-if="zt != 0" />
+            <img class="d1" :src="imgUrl.d1" v-if="zt == 0" />
             <!-- 审核中 -->
-            <img class="sx1"
-                 :src="imgUrl.sx1"
-                 alt />
-            <img class="d0"
-                 :src="imgUrl.d0"
-                 v-if="zt != 1" />
-            <img class="d1"
-                 :src="imgUrl.d1"
-                 v-if="zt == 1" />
+            <img class="sx1" :src="imgUrl.sx1" alt />
+            <img class="d0" :src="imgUrl.d0" v-if="zt != 1" />
+            <img class="d1" :src="imgUrl.d1" v-if="zt == 1" />
             <!-- 审核通过 -->
-            <img class="sx1"
-                 :src="imgUrl.sx1"
-                 alt />
-            <img class="d0"
-                 :src="imgUrl.d0"
-                 v-if="zt != 2" />
-            <img class="d1"
-                 :src="imgUrl.d1"
-                 v-if="zt == 2" />
+            <img class="sx1" :src="imgUrl.sx1" alt />
+            <img class="d0" :src="imgUrl.d0" v-if="zt != 2" />
+            <img class="d1" :src="imgUrl.d1" v-if="zt == 2" />
             <!-- 评审中 -->
-            <img class="sx1"
-                 :src="imgUrl.sx1"
-                 alt />
-            <img class="d0"
-                 :src="imgUrl.d0"
-                 v-if="zt != 3" />
-            <img class="d1"
-                 :src="imgUrl.d1"
-                 v-if="zt == 3" />
+            <img class="sx1" :src="imgUrl.sx1" alt />
+            <img class="d0" :src="imgUrl.d0" v-if="zt != 3" />
+            <img class="d1" :src="imgUrl.d1" v-if="zt == 3" />
             <!-- 评审通过 -->
-            <img class="sx1"
-                 :src="imgUrl.sx1"
-                 alt />
-            <img class="d0"
-                 :src="imgUrl.d0"
-                 v-if="zt != 4" />
-            <img class="d1"
-                 :src="imgUrl.d1"
-                 v-if="zt == 4" />
+            <img class="sx1" :src="imgUrl.sx1" alt />
+            <img class="d0" :src="imgUrl.d0" v-if="zt != 4" />
+            <img class="d1" :src="imgUrl.d1" v-if="zt == 4" />
             <!-- end -->
-            <img class="sx1"
-                 :src="imgUrl.sx1"
-                 alt />
+            <img class="sx1" :src="imgUrl.sx1" alt />
           </div>
           <div class="bb">
             <div class="o">
               <span>项目已申报</span>
-              <img class="oo"
-                   :src="imgUrl.d0"
-                   alt />
+              <img class="oo" :src="imgUrl.d0" alt />
             </div>
             <div>
               <span>初筛审核中</span>
-              <img class="oo"
-                   :src="imgUrl.d0"
-                   alt />
+              <img class="oo" :src="imgUrl.d0" alt />
             </div>
             <div class="div-v">
               <span>初筛审核通过</span>
-              <img class="oo"
-                   :src="imgUrl.d0"
-                   alt />
+              <img class="oo" :src="imgUrl.d0" alt />
               <section>
                 <span style="color:#e60012;font-size:20px;">总分: 71分</span>
                 <span style="color:#999;font-size:16px;">（及格分数: 70）</span>
@@ -117,53 +70,109 @@
             </div>
             <div>
               <span>立项评审中</span>
-              <img class="oo"
-                   :src="imgUrl.d0"
-                   alt />
+              <img class="oo" :src="imgUrl.d0" alt />
             </div>
             <div>
               <span>立项评审通过</span>
-              <img class="oo"
-                   :src="imgUrl.d0"
-                   alt />
+              <img class="oo" :src="imgUrl.d0" alt />
             </div>
           </div>
         </div>
         <div class="right">
           <p>项目流程说明</p>
           <ul>
-            <li v-for="(list,index) in text"
-                :key="index">{{list}}</li>
+            <li v-for="(list,index) in text" :key="index">{{list}}</li>
           </ul>
         </div>
       </div>
       <!-- 项目信息 -->
-      <div class="boxx"
-           v-if="sub == 1">
+      <div class="boxx" v-if="sub == 1" :class="popupStatus == true ? 'fliter' : ''">
         <h3>一、基本信息</h3>
         <div class="one-o">
-          <ul v-for="(item,index) in arr"
-              :key="index">
-            <template v-for="(item,index) in text1">
-              <li :key="index">{{item}}</li>
-            </template>
+          <ul>
+            <li>项目名称：{{zData.name}}</li>
+            <li>项目申报单位：{{zData.company}}</li>
+            <li>项目类型：{{zData.tid}}</li>
+            <li>项目落地区域：{{zData.rid}}</li>
+            <li>一级项目方向：{{zData.first_level}}</li>
+            <li>二级项目方向：{{zData.secondary}}</li>
+            <li>项目服务领域：{{zData.fieldeara}}</li>
+            <li>项目有效期：{{zData.aterm + '-' + zData.fterm}}</li>
+            <li>申报单位属性：{{zData.attribute}}</li>
+            <li>通讯地址：{{zData.postaladdress}}</li>
+            <li>电子信箱：{{zData.pmail}}</li>
+            <li>传真电话：{{zData.fax_tel}}</li>
+            <li>邮政编码：{{zData.postalcode}}</li>
+          </ul>
+          <ul>
+            <li>法定代表人：{{zData.plegal}}</li>
+            <li>法人代码：{{zData.plcode}}</li>
+            <li>负责人姓名：{{zData.pname}}</li>
+            <li>职务：{{zData.poster}}</li>
+            <li>办公电话：{{zData.poffice_tel}}</li>
+            <li>手机：{{zData.aphone}}</li>
+            <li>联系人姓名：{{zData.cname}}</li>
+            <li>职务：{{zData.cpost}}</li>
+            <li>办公电话：{{zData.coffice_tel}}</li>
+            <li>手机：{{zData.cphone}}</li>
+          </ul>
+          <ul>
+            <li>项目主责单位：{{zData.prespo}}</li>
+            <li>通讯地址：{{zData.respoadd}}</li>
+            <li>邮政编码：{{zData.respopcode}}</li>
+            <li>传真电话：{{zData.respophone}}</li>
+            <li>电子信箱：{{zData.respomail}}</li>
+            <li>负责人姓名：{{zData.respopname}}</li>
+            <li>职务：{{zData.respopost}}</li>
+            <li>手机：{{zData.respoptel}}</li>
+            <li>办公电话：{{zData.respoophone}}</li>
+            <li>负责人姓名：{{zData.respocname}}</li>
+            <li>职务：{{zData.respocpost}}</li>
+            <li>办公电话：{{zData.respocophone}}</li>
+            <li>手机：{{zData.respoctel}}</li>
           </ul>
         </div>
         <h3>二、申报单位简介:</h3>
         <div class="one-e">
-          <p>我国仍处于井将长期处于社会主义初级阶段,是最大的国情和实际。“我们开展各项工作,要一切从实际出发,牢牢立足这个最大国情和实际,不要超越阶段。从能源来看,我国當富煤少油缺气?的资源禀赋,决定了煤炭在较长一个时期内作为我国主体能源的地位不会发玍变化,这就婓求我们坚持从煤炭资源丰富的囯情出发,切实抓好煤炭清洁高效利用。”章建华</p>
+          <p>{{zData.decldes}}</p>
         </div>
         <h3>三、项目简介</h3>
         <div class="one-e">
-          <p>我国仍处于井将长期处于社会主义初级阶段,是最大的国情和实际。“我们开展各项工作,要一切从实际出发,牢牢立足这个最大国情和实际,不要超越阶段。从能源来看,我国當富煤少油缺气?的资源禀赋,决定了煤炭在较长一个时期内作为我国主体能源的地位不会发玍变化,这就婓求我们坚持从煤炭资源丰富的囯情出发,切实抓好煤炭清洁高效利用。”章建华</p>
+          <p>{{zData.prodes}}</p>
         </div>
         <h3>四、项目论证</h3>
+        <h4>(一) 项目实施的必要性、可行性</h4>
         <div class="one-e">
-          <p>我国仍处于井将长期处于社会主义初级阶段,是最大的国情和实际。“我们开展各项工作,要一切从实际出发,牢牢立足这个最大国情和实际,不要超越阶段。从能源来看,我国當富煤少油缺气?的资源禀赋,决定了煤炭在较长一个时期内作为我国主体能源的地位不会发玍变化,这就婓求我们坚持从煤炭资源丰富的囯情出发,切实抓好煤炭清洁高效利用。”章建华</p>
+          <p>{{zData.prodemo}}</p>
+        </div>
+        <h4>(二) 项目实施的已有基础、具体方法和途径及进度安排、预期效果及完成时间</h4>
+        <h5>1.项目实施的已有基础</h5>
+        <div class="one-e">
+          <p>{{zData.prodemojc}}</p>
+        </div>
+        <h5>2.具体方法和途径</h5>
+        <div class="one-e">
+          <p>{{zData.prodemotj}}</p>
+        </div>
+        <h5>3.进度安排</h5>
+        <div class="one-e">
+          <p>{{zData.prodemojd}}</p>
+        </div>
+        <h5>4.预期效果</h5>
+        <div class="one-e">
+          <p>{{zData.prodemoxg}}</p>
+        </div>
+        <h5>5.项目团队及分工</h5>
+        <div class="one-e">
+          <p>{{zData.prodemofg}}</p>
+        </div>
+        <h4>(三) 项目实施涵盖的范围、实施的规模、服务的人群，创新之处等</h4>
+        <div class="one-e">
+          <p>{{zData.prodemotwo}}</p>
         </div>
         <h3>五、经费预算:</h3>
         <div class="one-e">
-          <p>我国仍处于井将长期处于社会主义初级阶段,是最大的国情和实际。“我们开展各项工作,要一切从实际出发,牢牢立足这个最大国情和实际,不要超越阶段。从能源来看,我国當富煤少油缺气?的资源禀赋,决定了煤炭在较长一个时期内作为我国主体能源的地位不会发玍变化,这就婓求我们坚持从煤炭资源丰富的囯情出发,切实抓好煤炭清洁高效利用。”章建华</p>
+          <p>{{zData.funds}}</p>
         </div>
         <h3>六、申报单位承诺:</h3>
         <div class="one-e">
@@ -175,13 +184,18 @@
             <span>
               <span>下载</span>
               &nbsp;|&nbsp;
-              <span>预览</span>
+              <span @click="preview()">预览</span>
             </span>
           </p>
         </div>
       </div>
+      <section id="preview" v-if="popupStatus">
+        <div class="tc" @click="preview()"></div>
+        <!-- <section class="tc-text">{{zData.proimages}}</section> -->
+        <img  class="tc-text" :src="zData.proimages" />
+      </section>
     </div>
-    <footer-nav class="footer"></footer-nav>
+    <footer-nav class="footer" :class="popupStatus == true ? 'fliter' : ''"></footer-nav>
   </div>
 </template>
 
@@ -190,7 +204,9 @@
 import HeaderNav from "../../components/HeaderNav";
 /* eslint-disable */
 import FooterNav from "../../components/FooterNav";
-
+var preD = function (e) {
+  e.preventDefault()
+}
 export default {
   components: {
     HeaderNav,
@@ -213,7 +229,7 @@ export default {
       },
       state: 0,
       zt: 2,
-      arr: [1, 2, 3],
+      popupStatus: false,
       text: [
         "第一步：填写并提交项目申报书",
         "第二步：线上初筛审核",
@@ -221,38 +237,97 @@ export default {
         "第四步：线下立项评审",
         "第五步：立项结果查询"
       ],
-      text1: [
-        "项目名称：世界婚会",
-        "项目申报单位：劳动社会组织",
-        "项目类型：活动",
-        "项目落地区域：北区",
-        "一级项目方向：婚礼",
-        "一级项目方向：婚礼",
-        "项目服务领域：北区",
-        "项目有效期：2019-09-02至2019-09-23",
-        "申报单位属性：国企",
-        "通讯地址：北京市海涟区",
-        "电子信箱：15901401996@qq.com",
-        "传真电话：81223221",
-        "邮政编码：100000"
-      ]
+      zData: []
     };
   },
   computed: {},
-  watch: {},
+  watch: {
+    popupStatus(val) {
+      if (val) {
+        document.body.style.overflow = 'hidden'
+        document.addEventListener('touchmove', preD, {
+          passive: false
+        }) /** 禁止页面滑动 */
+      } else {
+        document.body.style.overflow = '' /**出现滚动条 */
+        document.removeEventListener('touchmove', preD, { passive: false })
+      }
+    }
+  },
   methods: {
+    preview() {
+      this.popupStatus = !this.popupStatus
+    },
     btn(index) {
       let s = this.sub;
       s = index;
       this.sub = s;
+    },
+    getData(id) {
+      let _this = this
+      this.$http({
+        method: 'post',
+        url: 'v1/project/details',
+        data: {
+          id: id
+        }
+      }).then(res => {
+        if (res.data.data.code === 200) {
+          _this.zData = res.data.data.data.ProjectDetails
+        } else {
+          alert('请求失败！')
+        }
+      })
+        // eslint-disable-next-line handle-callback-err
+        .catch(err => {
+          console.log(err)
+        })
     }
   },
-  created() {},
-  mounted() {}
+  created() {
+    let id = this.$route.params.id
+    this.getData(id)
+  },
+  mounted() { }
 };
 </script>
 
 <style lang='scss' scoped>
+#preview {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0%;
+  left: 0%;
+  z-index: 999;
+
+  .tc {
+    width: 100%;
+    height: 100%;
+    background-color: rgba($color: #000, $alpha: 0.58);
+    position: fixed;
+    top: 0%;
+    left: 0%;
+  }
+
+  .tc-text {
+    width: 350px;
+    height: 600px;
+    background-color: #fff;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translateX(-50%) translateY(-50%);
+  }
+}
+
+.fliter {
+  -webkit-filter: blur(10px);
+  -o-filter: blur(10px);
+  -moz-filter: blur(10px);
+  filter: blur(10px);
+}
+
 .wrapper {
   min-width: 1280px;
   box-sizing: border-box;
@@ -331,6 +406,24 @@ export default {
         letter-spacing: 0px;
         color: #333333;
       }
+      h4 {
+        margin-top: 38px;
+        font-family: "MicrosoftYaHei";
+        font-size: 20px;
+        font-weight: normal;
+        font-stretch: normal;
+        letter-spacing: 0px;
+        color: #333333;
+      }
+      h5 {
+        margin-top: 38px;
+        font-family: "MicrosoftYaHei";
+        font-size: 20px;
+        font-weight: normal;
+        font-stretch: normal;
+        letter-spacing: 0px;
+        color: #333333;
+      }
     }
 
     .bobb {
diff --git a/static/img/default.jpg b/static/img/default.jpg
new file mode 100644
index 0000000..4b62e51
Binary files /dev/null and b/static/img/default.jpg differ
diff --git a/static/img/dsh.png b/static/img/dsh.png
new file mode 100644
index 0000000..32b00d8
Binary files /dev/null and b/static/img/dsh.png differ
diff --git a/vue.config.js b/vue.config.js
index d63911b..5dbfc7f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,7 +5,7 @@ module.exports = {
   indexPath: 'index.html',
 
   devServer: {
-    open: true,
+    open: false,
     host: 'localhost',
     port: '8080',
     https: false,