From f1daab1193adfd44230d8c5973c29d3a517c198c Mon Sep 17 00:00:00 2001
From: shirlwang <15254118591@163.com>
Date: Mon, 3 Nov 2025 13:40:27 +0800
Subject: [PATCH] 1

---
 App.vue                                       |  2 +-
 main.js                                       | 78 +++++++++----------
 node_modules/.package-lock.json               |  5 ++
 packageRc/api/jobType/index.js                | 12 ++-
 packageRc/api/login.js                        | 25 ++++--
 packageRc/api/needs/person.js                 | 21 +++--
 packageRc/api/needs/personDemand.js           | 29 ++++---
 packageRc/api/personinfo/index.js             | 20 +++--
 packageRc/pages/personalList/personalList.vue |  8 +-
 utilsRc/request.js                            |  6 +-
 10 files changed, 124 insertions(+), 82 deletions(-)

diff --git a/App.vue b/App.vue
index b1d098e..d6b4bf9 100644
--- a/App.vue
+++ b/App.vue
@@ -56,7 +56,7 @@ onHide(() => {
 
 <style lang="scss">
 /*每个页面公共css */
-@import 'uview-ui/index.scss';
+// @import 'uview-ui/index.scss';
 @import '@/common/animation.css';
 @import '@/common/common.css';
 /* 引入阿里图标库 */
diff --git a/main.js b/main.js
index 86ce9f7..24110f6 100644
--- a/main.js
+++ b/main.js
@@ -1,7 +1,7 @@
 /*
  * @Date: 2025-10-23 14:48:48
  * @LastEditors: shirlwang
- * @LastEditTime: 2025-10-31 18:11:22
+ * @LastEditTime: 2025-11-03 09:39:18
  */
 import App from './App'
 import * as Pinia from 'pinia'
@@ -32,48 +32,48 @@ const directives = import.meta.glob('./directives/*.js', {
 });
 
 import { createSSRApp } from 'vue'
-import { createStore } from 'vuex'
+// import { createStore } from 'vuex'
 // 导入已安装的uni-ui组件
 import uniIcons from './uni_modules/uni-icons/components/uni-icons/uni-icons.vue'
 import uniPopup from './uni_modules/uni-popup/components/uni-popup/uni-popup.vue'
 
-// 创建Vuex store实例，避免从分包导入
-const storeRc = createStore({
-  state() {
-    return {
-      userInfo: null,
-      token: '',
-      roles: []
-    }
-  },
-  mutations: {
-    setUserInfo(state, userInfo) {
-      state.userInfo = userInfo
-    },
-    setToken(state, token) {
-      state.token = token
-    },
-    setRoles(state, roles) {
-      state.roles = roles
-    },
-    logout(state) {
-      state.userInfo = null
-      state.token = ''
-      state.roles = []
-    }
-  },
-  actions: {
-    async login({ commit }, userData) {
-      // 登录逻辑
-      commit('setUserInfo', userData)
-      commit('setToken', 'mock-token')
-      commit('setRoles', ['user'])
-    }
-  },
-  getters: {
-    roles: state => state.roles
-  }
-})
+// // 创建Vuex store实例，避免从分包导入
+// const storeRc = createStore({
+//   state() {
+//     return {
+//       userInfo: null,
+//       token: '',
+//       roles: []
+//     }
+//   },
+//   mutations: {
+//     setUserInfo(state, userInfo) {
+//       state.userInfo = userInfo
+//     },
+//     setToken(state, token) {
+//       state.token = token
+//     },
+//     setRoles(state, roles) {
+//       state.roles = roles
+//     },
+//     logout(state) {
+//       state.userInfo = null
+//       state.token = ''
+//       state.roles = []
+//     }
+//   },
+//   actions: {
+//     async login({ commit }, userData) {
+//       // 登录逻辑
+//       commit('setUserInfo', userData)
+//       commit('setToken', 'mock-token')
+//       commit('setRoles', ['user'])
+//     }
+//   },
+//   getters: {
+//     roles: state => state.roles
+//   }
+// })
 
 import storeRc from './utilsRc/store/index.js'
 // const foldFeature = window.visualViewport && 'segments' in window.visualViewport
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index f6c78cf..0f1ad8a 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -3,6 +3,11 @@
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
+    "node_modules/dayjs": {
+      "version": "1.11.19",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
+      "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw=="
+    },
     "node_modules/jsbn": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
diff --git a/packageRc/api/jobType/index.js b/packageRc/api/jobType/index.js
index 47d504c..6be423e 100644
--- a/packageRc/api/jobType/index.js
+++ b/packageRc/api/jobType/index.js
@@ -1,9 +1,15 @@
+/*
+ * @Date: 2025-10-31 11:06:15
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-03 10:28:16
+ */
 import { post, get } from '../../utils/request.js'
 
+import request from '@/utilsRc/request'
 export function listJobType(query) {
-  return get({
-    url: 'basicdata/workType/list',
- 
+  return request({
+    url: '/basicdata/workType/list',
+    method: 'get',
     params: query
   })
 }
\ No newline at end of file
diff --git a/packageRc/api/login.js b/packageRc/api/login.js
index d1ce5af..e87d13a 100644
--- a/packageRc/api/login.js
+++ b/packageRc/api/login.js
@@ -1,9 +1,16 @@
+/*
+ * @Date: 2025-10-31 11:06:15
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-03 10:28:40
+ */
 import { post, get } from '../utils/request.js'
+import request from '@/utilsRc/request'
 
 // 登录方法
 export function login(data) {
-  return post({
-    url: 'personnel/personBaseInfo/loginGrAndQy',
+  return request({
+    method: 'post',
+    url: '/personnel/personBaseInfo/loginGrAndQy',
     data,
     headers: {
       isToken: false
@@ -13,8 +20,9 @@ export function login(data) {
 
 // 获取验证码
 export function getCodeImg() {
-  return get({
-    url: 'captchaImage',
+  return request({
+    method: 'get',
+    url: '/captchaImage',
     headers: {
       isToken: false
     },
@@ -24,21 +32,24 @@ export function getCodeImg() {
 
 // 获取用户详细信息
 export function getInfo() {
-  return get({
+  return request({
+    method: 'get',
     url: '/getInfo'
   })
 }
 
 // 退出方法
 export function logout() {
-  return post({
+  return request({
+    method: 'post',
     url: '/logout'
   })
 }
 
 // 短信验证码
 export function getCodeSms() {
-  return get({
+  return request({
+    method: 'get',
     url: '/captchaSms',
     headers: {
       isToken: false
diff --git a/packageRc/api/needs/person.js b/packageRc/api/needs/person.js
index 0c22bb1..186823d 100644
--- a/packageRc/api/needs/person.js
+++ b/packageRc/api/needs/person.js
@@ -1,15 +1,22 @@
+/*
+ * @Date: 2025-10-31 11:06:15
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-03 10:28:27
+ */
 // 人员接口
 import { post, get } from '../../utils/request.js'
+import request from '@/utilsRc/request'
 export function getPersonBase(params) {
-  return get({
-    url: 'personnel/personBaseInfo/list',
+  return request({
+    url: '/personnel/personBaseInfo/list',
+    method: 'get',
 
     params
   })
 }
 export function getPersonList(params) {
-  return get({
-    url: 'personnel/personBaseInfo/list',
+  return request({
+    url: '/personnel/personBaseInfo/list',
     method: 'get',
     params
   })
@@ -18,9 +25,9 @@ export function getPersonList(params) {
 
 // 新增角色
 export function addInvestigate(data) {
-  return post({
-    // url: '/process/processInterview',
-    url: '/timelime/timelime',
+  return request({
+    // url: '//process/processInterview',
+    url: '//timelime/timelime',
     method: 'post',
     data: data
   })
diff --git a/packageRc/api/needs/personDemand.js b/packageRc/api/needs/personDemand.js
index e7b9f3e..12d61d3 100644
--- a/packageRc/api/needs/personDemand.js
+++ b/packageRc/api/needs/personDemand.js
@@ -1,15 +1,22 @@
+/*
+ * @Date: 2025-11-03 08:48:44
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-11-03 10:28:31
+ */
 // 查询个人需求信息列表
 import { post, get } from '../../utils/request.js'
+import request from '@/utilsRc/request'
 export function listPersonDemand(query) {
-  return get({
-    url: 'manage/personDemand/list',
+  return request({
+    method: 'get',
+    url: '/manage/personDemand/list',
   
     params: query
   })
 }
 export function delPersonDemand(id) {
-  return get({
-    url: 'manage/personDemand/' + id,
+  return request({
+    url: '/manage/personDemand/' + id,
     method: 'delete'
   })
 }
@@ -17,9 +24,9 @@ export function delPersonDemand(id) {
 
 // 查询个人需求信息详细
 export function getPersonDemand(id) {
-  return get({
-    url: 'manage/personDemand/' + id,
-    method: 'get'
+  return request({
+    method: 'get',
+    url: '/manage/personDemand/' + id,
   })
 }
 
@@ -27,8 +34,8 @@ export function getPersonDemand(id) {
 export function addPersonDemand(data) {
   // 确保传递数据前进行日志输出
   console.log('addPersonDemand函数接收到的数据:', data);
-  return post({
-    url: 'manage/personDemand',
+  return request({
+    url: '/manage/personDemand',
     method: 'post', // 修改为大写POST，确保请求参数正确传递
     data: data
   })
@@ -36,8 +43,8 @@ export function addPersonDemand(data) {
 
 // 修改个人需求信息
 export function updatePersonDemand(data) {
-  return post({
-    url: 'manage/personDemand',
+  return request({
+    url: '/manage/personDemand',
     method: 'put',
     data: data
   })
diff --git a/packageRc/api/personinfo/index.js b/packageRc/api/personinfo/index.js
index a173264..6bfad05 100644
--- a/packageRc/api/personinfo/index.js
+++ b/packageRc/api/personinfo/index.js
@@ -1,35 +1,41 @@
 import { post, get } from '../../utils/request.js'
+import request from '@/utilsRc/request'
 
 // 登录方法
 export function personInfoList(data) {
-  return get({
-    url: 'personnel/personBaseInfo/list',
+  return request({
+		method: 'get',
+    url: '/personnel/personBaseInfo/list',
     params: data,
   })
 }
 // 需求预警列表
 export function personAlertList(params) {
-	return get({
-		url: 'manage/personDemand/warningList',
+	return request({
+		method: 'get',
+		url: '/manage/personDemand/warningList',
 	
 		params
 	})
 }
 //经办人数据获取
 export function getJbrInfo() {
-	return get({
+	return request({
+		method: 'get',
 		url: `system/center/user/selectHxjbr`,
 		method: 'get'
 	})
 }
 export function getPersonBase() {
-	return get({
+	return request({
+		method: 'get',
 		url: `system/center/user/selectHxjbr`,
 		method: 'get'
 	})
 }
 export function returnPerson(params) {
-	return get({
+	return request({
+		method: 'get',
 		'url': `/personnel/personBaseInfo/returnPerson`,
 		
 		params
diff --git a/packageRc/pages/personalList/personalList.vue b/packageRc/pages/personalList/personalList.vue
index 7f17220..9f631dc 100644
--- a/packageRc/pages/personalList/personalList.vue
+++ b/packageRc/pages/personalList/personalList.vue
@@ -78,7 +78,7 @@
       <view>
         <view  v-for="(job,index) in perlist" :key="index"
           class="swipe_action_item">
-          <view class="job-list__item" :style="{ paddingBottom: job.auditStatus == 1 ? '0' : '32rpx' }" @tap="toPage(`/pages/community/personEdit?id=${job.id}&type=edit`)">
+          <view class="job-list__item" :style="{ paddingBottom: job.auditStatus == 1 ? '0' : '32rpx' }" @tap="toPage(`/packageRc/pages/community/personEdit?id=${job.id}&type=edit`)">
             <view class="job-list__item-top">
               <img src="https://rc.jinan.gov.cn/qcwjyH5/static/images/person/malepng.png" v-if="job.gender == 0" class="gender-img" alt="" />
               <img src="https://rc.jinan.gov.cn/qcwjyH5/static/images/person/femalepng.png" v-else class="gender-img" alt="" />
@@ -125,8 +125,8 @@
             <view class="job-list__item-btn">
               <view v-show="$store.getters.roles.includes('shequn')" class="btn" style="color: #f56c6c;"
                 @click.native.stop="handleReturn(job)">退回</view>
-              <view class="btn" @click.native.stop=" $tab.navigateTo(
-                `/pages/community/serviceDetails?id=${job.id}&userId=${job.userId}`
+              <view class="btn" @click.native.stop="toPage(
+                `/packageRc/pages/community/serviceDetails?id=${job.id}&userId=${job.userId}`
               )">服务</view>
               <view
                 v-if=" job.personType == 3"
@@ -654,7 +654,7 @@ export default {
       this.getList(true);
     },
   },
-};
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/utilsRc/request.js b/utilsRc/request.js
index 533390c..47c2ad5 100644
--- a/utilsRc/request.js
+++ b/utilsRc/request.js
@@ -20,8 +20,7 @@ const request = config => {
   if (getToken() && !isToken) {
     config.header['Authorization'] = 'Bearer ' + getToken()
   }
-  console.log('（sjdoifjsidof')
-  config.header['Authorization'] = 'Bearer ' + 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJzeXNfdXNlcjoxIiwicm5TdHIiOiJCVFJHeXdHcjB1M1dFN1lpOXVUSmxMQXltMjZjWldyQiIsInVzZXJJZCI6MX0.ItipztABmyMHsNESI_a34HT_FuTtmeIlzz6cldH7tB0'
+  config.header['Authorization'] = 'Bearer ' + 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJzeXNfdXNlcjoxIiwicm5TdHIiOiJVMDRocERSZjdZMXJUbUxXb05uOUpzYUdDZzBNazJJQSIsInVzZXJJZCI6MX0.LZ29vvA4tK3b9Hki4nU9Jb1himXZM2AEOue3CMRY95w'
   // get请求映射params参数
   if (config.params) {
     let url = config.url + '?' + tansParams(config.params)
@@ -90,7 +89,8 @@ const request = config => {
         resolve(res.data)
       })
       .catch(error => {
-        let { message } = error
+        console.log(error, 'error')
+        let message = error.errMsg
         if (message === 'Network Error') {
           message = '网络出小差，请稍后再试'
         } else if (message.includes('timeout')) {