用户信息

api/user.js

@@ -1,7 +1,7 @@
 import request from "@/utils/request"
 
-// 获取用户基本信息
-export const getUserInfo = (params) => {
+// 获取人才信息信息
+export const getBaseInfo = (params) => {
   return request({
     url: '/app-api/menduner/system/person/get',
     method: 'GET',
@@ -13,6 +13,19 @@ export const getUserInfo = (params) => {
   })
 }
 
+// 获取用户信息
+export const getUserInfo = (params) => {
+  return request({
+    url: '/app-api/menduner/system/mde-user/get',
+    method: 'GET',
+    params,
+    custom: {
+      showLoading: false,
+      auth: true
+    }
+  })
+}
+
 // 获取附件列表
 export const getPersonResumeCv = () => {
   return request({

pages/index/my.vue

@@ -1,9 +1,9 @@
 <template>
   <view class="ss-p-b-30">
     <view class="text-center">
-      <img :src="getUserAvatar(userInfo?.avatar, userInfo?.sex)" alt="" class="img-box">
+      <img :src="getUserAvatar(baseInfo?.avatar, baseInfo?.sex)" alt="" class="img-box">
       <view v-if="!useUserStore.isLogin" class="font-weight-bold font-size-20" @tap="handleLogin">点击登录</view>
-      <view v-else class="font-weight-bold font-size-20">{{ userInfo.name || userInfo.phone }}</view>
+      <view v-else class="font-weight-bold font-size-20">{{ baseInfo?.name || userInfo?.phone }}</view>
     </view>
     <view class="d-flex" style="margin-top: 80rpx;">
         <view v-for="(item, index) in itemList" :key="index" @tap="handleToLink(item)" class="parent">
@@ -46,6 +46,7 @@ import { getUserAvatar } from '@/utils/avatar'
 import { getAccessToken } from '@/utils/request'
 
 const useUserStore = userStore()
+const baseInfo = computed(() => useUserStore?.baseInfo)
 const userInfo = computed(() => useUserStore?.userInfo)
 const popup = ref()
 const itemList = [

pages/index/position.vue

@@ -15,7 +15,6 @@
       <view class="white-bgc px-10 pb-10 mb-10">
         <SwiperAd :list="swiperAdList"></SwiperAd>
         <FilterList :list="filterList" idValue="label" class="ss-m-t-30" @change="handleSearch"></FilterList>
-        <uni-icons custom-prefix="iconfont" type="icon-ClearFilter" color="#00897B" size="30"></uni-icons>
       </view>
       <PositionList class="pb-10" :list="positionListData" :noMore="noMore"></PositionList>
     </scroll-view>

pagesA/interview/index.vue

@@ -96,7 +96,7 @@ const handleConfirm = async () => {
   const api = type.value === 'agree' ? userInterviewInviteConsent : userInterviewInviteReject
   // 同意需提交手机号
   let phone = ''
-  if (useUserStore?.userInfo?.phone) phone = useUserStore?.userInfo?.phone
+  if (useUserStore?.baseInfo?.phone) phone = useUserStore?.baseInfo?.phone
   await api(type.value === 'agree' ? { id: id.value, phone } : id.value)
   handleClose()
   uni.showToast({

store/user.js

@@ -1,10 +1,10 @@
 import { defineStore } from 'pinia';
 import { clone, cloneDeep } from 'lodash-es';
-import { getUserInfo } from '@/api/user';
+import { getBaseInfo, getUserInfo } from '@/api/user';
 import { smsLogin, passwordLogin, logout } from '@/api/common'
 
 // 默认用户信息
-const defaultUserInfo = {
+const defaultBaseInfo = {
   avatar: '', // 头像
   nickname: '', // 昵称
   gender: 0, // 性别
@@ -31,7 +31,8 @@ const tabUrl = [
 export const userStore = defineStore({
   id: 'user',
   state: () => ({
-    userInfo: {}, // 用户信息
+    baseInfo: {}, // 用户信息
+    userInfo: {},
     isLogin: !!uni.getStorageSync('token'), // 登录状态
     lastUpdateTime: 0, // 上次更新时间
     accountInfo: cloneDeep(defaultAccountInfo), // 账号信息
@@ -49,6 +50,7 @@ export const userStore = defineStore({
       }
       this.accountInfo = data
       this.getInfo()
+      this.getUserInfo()
 
       // 登录成功后的跳转地址
       // if (tabUrl.includes(route)) {
@@ -64,9 +66,18 @@ export const userStore = defineStore({
         url: '/pages/index/position'
       })
     },
-    // 获取用户信息
+    // 获取人才信息
     async getInfo() {
-      const { code, data } = await getUserInfo({ userId: this.accountInfo.userId });
+      const { code, data } = await getBaseInfo({ userId: this.accountInfo.userId });
+      if (code !== 0) {
+        return;
+      }
+      this.baseInfo = data;
+      return Promise.resolve(data);
+    },
+    // 获取用户信息
+    async getUserInfo() {
+      const { code, data } = await getUserInfo({ id: this.accountInfo.userId });
       if (code !== 0) {
         return;
       }
@@ -102,9 +113,7 @@ export const userStore = defineStore({
       this.lastUpdateTime = nowTime;
 
       // 获取最新信息
-      // await this.getInfo();
-      // this.getWallet();
-      return this.userInfo;
+      return this.baseInfo;
     },
 
     // 重置用户默认数据
@@ -112,7 +121,8 @@ export const userStore = defineStore({
       // 清空 token
       this.setToken();
       // 清空用户相关的缓存
-      this.userInfo = clone(defaultUserInfo);
+      this.baseInfo = clone(defaultBaseInfo);
+      this.userInfo = {}
       this.accountInfo = cloneDeep(defaultAccountInfo);
     },