From 6787bc887559a4fc5d88834fab20df7fd6088ce0 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Tue, 15 Nov 2022 16:03:37 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=BF=83=E6=84=BF=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppPhotoReport/AppPhotoReport.vue | 17 ++-- .../pingchang/AppPhotoReport/evaluate.vue | 81 +++++++++++++++++++ 2 files changed, 93 insertions(+), 5 deletions(-) create mode 100644 src/project/pingchang/AppPhotoReport/evaluate.vue diff --git a/src/project/pingchang/AppPhotoReport/AppPhotoReport.vue b/src/project/pingchang/AppPhotoReport/AppPhotoReport.vue index 250a72f..ff588c6 100644 --- a/src/project/pingchang/AppPhotoReport/AppPhotoReport.vue +++ b/src/project/pingchang/AppPhotoReport/AppPhotoReport.vue @@ -3,9 +3,8 @@
- -
+ +

{{ item.content }}

@@ -23,10 +22,14 @@ {{ item.statusName }}
- + +
+
去评价
+ +
@@ -80,6 +83,10 @@ export default { this.$linkTo('./PhotoForm') }, + toEvaluate() { + this.$linkTo('./evaluate') + }, + getList() { if (this.isMore) return diff --git a/src/project/pingchang/AppPhotoReport/evaluate.vue b/src/project/pingchang/AppPhotoReport/evaluate.vue new file mode 100644 index 0000000..88e911b --- /dev/null +++ b/src/project/pingchang/AppPhotoReport/evaluate.vue @@ -0,0 +1,81 @@ + + + + + \ No newline at end of file From a11f5072488370c7a7c934d478eac0841259dcf8 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Tue, 15 Nov 2022 16:28:39 +0800 Subject: [PATCH 02/10] bug --- src/project/pingchang/AppGetewayRegister/getewayAdd.vue | 2 ++ src/project/pingchang/AppReturnHomeRegister/Add.vue | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/project/pingchang/AppGetewayRegister/getewayAdd.vue b/src/project/pingchang/AppGetewayRegister/getewayAdd.vue index 6c560c8..43426c7 100644 --- a/src/project/pingchang/AppGetewayRegister/getewayAdd.vue +++ b/src/project/pingchang/AppGetewayRegister/getewayAdd.vue @@ -528,6 +528,8 @@ export default { this.form.description = res.data.description || '' this.form.arriveAreaId = res.data.arriveAreaId this.form.arriveAreaName = res.data.arriveAreaName + this.form.startAddress = res.data.startAddress || '' + this.form.arriveAddress = res.data.arriveAddress || '' } }) }, diff --git a/src/project/pingchang/AppReturnHomeRegister/Add.vue b/src/project/pingchang/AppReturnHomeRegister/Add.vue index 70e3f78..888a915 100644 --- a/src/project/pingchang/AppReturnHomeRegister/Add.vue +++ b/src/project/pingchang/AppReturnHomeRegister/Add.vue @@ -435,6 +435,8 @@ export default { this.startAreaName = res.data.records?.[0]?.startAreaName this.form.arriveAreaId = res.data.records?.[0]?.arriveAreaId this.form.arriveAreaName = res.data.records?.[0]?.arriveAreaName + this.form.startAddress = res.data.records?.[0]?.startAddress || '' + this.form.arriveAddress = res.data.records?.[0]?.arriveAddress || '' } }) }, From 10890ad64eb3fc2c151baf371321b252d2c20fdf Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 16 Nov 2022 09:42:29 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=BE=AE=E5=BF=83=E6=84=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppPhotoReport/AppPhotoReport.vue | 2 +- .../pingchang/AppPhotoReport/PhotoDetail.vue | 2 + .../pingchang/AppPhotoReport/PhotoForm.vue | 37 ++++++++++++------- .../pingchang/AppReturnHomeRegister/Add.vue | 1 + 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/project/pingchang/AppPhotoReport/AppPhotoReport.vue b/src/project/pingchang/AppPhotoReport/AppPhotoReport.vue index ff588c6..a1c5b79 100644 --- a/src/project/pingchang/AppPhotoReport/AppPhotoReport.vue +++ b/src/project/pingchang/AppPhotoReport/AppPhotoReport.vue @@ -36,7 +36,7 @@
-
我要上报
+
新增微心愿
diff --git a/src/project/pingchang/AppPhotoReport/PhotoDetail.vue b/src/project/pingchang/AppPhotoReport/PhotoDetail.vue index b1ae503..1e98f69 100644 --- a/src/project/pingchang/AppPhotoReport/PhotoDetail.vue +++ b/src/project/pingchang/AppPhotoReport/PhotoDetail.vue @@ -35,6 +35,8 @@ +
去评价
 diff --git a/src/project/pingchang/AppPhotoReport/PhotoForm.vue b/src/project/pingchang/AppPhotoReport/PhotoForm.vue index 30dc6ca..fe0c97d 100644 --- a/src/project/pingchang/AppPhotoReport/PhotoForm.vue +++ b/src/project/pingchang/AppPhotoReport/PhotoForm.vue @@ -1,5 +1,5 @@ @@ -120,7 +134,7 @@ export default { margin-right: 8px; } .photo-detail { - padding: 32px 0; + padding: 32px 0 50px; margin-bottom: 60px; background: #fff; @@ -172,11 +186,41 @@ export default { } } +.evaluation { + padding: 0 32px; + box-sizing: border-box; + + .rate { + display: flex; + padding-bottom: 24px; + box-sizing: border-box; + justify-content: space-between; + border-bottom: 1px solid #DDDDDD; + } + .detail, + .photo { + padding: 24px 0; + } + .detail { + border-bottom: 1px solid #DDDDDD; + } +} + +.title, +.titles { + color: #999999; +} + +.titles { + margin-bottom: 15px; +} + .content_img { width: 200px; height: 200px; margin-right: 8px; } + .bottomBtn { margin: 16px 32px 16px 0; } diff --git a/src/project/pingchang/AppPhotoReport/evaluate.vue b/src/project/pingchang/AppPhotoReport/evaluate.vue index 88e911b..2540b1c 100644 --- a/src/project/pingchang/AppPhotoReport/evaluate.vue +++ b/src/project/pingchang/AppPhotoReport/evaluate.vue @@ -2,21 +2,21 @@
*心愿评价
- +
*评价详情
- -
{{value.length }}/500
+
{{ form.evaluationDetail.length }}/500
图片上传(最多9张)
- +
@@ -31,15 +31,35 @@ export default { appName: "心愿评价", data() { return { - rate: 2, - value: '', - images: [] + images: [], + form: { + eventId: '', + evaluationScore: '', + evaluationDetail: '', + files: [], + } } }, methods: { - + submit() { + if(!this.form.evaluationScore) { + return this.$toast('请选择心愿评价') + } + if(!this.form.evaluationDetail) { + return this.$toast('请输入评价详情') + } + this.$instance.post(`/app/appclapeventinfopingchang/addEvaluation`,{ + ...this.form + }).then(res => { + if(res?.code == 0) { + this.$u.toast("评价成功") + uni.redirectTo({url: './AppPhotoReport'}) + } + }) + } }, - onLoad() { + onLoad(o) { + this.form.eventId = o.id uni.setNavigationBarTitle({title: "心愿评价"}) } }