完成助教端 页面

src/pages/system/launchPage/launchPage.vue

@@ -34,7 +34,6 @@ function toHome(data: any) {
   }
 }
 onLoad(async (data: any) => {
-  console.log(data);
   if (data && data.openId) {
     setGlobal(data);
     checkOpenId({

src/pages/system/login/login.vue

@@ -96,7 +96,6 @@ import {
   updateUserApi,
 } from "@/api/system/login";
 import { useUserStore } from "@/store/modules/user";
-import pages from "@/pages.json";
 const { getGlobal } = useDataStore();
 const formData = reactive({
   loginName: "",
@@ -179,6 +178,7 @@ const handleVerify = async () => {
     appCode: getGlobal.type == 1 ? "ZB" : "JS",
   });
   if (result.resultCode == 1) {
+    if (result.result) {
       afterLoginAction(result.result);
       uni.showToast({ title: "验证成功", icon: "success" });
       if (getGlobal.type == 1) {
@@ -207,6 +207,9 @@ const handleVerify = async () => {
     } else {
       uni.showToast({ title: result.message || "验证失败", icon: "none" });
     }
+  } else {
+    uni.showToast({ title: result.message || "验证失败", icon: "none" });
+  }
 };
 
 async function afterRead(event: any) {

src/utils/request/index.ts

@@ -1,52 +1,59 @@
-import {AUTH_KEY, BASE_URL, HOMEAGENT, RESULT_CODE_NOT_LOGIN} from "@/config";
+import { AUTH_KEY, BASE_URL, HOMEAGENT, RESULT_CODE_NOT_LOGIN } from "@/config";
-import {useUserStore} from "@/store/modules/user";
+import { useUserStore } from "@/store/modules/user";
-import {getLogin} from "../permission";
+import { getLogin } from "../permission";
-import {request} from "@/utils/request/request";
+import { request } from "@/utils/request/request";
-import {showToast} from "@/utils/uniapp";
+import { showToast } from "@/utils/uniapp";
 
 let count: boolean = false;
 
 function _loginExpiredModal() {
   const store = useUserStore();
-    store.logout()
+  store.logout();
   uni.showModal({
-        title: '提示',
+    title: "提示",
-        content: '登录过期,请重新登录',
+    content: "登录过期,请重新登录",
     showCancel: false,
     success: function (res) {
       if (res.confirm) {
-                count = false
+        count = false;
-                getLogin()
+        getLogin();
       } else if (res.cancel) {
-                count = false
+        count = false;
         uni.navigateBack({
           delta: 1,
           fail: (err) => {
-                        console.log(err)
+            console.log(err);
-                    }
+          },
-                })
+        });
-            }
       }
+    },
   });
 }
 
 export const config = {
-    baseUrl: process.env.NODE_ENV == 'development' ? HOMEAGENT ? '/base' : BASE_URL : BASE_URL,
+  baseUrl:
-    header: {}
+    process.env.NODE_ENV == "development"
-}
+      ? HOMEAGENT
+        ? "/base"
+        : BASE_URL
+      : BASE_URL,
+  header: {},
+};
 export const interceptor = {
-    request: (config: UniNamespace.UploadFileOption | UniNamespace.RequestOptions) => {
+  request: (
+    config: UniNamespace.UploadFileOption | UniNamespace.RequestOptions
+  ) => {
     const store = useUserStore();
     if (store.getToken) {
       config.header = {
-                [AUTH_KEY]: store.getToken
+        [AUTH_KEY]: store.getToken,
       };
     }
   },
   response: (response: any) => {
     if (response.data && RESULT_CODE_NOT_LOGIN == response.data.resultCode) {
       if (!count) {
-                _loginExpiredModal()
+        _loginExpiredModal();
       }
       count = true;
       return;
@@ -57,77 +64,126 @@ export const interceptor = {
     if (response.data) {
       return response.data;
     } else {
-            console.log('接口无返回值', response)
+      console.log("接口无返回值", response);
     }
-    }
+  },
-}
+};
 
-export function get<T = any>(url: string, data?: any, options?: UniNamespace.RequestOptions): Promise<Requests<T>> {
+export function get<T = any>(
+  url: string,
+  data?: any,
+  options?: UniNamespace.RequestOptions
+): Promise<Requests<T>> {
   return new Promise((resolve, reject) => {
-        request(Object.assign({}, {
+    request(
+      Object.assign(
+        {},
+        {
           url,
           data,
-            method: 'GET',
+          method: "GET",
-            dataType: 'json',
+          dataType: "json",
-            responseType: 'text',
+          responseType: "text",
-        }, options)).then(res => {
+        },
+        options
+      )
+    ).then((res) => {
       if (res.resultCode == 1) {
-                resolve(res)
+        resolve(res);
       } else {
         if (res.resultCode) {
           if (res.resultCode != RESULT_CODE_NOT_LOGIN) {
-                        showToast(res.message || '接口异常')
+            showToast(res.message || "接口异常");
-                        reject(res)
+            reject(res);
           }
         } else {
           if (res.rows) {
-                        resolve(res)
+            resolve(res);
           } else {
-                        showToast(res.message || '接口异常')
+            showToast(res.message || "接口异常");
-                        reject(res)
+            reject(res);
           }
         }
       }
-        })
+    });
-    })
+  });
 }
 
-
+export function post<T = any>(
-export function post<T = any>(url: string, data?: any, options?: UniNamespace.RequestOptions): Promise<Requests<T>> {
+  url: string,
+  data?: any,
+  options?: UniNamespace.RequestOptions
+): Promise<Requests<T>> {
   return new Promise((resolve, reject) => {
-        request(Object.assign({}, {
+    request(
+      Object.assign(
+        {},
+        {
           url,
           data,
-            method: 'POST',
+          method: "POST",
-            dataType: 'json',
+          dataType: "json",
-            responseType: 'text',
+          responseType: "text",
-        }, options)).then(res => {
+        },
+        options
+      )
+    ).then((res) => {
       if (res.resultCode == 1) {
-                resolve(res)
+        resolve(res);
       } else {
         if (res.resultCode) {
           if (res.resultCode != RESULT_CODE_NOT_LOGIN) {
-                        showToast(res.message || '接口异常')
+            showToast(res.message || "接口异常");
-                        reject(res)
+            reject(res);
           }
         } else {
           if (res.rows) {
-                        resolve(res)
+            resolve(res);
           } else {
-                        showToast(res.message || '接口异常')
+            showToast(res.message || "接口异常");
-                        reject(res)
+            reject(res);
           }
         }
       }
-        })
+    });
-    })
+  });
 }
 
-export function file(url: string, data: Blob, options?: UniNamespace.UploadFileOption) {
+export function file(
-    return request(Object.assign({}, {
+  url: string,
+  data: Blob,
+  options?: UniNamespace.UploadFileOption
+) {
+  return new Promise((resolve, reject) => {
+    request(
+      Object.assign(
+        {},
+        {
           url,
           filePath: data,
-        name: 'files',
+          name: "files",
-    }, options), true)
+        },
+        options
+      ),
+      true
+    ).then((res) => {
+      if (res.resultCode == 1) {
+        resolve(res);
+      } else {
+        if (res.resultCode) {
+          if (res.resultCode != RESULT_CODE_NOT_LOGIN) {
+            showToast(res.message || "接口异常");
+            reject(res);
+          }
+        } else {
+          if (res.rows) {
+            resolve(res);
+          } else {
+            showToast(res.message || "接口异常");
+            reject(res);
+          }
+        }
+      }
+    });
+  });
 }
-