'消息中心'

src/main.js

@@ -24,6 +24,7 @@ import directives from './scripts/directives'
 
 import filter from './scripts/filter'
 
+import './scripts/prototype'
 /**
  * 组件
  */

src/pages/login.vue

@@ -99,7 +99,7 @@ export default {
       }
     },
     registerNew: function () {
-      this.$router.push('regiester')
+      this.$router.push('regiester2')
     },
     pwdForgotten: function () {
       this.$router.push('pwd-forgot')
@@ -142,9 +142,9 @@ export default {
       display: -webkit-flex;
       margin: 5% 0 5% 14%;
       .pwd-icon {
-        margin-bottom: 6px;
-        margin-right: 15px;
-        margin-left: 3px;
+        margin-top: 2px;
+        margin-right: 6px;
+        margin-left: 4px;
         img {
           width: 18px;
           height: 20px;

src/pages/messageCenter/message-list.vue

@@ -4,39 +4,50 @@
       <div slot="center" class="top-word">消息通知</div>
     </h-header>
     <h-content class="content">
-      <!-- <div v-for="(item,index) in list" :key="index" class="card-info">
-        <div class="card-position">
-          <div class="card-top">
-            <img src="@/assets/messageCenter/messageIcon.png" class="icon" >
-            <span class="title">{{ item.notice_title }}</span>
-            <span class="time">{{ item.notice_time }}</span>
+      <section v-for="(item,parentIndex) in list" :key="parentIndex" class="msg-wrap">
+        <item-option>
+          <list-item>
+            <item :hasBorder="false" :proportion="[2,2]">
+              <div slot="left-icon" class="left-icon left-icon-box"><img src="@/assets/messageCenter/messageIcon.png"></div>
+              <div slot="name" class="font-color">{{ item.msg_title }}</div>
+              <div slot="content" class="time-color">{{ item.msg_time }}</div>
+            </item>
+            <div class="msg-content">
+              <div class="text">
+                <div
+                  ref="textContainer" :class="{'retract': item.status}"
+                  :style="{'max-height':item.status ? textHeight: ''}">
+                  {{ item.msg_content }}
+                </div>
+                <div class="btn">
+                  <p v-if="item.status" @click="item.status = false">展开</p>
+                  <p v-if="item.status == false" @click="item.status = true">收起</p>
+                </div>
+              </div>
+            </div>
+            <div class="detail-wrap">
+              <div class="detail-wrap-content">
+                <span>查看详情</span>
+                <img src="@/assets/messageCenter/right-gray.png">
+              </div>
+            </div>
+          </list-item>
+          <div slot="buttons">
+            <option-button type="warn" text="删除" @click.native="deleteFun(parentIndex)"></option-button>
           </div>
-          <img src="@/assets/messageCenter/messageIcon.png" class="arrow">
-          <div class="message">{{ item.notice_body }}</div>
-        </div>
-      </div>-->
-      <!--下面代码不要删****************************************************************-->
-      <section v-for="(item,index) in list" :key="index" class="msg-wrap">
+        </item-option>
+      </section>
+      <!--逾期消息-->
+      <section v-for="(item,Index) in overList" class="msg-wrap">
         <list-item>
-          <item>
-            <img slot="left-icon" src="@/assets/messageCenter/messageIcon.png" class="left-icon">
-            <div slot="name">{{ item.msg_title }}</div>
-            <div slot="content">{{ item.msg_time }}</div>
+          <item :hasBorder="false" :proportion="[2,2]">
+            <div slot="left-icon" class="left-icon over-icon-box"><img src="@/assets/messageCenter/overIcon.png"></div>
+            <div slot="name" class="over-color">{{ item.msg_title }}</div>
+            <div slot="content" class="time-color">{{ item.msg_time }}</div>
           </item>
-          <!--  <div class="msg-content" :class="{ 'nowrap': isFold}">
-              {{ item.msg_content }}<span>展开</span>
-            </div>-->
           <div class="msg-content">
-            <div class="text">
-              <div
-                ref="textContainer" :class="{'retract': item.status}"
-                :style="{'max-height':item.status ? textHeight: ''}">
-                {{ item.msg_content }}
-              </div>
-              <div class="btn">
-                <p v-if="item.status" @click="item.status = false">展开</p>
-                <p v-if="item.status == false" @click="item.status = true">收起</p>
-              </div>
+            <div class="text" style="padding-bottom: 10px;">
+              <div>{{ item.msg_content }}</div>
             </div>
           </div>
         </list-item>
@@ -54,7 +65,7 @@ export default {
       list: [
         {
           msg_title: '视频面签',
-          msg_content: '您有一条保证缴纳确认信息待您确认，请确认进件号：2001于2019-08-29进行视频面签，届时请注意接收视频消息！',
+          msg_content: '您有一条保证缴纳确认信息待您确认，请确认：2001于2019-08-29进行视频面签，届时请注意接收视频消息！',
           msg_time: '2019-10-20',
         },
         {
@@ -79,7 +90,7 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      //vm.getInfo()
+      // vm.getInfo()
     })
   },
   mounted () {
@@ -131,72 +142,41 @@ export default {
         }
       })
     },
+    deleteFun(Index){
+      let vm = this
+      hlsPopup.showConfirm({
+        title: '提示',
+        content: '确认删除',
+        onConfirm: function (index) {
+          if (index === 1) {
+            vm.list.remove(Index)
+            vm.list.sort()
+          }
+        },
+      })
+    },
   },
 }
 </script>
-<style lang="less" scoped>
+<style lang="less">
   @import "../../styles/mixin";
 
   #message-center {
-    /*  .card-info {
-        width: 100%;
-        height: 78px;
-        background-color: #fff;
-        .card-position {
-          width: 90%;
-          margin: 0 auto;
-          .card-top {
-            padding-top: 16px;
-            display: flex;
-            align-items: center;
-            .time {
-              font-family: PingFangSC-Regular;
-              font-size: 12px;
-              color: rgba(56, 63, 69, 0.6);
-              flex:6;
-            }
-          }
-          .arrow{
-              width:10px;
-              height:12px;
-              float: right;
-          }
-          .title {
-            font-family: PingFangSC-Semibold;
-            font-size: 14px;
-            color: #00469c;
-            font-weight: bold;
-            margin-left: 11px;
-            flex:15;
-          }
-          .icon {
-            width: 13px;
-            height: 15px;
-            flex:1;
-          }
-          .message {
-            font-family: PingFangSC-Regular;
-            font-size: 13px;
-            color: #656464;
-            margin-top:10px;
-            margin-left:24px;
-            line-height:16px;
-          }
-        }
-      }
-      .card-info:not(:first-child) {
-          margin-top:8px;
-      }*/
-
     .content {
       padding-top: 10px;
     }
-
+.swipeout-list{
+  height: auto;
+  padding: 0;
+  .function{
+    right: -22% !important;
+  }
+}
     .msg-wrap {
-      margin: 0 2%;
+      margin: 0 2% 10px 2%;
 
       .msg-content {
-        margin-left: 11%;
+        margin-left: 14%;
         margin-right: 4%;
         line-height: 20px;
         font-family: PingFangSC-Regular;
@@ -258,5 +238,81 @@ export default {
       color: #666666;
       visibility: hidden;
     }
+    .left-icon-box{
+      position: relative;
+      width: 26px;
+      height: 26px;
+      background: #efefef;
+      border-radius: 8px;
+      img{
+        position: absolute;
+        left: 6px;
+        z-index: 100;
+        top: 6px;
+      }
+    }
+    .over-icon-box{
+      position: relative;
+      width: 26px;
+      height: 26px;
+      background: #FFFFE0;
+      border-radius: 8px;
+      img{
+        position: absolute;
+        left: 6px;
+        z-index: 100;
+        top: 6px;
+      }
+    }
+    .contents{
+      .add-name{
+        .font-color{
+          font-family: PingFangSC-Semibold;
+          font-size: 15px;
+          color: #4B4A4B;
+        }
+        .over-color{
+          font-family: PingFangSC-Semibold;
+          font-size: 15px;
+          color: #FDB62F;
+        }
+      }
+      .add-content{
+        .time-color{
+          font-family: PingFangSC-Regular;
+          font-size: 13px;
+          color: rgba(56,63,69,0.60);
+        }
+      }
+      img{
+        width: 14px;
+        height: 14px;
+      }
+    }
+    .detail-wrap{
+      margin-top: 10px;
+      width: 100%;
+      height: 40px;
+      padding: 0 4% 0 14%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .detail-wrap-content{
+        width: 100%;
+        height: 100%;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .border-top;
+        span{
+          font-family: PingFangSC-Semibold;
+          font-size: 0.3rem;
+          color: #4B4A4B;
+        }
+        img{
+          width: 14px;
+        }
+      }
+    }
   }
 </style>

src/pages/userBind/np/naturePerson.vue

@@ -174,14 +174,14 @@
             >
           </item>
           <item>
-            <div slot="name" class="required">居住地址</div>
+            <div slot="name" class="required">联系地址</div>
             <textarea
               slot="content"
               ref="myTestareaLive"
               v-model="baseInfo.living_address"
               rows="1"
               cols="30"
-              placeholder="请输入居住地址"
+              placeholder="请输入联系地址"
               @input="addRowsLive(baseInfo.living_address)"
             />
           </item>
@@ -271,8 +271,8 @@
               <input slot="content" v-model="baseInfo.working_place_sp" placeholder="请输入工作单位" >
             </item>
             <item>
-              <div slot="name" class="required">居住地址</div>
-              <input slot="content" v-model="baseInfo.address_sp" placeholder="请输入居住地址" >
+              <div slot="name" class="required">联系地址</div>
+              <input slot="content" v-model="baseInfo.address_sp" placeholder="请输入联系地址" >
             </item>
           </list-item>
         </div>
@@ -453,7 +453,7 @@ export default {
         id_card_no: null,
         id_card_date_from: '', // 身份证有效期从
         id_card_date_to: '', // 身份证有效期到
-        cell_phone: null,
+        cell_phone: window.localStorage.getItem('user_phone'),
         living_address: '',
         address_on_resident_booklit: '',
         marital_status: '',
@@ -770,7 +770,7 @@ export default {
       } else if (!vm.baseInfo.cell_phone) {
         vm.hlsPopup.showLongCenter('手机号不能为空！')
       } else if (!vm.baseInfo.living_address) {
-        vm.hlsPopup.showLongCenter('居住地址不能为空！')
+        vm.hlsPopup.showLongCenter('联系地址不能为空！')
       } else if (!vm.baseInfo.address_on_resident_booklit) {
         vm.hlsPopup.showLongCenter('户籍地址不能为空！')
       } else if (!vm.baseInfo.academic_background) {
@@ -793,7 +793,7 @@ export default {
       ) {
         vm.hlsPopup.showLongCenter('配偶工作单位不能为空！')
       } else if (vm.marital_status_n === '已婚' && !vm.baseInfo.address_sp) {
-        vm.hlsPopup.showLongCenter('配偶居住地址不能为空！')
+        vm.hlsPopup.showLongCenter('配偶联系地址不能为空！')
       } else if (!vm.hlsUtil.phoneNumber(vm.baseInfo.cell_phone)) {
         vm.hlsPopup.showLongCenter('手机号码有误!')
       } else {

src/pages/userBind/org/enterprise.vue

@@ -313,14 +313,14 @@
             <input slot="content" v-model="legal_personMsg.cell_phone" placeholder="请输入手机号" >
           </item>
           <item>
-            <div slot="name" class="font-color required">居住地址</div>
+            <div slot="name" class="font-color required">联系地址</div>
             <textarea
               ref="address"
               slot="content"
               v-model="legal_personMsg.living_address"
               cols="30"
               rows="1"
-              placeholder="请输入居住地址"
+              placeholder="请输入联系地址"
               @input="addAddressRows(legal_personMsg.living_address)"
             />
           </item>
@@ -505,7 +505,7 @@ export default {
       legal_personMsg: {
         id_card_no: null,
         // legal_person: '',
-        cell_phone: null,
+        cell_phone: window.localStorage.getItem('user_phone'),
         living_address: '',
         id_card_date_from: '', // 法定代表人身份证有效期从
         id_card_date_to: '', // 法定代表人身份证有效期到
@@ -856,7 +856,7 @@ export default {
                 vm.hlsPopup.showLongCenter('手机号未填写')
                 break
               case 'living_address':
-                vm.hlsPopup.showLongCenter('居住地址未填写')
+                vm.hlsPopup.showLongCenter('联系地址未填写')
                 break
               case 'id_card_date_from':
                 vm.hlsPopup.showLongCenter('身份证有效期从未填写')
@@ -937,7 +937,7 @@ export default {
                 vm.hlsPopup.showLongCenter('手机号未填写')
                 break
               case 'living_address':
-                vm.hlsPopup.showLongCenter('居住地址未填写')
+                vm.hlsPopup.showLongCenter('联系地址未填写')
                 break
               case 'auth_person_name':
                 vm.hlsPopup.showLongCenter('授权人姓名未填写')

src/router/index.js

@@ -11,6 +11,7 @@ import Router from 'vue-router'
 import Guide from '@/pages/guide/guide'
 import Login from '@/pages/login'
 import Regiester from '@/pages/regiester'
+import Regiester2 from '@/pages/regiester2'
 import PwdForgot from '@/pages/pwd-forgotten'
 import FingerLogin from '@/pages/finger-login'
 import Home from '@/pages/home'
@@ -157,6 +158,12 @@ export default new Router({
       name: 'Regiester',
       meta: {keepAlive: false},
     },
+    {
+      path: '/regiester2',
+      component: Regiester2,
+      name: 'Regiester2',
+      meta: {keepAlive: false},
+    },
     {
       path: '/finger-login',
       component: FingerLogin,

src/scripts/prototype.js

+/**
+ *
+ * @param fmt
+ * @returns {*}
+ * @constructor
+ */
+Date.prototype.format = function (fmt) {
+  var o = {
+    "M+": this.getMonth() + 1, //月份
+    "d+": this.getDate(), //日
+    "h+": this.getHours(), //小时
+    "m+": this.getMinutes(), //分
+    "s+": this.getSeconds(), //秒
+    "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+    "S": this.getMilliseconds() //毫秒
+  };
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+  for (var k in o)
+    if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+  return fmt;
+}
+/**
+ * 移除数组的某个元素
+ * @param dx 下标
+ * @returns {boolean}
+ */
+Array.prototype.remove = function (dx) {
+  if (isNaN(dx) || dx > this.length) {
+    return false;
+  }
+  for (var i = 0, n = 0; i < this.length; i++) {
+    if (this[i] != this[dx]) {
+      this[n++] = this[i]
+    }
+  }
+  this.length -= 1
+}