瀏覽代碼

个人中心

sss 3 年之前
父節點
當前提交
29f913e0a4
共有 2 個文件被更改,包括 28 次插入25 次删除
  1. 2 2
      src/utils/validate.js
  2. 26 23
      src/views/middle.vue

+ 2 - 2
src/utils/validate.js

@@ -65,7 +65,7 @@ export function validEmail(email) {
 }
 
 export function isvalidPhone(phone) {
-  const reg = /^1[3|4|5|7|8|9][0-9]\d{8}$/
+  const reg = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/
   return reg.test(phone)
 }
 
@@ -140,7 +140,7 @@ export function validateTelephone(rule, value, callback) {
 
 /* 是否手机号码*/
 export function validatePhone(rule, value, callback) {
-  const reg = /^[1][3,4,5,7,8,9][0-9]{9}$/
+  const reg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/
   if (value === '' || value === undefined || value == null) {
     callback()
   } else {

+ 26 - 23
src/views/middle.vue

@@ -7,10 +7,10 @@
           <img src="../assets/images/logo.png" alt="">
         </div>
         <div class="header_right">
-          <el-avatar shape="circle" :size="50" :src="dmUser.faceid" />
+          <el-avatar shape="circle" :size="50" :src="dmUser.user.dmUser.faceid" />
           <div class="departmeny">
-            <p class="name"><span>{{ nowUser.nickName }}</span></p>
-            <p><span>部门:</span><span>{{ dept.name }}</span></p>
+            <p class="name"><span>{{ dmUser.user.nickName }}</span></p>
+            <p><span>部门:</span><span>{{ dmUser.user.dept.name }}</span></p>
           </div>
         </div>
       </header>
@@ -19,13 +19,13 @@
       <el-col :span="24">
         <div class="demo-basic--circle">
           <div class="block">
-            <el-avatar :size="150" :src="dmUser.faceid" />
+            <el-avatar :size="150" :src="dmUser.user.dmUser.faceid" />
           </div>
           <div class="userInfo">
-            <div class="name"><span>{{ nowUser.nickName }}</span></div>
+            <div class="name"><span>{{ dmUser.user.nickName }}</span></div>
             <div class="departmeny">
-              <p><span>部门:</span><span>{{ dept.name }}</span></p>
-              <p><span>手机:</span><span>{{ nowUser.phone }}</span></p>
+              <p><span>部门:</span><span>{{ dmUser.user.dept.name }}</span></p>
+              <p><span>手机:</span><span>{{ dmUser.user.phone }}</span></p>
             </div>
             <div class="icon">
               <div class="icon_left">
@@ -174,9 +174,7 @@ export default {
       systemListOne: [], // 快捷功能入口列表(字段需改,暂用的系统功能入口)
       balance: null,
       plate: null,
-      nowUser: {},
-      dmUser: {},
-      dept: {}
+      dmUser: { 'user': { 'dmUser': {}, 'dept': {}}}
     }
   },
   computed: {
@@ -191,27 +189,32 @@ export default {
   methods: {
     getUser(token) {
       ssoGetUser(token).then((res) => {
-        this.nowUser = res.data.data.user
-        this.dmUser = this.nowUser.dmUser
-        this.dept = this.nowUser.dept
-        console.log(this.nowUser)
+        if (!sessionStorage.getItem('dmUser')) {
+          console.log(111)
+          sessionStorage.setItem('dmUser', JSON.stringify(res.data.data))
+          this.dmUser = res.data.data
+        } else {
+          console.log(222)
+          this.dmUser = JSON.parse(sessionStorage.getItem('dmUser'))
+        }
+        console.log(this.dmUser)
         const user = {
-          username: res.data.data.user.username,
-          password: res.data.data.user.ossPassword
+          username: this.dmUser.user.username,
+          password: this.dmUser.user.ossPassword
         }
         this.$store.dispatch('Sso', user).then(() => {
-          crudDmSystem.queryByUserId(res.data.data.user.id, 0).then((res) => {
+          crudDmSystem.queryByUserId(this.dmUser.user.id, 0).then((res) => {
             this.systemList = res
           })
-          crudDmSystem.queryByUserId(res.data.data.user.id, 1).then((res) => {
+          crudDmSystem.queryByUserId(this.dmUser.user.id, 1).then((res) => {
             this.systemListOne = res
           })
         })
-        this.getBalance(res.data.data.user.dmUser.cardid)
-        this.getPlate(res.data.data.token, res.data.data.nonce, res.data.data.timestamp, res.data.data.user.id)
-        this.getAccessTraffic(res.data.data.token, res.data.data.nonce, res.data.data.timestamp, res.data.data.user.id)
-        this.orderRecord(res.data.data.token, res.data.data.nonce, res.data.data.timestamp, res.data.data.user.dmUser.cardid)
-        this.getVisitors(res.data.data.token, res.data.data.nonce, res.data.data.timestamp, res.data.data.user.id)
+        this.getBalance(this.dmUser.user.dmUser.cardid)
+        this.getPlate(this.dmUser.token, this.dmUser.nonce, this.dmUser.timestamp, this.dmUser.user.id)
+        this.getAccessTraffic(this.dmUser.token, this.dmUser.nonce, this.dmUser.timestamp, this.dmUser.user.id)
+        this.orderRecord(this.dmUser.token, this.dmUser.nonce, this.dmUser.timestamp, this.dmUser.user.dmUser.cardid)
+        this.getVisitors(this.dmUser.token, this.dmUser.nonce, this.dmUser.timestamp, this.dmUser.user.id)
       })
     },
     getBalance(card) {