From f2b336d3067b956c8d9bad62196aeac86daf67f7 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 16 Jul 2024 17:22:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/weiyang/AppPeopleList/AddTag.vue | 132 +++++-- .../weiyang/AppPeopleList/AppPeopleList.vue | 2 +- .../weiyang/AppPeopleList/DetailCard.vue | 172 +++++--- .../weiyang/AppPeopleList/DetailPeople.vue | 371 +++++++++--------- .../weiyang/AppPeopleList/PeopleList.vue | 10 +- src/project/weiyang/AppPeopleList/TagList.vue | 114 +++++- .../AppSpecialPeople/AppSpecialPeople.vue | 2 +- 7 files changed, 505 insertions(+), 298 deletions(-) diff --git a/src/project/weiyang/AppPeopleList/AddTag.vue b/src/project/weiyang/AppPeopleList/AddTag.vue index f228f14..fafa166 100644 --- a/src/project/weiyang/AppPeopleList/AddTag.vue +++ b/src/project/weiyang/AppPeopleList/AddTag.vue @@ -5,12 +5,38 @@
+
+
+ * +
标签
+
+ +
+
+ +
+ -
+
保存
@@ -22,7 +48,7 @@ import {mapState} from 'vuex' export default { name: 'AddTag', - appName: '居民标签管理', + labelName: '居民标签管理', customNavigation: true, data() { return { @@ -30,15 +56,18 @@ export default { background: 'url(https://cdn.sinoecare.com/i/2024/07/12/6690a1309c7d3.png) no-repeat', backgroundSize: 'cover', }, - current: 1, - pages: 2 + labelName: '', + id: '' } }, computed: { ...mapState(['user']), }, - onLoad() { - + onLoad(e) { + this.id = e.id || '' + if(this.id) { + this.getDetail() + } }, onShow() { uni.setNavigationBarColor({ @@ -47,31 +76,26 @@ export default { }) }, methods: { - getList() { - if(this.current > this.pages) return - this.$instance.post('/app/appresident/list', null, { - params: { - size: 20, - current: this.current, - }, - }) - .then((res) => { + getDetail() { + this.$instance.post(`/app/appresidentlabelinfo/queryDetailById?id=${this.id}`).then((res) => { if (res.code == 0) { - res.data.records.map((item) => { - item.isCheck = false - }) - this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records - - this.pages = res.data.pages + this.labelName = res.data.labelName + } + }) + }, + confirm() { + this.$instance.post(`/app/appresidentlabelinfo/addOrUpdate`, {id: this.id, labelName: this.labelName}).then((res) => { + if (res.code == 0) { + this.$u.toast(this.id ? '编辑成功!' : '新增成功!') + setTimeout(()=> { + uni.navigateBack() + uni.$emit('updateTag') + }, 600) } }) } }, - onReachBottom() { - // this.current = this.current + 1 - // this.getList() - }, } @@ -80,12 +104,64 @@ export default { height: 100%; .header-content-bg { width: 100%; - position: relative; + position: fixed; img { width: 100%; height: 592px; - position: absolute; - z-index: -1; + } + } + .list-content { + padding: 16px 0 220px 0; + .item { + width: calc(100% - 64px); + background-color: #fff; + margin-left: 32px; + padding: 34px 32px; + box-sizing: border-box; + position: relative; + border-bottom: 1px solid #eee; + .tips { + position: absolute; + top: 40px; + left: 14px; + font-family: PingFangSC-Regular; + font-weight: 400; + font-size: 32px; + color: #F46; + } + .label { + display: inline-block; + width: 176px; + line-height: 44px; + font-family: PingFangSC-Regular; + font-weight: 400; + font-size: 32px; + color: #333; + } + .value { + display: inline-block; + width: calc(100% - 176px); + } + } + .item:nth-of-type(1) { + border-top-left-radius: 16px; + border-top-right-radius: 16px; + } + .item:nth-last-of-type(1) { + border-bottom-left-radius: 16px; + border-bottom-right-radius: 16px; + border-bottom: none; + } + } + .add-btn { + position: fixed; + bottom: 300px; + right: 0; + z-index: 9; + padding: 30px; + img { + width: 104px; + height: 104px; } } .footer { diff --git a/src/project/weiyang/AppPeopleList/AppPeopleList.vue b/src/project/weiyang/AppPeopleList/AppPeopleList.vue index c7a91b1..23aaff9 100644 --- a/src/project/weiyang/AppPeopleList/AppPeopleList.vue +++ b/src/project/weiyang/AppPeopleList/AppPeopleList.vue @@ -28,7 +28,7 @@ export default { { img: 'https://cdn.sinoecare.com/i/2024/07/16/66960746d79c9.png', title: '居民标签管理', - linkUrl: './ExamineList' + linkUrl: './TagList' } ], backgroundNavbar: { diff --git a/src/project/weiyang/AppPeopleList/DetailCard.vue b/src/project/weiyang/AppPeopleList/DetailCard.vue index 60dde83..4ba5294 100644 --- a/src/project/weiyang/AppPeopleList/DetailCard.vue +++ b/src/project/weiyang/AppPeopleList/DetailCard.vue @@ -1,49 +1,51 @@