From b8bd07a9af43d9bb7e7bbec9bc0002d02aaac7b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com> Date: Sat, 5 Jul 2025 15:19:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=88=BF=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/community.js | 4 + packages/community/choseCommunity/index.vue | 372 +++++++++++++------- packages/storeManagement/index/index.vue | 4 +- packages/storeManagement/order/index.vue | 2 +- 4 files changed, 247 insertions(+), 135 deletions(-) diff --git a/api/community.js b/api/community.js index 9d9478eb..99b4c6a4 100644 --- a/api/community.js +++ b/api/community.js @@ -29,4 +29,8 @@ export const apiArr = { getButton:"/api/v1/wechat/home-page/button-list",//获取button getHotWords:"/api/v1/wechat/home-page/search-hot-word/info",//搜索热词 + + getAllList:"/api/v2/wechat/community/get-all-list",//获取小区信息列表 + commRoomSelect:"/api/v2/wechat/community-room/comm-room-select",//房源筛选器 + }; \ No newline at end of file diff --git a/packages/community/choseCommunity/index.vue b/packages/community/choseCommunity/index.vue index 61596e92..4234c939 100644 --- a/packages/community/choseCommunity/index.vue +++ b/packages/community/choseCommunity/index.vue @@ -1,132 +1,240 @@ - - - - - + + + + + \ No newline at end of file diff --git a/packages/storeManagement/index/index.vue b/packages/storeManagement/index/index.vue index 97769436..00d7ad59 100644 --- a/packages/storeManagement/index/index.vue +++ b/packages/storeManagement/index/index.vue @@ -8,7 +8,7 @@
- +
@@ -47,7 +47,7 @@
- +
diff --git a/packages/storeManagement/order/index.vue b/packages/storeManagement/order/index.vue index ed062b08..5bf84c30 100644 --- a/packages/storeManagement/order/index.vue +++ b/packages/storeManagement/order/index.vue @@ -60,7 +60,7 @@ - 备注 + 备注 From 2b148c85e805bd9892ebb0a247940bf5e58ef429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com> Date: Mon, 7 Jul 2025 09:54:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=88=BF=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/community.js | 2 + packages/community/choseCommunity/index.vue | 1 - packages/community/index/index.vue | 205 ++++++++++---------- packages/community/myCommunity/index.vue | 73 ++++--- 4 files changed, 154 insertions(+), 127 deletions(-) diff --git a/api/community.js b/api/community.js index 99b4c6a4..f82fe352 100644 --- a/api/community.js +++ b/api/community.js @@ -33,4 +33,6 @@ export const apiArr = { getAllList:"/api/v2/wechat/community/get-all-list",//获取小区信息列表 commRoomSelect:"/api/v2/wechat/community-room/comm-room-select",//房源筛选器 + commInfo:"/api/v2/wechat/mpuser-crud/community-owner/info",//我的房产信息小区列表 + }; \ No newline at end of file diff --git a/packages/community/choseCommunity/index.vue b/packages/community/choseCommunity/index.vue index 4234c939..942f3959 100644 --- a/packages/community/choseCommunity/index.vue +++ b/packages/community/choseCommunity/index.vue @@ -210,7 +210,6 @@ // this.roomList = res.rows this.step = '4'; } else { - console.log(this.step) this.dialogBoxShow = true; this.rName = item.label } diff --git a/packages/community/index/index.vue b/packages/community/index/index.vue index c53cd06f..374d32b1 100644 --- a/packages/community/index/index.vue +++ b/packages/community/index/index.vue @@ -2,7 +2,7 @@
-
添加我的房产
+
{{communityVal}}
@@ -99,120 +99,123 @@
- +
\ No newline at end of file diff --git a/packages/community/myCommunity/index.vue b/packages/community/myCommunity/index.vue index f99817a3..5585b080 100644 --- a/packages/community/myCommunity/index.vue +++ b/packages/community/myCommunity/index.vue @@ -7,14 +7,15 @@
-
+
-
-
世纪名城东区（5）
-
河北省 石家庄市 桥西区 塔谈国际 108km
+
+
{{item.name}}（ {{item.room_owner_list.length}} + ）
+
{{item.addr}}
@@ -28,30 +29,52 @@ + @import url("./index.css"); + \ No newline at end of file From 41b0781ad79f43b22a0564c8c9c63dd7f57bdb66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com> Date: Mon, 7 Jul 2025 15:15:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=88=BF=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/community.js | 2 +- packages/community/addCommunity/index.vue | 165 +++++++++++++------- packages/community/choseCommunity/index.vue | 31 +++- 3 files changed, 133 insertions(+), 65 deletions(-) diff --git a/api/community.js b/api/community.js index f82fe352..9e45d3c7 100644 --- a/api/community.js +++ b/api/community.js @@ -34,5 +34,5 @@ export const apiArr = { commRoomSelect:"/api/v2/wechat/community-room/comm-room-select",//房源筛选器 commInfo:"/api/v2/wechat/mpuser-crud/community-owner/info",//我的房产信息小区列表 - + create:"/api/v2/wechat/community-owners/create",//创建新的业主信息 }; \ No newline at end of file diff --git a/packages/community/addCommunity/index.vue b/packages/community/addCommunity/index.vue index a6449708..55b2811b 100644 --- a/packages/community/addCommunity/index.vue +++ b/packages/community/addCommunity/index.vue @@ -5,23 +5,23 @@ 房产 - + 姓名 - + 手机 - + 身份 - + @@ -39,70 +39,115 @@ + @import url("./index.css"); + \ No newline at end of file diff --git a/packages/community/choseCommunity/index.vue b/packages/community/choseCommunity/index.vue index 942f3959..8636ba46 100644 --- a/packages/community/choseCommunity/index.vue +++ b/packages/community/choseCommunity/index.vue @@ -21,8 +21,7 @@
{{item.addr}}
- +
@@ -117,7 +116,7 @@
{{facilityName + fName + rName}}
取消
-
确定
+
确定
@@ -150,13 +149,14 @@ // foloorList: [], // floorsList: [], rName: '', + roomId: '', // roomList: [], page_num: 1, page_size: 10, dialogBoxShow: false, searchQuery: '', filteredFloorsList: [], - searchList:[] + searchList: [] } }, methods: { @@ -212,6 +212,7 @@ } else { this.dialogBoxShow = true; this.rName = item.label + this.romId = item.value } }) }, @@ -221,6 +222,28 @@ item.label.includes(this.searchQuery) ); }, + confirmComm() { + const params = { + changeVal: `${this.cName}${this.facilityName}${this.fName}${this.rName}`, + community_id: this.communityId, + room_id: this.romId + }; + console.log(params) + // 手动创建查询字符串 + function createQueryString(params) { + return Object.keys(params) + .map(key => `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`) + .join('&'); + } + + // 拼接路径和参数 + const targetPath = "/packages/community/addCommunity/index"; + const queryString = createQueryString(params); + const fullPath = `${targetPath}?${queryString}`; + + // 调用导航方法 + NavgateTo(fullPath); + } }, onLoad(options) { From 2aa560e081f1218e239c4c66eaa54bc88d0e7527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com> Date: Tue, 8 Jul 2025 16:27:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=B0=8F=E5=8C=BA=20-=20?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/v2Community.js | 6 + packages/community/addCommunity/index.vue | 2 +- packages/community/index/index.vue | 335 +++++++++++++++++----- packages/community/myCommunity/index.vue | 6 +- 4 files changed, 275 insertions(+), 74 deletions(-) diff --git a/api/v2Community.js b/api/v2Community.js index f5208787..bbf3a05e 100644 --- a/api/v2Community.js +++ b/api/v2Community.js @@ -9,4 +9,10 @@ export const apiArr = { workOrderCrudDispatch: '/api/v2/wechat/work-order-crud/dispatch', // 人员派单 workOrderCrudAccept: '/api/v2/wechat/work-order-crud/accept', // 人员接单 workOrderCrudUpdate: '/api/v2/wechat/work-order-crud/worker/update', // 工作人员更新工单 + + navPage: '/api/v2/wechat/community-navigation-crud/page', // 小区图标导航信息分页 + advPage: '/api/v2/wechat/community-advertisement-crud/page', // 小区广告信息分页 + + categoryPage: '/api/v2/wechat/announcement-category-crud/page', // 公告分类信息分页 + infoPage: '/api/v2/wechat/announcement-crud/page', // 公告信息分页 }; diff --git a/packages/community/addCommunity/index.vue b/packages/community/addCommunity/index.vue index 55b2811b..0618585c 100644 --- a/packages/community/addCommunity/index.vue +++ b/packages/community/addCommunity/index.vue @@ -126,7 +126,7 @@ icon: "none", duration: 2000 }); - NavgateTo("packages/community/myCommunity/index") + NavgateTo("/packages/community/myCommunity/index") }) }, choseCommunity() { diff --git a/packages/community/index/index.vue b/packages/community/index/index.vue index 374d32b1..b0ee4067 100644 --- a/packages/community/index/index.vue +++ b/packages/community/index/index.vue @@ -3,74 +3,68 @@
{{communityVal}}
-
+
- - - - - - - + + + -
+ + + + + +
- - - - - - - + + +
-
- - {{ item.name }} +
+ + {{ item.nav_name }}
-
- -
- -
- +
+
-
物业公告
-
天气
-
放假时间
-
送饭
+
+ {{ item.category_name }} +
-
+
-
关于小区停车场治理通告
-
高尚
+
{{item.title}}
+
{{item.author}}
- +
@@ -80,7 +74,12 @@
- + + + + +
@@ -91,11 +90,15 @@
- + + + + +
-
取消
-
了解详情
+
取消
+
了解详情
@@ -120,7 +123,7 @@ export default { data() { return { - communityVal:'添加我的房产', + communityVal: '添加我的房产', picUrl, top: "", localHeight: "", @@ -131,44 +134,33 @@ communityList: [], flag: false, - functionList: [{ - name: "报事报修", - link: "", - url: "http://192.168.0.172:5500/com_homeIcon1.png", - }, - { - name: "物业缴费", - link: "/packages/community/propertyPayment/index", - url: "http://192.168.0.172:5500/com_homeIcon2.png", - }, - { - name: "物业公积", - link: "/packages/community/providentFund/index", - url: "http://192.168.0.172:5500/com_homeIcon3.png", - }, - { - name: "物业公积", - link: "", - url: "http://192.168.0.172:5500/com_homeIcon4.png", - }, - { - name: "物业服务", - link: "", - url: "http://192.168.0.172:5500/com_homeIcon5.png", - }, - ], + functionList: [], - ads1Show: false, - ads2Show: false, + ads1Show: true, + ads2Show: true, + + bannerList: [], //轮播图广告 + currentIdx: 0, + streamerList: [], //横幅广告 + tileList: [], //平铺广告 + largePopList: [], //巨幅弹屏广告 + popList: [], //弹屏广告 + + categoryList: [], + infoList: [], + selectedTab: 0 } }, - onLoad(options) { + async onLoad(options) { const meun = menuButtonInfo(); this.top = meun.top; // this.top = meun.height + meun.top; this.localHeight = meun.height; // this.getCommunityList() - this.communityVal = uni.getStorageSync('changeCommName') + this.communityVal = uni.getStorageSync('changeCommData').name + await this.getfunctionList() + this.getAdvertising() + this.getCategoryList() }, @@ -181,6 +173,8 @@ }, closeAds() { this.ads1Show = false + }, + closeAds2() { this.ads2Show = false }, jump(e) { @@ -210,6 +204,207 @@ // } // }) // }, + swipers(event) { + // 获取当前轮播图索引 + this.currentIdx = event.detail.current; + }, + async getfunctionList() { + const res = await request(apiArr.navPage, "POST", { + community_id: Number(uni.getStorageSync('changeCommData').id), + page_num: 1, + page_size: 50 + }) + this.functionList = res.rows.map(item => { + return { + ...item, + nav_icon: picUrl + item.nav_icon + }; + }); + console.log(this.functionList) + }, + + async getAdvertising() { + // bannerList + // streamerList + // tileList + // largePopList + // popList + const res = await request(apiArr.advPage, "POST", { + community_id: Number(uni.getStorageSync('changeCommData').id), + ad_position: 1, + page_num: 1, + page_size: 50 + }) + this.bannerList = res.rows.map(item => { + return { + ...item, + ad_picture: picUrl + item.ad_picture + }; + }); + + const res2 = await request(apiArr.advPage, "POST", { + community_id: Number(uni.getStorageSync('changeCommData').id), + ad_position: 2, + page_num: 1, + page_size: 50 + }) + this.streamerList = res2.rows.map(item => { + return { + ...item, + ad_picture: picUrl + item.ad_picture + }; + }); + + const res3 = await request(apiArr.advPage, "POST", { + community_id: Number(uni.getStorageSync('changeCommData').id), + ad_position: 3, + page_num: 1, + page_size: 50 + }) + this.tileList = res3.rows.map(item => { + return { + ...item, + ad_picture: picUrl + item.ad_picture + }; + }); + + const res4 = await request(apiArr.advPage, "POST", { + community_id: Number(uni.getStorageSync('changeCommData').id), + ad_position: 4, + page_num: 1, + page_size: 50 + }) + this.largePopList = res4.rows.map(item => { + return { + ...item, + ad_picture: picUrl + item.ad_picture + }; + }); + + const res5 = await request(apiArr.advPage, "POST", { + community_id: Number(uni.getStorageSync('changeCommData').id), + ad_position: 5, + page_num: 1, + page_size: 50 + }) + this.popList = res5.rows.map(item => { + return { + ...item, + ad_picture: picUrl + item.ad_picture + }; + }); + }, + + headerServerClick(e) { + console.log('当前点击内容', e); + if (!e.link_url) { + this.NotOpen(); + return + } + if (e.link_url) { + // #ifdef APP-PLUS + uni.navigateTo({ + url: '/pages/webview/webview?url=' + encodeURIComponent(e.link_url) + }); + // #endif + + // #ifdef H5 + window.open(e.link_url, '_blank'); + // #endif + + // #ifdef MP-WEIXIN || MP-ALIPAY || MP-BAIDU + if (e.appid) { + uni.navigateToMiniProgram({ + appId: e.appid, + path: e.link_url, + //需要传递给目标小程序的数据 + extraData: { + 'data1': 'test' + }, + success(res) { + console.log('打开成功', res) + } + }) + } else { + NavgateTo(e.link_url) + // NavgateTo('/packages/localLife/index/index') + } + // 小程序中可能需要用户手动复制链接或使用web-view + // uni.showModal({ + // title: '提示', + // content: '即将打开外部链接，请复制后在浏览器中打开: ' + e.link_url, + // confirmText: '复制链接', + // success(res) { + // if (res.confirm) { + // uni.setClipboardData({ + // data: e.link_url, + // success() { + // uni.showToast({ + // title: '复制成功', + // icon: 'success' + // }); + // } + // }); + // } + // } + // }); + // #endif + } + }, + onDetailClick() { + // 获取当前显示的广告项 + const currentAd = this.popList[this.currentAdIndex]; + if (currentAd) { + this.headerServerClick(currentAd); + } else if (this.popList.length > 0) { + // 如果当前索引无效，默认使用第一项 + this.headerServerClick(this.popList[0]); + } + }, + + NotOpen() { + uni.showModal({ + title: '提示', + content: '此功能暂未开通！', + showCancel: false, + complete: (res) => { + if (res.cancel) { + + } + } + }) + }, + + async getCategoryList() { + const res = await request(apiArr.categoryPage, "POST", { + community_id: Number(uni.getStorageSync('changeCommData').id), + category_code: "", + category_name: "", + page_num: 1, + page_size: 30 + }) + this.categoryList = res.rows + this.selectTab(0, res.rows[0]) + }, + + async selectTab(index, item) { + this.selectedTab = index; + console.log('选中的tab:', index); + const res = await request(apiArr.infoPage, "POST", { + community_id: Number(uni.getStorageSync('changeCommData').id), + announcement_category_id: item.id, + title: '', + category_name: '', + page_num: 1, + page_size: 10, + }) + this.infoList = res.rows.map(item => { + return { + ...item, + list_image: picUrl + item.list_image, + }; + }); + } }, diff --git a/packages/community/myCommunity/index.vue b/packages/community/myCommunity/index.vue index 5585b080..8981bc61 100644 --- a/packages/community/myCommunity/index.vue +++ b/packages/community/myCommunity/index.vue @@ -12,7 +12,7 @@
-
+
{{item.name}}（ {{item.room_owner_list.length}} ）
{{item.addr}}
@@ -61,8 +61,8 @@ console.log(res) }) }, - toUpview(name) { - uni.setStorageSync('changeCommName', name); + toUpview(item) { + uni.setStorageSync('changeCommData', { id: item.community_id, name: item.name }); NavgateTo("/packages/community/index/index") } },