diff --git a/common/loginHandle.js b/common/loginHandle.js new file mode 100644 index 0000000..6c2cd6c --- /dev/null +++ b/common/loginHandle.js @@ -0,0 +1,6 @@ + +import { goto } from "./untool" + +export const goLogin = ()=> { + // goto("login/login", 2) +} \ No newline at end of file diff --git a/common/manageServer.js b/common/manageServer.js index 74c578e..ac46012 100644 --- a/common/manageServer.js +++ b/common/manageServer.js @@ -2,6 +2,8 @@ import { goto, getImageTempFilePath } from "./untool"; import { showToast, showLoading, hideLoading, downloadFile } from "./untool" import { setSessionXToken, getSessionXToken } from "@/session" import { textEncoder, textDecoder } from "./util" +import { goLogin } from "@/common/loginHandle" + const getCommonReqData = ()=> { const xToken = getSessionXToken() return { @@ -84,7 +86,7 @@ async function handleResponse(options) { setSessionXToken() msg = '登录失效,请重新登录' showToast(msg) - goto("login/login", 2) + goLogin() return reject({ code: {} }); diff --git a/common/validate.js b/common/validate.js index 631ea27..3190017 100644 --- a/common/validate.js +++ b/common/validate.js @@ -1,6 +1,6 @@ import { showToast } from "./untool" const checkParams = (param, validConfig, showErrMsg = true)=> { - return new Promise((resolve)=> { + return new Promise((resolve, reject)=> { let errMsg = '' Object.keys(validConfig).map(key=> { const itemConf = validConfig[key] @@ -14,6 +14,7 @@ const checkParams = (param, validConfig, showErrMsg = true)=> { }) if(errMsg) { showErrMsg && showToast(errMsg) + reject() } else { resolve() } diff --git a/components/buns-api/login/index.vue b/components/buns-api/login/index.vue new file mode 100644 index 0000000..54299c4 --- /dev/null +++ b/components/buns-api/login/index.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/components/buns-api/login/mp-login.vue b/components/buns-api/login/mp-login.vue index 5580661..d457415 100644 --- a/components/buns-api/login/mp-login.vue +++ b/components/buns-api/login/mp-login.vue @@ -1,54 +1,40 @@