1.18整合

request/api.js

@@ -37,6 +37,14 @@ export function addHiddenDanger(params) {
     data: params
   });
 }
+//交办隐患
+export function assignHiddenDanger(params) {
+  return requestAPI({
+    url: '/frontend/hazard/assign',
+    method: 'POST',
+    data: params
+  });
+}
 //文件图片上传
 export function uploadFile(params) {
   return requestAPI({
@@ -61,6 +69,15 @@ export function getHiddenDangerDetail(params) {
     data: params
   });
 }
+//获取隐患排查列表
+export function getHiddenDangerList(params) {
+  return requestAPI({
+    url: '/frontend/hazard/my/list',
+    method: 'GET',
+    data: params
+  });
+}
+
 //提交整改
 export function submitRectification(params) {
   return requestAPI({
@@ -75,4 +92,81 @@ export function getHiddenDangerLabelList() {
     url: '/frontend/hazard/tag/list',
     method: 'GET'
   });
+}
+//获取部门人员列表（本部门、上级部门、上上级部门）
+export function getDepartmentPersonUsers(params) {
+  return requestAPI({
+    url: '/frontend/hazard/dept/users',
+    method: 'GET',
+    data: params
+  });
+}
+//成员管理
+//添加成员
+export function addMember(params) {
+  return requestAPI({
+    url: '/frontend/member/add',
+    method: 'POST',
+    data: params
+  });
+}
+//获取成员列表
+export function getMemberList(params) {
+  return requestAPI({
+    url: '/frontend/member/list',
+    method: 'GET',
+    data: params
+  });
+}
+//锁定/解锁成员
+export function lockOrUnlockMember(params) {
+  return requestAPI({
+    url: '/frontend/member/lock',
+    method: 'POST',
+    data: params
+  });
+}
+//销号申请
+//申请销号
+export function applyDelete(params) {
+  return requestAPI({
+    url: '/frontend/hazard/writeoff/apply',
+    method: 'POST',
+    data: params
+  });
+}
+//获取验收完成的隐患列表（可申请销号）
+export function getAcceptanceList(params) {
+  return requestAPI({
+    url: '/frontend/hazard/verified/list',
+    method: 'GET',
+    data: params
+  });
+}
+//获取我的销号申请列表
+export function getMyWriteOffList(params) {
+  return requestAPI({
+    url: '/frontend/hazard/writeoff/my/list',
+    method: 'GET',
+    data: params
+  });
+}
+
+//验收整改
+export function acceptanceRectification(params) {
+  return requestAPI({
+    url: '/frontend/hazard/verify',
+    method: 'POST',
+    data: params
+  });
+}
+
+//登录
+export function login(params) {
+  return requestAPI({
+    url: '/frontend/auth/login',
+    method: 'POST',
+    data: params,
+    noAuth: true  // 登录接口不需要 Authorization
+  });
 }

request/request.js

@@ -7,15 +7,14 @@ import Request from './luch-request/index.js';
 
 const http = new Request({
 	baseURL: baseUrl,
-	timeout: 10000,
-	header: {
-		// 'content-type': 'application/json',
-		'Authorization': "Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiNzQ5NGU2MzAtNTRlYS00ZTM5LWIxYjUtNzc2MzY5NTRhYmJmIn0.7l5CMwFitlpXniZ6PTR5DqN8ASFTFZ1DCUZKjOtr5CpuXWiPHeSW19nY8XKfGdxMvB7j-OnXuSznLRjx-N7K9g"
-	}
+	timeout: 10000
 })
 
-// 固定的 token
-const AUTH_TOKEN = "Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiNTQyMjJlODYtZDUyNS00ZTA0LWI3Y2QtMGU1ZWYzYmIwM2EwIn0.x8zPXafDGVjIDIcAdWsWT3F2fU20QHVLFR15b251LfwpfRt_UaDo1-bvHEyi8hxqVkiStOqi09TTUTPBgjPYkw";
+// 动态获取 token（从登录接口存储的）
+const getToken = () => {
+	const token = uni.getStorageSync('token');
+	return token ? `Bearer ${token}` : '';
+};
 // 请求之前查看是否为空
 const isEmptyObject = (obj) => {
     return Object.keys(obj).length === 0;
@@ -44,7 +43,7 @@ function showToast(title) {
 // 请求
 const requestAPI = (config) => {
     // 支持对象参数或传统参数
-    let { url, method = 'GET', data = {} } = typeof config === 'object' && config.url ? config : { url: config, method: arguments[1] || 'GET', data: arguments[2] || {} };
+    let { url, method = 'GET', data = {}, noAuth = false } = typeof config === 'object' && config.url ? config : { url: config, method: arguments[1] || 'GET', data: arguments[2] || {} };
     
     if (method == 'GET' && !isEmptyObject(data)) {
         url += '?' + objectToQueryString(data);
@@ -53,14 +52,24 @@ const requestAPI = (config) => {
     uni.showLoading({
         title: '加载中...'
     });
+    
+    // 构建 header，登录等接口不需要 Authorization
+    const header = {
+        'Content-Type': 'application/json'
+    };
+    if (!noAuth) {
+        const token = getToken();
+        if (token) {
+            header['Authorization'] = token;
+        }
+    }
+    
     return new Promise((resolve, reject) => {
         uni.request({
             url: baseUrl + url,
             method,
             data,
-            header: {
-                'Authorization': AUTH_TOKEN
-            },
+            header,
             success: (res) => {
                 uni.hideLoading();
 
@@ -79,8 +88,14 @@ const requestAPI = (config) => {
                         resolve(res.data);
                     } else if (res.data.code === 401) {
                         // token过期处理
-                        uni.removeStorageSync('_user_token_');
+                        uni.removeStorageSync('token');
+                        uni.removeStorageSync('userInfo');
                         showToast('登录已过期，请重新登录');
+                        setTimeout(() => {
+                            uni.reLaunch({
+                                url: '/pages/login/login'
+                            });
+                        }, 1500);
                         reject('401');
                     } else {
                         showToast(res.data.msg || '请求失败');
@@ -109,4 +124,4 @@ const requestAPI = (config) => {
 };
 
 // 文件末尾应该导出
-export { requestAPI,baseUrl,AUTH_TOKEN };
+export { requestAPI, baseUrl, getToken };