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

---
 src/components/FooterNav.vue      | 65 +++++++++++++++++++-------
 src/components/HeaderNav.vue      |  1 +
 src/router.js                     |  2 +-
 src/views/Registered.vue          | 12 ++---
 src/views/home/HomePage.vue       |  1 +
 src/views/home/NewsList.vue       | 11 +++--
 src/views/personal/Declare.vue    | 76 +++++++++++++++++++++++++------
 src/views/project/Application.vue | 14 +++++-
 src/views/project/Project.vue     | 35 +++++++++-----
 src/views/project/Schedule.vue    | 32 ++++++++-----
 10 files changed, 185 insertions(+), 64 deletions(-)

diff --git a/src/components/FooterNav.vue b/src/components/FooterNav.vue
index 61b7b1f..9265c36 100644
--- a/src/components/FooterNav.vue
+++ b/src/components/FooterNav.vue
@@ -3,6 +3,12 @@
     <div class="div1">
       <p>版权所有：朝阳区委社会工委区民政局</p>
       <p>京ICP备19040879号 Copyright 2019-2029 www.cyteam.orz.cn All Rights Reserved</p>
+      <p>
+        <span>友情链接：</span>
+        <a href="https://inv-veri.chinatax.gov.cn/">发票查验平台</a>
+        <a href="http://beijing.chinatax.gov.cn/bjswjwz/">北京市税务局</a>
+        <a href="https://www.tianyancha.com/">天眼查</a>
+      </p>
     </div>
     <div class="div2">
       <div class="img-box">
@@ -61,7 +67,7 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    margin-top: 34px;
+    margin-top: 30px;
 
     img {
       width: 80px;
@@ -84,23 +90,48 @@ export default {
     height: 64px;
     text-align: center;
 
-    & > p:first-child {
-      font-family: "MicrosoftYaHei";
-      font-size: 16px;
-      font-weight: normal;
-      font-stretch: normal;
-      letter-spacing: -1px;
-      color: #ffffff;
-    }
+    p {
+      &:nth-of-type(1) {
+        font-family: "MicrosoftYaHei";
+        font-size: 16px;
+        font-weight: normal;
+        font-stretch: normal;
+        letter-spacing: -1px;
+        color: #ffffff;
+      }
+      &:nth-of-type(2) {
+        font-family: "MicrosoftYaHei";
+        font-size: 16px;
+        font-weight: bold;
+        font-stretch: normal;
+        margin-top: 15px;
+        letter-spacing: 0px;
+        color: #ffffff;
+      }
+      &:nth-of-type(3) {
+        margin-top: 15px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
 
-    & > p:last-child {
-      font-family: "MicrosoftYaHei";
-      font-size: 16px;
-      font-weight: bold;
-      font-stretch: normal;
-      margin-top: 30px;
-      letter-spacing: 0px;
-      color: #ffffff;
+        span {
+          font-family: "MicrosoftYaHei";
+          font-size: 16px;
+          font-weight: bold;
+          font-stretch: normal;
+          letter-spacing: 0px;
+          color: #fff;
+        }
+
+        a {
+          margin-left: 10px;
+          color: #fff;
+
+          &:hover {
+            color: #0099ff;
+          }
+        }
+      }
     }
   }
 }
diff --git a/src/components/HeaderNav.vue b/src/components/HeaderNav.vue
index a33b5f5..ab1a176 100644
--- a/src/components/HeaderNav.vue
+++ b/src/components/HeaderNav.vue
@@ -52,6 +52,7 @@ export default {
       })
       this.$message.success('退出成功!')
       sessionStorage.clear()
+      localStorage.clear()
       this.enter = true
     }
   },
diff --git a/src/router.js b/src/router.js
index 8b0603a..bf9d0f4 100644
--- a/src/router.js
+++ b/src/router.js
@@ -147,7 +147,7 @@ export default new Router({
     },
     /** 项目进度 */
     {
-      path: '/schedule',
+      path: '/schedule:id',
       name: 'schedule',
       meta: {
         requireAuth: true
diff --git a/src/views/Registered.vue b/src/views/Registered.vue
index 754ffbe..7873d48 100644
--- a/src/views/Registered.vue
+++ b/src/views/Registered.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="wrapper">
-    <img :src="imgUrl.registered" id="img">
+    <img :src="imgUrl.registered" id="img" />
     <div class="box">
       <div class="boxx">
         <h3>立 即 注 冊</h3>
@@ -250,10 +250,10 @@ input:required:valid {
   justify-content: center;
   align-items: center;
 
-  #img{
+  #img {
     width: 100vw;
-    height:100vh;
-    position: fixed;
+    height: auto;
+    position: absolute;
     left: 0%;
     top: 0%;
     z-index: -1;
@@ -261,16 +261,16 @@ input:required:valid {
 
   .box {
     width: 736px;
-    height: 1167px;
     background-color: rgba($color: #fff, $alpha: 0.5);
     box-shadow: 0px 3px 29px 0px rgba(0, 0, 0, 0.18);
     border-radius: 10px;
     display: flex;
     justify-content: center;
     align-items: center;
+    padding: 120px 0px;
+    box-sizing: border-box;
     .boxx {
       width: 474px;
-      height: 980px;
 
       h3 {
         font-family: "HanWangKaiBold-Gb5";
diff --git a/src/views/home/HomePage.vue b/src/views/home/HomePage.vue
index ed441a6..e11e1f2 100644
--- a/src/views/home/HomePage.vue
+++ b/src/views/home/HomePage.vue
@@ -498,6 +498,7 @@ li {
 
           .ult-t {
             margin-top: 29px;
+            height: 100px;
             overflow-y: scroll;
 
             &::-webkit-scrollbar {
diff --git a/src/views/home/NewsList.vue b/src/views/home/NewsList.vue
index c0decc4..a3ffa0f 100644
--- a/src/views/home/NewsList.vue
+++ b/src/views/home/NewsList.vue
@@ -2,8 +2,8 @@
   <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})">
+      <template v-if="bgData.info.length > 0">
+        <div id="news" v-for="(info,index) in bgData.info" :key="index" @click="$jParams('newsDetails',{id:info.id,type:getType})">
           <div class="news-box">
             <img :src="info.cover ? info.cover : moren" />
             <section>
@@ -18,6 +18,11 @@
           </div>
         </div>
       </template>
+
+      <template v-else>
+          <span>没有内容了呦</span>
+      </template>
+
       <!-- 分页按钮 -->
       <div class="page">
         <el-pagination
@@ -112,7 +117,7 @@ export default {
     localStorage.setItem('getType', this.getType)
   },
   destroyed() {
-    localStorage.setItem('pagination', this.currentPage)
+    localStorage.setItem('pagination', 1)
     localStorage.setItem('getType', this.getType)
   }
 };
diff --git a/src/views/personal/Declare.vue b/src/views/personal/Declare.vue
index 299c3a2..2bd8285 100644
--- a/src/views/personal/Declare.vue
+++ b/src/views/personal/Declare.vue
@@ -93,8 +93,13 @@
           </div>
           <!-- 主题内容 -->
           <div class="cc">
-            <template v-for="(item,index) in bgData.info">
-              <div class="list" :key="index" @click="$jump('schedule')">
+            <template v-if="cd > 0">
+              <div
+                class="list"
+                v-for="(item,index) in bgData.info"
+                :key="index"
+                @click="$jump('schedule')"
+              >
                 <div class="div">
                   <div class="bb">
                     <h3>{{item.name}}</h3>
@@ -124,6 +129,9 @@
                 </dl>
               </div>
             </template>
+            <template v-else>
+              <span>您搜索的内容暂无！</span>
+            </template>
           </div>
         </div>
         <!-- 分页按钮 -->
@@ -171,7 +179,8 @@ export default {
       area_value: '全部',
       value_date: '',
       start_time: '',
-      end_time: ''
+      end_time: '',
+      cd: Number
     }
   },
   computed: {},
@@ -218,6 +227,7 @@ export default {
         if (res.data.code === 200) {
           _this.bgData = res.data.data.data
           _this.totalCount = _this.bgData.allPage
+          _this.cd = _this.bgData.info.length
         } else {
           _this.$message.error('请求数据有问题！')
         }
@@ -499,17 +509,55 @@ export default {
         margin-top: 50px;
         margin-bottom: 50px;
 
+        .block {
+          /deep/.el-range-editor.el-input__inner {
+            width: 325px;
+            background: url("../../../static/img/xa.png") 90% center no-repeat;
+            background-color: #f9f8f8;
+          }
+
+          /deep/.el-date-editor .el-range-input {
+            background-color: #f9f8f8;
+            font-family: "MicrosoftYaHei";
+            font-size: 18px;
+            font-weight: normal;
+            font-stretch: normal;
+            line-height: 33px;
+            letter-spacing: 0px;
+            color: #666666;
+          }
+
+          /deep/.el-input__inner {
+            border: 1px solid #c7c7c7;
+          }
+
+          /deep/.el-date-editor .el-range-separator {
+            font-family: "MicrosoftYaHei";
+            font-size: 18px;
+            font-weight: normal;
+            font-stretch: normal;
+            line-height: 33px;
+            letter-spacing: 0px;
+            color: #666666;
+          }
+
+          /deep/ .el-input__icon {
+            width: 0px;
+          }
+        }
+
         .one {
-          padding-left: 30px;
+          // padding-left: 30px;
           box-sizing: border-box;
           /* 清除默认的箭头样式 */
           appearance: none;
           -moz-appearance: none;
           -webkit-appearance: none;
           /* 右侧添加小箭头的背景图 */
-          background: url("../../../static/img/xa.png") 280px center no-repeat;
+          background: url("../../../static/img/xa.png") 90% center no-repeat;
           background-size: 14px 8px;
-          width: 325px;
+          // width: 325px;
+          padding: 0px 30px;
           height: 38px;
           background-color: #f9f8f8;
           border-radius: 4px;
@@ -520,17 +568,18 @@ export default {
         }
 
         .two {
-          padding-left: 30px;
-          padding-right: 48px;
+          // padding-left: 30px;
+          // padding-right: 48px;
           box-sizing: border-box;
           /* 清除默认的箭头样式 */
           appearance: none;
           -moz-appearance: none;
           -webkit-appearance: none;
           /* 右侧添加小箭头的背景图 */
-          background: url("../../../static/img/xa.png") 90px center no-repeat;
+          background: url("../../../static/img/xa.png") 90% center no-repeat;
           background-size: 14px 8px;
-          width: 134px;
+          // width: 134px;
+          padding: 0px 30px;
           height: 38px;
           background-color: #f9f8f8;
           border-radius: 4px;
@@ -541,16 +590,17 @@ export default {
         }
 
         .three {
-          padding-left: 30px;
+          // padding-left: 30px;
           box-sizing: border-box;
           /* 清除默认的箭头样式 */
           appearance: none;
           -moz-appearance: none;
           -webkit-appearance: none;
           /* 右侧添加小箭头的背景图 */
-          background: url("../../../static/img/xa.png") 90px center no-repeat;
+          background: url("../../../static/img/xa.png") 90% center no-repeat;
           background-size: 14px 8px;
-          width: 134px;
+          // width: 134px;
+          padding: 0px 30px;
           height: 38px;
           background-color: #f9f8f8;
           border-radius: 4px;
diff --git a/src/views/project/Application.vue b/src/views/project/Application.vue
index 683f5f8..4f2845a 100644
--- a/src/views/project/Application.vue
+++ b/src/views/project/Application.vue
@@ -462,7 +462,7 @@ export default {
     },
     /** 下一步 */
     btn(index) {
-      let regd = /(\d3,4|\d{3,4}-|\s)?\d{8}/
+      let regd = /^(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$/
       let regs = /^(0|86|17951)?(13[0-9]|15[012356789]|166|17[3678]|18[0-9]|14[57])[0-9]{8}$/
       let s = this.sub;
       s = index;
@@ -536,6 +536,10 @@ export default {
     },
     /** 保存和提交 */
     submit(index) {
+      let regd = /^(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$/
+      let regs = /^(0|86|17951)?(13[0-9]|15[012356789]|166|17[3678]|18[0-9]|14[57])[0-9]{8}$/
+
+
       if (this.sub == 1) {
         if (this.prespo == '' || this.respoadd == '' || this.respopcode == '' ||
           this.respomail == '' || this.respopname == '' ||
@@ -548,6 +552,12 @@ export default {
         ) {
           alert('以上内容不可为空！')
           return
+        } else if (!regd.test(this.respoophone) || !regd.test(this.respocophone)) {
+          alert('请填写正确的电话号码！')
+          return
+        } if (!regs.test(this.respoptel) || !regs.test(this.respoctel)) {
+          alert('请填写正确的手机号码！')
+          return
         } else if (this.thff == false) {
           alert('请同意：申报单位承诺')
           return
@@ -592,7 +602,7 @@ export default {
           plcode: _this.plcode,
           pname: _this.pname,
           poster: _this.poster,
-          poffice_tel: _this.poffice_tel,
+          respoophone: _this.poffice_tel,
           aphone: _this.aphone,
           cname: _this.cname,
           cpost: _this.cpost,
diff --git a/src/views/project/Project.vue b/src/views/project/Project.vue
index ad8ac3a..915caf8 100644
--- a/src/views/project/Project.vue
+++ b/src/views/project/Project.vue
@@ -94,8 +94,13 @@
           </div>
           <!-- 主题内容 -->
           <div class="cc">
-            <template v-for="(item,index) in bgData.info">
-              <div class="list" :key="index" @click="$jParams('schedule',{id:item.id})">
+            <template v-if="cd > 0">
+              <div
+                class="list"
+                v-for="(item,index) in bgData.info"
+                :key="index"
+                @click="$jParams('schedule',{id:item.id})"
+              >
                 <div class="div">
                   <div class="bb">
                     <h3>{{item.name}}</h3>
@@ -128,6 +133,9 @@
                 </dl>
               </div>
             </template>
+            <template v-else>
+              <span>您搜索的内容暂无！</span>
+            </template>
           </div>
         </div>
         <!-- 分页按钮 -->
@@ -228,6 +236,7 @@ export default {
         if (res.data.code === 200) {
           _this.bgData = res.data.data.data
           _this.totalCount = _this.bgData.allPage
+          _this.cd = _this.bgData.info.length
         } else {
           _this.$message.error('请求数据有问题！')
         }
@@ -430,7 +439,7 @@ export default {
                 .block-k {
                   width: 288px;
                   display: inline-block;
-                 /* overflow: hidden;*/
+                  /* overflow: hidden;*/
                   text-overflow: ellipsis;
                   white-space: nowrap;
 
@@ -543,7 +552,7 @@ export default {
         .block {
           /deep/.el-range-editor.el-input__inner {
             width: 325px;
-            background: url("../../../static/img/xa.png") 280px center no-repeat;
+            background: url("../../../static/img/xa.png") 90% center no-repeat;
             background-color: #f9f8f8;
           }
 
@@ -578,16 +587,17 @@ export default {
         }
 
         .one {
-          padding-left: 30px;
+          // padding-left: 30px;
           box-sizing: border-box;
           /* 清除默认的箭头样式 */
           appearance: none;
           -moz-appearance: none;
           -webkit-appearance: none;
           /* 右侧添加小箭头的背景图 */
-          background: url("../../../static/img/xa.png") 280px center no-repeat;
+          background: url("../../../static/img/xa.png") 90% center no-repeat;
           background-size: 14px 8px;
-          width: 325px;
+          // width: 325px;
+          padding: 0px 30px;
           height: 38px;
           background-color: #f9f8f8;
           border-radius: 4px;
@@ -598,17 +608,18 @@ export default {
         }
 
         .two {
-          padding-left: 30px;
-          padding-right: 48px;
+          // padding-left: 30px;
+          // padding-right: 48px;
           box-sizing: border-box;
           /* 清除默认的箭头样式 */
           appearance: none;
           -moz-appearance: none;
           -webkit-appearance: none;
           /* 右侧添加小箭头的背景图 */
-          background: url("../../../static/img/xa.png") 90px center no-repeat;
+          background: url("../../../static/img/xa.png") 90% center no-repeat;
           background-size: 14px 8px;
-          width: 134px;
+          // width: 134px;
+          padding: 0px 30px;
           height: 38px;
           background-color: #f9f8f8;
           border-radius: 4px;
@@ -616,6 +627,7 @@ export default {
           outline: none;
           font-size: 18px;
           color: #666;
+          text-align: center
         }
 
         .three {
@@ -636,6 +648,7 @@ export default {
           outline: none;
           font-size: 18px;
           color: #666;
+          text-align: center
         }
         span {
           display: inline-block;
diff --git a/src/views/project/Schedule.vue b/src/views/project/Schedule.vue
index 78cafeb..f3f8fd8 100644
--- a/src/views/project/Schedule.vue
+++ b/src/views/project/Schedule.vue
@@ -16,7 +16,7 @@
         <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>-->
       <!-- 项目流程 -->
       <div class="bobb" v-if="sub == 0">
         <div class="left">
@@ -24,7 +24,6 @@
             <template v-for="(time,index) in zDate.date">
               <span v-if="index < 5" :key="index">{{time}}</span>
             </template>
-
           </div>
           <div class="jdt">
             <!-- 已申报 -->
@@ -100,7 +99,7 @@
             <li>一级项目方向：{{zData.first_level}}</li>
             <li>二级项目方向：{{zData.secondary}}</li>
             <li>项目服务领域：{{zData.fieldeara}}</li>
-            <li>项目有效期：{{zData.aterm + '-' + zData.fterm}}</li>
+            <li>项目有效期: {{zData.aterm + '至' + zData.fterm}}</li>
             <li>申报单位属性：{{zData.attribute}}</li>
             <li>通讯地址：{{zData.postaladdress}}</li>
             <li>电子信箱：{{zData.pmail}}</li>
@@ -179,7 +178,7 @@
         </div>
         <h3>六、申报单位承诺:</h3>
         <div class="one-e">
-          <p>我们确认项目中报内容的真实性,并愿意承担相应的责任</p>
+          <p>{{msg}}</p>
         </div>
         <h3>七、项目主责单位意见 :</h3>
         <div class="one-e">
@@ -232,6 +231,7 @@ export default {
         d0: require("../../../static/img/d0.png"),
         d1: require("../../../static/img/d1.png")
       },
+      msg: '我们确认项目中报内容的真实性,并愿意承担相应的责任',
       state: 0,
       zt: 2,
       popupStatus: false,
@@ -243,7 +243,8 @@ export default {
         "第五步：立项结果查询"
       ],
       zData: [],
-      zDate:[]
+      zDate: [],
+      id: Number
     };
   },
   computed: {},
@@ -272,13 +273,13 @@ export default {
       s = index;
       this.sub = s;
     },
-    getData(id) {
+    getData() {
       let _this = this
       this.$http({
         method: 'post',
         url: 'v1/project/details',
         data: {
-          id: id
+          id: _this.id
         }
       }).then(res => {
         if (res.data.data.code === 200) {
@@ -296,10 +297,19 @@ export default {
     }
   },
   created() {
-    let id = this.$route.params.id
-    this.getData(id)
+    this.id = this.$route.params.id;
+    this.getData()
   },
-  mounted() { }
+  mounted() { },
+  // beforeUpdate() {
+  //   localStorage.setItem('schedule', this.id)
+  // },
+  // beforeDestroy() {
+  //   localStorage.setItem('schedule', this.id)
+  // },
+  // destroyed() {
+  //   localStorage.setItem('schedule', this.id)
+  // }
 };
 </script>
 
@@ -323,7 +333,7 @@ export default {
 
   .tc-text {
     width: 350px;
-    height: 600px;
+    height: auto;
     background-color: #fff;
     position: absolute;
     left: 50%;