diff --git a/App.vue b/App.vue
index dd7a106..e2099f2 100644
--- a/App.vue
+++ b/App.vue
@@ -3,17 +3,20 @@ import { reactive, inject, onMounted } from 'vue';
import { onLaunch, onShow, onHide } from '@dcloudio/uni-app';
import useUserStore from './stores/useUserStore';
import useDictStore from './stores/useDictStore';
+import { tabbarManager } from './utils/tabbarManager';
const { $api, navTo, appendScriptTagElement } = inject('globalFunction');
import config from '@/config.js';
onLaunch((options) => {
useUserStore().initSeesionId(); //更新
useDictStore().getDictData();
- // uni.hideTabBar();
- // 尝试从缓存恢复用户信息
+ // 先尝试从缓存恢复用户信息
const restored = useUserStore().restoreUserInfo();
+ // 用户信息恢复后再初始化自定义tabbar
+ tabbarManager.initTabBar();
+
if (restored) {
// 如果成功恢复用户信息，验证token是否有效
let token = uni.getStorageSync('token') || '';
diff --git a/apiRc/login.js b/apiRc/login.js
new file mode 100644
index 0000000..2c517e0
--- /dev/null
+++ b/apiRc/login.js
@@ -0,0 +1,177 @@
+/*
+ * @Descripttion:
+ * @Author: lip
+ * @Date: 2023-07-27 16:01:59
+ * @LastEditors: shirlwang
+ */
+import request from '@/utilsRc/request'
+
+// 登录方法
+// export function login(data) {
+// return request({
+// 'url': '/login',
+// headers: {
+// isToken: false
+// },
+// 'method': 'post',
+// data
+// })
+// }
+const userApi = {
+ Login: '/login',
+ Logout: '/logout',
+ Register: '/register',
+ // get my info
+ UserInfo: '/getInfo'
+}
+// 登录接口
+export function login(data) {
+ return request({
+ 'url': '/personnel/personBaseInfo/loginGrAndQy',
+ headers: {
+ isToken: false
+ },
+ 'method': 'post',
+ data
+ })
+}
+export function loginphone(data) {
+ return request({
+ 'url': '/not/login/person/xcxLogin',
+ 'method': 'get',
+ headers: {
+ isToken: false
+ },
+ data
+ })
+}
+
+
+// 注册方法
+export function register (data) {
+ return request({
+ 'url': '/register',
+ headers: {
+ isToken: false
+ },
+ method: 'post',
+ data: data
+ })
+}
+
+// 短信登录
+export function smsLogin(data) {
+ return request({
+ 'url': '/smsLogin',
+ 'method': 'post',
+ 'data': data
+ })
+}
+export function wechatLogin(data) {
+ return request({
+ url: '/xcxLogin',
+ method: 'post',
+ params: data
+ })
+}
+
+// 获取用户详细信息
+export function getInfo() {
+ return request({
+ 'url': '/getInfo',
+ 'method': 'get'
+ })
+}
+
+// 退出方法
+export function logout() {
+ return request({
+ 'url': '/logout',
+ 'method': 'post'
+ })
+}
+
+// 获取验证码
+export function getCodeImg() {
+ return request({
+ 'url': '/captchaImage',
+ headers: {
+ isToken: false
+ },
+ method: 'get',
+ timeout: 20000
+ })
+}
+
+export function registerReq(data) {
+ // const data = {
+ // username,
+ // password,
+ // code,
+ // uuid,
+ // userType
+ // }
+ return request({
+ 'url': '/registerBody',
+ headers: {
+ isToken: false
+ },
+ 'method': 'post',
+ 'data': data
+ })
+}
+
+// 发送邮箱验证码
+export function sendMailCode(query) {
+ return request({
+ url: '/manage/mail/sendMailCode',
+ method: 'get',
+ params: query
+ })
+}
+
+// 发送短信(人才集团)
+export function sendSmsForRcjt(data) {
+ return request({
+ 'url': '/sendSmsForRcjt',
+ 'method': 'post',
+ 'data': data
+ })
+}
+// 发送登录短信
+export function sendSmsCode(data) {
+ return request({
+ 'url': '/onlySendSms',
+ 'method': 'post',
+ 'data': data
+ })
+}
+// 修改密码
+export function updateUserPwd({oldPassword, newPassword}) {
+ return request({
+ url: '/system/center/user/profile/updatePwd',
+ method: 'put',
+ params: {
+ oldPassword,
+ newPassword
+ }
+ })
+}
+
+// 找回密码 发送验证码
+export function sendSms(data) {
+ return request({
+ 'url': '/sendSms',
+ 'method': 'post',
+ data
+ })
+}
+
+// 找回密码
+export function retrieve(data) {
+ return request({
+ 'url': '/retrieve',
+ 'method': 'post',
+ data
+ })
+}
diff --git a/apiRc/person.js b/apiRc/person.js
new file mode 100644
index 0000000..ed193ff
--- /dev/null
+++ b/apiRc/person.js
@@ -0,0 +1,84 @@
+/*
+ * @Date: 2025-10-31 13:50:15
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-10-31 14:30:31
+ */
+import request from '@/utilsRc/request'
+
+// 人员信息保存
+export function savePersonBase(data) {
+ return request({
+ 'url': '/personnel/personBaseInfo',
+ 'method': 'put',
+ 'data': data
+ })
+}
+
+// 人员信息查询
+export function getPersonBase(userId) {
+ return request({
+ 'url': `/personnel/personBaseInfo/user/${userId}`,
+ 'method': 'get',
+ })
+}
+// 获取行政区划列表
+export function getQUList() {
+ return request({
+ url: `/manage/xzqh//xzqhTree`,
+ method: 'get'
+ })
+ }
+// 查询部门下拉树结构
+export function deptTreeSelect() {
+ return request({
+ url: '/system/center/user/deptTree',
+ method: 'get'
+ })
+}
+
+
+// 社群端 根据所在社区 获取姓名
+export function generateUserName(deptId) {
+ return request({
+ url: `/generateUserName/${deptId}`,
+ method: 'get'
+ })
+}
+
+// 获取部门列表
+export function getDeptList(name,personId) {
+ return request({
+ url: `/system/center/user/getDeptList?name=${name}&parentId=${personId}`,
+ method: 'get'
+ })
+ }
+// 求职工种列表
+export function touristWork() {
+ return request({
+ url: `/basicdata/workType/workTypeTree`,
+ method: 'get'
+ })
+}
+// 获取招聘工种列表
+export function jobTypeList(params) {
+ return request({
+ url: '/basicdata/workType/list',
+ method: 'get',
+ params
+ })
+}
+// 未读消息数量
+
+export function unreadNum() {
+ return request({
+ url: '/manage/tjgw/notReadNum',
+ method: 'get',
+ })
+}
+// 地图类型列表
+export function jyshdt(cyfhjd) {
+ return request({
+ url: `/jyshdt/jyshdt/queryList?lx=${cyfhjd}`,
+ method: 'get',
+ })
+}
diff --git a/apiRc/system/dict.js b/apiRc/system/dict.js
new file mode 100644
index 0000000..f031632
--- /dev/null
+++ b/apiRc/system/dict.js
@@ -0,0 +1,51 @@
+import request from '@/utilsRc/request'
+// 查询字典数据列表
+export function listData (query) {
+ return request({
+ url: '/system/dict/data/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询字典数据详细
+export function getData (dictCode) {
+ return request({
+ url: '/system/dict/data/' + dictCode,
+ method: 'get'
+ })
+}
+
+// 根据字典类型查询字典数据信息
+export function getDicts (dictType) {
+ return request({
+ url: '/system/dict/data/type/' + dictType,
+ method: 'get'
+ })
+}
+
+// 新增字典数据
+export function addData (data) {
+ return request({
+ url: '/system/dict/data/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改字典数据
+export function updateData (data) {
+ return request({
+ url: '/system/dict/data',
+ method: 'post',
+ data: data
+ })
+}
+
+// 删除字典数据
+export function delData (dictCode) {
+ return request({
+ url: '/system/dict/data/remove' + dictCode,
+ method: 'get'
+ })
+}
diff --git a/common/globalFunction.js b/common/globalFunction.js
index 80aba7a..7f6e7f8 100644
--- a/common/globalFunction.js
+++ b/common/globalFunction.js
@@ -2,7 +2,8 @@ import useUserStore from "../stores/useUserStore";
import {
request,
createRequest,
- uploadFile
+ uploadFile,
+ myRequest
} from "../utils/request";
import streamRequest, {
chatRequest
@@ -885,7 +886,8 @@ export const $api = {
uploadFile,
formatFileSize,
sendingMiniProgramMessage,
- copyText
+ copyText,
+ myRequest
}
@@ -916,4 +918,4 @@ export default {
insertSortData,
isInWechatMiniProgramWebview,
isEmptyObject,
-}
\ No newline at end of file
+}
diff --git a/components/AppLayout/AppLayout.vue b/components/AppLayout/AppLayout.vue
index e9b405f..c439a44 100644
--- a/components/AppLayout/AppLayout.vue
+++ b/components/AppLayout/AppLayout.vue
@@ -6,6 +6,7 @@
>
- {{ item.badge }}
+ {{ item.badge }}
{{ item.text }}
@@ -19,7 +19,7 @@
+
+
+