我的页和设置页完成

src/api/login.js

@@ -2,9 +2,12 @@ import request from '@/api/request'
 import common from "@/common/common";
 import {
 	setToken,
-	setUserInfo
+	setUserInfo,
+	getUserInfo
 } from "@/common/common";
-
+import {
+	get_base_url
+} from '@/api/request.js'
 
 // 账号登录接口
 export const useAccountLoginApp = (data) => request({
@@ -17,17 +20,10 @@ export const useAccountLoginApp = (data) => request({
 }) => {
 	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 user_data
+
 	}
 	return Promise.reject({
 		rtnCode,
@@ -49,14 +45,14 @@ export const useAccountLoginApp = (data) => request({
 	 rtnCode: "9999"
 	 rtnTime: "2025-06-24 08:54:52"
 	*/
-	
+
 	return Promise.reject(res)
 })
 
 /**
  * 获取个人信息
  * 入参
-	 gender F是女 M男
+	 gender f是女 m男
 	 imageAddr： 图片
 	 loginName  ID
 	 userName  姓名
@@ -65,6 +61,64 @@ export const queryCurrentUser = (data) => request({
 	url: '/traapp/access/queryCurrentUser',
 	method: 'post',
 	data
+}).then(res => {
+	// deptId: ""
+	// deptName: null
+	// loginName: "ADMIN" // todo  id
+	// orgId: "00E200"
+	// orgName: "金融科技部"
+	// userId: "USER001"
+	// userName: "ADMIN" / todo  name
+	// userStatus: "01"
+	setUserInfo(res.body)
+	console.log('预加载头像');
+	const base_url = get_base_url()
+	// 预加载头像
+	// #ifdef APP-PLUS
+	const updateUserAvatar = (imagePath) => {
+	  const userInfo = getUserInfo()
+	  setUserInfo({
+	    ...userInfo,
+	    'imagePath': imagePath
+	  })
+	}
+	
+	try {
+	  const pathName = res.body.imageAddr
+	  const url = base_url + pathName
+	  // 生成唯一文件名，避免冲突
+	  const filename = pathName.split('/').pop()
+	  const localFilePath = '_downloads/' + filename
+	  
+	  // 先检查是否存在
+	  uni.getFileInfo({
+	    filePath: localFilePath,
+	    success: () => {
+	      console.log('头像已存在，无需下载');
+	      updateUserAvatar(localFilePath)
+	    },
+	    fail: () => {
+	      console.log('开始下载头像:', url);
+	      const dtask = plus.downloader.createDownload(
+	        url, {
+	          method: 'GET',
+	          filename: '_downloads/' + filename
+	        },
+	        (download, status) => {
+	          if (status === 200) {
+	            console.log('头像下载成功:', download.filename);
+	            updateUserAvatar(download.filename)
+	          } 
+	        }
+	      )
+	      dtask.start();
+	    }
+	  })
+	} catch (error) {
+	  console.error('头像预加载过程发生错误:', error);
+	}
+	// #endif
+	return res.body
 })
 
 //获取隐私协议