From 11f7f6af350e4c2615c0c15be386381646b6c3d8 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 20 Apr 2022 15:42:55 +0800
Subject: [PATCH] 29214

---
 .../sanjianxi/AppNeighborLinkage/AppNeighborLinkage.vue  | 2 +-
 project/sanjianxi/AppNeighborLinkage/neighborDetail.vue  | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/project/sanjianxi/AppNeighborLinkage/AppNeighborLinkage.vue b/project/sanjianxi/AppNeighborLinkage/AppNeighborLinkage.vue
index 518432f..81e05da 100644
--- a/project/sanjianxi/AppNeighborLinkage/AppNeighborLinkage.vue
+++ b/project/sanjianxi/AppNeighborLinkage/AppNeighborLinkage.vue
@@ -2,7 +2,7 @@
   <div class="AppNeighborLinkage">
     <div class="header">
       <div class="search">
-        <u-search placeholder="请输入四邻对象、描述" v-model="residentName" :show-action="false" @search="search"></u-search>
+        <u-search placeholder="请输入四邻对象、描述" v-model="residentName" :show-action="false" @search="search" @clear="residentName='',getList()"></u-search>
       </div>
       <div class="select">
         <div class="item" >
diff --git a/project/sanjianxi/AppNeighborLinkage/neighborDetail.vue b/project/sanjianxi/AppNeighborLinkage/neighborDetail.vue
index 3500243..7662fe6 100644
--- a/project/sanjianxi/AppNeighborLinkage/neighborDetail.vue
+++ b/project/sanjianxi/AppNeighborLinkage/neighborDetail.vue
@@ -29,8 +29,8 @@
       </div>
     </div>
     <div class="btn">
-      <div class="delBtn" @click="delBtn" v-if="data.status==1">删除联动记录</div>
-      <div class="editBtn" @click="$linkTo(`./addLinkage?id=${id}`)" v-else>修改联动记录</div>
+      <div class="delBtn" @click="delBtn">删除联动记录</div>
+      <div class="editBtn" @click="$linkTo(`./addLinkage?id=${id}`)" v-if="data.status ==0 || data.status ==2">修改联动记录</div>
     </div>
   </div>
 </template>
@@ -134,11 +134,8 @@ export default {
       border: 1px solid #FF4466;
       border-radius: 16px;
     }
-    .delBtn {
-      margin-right: 10px;
-    }
     .editBtn {
-
+      margin-left: 20px;
       background: #4181FF !important;
       color: #FFF;
       border: none;