From b3d720e94fdd9b59cc633ccf3f42ef859e22b998 Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 19 Jul 2024 11:15:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=A4=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/weiyang/AppMine/userInfo.vue | 3 + .../weiyang/AppPatrolReport/Detail.vue | 37 +++--- .../weiyang/AppPeopleList/PeopleList.vue | 124 +++++++++--------- .../weiyang/AppPhotoReport/PhotoDetail.vue | 3 +- .../AppResidentFile/AppResidentFile.vue | 102 ++++---------- 5 files changed, 117 insertions(+), 152 deletions(-) diff --git a/src/project/weiyang/AppMine/userInfo.vue b/src/project/weiyang/AppMine/userInfo.vue index 5d96b95..7fd1d43 100644 --- a/src/project/weiyang/AppMine/userInfo.vue +++ b/src/project/weiyang/AppMine/userInfo.vue @@ -146,6 +146,9 @@ export default { if (!this.userPhone) { return this.$u.toast('请输入手机号') } + if (!this.vcode) { + return this.$u.toast('请输入验证码') + } // if (!this.userRealName) { // return this.$u.toast('请输入真实姓名') // } diff --git a/src/project/weiyang/AppPatrolReport/Detail.vue b/src/project/weiyang/AppPatrolReport/Detail.vue index 8a003f7..676ab4f 100644 --- a/src/project/weiyang/AppPatrolReport/Detail.vue +++ b/src/project/weiyang/AppPatrolReport/Detail.vue @@ -49,7 +49,7 @@ 三角湖居民社群 李毅 小程序填报三角湖居民社群 李毅 小程序填报三角湖居民社群 李毅 小程序填报 --> -
+
照片
@@ -77,7 +77,7 @@
{{ item.doExplain }}
-
+
@@ -141,20 +141,23 @@ export default { }, process() { const getAvatar = str => str?.substring(str?.length, str?.length - 2) - const list = this.data.processList.map(e => ({ - ...e, - avatar: getAvatar(e.girdMemberName), - statusLabel: this.$dict.getLabel('residentReportDoStatus', e.doStatus) - })) - if (this.evaluation.id) { - const {id, createUserName, score, files, createTime: doTime, content: doExplain} = this.evaluation - list.splice(0, 0, { - id, doTime, doExplain, - statusLabel: `${score}星评价`, - avatar: getAvatar(createUserName), - systemExplain: `${createUserName}完成评价`, - files: files - }) + var list = [] + if(this.data.processList && this.data.processList.length) { + list = this.data.processList.map(e => ({ + ...e, + avatar: getAvatar(e.girdMemberName), + statusLabel: this.$dict.getLabel('residentReportDoStatus', e.doStatus) + })) + if (this.evaluation.id) { + const {id, createUserName, score, files, createTime: doTime, content: doExplain} = this.evaluation + list.splice(0, 0, { + id, doTime, doExplain, + statusLabel: `${score}星评价`, + avatar: getAvatar(createUserName), + systemExplain: `${createUserName}完成评价`, + files: files + }) + } } return list } @@ -385,6 +388,8 @@ uni-page-body { font-size: 32px; color: #333; margin-bottom: 8px; + font-size: 32px; + word-break: break-all; } .time { line-height: 40px; diff --git a/src/project/weiyang/AppPeopleList/PeopleList.vue b/src/project/weiyang/AppPeopleList/PeopleList.vue index fe1d354..af50bf3 100644 --- a/src/project/weiyang/AppPeopleList/PeopleList.vue +++ b/src/project/weiyang/AppPeopleList/PeopleList.vue @@ -5,46 +5,18 @@
- - -
+
-
- - - - + + +
@@ -71,33 +43,22 @@
-
- -

暂无居民信息
点击新增按钮新增居民信息,也可在管理系统批量导入

-
+ -
-
-
打标签
+
+
打标签
-
111
+
选择标签
-
2222
-
2222
-
2222
-
-
111
-
-
333
-
333
+
{{ item.labelName }}
取消
-
确定
+
确定
 @@ -147,7 +108,8 @@ export default { checkImg: 'https://cdn.sinoecare.com/i/2024/07/16/6695ddf91113c.png', circleImg: 'https://cdn.sinoecare.com/i/2024/07/16/6695ddf890b1e.png', userImg: 'https://cdn.sinoecare.com/i/2024/07/16/6695e2a0d95c9.png', - showTag: false + showTag: false, + tagList: [] } }, computed: { @@ -202,30 +164,25 @@ export default { } }) }, - change(index) { this.currentTabs = index this.current = 1 this.datas = [] this.getList() }, - toDetailCard(item) { uni.navigateTo({url: `./DetailCard?id=${item.id}`}) }, - - seachObj(e) { + areaSelect(e) { this.areaId = e this.current = 1 this.getList() }, - handerSearch(e) { this.keyword = e this.current = 1 this.getList() }, - handerClear() { this.keyword = '' this.current = 1 @@ -251,6 +208,41 @@ export default { }, clickCheck(index) { this.datas[index].isCheck = !this.datas[index].isCheck + }, + showTagClick() { + if(!this.showBtn) return + this.getTagList() + }, + getTagList() { + this.$instance.post('app/appresidentlabelinfo/list?current=1&size=2000').then((res) => { + if (res.code == 0) { + res.data.records.map((item) => { + item.isCheck = false + }) + this.tagList = res.data.records + this.showTag = true + } + }) + }, + confirmTag() { + var residentId = [], residentLabelList = [] + this.datas.map((item) => { + if(item.isCheck) { + residentId.push(id) + } + }) + this.tagList.map((item) => { + residentLabelList.push(item) + }) + this.$instance.post('/app/appresidentlabel/update', { + residentId: residentId.join(','), + residentLabelList + }).then((res) => { + if (res.code == 0) { + this.$u.toast('操作成功') + this.getList() + } + }) } }, onReachBottom() { @@ -412,8 +404,6 @@ export default { .dataes { width: calc(100% - 64px); margin: 320px 0 0 32px; - border-bottom-left-radius: 16px; - border-bottom-right-radius: 16px; .datass { display: flex; padding: 24px 0; @@ -478,6 +468,13 @@ export default { } } } + .datass:nth-last-of-type(1) { + border-bottom-left-radius: 16px; + border-bottom-right-radius: 16px; + .right { + border-bottom: none; + } + } } .footer { @@ -499,6 +496,9 @@ export default { color: #FFF; text-align: center; } + .bg-gray { + background-color: #ddd; + } } .empty { @@ -540,7 +540,7 @@ export default { .tag-list { .item { display: inline-block; - padding: 0 8px; + padding: 0 16px; line-height: 44px; border-radius: 8px; margin: 0 16px 16px 0; @@ -581,5 +581,11 @@ export default { } } } + ::v-deep .emptyWrap { + background-color: #fff; + padding-bottom: 32px; + border-bottom-left-radius: 16px; + border-bottom-right-radius: 16px; + } } diff --git a/src/project/weiyang/AppPhotoReport/PhotoDetail.vue b/src/project/weiyang/AppPhotoReport/PhotoDetail.vue index 4f3ccef..fb8f5d4 100644 --- a/src/project/weiyang/AppPhotoReport/PhotoDetail.vue +++ b/src/project/weiyang/AppPhotoReport/PhotoDetail.vue @@ -13,11 +13,10 @@ - +
- 暂无照片
diff --git a/src/project/weiyang/AppResidentFile/AppResidentFile.vue b/src/project/weiyang/AppResidentFile/AppResidentFile.vue index ad000fd..ffef253 100644 --- a/src/project/weiyang/AppResidentFile/AppResidentFile.vue +++ b/src/project/weiyang/AppResidentFile/AppResidentFile.vue @@ -64,23 +64,8 @@
- - -
- +
@@ -104,7 +89,7 @@ />
--> -
+
@@ -117,57 +102,18 @@

-

真实姓名：{{ item.idNumber }} {{item.realName }}

+

昵称：{{ item.remark }}

- -
+
- -
-
+
@@ -259,12 +205,13 @@ export default { todayList2: [], counts1: "", counts2: "", - page2: { current: 1, size: 10, total: 0 }, + page2: { current: 1, size: 10, total: 0, pages: 2}, search2: { name: "" }, - page1: { current: 1, size: 10, total: 0 }, + page1: { current: 1, size: 10, total: 0, pages: 2}, search1: { name: "" }, cWidth: 750, cHeight: 500, + statusBarHeight: uni.getSystemInfoSync().statusBarHeight, }; }, computed: { @@ -325,12 +272,14 @@ export default { }, // 居民列表 getList() { + if(this.page1.current > this.page1.pages) return this.$instance .post("/app/wxcp/wxcustomer/list", null, { params: { ...this.page1, ...this.search, type: 1 }, }) .then((res) => { if (res?.data) { + this.page1.pages = res.data.pages if (this.page1.current > 1) { this.data = [...this.data, ...res.data.records]; } else this.data = res.data.records; @@ -355,12 +304,14 @@ export default { // 居民群列表 getList2() { + if(this.page2.current > this.page2.pages) return this.$instance .post("/app/wxcp/wxgroup/list", null, { params: { ...this.page2, ...this.search }, }) .then((res) => { if (res?.data) { + this.page2.pages = res.data.pages let meta = res.data.records?.map((e) => ({ ...e, avatar: e?.avatar || this.$cdn + "groupAvatar.png", @@ -399,7 +350,7 @@ export default { ), series: [ { - name: "居民总数", + name: "群成员总数", data: Object.values(this.weekList).map((e) => e.total), }, { @@ -581,25 +532,26 @@ uni-page-body { } .list-content { - width: 686px; - height: calc(100% - 216px); - background: #FFF; - border-radius: 16px; - margin: 32px 0 0 32px; - position: relative; + width: calc(100% - 64px); + margin: 0 0 0 32px; + padding-bottom: 200px; .search-top { - position: absolute; - top: 0; - left: 0; padding: 28px 32px; - width: 686px; + width: calc(100% - 64px); box-sizing: border-box; + position: fixed; + left: 0; + margin-left: 32px; background-color: #fff; - z-index: 99; + border-top-left-radius: 16px; + border-top-right-radius: 16px; + z-index: 9; } .user-list-content { background-color: #fff; - padding-top: 128px; + border-bottom-left-radius: 16px; + border-bottom-right-radius: 16px; + margin-top: 128px; .item { display: flex; padding: 24px 32px 0;