From a67333be231905525761ffe7e699e6b7c17aac97 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Sat, 10 Oct 2020 10:19:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86api=E9=9B=86?=
 =?UTF-8?q?=E4=B8=AD=E5=8C=96=20=E6=90=9E=E5=AE=9A=E4=BA=86vuex?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue               | 12 ++++++++++
 src/api/base.ts           | 27 ++++++++++++++++++-----
 src/api/index.ts          | 46 +++++++++++++++++++++++++--------------
 src/components/Menu.vue   | 19 ++++++++--------
 src/store/index.ts        | 15 ++++++++++---
 src/types/index.d.ts      | 27 ++++++++++++++++++-----
 src/views/login/Login.vue | 27 +++++------------------
 7 files changed, 112 insertions(+), 61 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index d831336..fc13294 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,6 +5,18 @@
   </div> -->
   <router-view/>
 </template>
+<script lang="ts">
+import { defineComponent } from 'vue';
+import store from './store';
+
+export default defineComponent({
+  setup(){
+    if(store.state.islogin){
+      store.dispatch("setUserInfo");
+    }
+  }
+})
+</script>
 
 <style lang="scss">
 .one-line-hide {
diff --git a/src/api/base.ts b/src/api/base.ts
index 292feb3..18ea39a 100644
--- a/src/api/base.ts
+++ b/src/api/base.ts
@@ -1,20 +1,35 @@
 import axios from '../config/axiosConfig'
 
+import { AxiosRequestConfig, CustomSuccessData } from 'axios';
+import { getValue } from '@/utils/common';
+
+// 泛型接口 
+export interface Get {
+    <T>(url: string, params?: object, config?: AxiosRequestConfig): Promise<CustomSuccessData<T>>;
+}
+
 axios.interceptors.response.use((response)=>{
-    return response.data;
+    return response;
 },(error)=>{
     return error;
 })
 
-function get(url: string,data?: object) {
-    return axios.get(url,{params:data})
+const get: Get = async function (url: string,data?: object) {
+    const res =  await axios.get(url,{params:data});
+    return res.data;
 }
 
-function post(url: string,data?: object) {
-    return axios.post(url,data)
+const post: Get = async function (url: string,data?: object) {
+    const res =  await axios.post(url,data)
+    return res.data;
+}
+
+function setToken(){
+    axios.defaults.headers.common['Authorization'] = "Bearer " + getValue("token");
 }
 
 export {
     get,
-    post
+    post,
+    setToken
 }
\ No newline at end of file
diff --git a/src/api/index.ts b/src/api/index.ts
index f82872e..9deef49 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,14 +1,10 @@
-import { get, post } from './base'
+import router from '@/router';
+import store from '@/store';
+import { LoginData, UserInfo } from '@/types';
+import { saveValue } from '@/utils/common';
+import { message } from 'ant-design-vue';
+import { get, post, setToken } from './base'
 
-/**
- * 请求验证码
- * @param phone 手机号
- * @param type 类型 0国内 1国外
- */
-
-export function sendsms(phone: string, type?: number){
-    return post('SendSms',{phone, type})
-}
 
 /**
  * 用户名密码登录
@@ -16,13 +12,31 @@ export function sendsms(phone: string, type?: number){
  * @param password 密码
  */
 
-export function loginpass(phone: string, password: string){
-    return post("login",{type: 2,username: phone, password: password})
+export async function loginpass(phone: string, password: string){
+    const res = await post<LoginData>("login",{type: 2,username: phone, password: password});
+    console.log(res.code)
+    if(res.code == 1){
+        message.error(res.msg)
+    }else{
+        console.log(res.data)
+        if(!saveValue("token", res.data?.api_token) && !saveValue("memberid", res.data?.memberid) ){
+            message.error("存储错误, 请允许网页使用本地存储！")
+        }else{
+            setToken();
+            store.commit("login");
+            router.push("/mine/archives")
+        }
+    }
 }
 
 /**
- * 用户信息详情
+ * 用户头像和用户名字
  */
-export function userinfo(){
-    return get('personalInfo')
-}
\ No newline at end of file
+export async function userinfo(){
+    const user =  await get<UserInfo>('personalInfo');
+    console.log(user.data?.img)
+    return {
+        head: user.data?.img,
+        username: user.data?.name
+    }
+}
diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 91e5617..df42b49 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -2,8 +2,8 @@
     <div class="menu">
         <div class="user" style="overflow: hidden;">
             <div class="user" :class="{'seltop': selnum == 0}">
-                <img src="" alt="" class="head">
-                <div class="name">name</div>
+                <img :src="userinfo.head" alt="" class="head">
+                <div class="name">{{userinfo.username}}</div>
             </div>
         </div>
         
@@ -50,7 +50,6 @@
         .head{
             width: 57px;
             height: 57px;
-            background-color: #0f0;
             margin-bottom: 15px;
             border-radius: 50%;
         }
@@ -117,9 +116,9 @@
 }
 </style>
 <script lang="ts">
-import { userinfo } from '@/api';
 import router from '@/router';
-import { defineComponent, ref } from 'vue';
+import store from '@/store';
+import { computed, defineComponent, ref } from 'vue';
 
 export default defineComponent({
     setup(){
@@ -170,6 +169,9 @@ export default defineComponent({
         ]
         // 当前选中的index
         const selnum = ref(0);
+
+        const userinfo = computed(() => store.state.userinfo)
+        console.log(userinfo.value)
         /**
          * 跳转路由与赋值对应的下标
          * @param index 选中的下标 方便赋值与跳转
@@ -183,13 +185,12 @@ export default defineComponent({
 
         }
 
-        userinfo().then((res)=>{
-            console.log(res)
-        })
+      
         return{
             list,
             routeto,
-            selnum
+            selnum,
+            userinfo
         }
     }
 })
diff --git a/src/store/index.ts b/src/store/index.ts
index db1fba8..6461189 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,18 +1,27 @@
+import { userinfo } from '@/api';
 import { createStore } from 'vuex'
 
 export default createStore({
   state: {
     userinfo:{
-      name: "",
-      img: ""
-    }
+      username: "username",
+      head: ""
+    },
+    islogin: false
   },
   mutations: {
     setUserInfo(state, userinfo){
       state.userinfo = userinfo
+    },
+    login(state){
+      state.islogin = true;
     }
   },
   actions: {
+    async setUserInfo({ commit }){
+      const user = await userinfo();
+      commit('setUserInfo', user);
+    }
   },
   modules: {
   }
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index b4b6141..54ddfd4 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -2,6 +2,19 @@
  * 只添加了一些必要的参数，并没有写完整，因为剩下的大部分用不到
  */
 
+// 定义axios
+import * as axios from 'axios';
+
+declare module 'axios' {
+    export interface CustomSuccessData<T> {
+        code: number;
+        msg?: string;
+        data?: T;
+        [keys: string]: any;
+    }
+}
+
+
 
 // 图片选择
 export interface ImgInfo {
@@ -20,10 +33,14 @@ export interface VideoInfo {
     uid: string;
 }
 
-// 返回数据
-export interface ResData<T = any>{
-    code?: number;
-    msg?: string;
-    data?: T;
+// 登录返回数据
+export interface LoginData{
+    api_token: string;
+    memberid: number;
 }
 
+// 用户信息
+export interface UserInfo {
+    name: string;
+    img: string;
+}
\ No newline at end of file
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index 58ce0c3..1040de9 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -149,11 +149,8 @@
 import { defineComponent, reactive, ref } from "vue";
 import LoginTab from "@/components/login/LoginTab.vue";
 import NavTop from "@/components/NavTop.vue"
-import { loginpass, sendsms } from '@/api';
-import { message } from 'ant-design-vue';
-import { ResData } from '@/types';
-import { saveValue } from '@/utils/common';
-import router from '@/router';
+import { loginpass } from '@/api';
+import store from '@/store';
 
 export default defineComponent({
   name: "Login",
@@ -188,9 +185,6 @@ export default defineComponent({
      */
     const getcode: () => void = () => {
       console.log(phone.value);
-      sendsms("86" + phone.value, 0).then((res)=>{
-        console.log(res)
-      })
       const timestep = setInterval(() => {
         console.log(11112);
         time.value = time.value - 1;
@@ -202,23 +196,12 @@ export default defineComponent({
         }
       }, 1000);
     };
-
     function login(): void {
         console.log(userinfo.phone,userinfo.password)
-        
-        loginpass(userinfo.phone,userinfo.password).then((res: ResData) =>{
-          console.log(res.code)
-          if(res.code == 1){
-            message.error(res.msg)
-          }else{
-            console.log(res.data)
-            if(!saveValue("token", res.data.api_token)){
-              message.error("存储错误, 请允许网页使用本地存储！")
-            }else{
-              router.push("/mine/archives")
-            }
-          }
+        loginpass(userinfo.phone,userinfo.password).then(()=>{
+            store.dispatch("setUserInfo");
         })
+
     }
     return {
       formLayout,