From ba43a5f1358f1c712abea3719f48fa1e598098c7 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 21 Apr 2022 13:35:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=B8=85=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppNeighborLinkage/AppNeighborLinkage.vue | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/project/sanjianxi/AppNeighborLinkage/AppNeighborLinkage.vue b/project/sanjianxi/AppNeighborLinkage/AppNeighborLinkage.vue
index 81e05da..76cd3cf 100644
--- a/project/sanjianxi/AppNeighborLinkage/AppNeighborLinkage.vue
+++ b/project/sanjianxi/AppNeighborLinkage/AppNeighborLinkage.vue
@@ -6,17 +6,19 @@
       </div>
       <div class="select">
         <div class="item" >
-          <AiSelect v-model="status" dict="partyFourLinkageStatus" @data="typeSelect">
+          <AiSelect v-model="status" :list='array' @data='typeSelect'>
             <span v-if="!status">全部状态</span>
             <span v-else>{{ $dict.getLabel('partyFourLinkageStatus',status) }}</span>
             <u-icon name="arrow-down-fill" color="#666666" size="28"></u-icon>
+            <!-- <u-icon name="close-circle" color="#666666" size="28" v-else @click="status='',getList()"></u-icon> -->
           </AiSelect>
         </div>
         
-        <div class="item" @click="isShowDate = true">
+        <div class="item">
           <span v-if="!linksageDate">时间选择</span>
           <span v-else>{{ linksageDate }}</span>
-          <u-icon name="arrow-down-fill" color="#666666" size="28"></u-icon>
+          <u-icon name="arrow-down-fill" color="#666666" size="28" v-if="!linksageDate" @click="isShowDate = true"></u-icon>
+          <u-icon name="close-circle" color="#666666" size="28" v-else @click="linksageDate='',getList()"></u-icon>
         </div>
         <u-picker mode="time" :params="params" v-model="isShowDate" @confirm="onDateChange"></u-picker>
       </div>
@@ -64,10 +66,22 @@ export default {
       },
       list: [],
       current: 1,
+      array: [],
     }
   },
   onShow() {
-    this.$dict.load('partyFourLinkageStatus')
+    this.$dict.load('partyFourLinkageStatus').then(()=>{
+      this.array = this.$dict.getDict('partyFourLinkageStatus').map(item=>{
+        return {
+          label: item.dictName,
+          value: item.dictValue,
+        }
+      })
+      this.array.unshift({
+        label: '全部',
+        value: ''
+      })
+    })
     uni.$on('update', ()=>{
       this.getList()
     })