From b148da839f0c461c5ddc37ca65c8fa4e1f0e6f5d Mon Sep 17 00:00:00 2001
From: fanzhen123 <1575502816@qq.com>
Date: Mon, 23 Dec 2019 17:57:18 +0800
Subject: [PATCH] fanzhen1223

---
 src/components/nav/Nav.vue                  | 4 ++++
 src/components/search/search.vue            | 1 +
 src/main.js                                 | 4 ++++
 src/views/index/Index.vue                   | 1 +
 src/views/personalCenter/PersonalCenter.vue | 2 +-
 src/views/register/Register.vue             | 2 +-
 6 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/nav/Nav.vue b/src/components/nav/Nav.vue
index d6d0099..2daee2c 100644
--- a/src/components/nav/Nav.vue
+++ b/src/components/nav/Nav.vue
@@ -190,6 +190,10 @@ export default {
               localStorage.setItem('userPwd', this.userpwd)
               localStorage.setItem('token', 'Bearer ' + res.data.data.token)
               localStorage.setItem('tokenB', res.data.data.token)
+              setTimeout(() => {
+                localStorage.clear()
+                this.$router.go(0)
+              }, 7200)
               // 登录状态
               localStorage.setItem('userLogin', true)
               console.log(this.$route, '000111')
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index cb86f17..304a10b 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -29,6 +29,7 @@ export default {
   methods: {
     blurUpset (textCont) {
       console.log(textCont, '3523')
+      this.searchContext = textCont
       if (this.searchContext === '') {
         alert('搜索词不能为空！')
         return
diff --git a/src/main.js b/src/main.js
index 22cba01..085aad2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -96,6 +96,10 @@ axios({
     localStorage.setItem('userPwd', '123456')
     localStorage.setItem('token', 'Bearer ' + res.data.data.token)
     localStorage.setItem('tokenB', res.data.data.token)
+    setTimeout(() => {
+      localStorage.clear()
+      this.$router.go(0)
+    }, 7200)
     // 登录状态
     localStorage.setItem('userLogin', true)
     Vue.prototype.$auth = true
diff --git a/src/views/index/Index.vue b/src/views/index/Index.vue
index 3fb96b2..b28dee6 100644
--- a/src/views/index/Index.vue
+++ b/src/views/index/Index.vue
@@ -555,6 +555,7 @@ export default {
       console.log(objStex, 'this.indexDatalabel[this.objStex]')
       switch (state) {
         case true:// 快速查询（专题统计报表）
+          console.log(12000)
           if (objStex.type === '1') { // 非地区
             this.$router.push(
               {
diff --git a/src/views/personalCenter/PersonalCenter.vue b/src/views/personalCenter/PersonalCenter.vue
index 3d0e20e..a433b86 100644
--- a/src/views/personalCenter/PersonalCenter.vue
+++ b/src/views/personalCenter/PersonalCenter.vue
@@ -356,7 +356,7 @@ export default {
             return {
               name: item.name,
               database: item.db,
-              birthTime: item.updated_at,
+              birthTime: item.created_at,
               staticInput: false,
               adv: item.adv,
               id: item.id,
diff --git a/src/views/register/Register.vue b/src/views/register/Register.vue
index f7c0001..7520888 100644
--- a/src/views/register/Register.vue
+++ b/src/views/register/Register.vue
@@ -97,7 +97,7 @@ export default {
         alert('机构地址不能为空！')
       } else if (this.registerData.department === '') {
         alert('所属部门不能为空！')
-      } else if (!(/^1[3456789]\d{9}$/.test(this.registerData.userIphone))) { // 验证手机号
+      } else if (!(/^1(?:3\d|4[4-9]|5[0-35-9]|6[67]|7[013-8]|8\d|9\d)\d{8}$/.test(this.registerData.userIphone))) { // 验证手机号
         alert('您输入的手机号码有误！')
       } else if (!(/^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(this.registerData.userMail))) { // 验证邮箱
         alert('您输入的邮箱地址有误！')