diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue index 4745432f..b950d988 100644 --- a/src/apps/AppWalkask/AppWalkask.vue +++ b/src/apps/AppWalkask/AppWalkask.vue @@ -14,53 +14,43 @@ - - - - -
-
-
+
-
点击新增按钮试试试吧~
+
点击新增按钮试试试吧~
@@ -70,60 +60,52 @@ - -
- -
-
-
-
+
-
点击新增按钮试试试吧~
+
点击新增按钮试试试吧~
- + +
+ @@ -159,19 +141,8 @@ export default { ], currentTabs: 0, show: false, - areaList: [ - { - value: '0', - label: '武汉', - }, - { - value: '1', - label: '襄阳', - }, - ], current: 0, keyword: '', - showBtn: false, deletShow: false, isList: true, comp: '', @@ -183,7 +154,6 @@ export default { }, computed: { ...mapState(['user']) }, created() { - console.log(this.user) this.areaId = this.user.areaId this.getList() }, @@ -225,25 +195,17 @@ export default { this.currentTabs = index }, - toAdd(item) { - console.log('编辑', '添加') - const id = item.id - // this.isList = false - // this.comp = 'add' - // this.params = 12313 - if (id) { - this.comp = 'add' - // this.params = id - this.params = 12313 - this.isList = false - } - }, - - toDetail(item) { - // const { id } = item.id + goDetail(item, hint) { this.isList = false - this.comp = 'detail' - this.params = detail + if (hint == 1 || hint == 2) { + console.log('left', item.id, hint) + this.comp = hint == 1 ? 'detail' : 'add' + this.params = item + } else { + console.log('right', 2) + this.comp = 'add' + this.params = 111 + } }, toDetele(item) { @@ -252,7 +214,6 @@ export default { }, delet() { - console.log('delet') this.$http.post(`/app/appvisitvondolence/delete?ids=${this.deletId}`).then((res) => { if (res.code == 0) { this.$u.toast('删除成功！') @@ -261,28 +222,14 @@ export default { }) }, - showHide() { - if (this.showBtn == false) { - this.showBtn = true - } else { - this.showBtn = false - } - }, - - btnHide() { - this.showBtn = false - }, - handerSearch(e) { this.keyword = e this.current = 1 - // this.getList() }, handerClear() { this.keyword = '' this.current = 1 - // this.getList() }, previewImage(images, img) { @@ -308,6 +255,7 @@ export default { align-items: center; background: #3975c6; padding: 24px 30px; + .left { width: 40%; display: flex; @@ -319,18 +267,16 @@ export default { } } - .datas { - .cards { - margin: 30px 30px 24px 30px; + .AiCard { + ::v-deep .start { border-bottom: 1px solid #dddddd; - .cards-top { - display: flex; - justify-content: space-between; + .fill { .cards-left { .walkName { font-size: 32px; font-weight: 500; margin-right: 16px; + color: #333; } .tags { display: inline-block; @@ -342,53 +288,48 @@ export default { margin-left: 16px; } } - .cards-right { - position: relative; - width: 32px; - margin-top: 1%; + .cards-hint { + margin-top: 16px; + font-size: 30px; + color: #666666; + line-height: 1.4; + text-overflow: -o-ellipsis-lastline; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; } - .btn { - position: absolute; - z-index: 99; - right: 45px; - top: 350px; - width: 224px; - height: 204px; - background: #ffffff; - box-shadow: 0px 4px 12px 4px rgba(162, 162, 162, 0.5); - border-radius: 4px; + .imgs { + margin-top: 20px; + img { + width: 221px; + height: 221px; + margin-right: 8px; + } + img:nth-child(3n + 0) { + margin-right: 0; + } + } + .cards-bottom { + margin: 24px 0 16px 0; + font-size: 24px; + color: #999999; } } + } - .cards-hint { - margin-top: 16px; - font-size: 30px; - color: #666666; - line-height: 1.4; - text-overflow: -o-ellipsis-lastline; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - } - - .imgs { - margin-top: 20px; - img { - width: 224px; - height: 224px; - margin-right: 8px; + ::v-deep .mask { + .moreMenu { + .menu { + text-align: center; + line-height: 80px; + width: 192px; + height: 80px; + font-size: 28px; + font-weight: 400; + color: #333333; } - img:nth-child(3n + 0) { - margin-right: 0; - } - } - - .cards-bottom { - margin: 24px 0 16px 0; - font-size: 24px; - color: #999999; } } } @@ -398,13 +339,27 @@ export default { color: #b7b7b7; margin-top: 5px; font-weight: 800; - .toAdd { + .toAdds { color: #467dfe; } } } } + .addBtn { + width: 96px; + height: 96px; + flex-shrink: 0; + background: $uni-color-primary; + box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2); + font-size: 48px; + color: #fff; + border-radius: 50%; + justify-content: center; + align-items: center; + display: flex; + } + .fixedImg { position: fixed; right: 0; diff --git a/src/apps/AppWalkask/add.vue b/src/apps/AppWalkask/add.vue index 59c2f6a8..433508cb 100644 --- a/src/apps/AppWalkask/add.vue +++ b/src/apps/AppWalkask/add.vue @@ -13,7 +13,7 @@ - + @@ -61,12 +61,15 @@ export default { components: { walkObject, }, - props: {}, + props: { + params: {}, + }, data() { return { backgroundNavbar: { backgroundColor: '#3975C6', }, + show: false, forms: { areaId: '', application: '', @@ -77,12 +80,6 @@ export default { images: [], }, showAreaId: false, - Objectlist: [ - { - value: '0', - label: '武汉', - }, - ], showObject: false, showStstus: false, flag: false, @@ -93,9 +90,10 @@ export default { }, computed: { ...mapState(['user']) }, created() { - console.log(this.user) this.areaIdProps = this.user.areaId - this.$dict.load('realityStatus').then(() => {}) + this.$dict.load('realityStatus').then(() => { + this.getDetail() + }) }, mounted() { this.$on('black', (data) => { @@ -103,6 +101,20 @@ export default { }) }, methods: { + getDetail() { + this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.params.id}`).then((res) => { + if (res?.data) { + this.forms = res.data + this.forms.realityValue = res.data.reality + this.forms.reality = this.$dict.getLabel('realityStatus', res.data.reality) + + if (res.data.images) { + this.forms.images = JSON.parse(res.data.images || '[]') + } + } + }) + }, + submit() { console.log(1) if (this.flag) return @@ -115,7 +127,6 @@ export default { if (!this.forms.title) { return this.$u.toast('请输入入户走访事项') } - console.log(2) const imgs = [] if (this.forms.images) { @@ -125,14 +136,13 @@ export default { }) } - console.log(3) this.flag = true this.$http .post(`/app/appvisitvondolence/addOrUpdate`, { areaId: this.forms.areaId, applicationId: '02fcf19c81154f6ea9560d9a9deee9f4', optionId: '4703806718f842a98a28df554c6aa6b2', - reality: this.forms.reality == Number ? this.forms.reality : this.forms.realitylabel, + reality: this.forms.realityValue ? this.forms.realityValue : this.forms.reality, title: this.forms.title, description: this.forms.description, createUserId: this.user.id, @@ -146,7 +156,7 @@ export default { console.log(5) this.$u.toast('保存成功') this.flag = false - uni.navigateBack({}) + uni.navigateTo({ url: `./AppWalkask` }) console.log(6) } }) @@ -164,14 +174,7 @@ export default { } }, - applicaStatus(e) { - console.log(e) - this.forms.object = e[0].value - this.forms.objectlabel = e[0].label - }, - realityStstus(e) { - console.log(e) this.forms.reality = e[0].label this.forms.realityValue = e[0].value }, @@ -193,15 +196,10 @@ export default { ::v-deep .u-form { .u-form-item { margin-bottom: 16px; - // padding-bottom: 10px !important; .u-form-item__body { - // .u-form-item--right { - // .u-form-item--right__content { .u-form-item--right__content__slot { padding-bottom: 0; } - // } - // } } } .u-form-item:last-child { @@ -210,21 +208,11 @@ export default { } .avatars { .u-form-item__body { - // .u-form-item--right { - // .u-form-item--right__content { - // .u-form-item--right__content__slot { - // .ai-uploader { - // .fileList { .default { width: 160px; height: 160px; } } - // } - // } - // } - // } - // } } } } diff --git a/src/apps/AppWalkask/components/images/天使彦5.jpg b/src/apps/AppWalkask/components/images/天使彦5.jpg deleted file mode 100644 index bf6a5a2c..00000000 Binary files a/src/apps/AppWalkask/components/images/天使彦5.jpg and /dev/null differ diff --git a/src/apps/AppWalkask/detail.vue b/src/apps/AppWalkask/detail.vue index 917fb52b..d96430a1 100644 --- a/src/apps/AppWalkask/detail.vue +++ b/src/apps/AppWalkask/detail.vue @@ -3,37 +3,34 @@
-
花园小区1栋101脱贫攻坚走访——沙堡村李维民
+
{{ data.title }}
走访对象： - 李维民 + {{ data.createUserName }}
-
+
现实状态： - 李维民 + {{ $dict.getLabel('realityStatus', data.reality) }}
走访人员： - 李维民 + {{ data.createUserName }}
走访时间： - 2021-12-28 14:00 + {{ data.createTime }}
-
本次议事会通过“7步议事法”即收集意见、确认议题、制定方案、发布公告、组织协商、结果运用、反馈公示的模拟方式，进行协商讨论，并教授议事会成员自如运用议事措施开展后续落地计划的学习性和功能性会议。 组织协商、结果运用、反馈公示的模拟方式，进行协商讨论，并教授议事会成员自如运用议事措施开展后续落地计划的线上学习性和功能性会议。作为基层民主自治的新亮点，已经全面铺开的互联网+“议事大厅”使得三联村成功走出了一条集思广益、民主决策和村民自治的新路子。
+
{{ data.description }}
- - - - +
@@ -45,7 +42,9 @@ export default { name: 'detail', components: {}, - props: {}, + props: { + params: {}, + }, data() { return { data: {}, @@ -56,14 +55,19 @@ export default { }, computed: {}, created() { - this.getDetail() + this.$dict.load('realityStatus').then(() => { + this.getDetail() + }) }, mounted() {}, methods: { getDetail() { - this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.id}`).then((res) => { + this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.params.id}`).then((res) => { if (res?.data) { this.data = res.data + if (this.data.images) { + this.data.images = JSON.parse(this.data.images || '[]') + } } }) },