From 205a6b40a68f5bc147b0b61b41441fbd48abafef 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 17:08:55 +0800
Subject: [PATCH] kun 19/10/14 17:10

---
 src/views/Registered.vue          |  13 +++-
 src/views/home/ApplyFor.vue       |  13 ++--
 src/views/home/HomePage.vue       | 112 ++++++++++++++++++------------
 src/views/project/Application.vue |  60 +++++++++++-----
 src/views/project/Project.vue     |  14 ++--
 static/css/swiper.css             |   4 +-
 6 files changed, 143 insertions(+), 73 deletions(-)

diff --git a/src/views/Registered.vue b/src/views/Registered.vue
index 1b92437..754ffbe 100644
--- a/src/views/Registered.vue
+++ b/src/views/Registered.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="wrapper" :style="{'background-image':'url('+imgUrl.registered+')'}">
+  <div class="wrapper">
+    <img :src="imgUrl.registered" id="img">
     <div class="box">
       <div class="boxx">
         <h3>立 即 注 冊</h3>
@@ -244,12 +245,20 @@ input:required:valid {
 .wrapper {
   min-width: 1280px;
   height: 1398px;
-  background-size: 100% 100%;
   box-sizing: border-box;
   display: flex;
   justify-content: center;
   align-items: center;
 
+  #img{
+    width: 100vw;
+    height:100vh;
+    position: fixed;
+    left: 0%;
+    top: 0%;
+    z-index: -1;
+  }
+
   .box {
     width: 736px;
     height: 1167px;
diff --git a/src/views/home/ApplyFor.vue b/src/views/home/ApplyFor.vue
index 66da8c0..1b4af1b 100644
--- a/src/views/home/ApplyFor.vue
+++ b/src/views/home/ApplyFor.vue
@@ -270,9 +270,9 @@ export default {
         ) {
           alert('以上内容不可为空！')
         } else {
-          if(this.flow_party_person < 0 || this.party_person < 0 || this.work_person < 0){
+          if (this.flow_party_person < 0 || this.party_person < 0 || this.work_person < 0) {
             alert('不能出现负数呦！')
-          }else{
+          } else {
             this.sub = s;
           }
         }
@@ -456,7 +456,7 @@ export default {
         justify-content: center;
 
         div {
-          margin-bottom: 25px;
+          margin-bottom: 30px;
           height: 43px;
 
           label {
@@ -701,7 +701,7 @@ export default {
         }
 
         .o {
-          margin-bottom: 25px;
+          margin-bottom: 30px;
           width: 100%;
           height: 43px;
           display: flex;
@@ -748,16 +748,17 @@ export default {
             }
 
             span {
-              margin-right: 30px;
+              margin-right: 20px;
               font-family: "MicrosoftYaHei";
               font-size: 16px;
               font-weight: normal;
               font-stretch: normal;
               letter-spacing: 0px;
-              color: #333333;
+              color: #333;
               display: inline-block;
               width: 101px;
               text-align: right;
+              white-space: nowrap;
             }
           }
         }
diff --git a/src/views/home/HomePage.vue b/src/views/home/HomePage.vue
index c8b3260..ed441a6 100644
--- a/src/views/home/HomePage.vue
+++ b/src/views/home/HomePage.vue
@@ -74,12 +74,12 @@
                 <img class="o" :src="imgUrl.gq" alt />
                 <span>党组织信息</span>
               </div>
-              <span class="more" @click="$jump('informationQuery')">更多>></span>
+              <!-- <span class="more" @click="$jump('informationQuery')">更多>></span> -->
             </div>
             <div class="p">
-              <ul class="ult">
+              <ul class="ult-t">
                 <template v-for="(party,index) in bgData.party">
-                  <li :key="index" v-if="index < 3">
+                  <li :key="index">
                     <!-- <a href="javascript:void(0);">{{party.party_name}}</a> -->
                     {{party.party_name}}
                   </li>
@@ -181,7 +181,7 @@ import HeaderNav from '../../components/HeaderNav';
 /* eslint-disable */
 import FooterNav from "../../components/FooterNav";
 import Swiper from 'swiper';
-// import swiper from 'swiper/css/swiper.css'
+
 export default {
   components: {
     HeaderNav,
@@ -213,14 +213,17 @@ export default {
       window.location.href = href
     },
     initSwiper() {
-      new Swiper(".swiper-one", {
+      var swiper = new Swiper(".swiper-one", {
         loop: true,
+        autoplayDisableOnInteraction: false,
         autoplay: {
           delay: 3000
         },
-        pagination: '.swiper-pagination',
-        paginationClickable: true,
-      
+
+        pagination: {
+          el: '.swiper-pagination',
+        },
+
         navigation: {
           nextEl: ".swiper-button-next",
           prevEl: ".swiper-button-prev"
@@ -230,23 +233,23 @@ export default {
     scrollFeeds: function (btn) {
       let feeds = document.querySelector(".f-row");
       if (btn === "left") {
-        this.leftPos += 460;
+        this.leftPos += 240;
         let scrollAmount = 0;
         var slideTimer = setInterval(function () {
           feeds.scrollLeft -= 10;
           scrollAmount += 10;
-          if (scrollAmount >= 460) {
+          if (scrollAmount >= 240) {
             window.clearInterval(slideTimer);
           }
         }, 25);
       } else {
-        this.leftPos -= 460;
+        this.leftPos -= 240;
         let scrollAmount = 0;
         // eslint-disable-next-line no-redeclare
         var slideTimer = setInterval(function () {
           feeds.scrollLeft += 10;
           scrollAmount += 10;
-          if (scrollAmount >= 460) {
+          if (scrollAmount >= 240) {
             window.clearInterval(slideTimer);
           }
         }, 25);
@@ -493,6 +496,32 @@ li {
           box-sizing: border-box;
           padding: 0 14px;
 
+          .ult-t {
+            margin-top: 29px;
+            overflow-y: scroll;
+
+            &::-webkit-scrollbar {
+              width: 0px;
+            }
+
+            li {
+              a {
+                color: #333333;
+              }
+
+              font-family: "MicrosoftYaHei";
+              font-size: 16px;
+              font-weight: normal;
+              font-stretch: normal;
+              line-height: 33px;
+              letter-spacing: 0px;
+              overflow: hidden;
+              -o-text-overflow: clip;
+              text-overflow: clip;
+              white-space: nowrap;
+            }
+          }
+
           .ult {
             margin-top: 29px;
 
@@ -792,39 +821,36 @@ li {
               height: 100%;
             }
           }
-        }
 
-        .swiper-pagination {
-        }
+          .swiper-button-prev {
+            position: absolute;
+            top: 93%;
+            left: 4%;
+            width: 13px;
+            height: 23px;
+            margin-top: -22px;
+            z-index: 10;
+            cursor: pointer;
+            background-size: 13px 23px;
+            background-position: center;
+            background-repeat: no-repeat;
+            outline: none;
+          }
 
-        .swiper-button-prev {
-          position: absolute;
-          top: 93%;
-          left: 4%;
-          width: 13px;
-          height: 23px;
-          margin-top: -22px;
-          z-index: 10;
-          cursor: pointer;
-          background-size: 13px 23px;
-          background-position: center;
-          background-repeat: no-repeat;
-          outline: none;
-        }
-
-        .swiper-button-next {
-          position: absolute;
-          top: 93%;
-          right: 4%;
-          width: 13px;
-          height: 23px;
-          margin-top: -22px;
-          z-index: 10;
-          cursor: pointer;
-          background-size: 13px 23px;
-          background-position: center;
-          background-repeat: no-repeat;
-          outline: none;
+          .swiper-button-next {
+            position: absolute;
+            top: 93%;
+            right: 4%;
+            width: 13px;
+            height: 23px;
+            margin-top: -22px;
+            z-index: 10;
+            cursor: pointer;
+            background-size: 13px 23px;
+            background-position: center;
+            background-repeat: no-repeat;
+            outline: none;
+          }
         }
       }
     }
diff --git a/src/views/project/Application.vue b/src/views/project/Application.vue
index e86a3cc..683f5f8 100644
--- a/src/views/project/Application.vue
+++ b/src/views/project/Application.vue
@@ -374,6 +374,7 @@ import HeaderNav from "../../components/HeaderNav";
 /* eslint-disable */
 import FooterNav from "../../components/FooterNav";
 import RichTextFour from "../../components/RichTextFour";
+import RegisteredVue from '../Registered.vue';
 const T_T = new Date()
 export default {
   components: {
@@ -444,7 +445,8 @@ export default {
       proimages: '',
       file: '',
       subStatus: 0,
-      src: ''
+      src: '',
+      pictureHeight: ''
     };
   },
   computed: {},
@@ -460,6 +462,8 @@ export default {
     },
     /** 下一步 */
     btn(index) {
+      let regd = /(\d3,4|\d{3,4}-|\s)?\d{8}/
+      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;
 
@@ -469,6 +473,17 @@ export default {
 
       // this.sub = s
 
+      let aterm = new Date(this.aterm).getTime()
+      let fterm = new Date(this.fterm).getTime()
+
+      // if (!regs.test(this.aphone) || !regs.test(this.cphone)) {
+      //   alert('请填写正确的手机号码！')
+      //   return
+      // }else{
+      //   alert('yes')
+      // }
+
+
       if (s == 1) {
         if (this.name == '' || this.company == '' || this.tid == '' ||
           this.rid == '' || this.first_level == '' || this.secondary == '' ||
@@ -481,6 +496,15 @@ export default {
         ) {
           alert('以上内容不可为空！')
           return
+        } else if (this.aterm > this.fterm) {
+          alert('截止日期应比申请日期晚')
+          return
+        } else if (!regd.test(this.poffice_tel) || !regd.test(this.coffice_tel)) {
+          alert('请填写正确的电话号码！')
+          return
+        } if (!regs.test(this.aphone) || !regs.test(this.cphone)) {
+          alert('请填写正确的手机号码！')
+          return
         } else {
           this.sub = s
         }
@@ -490,13 +514,13 @@ export default {
     getFile(event) {
       let _this = this
       let file = event.target.files[0];
-/*
-      let reader = new FileReader()
-      reader.readAsDataURL(file) // 这里是最关键的一步，转换就在这里
-      reader.onloadend = function () {
-        _this.src = this.result
-      }
-*/
+      /*
+            let reader = new FileReader()
+            reader.readAsDataURL(file) // 这里是最关键的一步，转换就在这里
+            reader.onloadend = function () {
+              _this.src = this.result
+            }
+      */
 
       let param = new FormData(); //创建form对象
       param.append('file', file);//通过append向form对象添加数据
@@ -509,7 +533,6 @@ export default {
           let url = response.data.data.url
           this.file = url
         })
-      console.log(this.file)
     },
     /** 保存和提交 */
     submit(index) {
@@ -604,6 +627,9 @@ export default {
         if (res.data.code === 200) {
           alert(res.data.data.msg)
           _this.proimages = ''
+          _this.$router.push({
+            name: 'project'
+          })
         } else {
           alert(res.data.message)
         }
@@ -680,11 +706,11 @@ export default {
 .img-img {
   margin-top: 25px;
   width: 150px;
-  height: 250px;
+  height: auto;
 
   &::-webkit-scrollbar {
     width: 0px;
-    height: 00x;
+    height: 0px;
   }
 }
 
@@ -903,6 +929,7 @@ export default {
               text-align: right;
               letter-spacing: 0px;
               color: #323232;
+              white-space: nowrap;
             }
 
             .i-i {
@@ -911,7 +938,7 @@ export default {
               background-color: #ffffff;
               border: solid 1px #c7c7c7;
               outline: none;
-              margin-left: 30px;
+              margin-left: 20px;
               font-family: "MicrosoftYaHei";
               font-size: 18px;
               font-weight: normal;
@@ -945,7 +972,7 @@ export default {
         display: flex;
         justify-content: space-between;
         align-items: center;
-        margin-bottom: 25px;
+        margin-bottom: 30px;
 
         label {
           display: inline-block;
@@ -959,6 +986,7 @@ export default {
           text-align: right;
           letter-spacing: 0px;
           color: #323232;
+          white-space: nowrap;
         }
 
         select {
@@ -976,7 +1004,7 @@ export default {
           padding-left: 83px;
           box-sizing: border-box;
           outline: none;
-          margin-left: 30px;
+          margin-left: 20px;
           font-family: "MicrosoftYaHei";
           font-size: 18px;
           font-weight: normal;
@@ -992,7 +1020,7 @@ export default {
           background-color: #ffffff;
           border: solid 1px #c7c7c7;
           outline: none;
-          margin-left: 30px;
+          margin-left: 20px;
           font-family: "MicrosoftYaHei";
           font-size: 18px;
           font-weight: normal;
@@ -1007,7 +1035,7 @@ export default {
           background-color: #ffffff;
           border: solid 1px #c7c7c7;
           outline: none;
-          margin-left: 30px;
+          margin-left: 20px;
           font-family: "MicrosoftYaHei";
           font-size: 18px;
           font-weight: normal;
diff --git a/src/views/project/Project.vue b/src/views/project/Project.vue
index ca2dc6f..ad8ac3a 100644
--- a/src/views/project/Project.vue
+++ b/src/views/project/Project.vue
@@ -404,9 +404,15 @@ export default {
               height: 97px;
               margin-top: 25px;
               position: relative;
+              display: flex;
+              flex-direction: column;
+              justify-content: space-between;
 
               dd {
-                margin-bottom: 22px;
+                height: 20px;
+                display: flex;
+                align-items: center;
+
                 .iconfont {
                   font-size: 17px;
                   color: #ccc;
@@ -423,10 +429,10 @@ export default {
 
                 .block-k {
                   width: 288px;
-                  height: 14px;
-                  line-height: 14px;
                   display: inline-block;
-                  overflow: hidden;
+                 /* overflow: hidden;*/
+                  text-overflow: ellipsis;
+                  white-space: nowrap;
 
                   b {
                     font-weight: 900;
diff --git a/static/css/swiper.css b/static/css/swiper.css
index dad21e1..cb732f7 100644
--- a/static/css/swiper.css
+++ b/static/css/swiper.css
@@ -272,8 +272,8 @@
   height: 8px;
   display: inline-block;
   border-radius: 100%;
-  background: #000;
-  opacity: 0.2;
+  background: #fff;
+  opacity: 0.65;
 }
 button.swiper-pagination-bullet {
   border: none;