Merge branch 'main' of http://gitea.bugtc.com/zhouyanli/property-resident-side

# Conflicts:
#	property-uniapp-project/manifest.json
#	property-uniapp-project/pageSubPack/api/request.js

property-uniapp-project/pageSubPack/api/api.js

@@ -1,4 +1,4 @@
-import request,{get,post} from "./request.js"
+import request,{get,post,upload} from "./request.js"
 
 
 // =======账号密码登录========
@@ -39,7 +39,12 @@ export const getCurrentVillage = () =>{
 export const getVillageSwitch = (data)=>{
 	return post('/api/resident/village/switch',data)
 }
-// ====公告列表======
+// 首页最新活动列表
+export const getActivitylatest = () =>{
+	return get('/api/resident/activity/latest')
+}
+
+// ========公告列表======
 // 获取公告列表
 export const getNoticeList = (data) =>{
 	return get('/api/resident/notice/list',data)
@@ -47,4 +52,73 @@ export const getNoticeList = (data) =>{
 // 获取公告详情
 export const getNoticeDetails = (noticeId) =>{
 	return get(`/api/resident/notice/${noticeId}`)
+}
+// =========键开门===============
+// 查询门禁列表
+export const getAccessDevices = (data) =>{
+	return get("/api/resident/access/devices",data)
+}
+// 确认开门
+export const getAccessOpen = (data) =>{
+	return post("/api/resident/access/open",data)
+}
+// ==========活动列表===========
+// 获取活动列表
+export const getActivityList = (data) =>{
+	return get("/api/resident/activity/list",data)
+}
+// 获取活动列表详情
+export const getActivityDetails = (id) =>{
+	return get(`/api/resident/activity/${id}`)
+}
+// 确认报名
+export const confirmResident = (id) =>{
+	return post(`/api/resident/activity/${id}/apply`)
+}
+// 取消报名
+export const cancelActivity = (id) =>{
+	return post(`/api/resident/activity/${id}/cancel`)
+}
+// =========我的活动========
+export const getMyActivityList = () =>{
+	return get("/api/resident/activity/my")
+}
+// ===========活动实况============
+// 活动实况列表
+export const getActivityLive = (id) =>{
+	return get(`/api/resident/activity/${id}/live`)
+}
+// 添加实况
+export const addActivityLive = (id, data) =>{
+	return post(`/api/resident/activity/${id}/live`, data)
+}
+// 签到
+export const signinActivityLive = (id, data) =>{
+	return post(`/api/resident/activity/${id}/signin`, data)
+}
+// ==============在线报修========
+// 添加报修工单
+export const addQueryRepair = (data) =>{
+	return post("/repairOrder/addRepair",data)
+}
+// 获取公共维修项目列表
+export const getRepairProjectList = (data) =>{
+	return get("/repairOrder/list",data)
+}
+// 获取报修列表
+export const getQueryRepair = (data) =>{
+	return get("/repairOrder/queryRepair",data)
+}
+// 获取房屋列表
+export const getHouseList = (data) =>{
+	return get('/api/resident/my/house/list',data)
+}
+
+// 通用文件上传
+export const uploadImage = () => {
+	return upload('');
+}
+// 上传单张图片（请根据后端实际地址修改）
+export const uploadFile = (filePath) => {
+	return upload(filePath, '/common/upload');
 }

property-uniapp-project/pageSubPack/api/request.js

@@ -103,4 +103,4 @@ export default function request(url, data = {}, method = "GET") {
 export const get = (url, data) => request(url, data, 'GET');
 export const post = (url, data) => request(url, data, 'POST');
 export const deleteMethod = (url, data) => request(url, data, 'DELETE');
-export const putMethod = (url, data) => request(url, data, 'PUT');
+export const putMethod = (url, data) => request(url, data, 'PUT');