Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

src/utils/userInfo.js

+
+
+const UserInfo = 'userInfo'
+
+export function getUserInfo() {
+  return JSON.parse(sessionStorage.getItem(UserInfo))
+}
+
+export function setUserInfo(userInfo) {
+  return sessionStorage.setItem(UserInfo,JSON.stringify(userInfo))
+}
+
+export function removeUserInfo() {
+  return sessionStorage.removeItem(UserInfo)
+}

src/views/Login2.vue

@@ -51,8 +51,9 @@
 </template>
 
 <script>
-import { getFun, postFun } from "@/service/table";
-import { setToken } from "@/utils/auth";
+import { getFun,postFun } from '@/service/table'
+import { setToken } from '@/utils/auth'
+import { setUserInfo ,getUserInfo} from '@/utils/userInfo'
 export default {
   data() {
     return {
@@ -64,14 +65,28 @@ export default {
   },
   mounted() {},
   methods: {
-    onSubmit(values) {
-      getFun("check/token", values).then(Response => {
-        if (Response.code == 0) {
-          //  这里可以有登录成功的提示
-          setToken(Response.data);
-          this.$router.push("/message-center");
-        }
-      });
+     onSubmit(values) {
+        getFun('check/token',values).then((Response)=>{
+            if(Response.code==0){
+                postFun('mobile/user').then((Response2)=>{
+                    var userInfo={
+                        avatar:Response2.data.avatar,
+                        userName:Response2.data.userName,
+                        deptName:Response2.data.dept.deptName
+                    }
+                    /* 存储用户信息 */
+                    setUserInfo(userInfo)
+                    console.log(getUserInfo())
+                })
+                this.$notify({
+                    message:'登录成功',
+                    background:'green',
+                    duration: 1000
+                })
+                setToken(Response.data)
+                this.$router.push('/message-center')
+            }
+        })
     }
   }
 };

src/views/my/index.vue

@@ -63,6 +63,7 @@
 <script>
 import tabBar from "@/components/TabBar";
 import { removeToken } from '@/utils/auth' // get token from cookie
+import { getUserInfo} from '@/utils/userInfo'
 export default {
   components: {
     tabBar
@@ -71,8 +72,10 @@ export default {
     return {
       userInfo: {
         portrait: require("@/assets/myTerritory/touxiang.png"),
-        name: "刘华强",
-        position: "技术安全部"
+        name: getUserInfo()?getUserInfo().userName:"刘华强",
+        position: getUserInfo()?getUserInfo().deptName:"技术安全部",
+        // name: "刘华强",
+        // position: "技术安全部"
         // jurisdiction: [
         //   '隐患上报人',
         //   '隐患整改人',