From 2e9f8da160ad58d0d3974c96349c2d60f78fbed0 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 20 May 2022 15:41:08 +0800
Subject: [PATCH] 29740

---
 src/apps/AppHelpDeclaration/details.vue |  2 +-
 src/apps/AppHelpDeclaration/list.vue    | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppHelpDeclaration/details.vue b/src/apps/AppHelpDeclaration/details.vue
index 1f9a42a6..1fdd9f62 100644
--- a/src/apps/AppHelpDeclaration/details.vue
+++ b/src/apps/AppHelpDeclaration/details.vue
@@ -38,7 +38,7 @@
       </div>
       <div class="item">
         <label>所在地区</label>
-        <div>{{ data.areaName }}</div>
+        <div>{{ data.areaName }}{{ data.address }}</div>
       </div>
       <div class="items" v-if="data.files && data.files.length">
         <p>照片</p>
diff --git a/src/apps/AppHelpDeclaration/list.vue b/src/apps/AppHelpDeclaration/list.vue
index 45f4e7e1..0a12abcd 100644
--- a/src/apps/AppHelpDeclaration/list.vue
+++ b/src/apps/AppHelpDeclaration/list.vue
@@ -13,16 +13,14 @@
               <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;margin-top:18px" @select="areaSelect(e)"></u-icon>
             </div>
           </AiAreaPicker>
-          <u-icon name="close-circle" v-if="areaId" @click="clearArea" color="#999" size="24"></u-icon>
         </div>
         <div class="right">
-          <AiSelect dict="helpDeclarationReason" v-model="declareReason">
+          <AiSelect v-model="declareReason" :list="riskList">
             <span v-if="!declareReason" style="color: #999;">风险类型</span>
             <span v-else>{{ $dict.getLabel('helpDeclarationReason', declareReason) }}</span>
             <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;"></u-icon>
+            <u-icon name="close-circle" v-if="declareReason" @click="clearReason" color="#999" size="24"></u-icon>
           </AiSelect>
-          <u-icon name="close-circle" v-if="declareReason" @click="clearReason" color="#999" size="24"></u-icon>
-          <!-- style="margin-left: 4px;width: 14px; display:inline-block;" -->
         </div>
       </div>
     </AiTopFixed>
@@ -63,6 +61,7 @@ export default {
       areaName: '',
       declareReason: '',
       list: [],
+      riskList: [],
     }
   },
   computed: {
@@ -70,6 +69,11 @@ export default {
   },
   onShow() {
     this.$dict.load('helpDeclarationStatus').then(() => {
+      this.riskList = this.$dict.getDict('helpDeclarationReason').map((item) => ({
+        label: item.dictName,
+        value: item.dictValue
+      }))
+      this.riskList.unshift({label: "全部", value: ""})
       uni.$on('update', () => {
         this.getList()
       })