From d5cacf4087e9621827959b433b145782915b3766 Mon Sep 17 00:00:00 2001 From: zhouyanli <593579392@qq.com> Date: Mon, 22 Jun 2026 17:21:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=82=E6=95=B0=EF=BC=8C=E6=8A=A5=E4=BF=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=82=E6=95=B0=EF=BC=8C=E9=A6=96=E9=A1=B5=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../privacy-popup/privacy-popup.vue | 1 + .../activity-list/activityList.vue | 2 ++ .../activity-list/activityListDetails.vue | 14 +++++---- .../pageSubPack/activity-list/live-add.vue | 30 +++++++++++-------- .../pageSubPack/api/api.js | 20 ++++++------- .../pageSubPack/my/settingIndex.vue | 4 +-- .../online-repair/onlineRepair.vue | 2 +- .../online-repair/personalRepair.vue | 2 +- property-uniapp-project/pages/index/index.vue | 3 +- 9 files changed, 44 insertions(+), 34 deletions(-) diff --git a/property-uniapp-project/components/privacy-popup/privacy-popup.vue b/property-uniapp-project/components/privacy-popup/privacy-popup.vue index 37e912f..8469d83 100644 --- a/property-uniapp-project/components/privacy-popup/privacy-popup.vue +++ b/property-uniapp-project/components/privacy-popup/privacy-popup.vue @@ -109,6 +109,7 @@ const goToPrivacy = () => { flex: 1; padding: 24rpx 30rpx; max-height: 50vh; + box-sizing: border-box; } .popup-content .section-text { diff --git a/property-uniapp-project/pageSubPack/activity-list/activityList.vue b/property-uniapp-project/pageSubPack/activity-list/activityList.vue index a00d642..6425045 100644 --- a/property-uniapp-project/pageSubPack/activity-list/activityList.vue +++ b/property-uniapp-project/pageSubPack/activity-list/activityList.vue @@ -218,6 +218,7 @@ const getActivityListData = async (pageNum = 1) => { const params = { pageNum: pageNum, pageSize: pageSize.value, + villageId:uni.getStorageSync('currentVillageId') } const res = await getActivityList(params) @@ -260,6 +261,7 @@ const getMyActivityListData = async (pageNum = 1) => { const params = { pageNum: pageNum, pageSize: pageSize.value, + villageId:uni.getStorageSync('currentVillageId') } // status 为空时不传，返回全部 if (myFilter.value !== '') { diff --git a/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue b/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue index 45af430..32b5ecc 100644 --- a/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue +++ b/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue @@ -274,7 +274,8 @@ onLoad((option) =>{ // 获取列表详情 const getActivityDetailsData = async (id) =>{ try{ - const res = await getActivityDetails(id) + let params = {villageId:uni.getStorageSync('currentVillageId')} + const res = await getActivityDetails(id,params) if(res.code === 200){ activityConent.value = res.data || {} }else{ @@ -322,7 +323,8 @@ const confirmSignup = () => { // 确认报名接口 const confirmRegist = async () =>{ try{ - const res = await confirmResident(curActivityId.value) + let params = {villageId:uni.getStorageSync('currentVillageId')} + const res = await confirmResident(curActivityId.value,params) if(res.code === 200){ hasSigned.value = true // 报名成功后更新状态 uni.showToast({ @@ -363,15 +365,14 @@ const hideCancelModal = () => { // 确认取消报名 const confirmCancel = () => { - hasSigned.value = false // 取消报名后更新状态 cancelActivityData() hideCancelModal() - // showToastMessage('已取消报名') } // 确认取消报名接口 const cancelActivityData = async () =>{ try{ - const res = await cancelActivity(curActivityId.value) + let params = {villageId:uni.getStorageSync('currentVillageId')} + const res = await cancelActivity(curActivityId.value,params) if(res.code === 200){ hasSigned.value = false // 报名成功后更新状态 uni.showToast({ @@ -403,7 +404,8 @@ const cancelActivityData = async () =>{ // -----获取活动实况列表---- const getLiveActivityList = async () =>{ try{ - const res = await getActivityLive(curActivityId.value) + let params = {villageId:uni.getStorageSync('currentVillageId')} + const res = await getActivityLive(curActivityId.value,params) if(res.code === 200){ liveRecords.value = res.rows || [] }else{ diff --git a/property-uniapp-project/pageSubPack/activity-list/live-add.vue b/property-uniapp-project/pageSubPack/activity-list/live-add.vue index d45b06d..48acd92 100644 --- a/property-uniapp-project/pageSubPack/activity-list/live-add.vue +++ b/property-uniapp-project/pageSubPack/activity-list/live-add.vue @@ -77,6 +77,7 @@ const latitude = ref(''); // 接收活动ID onLoad((option) => { + console.log('idiidd',option) activityId.value = option?.id || ''; }); @@ -233,33 +234,36 @@ const submitStatus = async () => { uni.showToast({ title: '请输入实况描述', icon: 'none' }); return; } - if (!location.value) { - uni.showToast({ title: '请先签到', icon: 'none' }); - return; - } + // if (!location.value) { + // uni.showToast({ title: '请先签到', icon: 'none' }); + // return; + // } uni.showLoading({ title: '提交中...', mask: true }); try { // 先上传图片 const imageUrls = await uploadAllImages(); - + // 同时签到 + await signinActivityLive(activityId.value, { + location: location.value, + longitude: longitude.value, + latitude: latitude.value, + villageId:uni.getStorageSync('currentVillageId') + }); // 提交实况 const liveData = { content: statusDesc.value.trim(), images: imageUrls, location: location.value, longitude: longitude.value, - latitude: latitude.value + latitude: latitude.value, + villageId:uni.getStorageSync('currentVillageId') }; + console.log('ssasss',uni.getStorageSync('currentVillageId')) + console.log("xxx",activityId.value) await addActivityLive(activityId.value, liveData); - - // 同时签到 - await signinActivityLive(activityId.value, { - location: location.value, - longitude: longitude.value, - latitude: latitude.value - }); + uni.hideLoading(); uni.showToast({ title: '添加成功', icon: 'success' }); diff --git a/property-uniapp-project/pageSubPack/api/api.js b/property-uniapp-project/pageSubPack/api/api.js index 3d3435a..ad96c4d 100644 --- a/property-uniapp-project/pageSubPack/api/api.js +++ b/property-uniapp-project/pageSubPack/api/api.js @@ -44,8 +44,8 @@ export const getVillageSwitch = (data)=>{ return post('/api/resident/village/switch',data) } // 首页最新活动列表 -export const getActivitylatest = () =>{ - return get('/api/resident/activity/latest') +export const getActivitylatest = (data) =>{ + return get('/api/resident/activity/latest',data) } // 重新加载用户信息 export const getReloadUserInfo = () =>{ @@ -76,16 +76,16 @@ export const getActivityList = (data) =>{ return get("/api/resident/activity/list",data) } // 获取活动列表详情 -export const getActivityDetails = (id) =>{ - return get(`/api/resident/activity/${id}`) +export const getActivityDetails = (id,data) =>{ + return get(`/api/resident/activity/${id}`,data) } // 确认报名 -export const confirmResident = (id) =>{ - return post(`/api/resident/activity/${id}/apply`) +export const confirmResident = (id,data) =>{ + return post(`/api/resident/activity/${id}/apply`,data) } // 取消报名 -export const cancelActivity = (id) =>{ - return post(`/api/resident/activity/${id}/cancel`) +export const cancelActivity = (id,data) =>{ + return post(`/api/resident/activity/${id}/cancel`,data) } // =========我的活动======== export const getMyActivityList = (data) =>{ @@ -93,8 +93,8 @@ export const getMyActivityList = (data) =>{ } // ===========活动实况============ // 活动实况列表 -export const getActivityLive = (id) =>{ - return get(`/api/resident/activity/${id}/live`) +export const getActivityLive = (id,data) =>{ + return get(`/api/resident/activity/live/${id}`,data) } // 添加实况 export const addActivityLive = (id, data) =>{ diff --git a/property-uniapp-project/pageSubPack/my/settingIndex.vue b/property-uniapp-project/pageSubPack/my/settingIndex.vue index 66428a5..57a49f2 100644 --- a/property-uniapp-project/pageSubPack/my/settingIndex.vue +++ b/property-uniapp-project/pageSubPack/my/settingIndex.vue @@ -395,11 +395,11 @@ height: 96rpx; line-height: 96rpx; text-align: center; - font-size: 36rpx; + font-size: 32rpx; border-radius: 12rpx; color: #666; background-color: #F3F3F3; - box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06); + /* box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06); */ } .logout-btn:active { diff --git a/property-uniapp-project/pageSubPack/online-repair/onlineRepair.vue b/property-uniapp-project/pageSubPack/online-repair/onlineRepair.vue index f5ca991..38d8542 100644 --- a/property-uniapp-project/pageSubPack/online-repair/onlineRepair.vue +++ b/property-uniapp-project/pageSubPack/online-repair/onlineRepair.vue @@ -92,7 +92,7 @@ - {{ item.orderDate || '' }} + {{ item.createTime || '' }} 报修详情 diff --git a/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue b/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue index 8cedc1b..e2a383c 100644 --- a/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue +++ b/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue @@ -369,7 +369,7 @@ const submitForm = async () => { villageId, houseId: houseId.value, maintenanceItemId: projectId.value, - title: form.value.title, + item: form.value.title, problem: form.value.desc, residentId: userId, orderDate: form.value.datetime, diff --git a/property-uniapp-project/pages/index/index.vue b/property-uniapp-project/pages/index/index.vue index da2092a..1e349df 100644 --- a/property-uniapp-project/pages/index/index.vue +++ b/property-uniapp-project/pages/index/index.vue @@ -394,7 +394,8 @@ const navigateToPage = () => { // 获取首页最新活动 const getNewActivityList = async() =>{ try{ - const res = await getActivitylatest() + let params = {villageId:uni.getStorageSync('currentVillageId')} + const res = await getActivitylatest(params) if(res.code === 200){ if(res.data){ activityList.value = res.data || []