diff --git a/src/api/login.js b/src/api/login.js
index c7b02018..b5348a22 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -1,32 +1,56 @@
import request from '@/api/request'
import common from "@/common/common";
-import {setToken, setUserInfo} from "@/common/common";
+import {
+ setToken,
+ setUserInfo
+} from "@/common/common";
// 账号登录接口
export const useAccountLoginApp = (data) => request({
- url: '/traapp/access/userLogin',
- method: 'post',
- data
-}).then(async({ rtnCode, body }) => {
- if (rtnCode === '0000') {
- setToken(body)
- // deptId: ""
- // deptName: null
- // loginName: "ADMIN" // todo id
- // orgId: "00E200"
- // orgName: "金融科技部"
- // userId: "USER001"
- // userName: "ADMIN" / todo name
- // userStatus: "01"
- const user_data = await queryCurrentUser()
- setUserInfo(user_data.body)
- return user_data.body
- }
- return Promise.reject({ rtnCode, body })
+ url: '/traapp/access/userLogin',
+ method: 'post',
+ data
+}).then(async ({
+ rtnCode,
+ body
+}) => {
+ if (rtnCode === '0000') {
+ setToken(body)
+ // deptId: ""
+ // deptName: null
+ // loginName: "ADMIN" // todo id
+ // orgId: "00E200"
+ // orgName: "金融科技部"
+ // userId: "USER001"
+ // userName: "ADMIN" / todo name
+ // userStatus: "01"
+ const user_data = await queryCurrentUser()
+ setUserInfo(user_data.body)
+ return user_data.body
+ }
+ return Promise.reject({
+ rtnCode,
+ body
+ })
}).catch(res => {
- console.log('报错s');
- console.log(res);
+ /**
+ error: "Service Unavailable"
+ path: "/traapp/access/userLogin"
+ requestId: "74d60800-104"
+ status: 503
+ timestamp: "2025-06-24T00:53:35.293+00:00"
+ */
+ /**
+ body: null
+ channelNo: "FF6944B69A99745C009F4D0B3C3B22B8E81B22F587D68455E354BABBABCCB6246C54ABD28F3C55AAD34224A16CE7E24E"
+ head: null
+ message: "系统异常"
+ rtnCode: "9999"
+ rtnTime: "2025-06-24 08:54:52"
+ */
+
+ return Promise.reject(res)
})
/**
@@ -38,31 +62,31 @@ export const useAccountLoginApp = (data) => request({
userName 姓名
*/
export const queryCurrentUser = (data) => request({
- url: '/traapp/access/queryCurrentUser',
- method: 'post',
- data
+ url: '/traapp/access/queryCurrentUser',
+ method: 'post',
+ data
})
//获取隐私协议
export const getYsxy = (data) => request({
- url: '/traapp/dfAgtInfo/queryValidDfAgt',
- method: 'post',
- data
+ url: '/traapp/dfAgtInfo/queryValidDfAgt',
+ method: 'post',
+ data
})
// 获取验证码(作废)
export const getLoginAppCheckCode = (data) => request({
- url: '/traapp/access/checkCode',
- method: 'get',
- data
+ url: '/traapp/access/checkCode',
+ method: 'get',
+ data
})
// 退出登录
export const loginOut = (data) => request({
- url: '/traapp/access/loginOut',
- method: 'post',
- data
-}).then(() =>{
+ url: '/traapp/access/loginOut',
+ method: 'post',
+ data
+}).then(() => {
setToken(null)
setUserInfo(null)
})
\ No newline at end of file
diff --git a/src/pages/courseDetail/components/comment.vue b/src/pages/courseDetail/components/comment.vue
index 78ff4c6c..b2acfea9 100644
--- a/src/pages/courseDetail/components/comment.vue
+++ b/src/pages/courseDetail/components/comment.vue
@@ -19,7 +19,8 @@
回复
- 展开3条回复
+ 展开3条回复
+
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 6b04a1a1..0c59dac7 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -102,6 +102,7 @@
// this.$common.reLaunch('/pages/homepage/index');
// }, this.GLOBAL_TIMER_SUBMIT_DELAY_TIME);
const pages = getCurrentPages()
+ console.log(pages.length, 'length');
if (pages.length >= 2) { // 页面栈只有一页,没有返回页,那就返回首页
console.log('返回登录的上一页');
back_state.value = false