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] =?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 @@
       <AiEmpty v-if="!list.length"/>
     </div>
     <div class="btn-wrapper">
-      <div class="btn" @click="toReport" hover-class="text-hover">我要上报</div>
+      <div class="btn" @click="toReport" hover-class="text-hover">新增微心愿</div>
     </div>
   </div>
 </template>
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 @@
       </AiStep>
     </AiGroup>
     <AiEvaluation v-if="currentTab=='1'" :bid="info.id" type="show"/>
+    <!-- <div v-if="currentTab=='1'">
+    </div> -->
     <AiEvaluation v-if="info.eventStatus > 1" v-model="evaluation" class="fixed-bottom bg-fff" :bid="info.id">
       <div class="bottomBtn">去评价</div>
     </AiEvaluation>
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 @@
 <template>
-  <div class="album">
+  <div class="PhotoForm">
     <div class="form-item__group">
       <div class="form-item">
         <div class="form-item__wrapper">
@@ -46,10 +46,13 @@
             <h2>所属地区</h2>
           </div>
           <div class="form-item__right">
-            <!-- <AiPagePicker type="gird" v-model="form.girdId" :params="{formType:2}" @select="handleSelectGrid" nodeKey="id">
-              <AiMore v-model="form.girdName"/>
-            </AiPagePicker> -->
-            
+            <AiAreaPicker class="ai-area"  v-model="form.areaId" :fullName.sync="form.areaName" @input="areaSelect">
+              <div class="ai-area__wrapper">
+                <span class="label" v-if="form.areaName">{{ form.areaName }}</span>
+                <span v-else>请选择</span>
+                <u-icon name="arrow-right" style="display: inline-block;" color="#ddd"/>
+              </div>
+            </AiAreaPicker>
           </div>
         </div>
       </div>
@@ -100,7 +103,6 @@
 import {mapState} from 'vuex'
 
 export default {
-  appName: "上报随手拍",
   data() {
     return {
       form: {
@@ -114,10 +116,12 @@ export default {
         groupName: '',
         girdName: '',
         girdId: '',
-        files: []
+        files: [],
+        areaId: '',
+        areaName: '',
       },
       dictList: [],
-      flag: false
+      flag: false,
     }
   },
 
@@ -166,7 +170,7 @@ export default {
     },
     getDict() {
       this.$instance.post(`/app/appclapeventgroup/list?current=1&size=100000`).then(res => {
-        if (res.code == 0) {
+        if (res?.code == 0) {
           this.dictList = res.data.records.map(v => {
             return {
               value: v.id,
@@ -176,6 +180,9 @@ export default {
         }
       })
     },
+    areaSelect(v) {
+      console.log(v);
+    },
     submit() {
       if (!this.form.groupId) {
         return this.$toast('请选择事件类型')
@@ -195,9 +202,11 @@ export default {
       if (!this.form.phone) {
         return this.$toast('请输入上报人联系方式')
       }
-      if (!this.form.girdId) {
-        return this.$toast('请选择所属网格')
-      }
+
+      // if (!this.form.girdId) {
+      //   return this.$toast('请选择所属网格')
+      // }
+
       if (this.flag) return
       this.flag = true
 
@@ -229,8 +238,8 @@ export default {
 }
 </script>
 
-<style lang="scss">
-.album {
+<style lang="scss" scoped>
+.PhotoForm {
   padding-bottom: 140px;
 
   .form-item__group {
diff --git a/src/project/pingchang/AppReturnHomeRegister/Add.vue b/src/project/pingchang/AppReturnHomeRegister/Add.vue
index 888a915..96ba167 100644
--- a/src/project/pingchang/AppReturnHomeRegister/Add.vue
+++ b/src/project/pingchang/AppReturnHomeRegister/Add.vue
@@ -437,6 +437,7 @@ export default {
           this.form.arriveAreaName = res.data.records?.[0]?.arriveAreaName
           this.form.startAddress = res.data.records?.[0]?.startAddress || ''
           this.form.arriveAddress = res.data.records?.[0]?.arriveAddress || ''
+          this.form.description = res.data.records?.[0]?.description || ''
         }
       })
     },