From 724421754ade31ec601050019174f89691af7982 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 20 Apr 2022 15:08:58 +0800
Subject: [PATCH] 29198

---
 .../AppGreatPowerIntegral/AppGreatPowerIntegral.vue   | 11 +++++++++--
 .../AppNeighborLinkage/AppNeighborLinkage.vue         |  8 +++++---
 project/sanjianxi/AppNeighborLinkage/addLinkage.vue   |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/project/sanjianxi/AppGreatPowerIntegral/AppGreatPowerIntegral.vue b/project/sanjianxi/AppGreatPowerIntegral/AppGreatPowerIntegral.vue
index d42aa2e..345ca5d 100644
--- a/project/sanjianxi/AppGreatPowerIntegral/AppGreatPowerIntegral.vue
+++ b/project/sanjianxi/AppGreatPowerIntegral/AppGreatPowerIntegral.vue
@@ -5,7 +5,7 @@
     <!-- 弹框 -->
     <u-popup v-model="show" mode="center" :closeable="false"> 
 			<div class="dialog">
-        <view>出淤泥而不染，濯清涟而不妖</view>
+        <u-input v-model="value" :type="number" :border="true" />
 
         <div style="display: flex;">
           <u-button type="primary" >取消</u-button>
@@ -23,6 +23,7 @@ export default {
   data() {
     return {
       show: false,
+      value: '',
     }
   },
   onShow() {},
@@ -32,6 +33,12 @@ export default {
 
 <style lang="scss" scoped>
 .AppGreatPowerIntegral {
-  
+
+
+
+  .dialog {
+    padding: 30px;
+    box-sizing: border-box;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/project/sanjianxi/AppNeighborLinkage/AppNeighborLinkage.vue b/project/sanjianxi/AppNeighborLinkage/AppNeighborLinkage.vue
index 8f6c1d4..9524bb8 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="keyword" :show-action="false" @search="search"></u-search>
+        <u-search placeholder="请输入四邻对象、描述" v-model="residentName" :show-action="false" @search="search"></u-search>
       </div>
       <div class="select">
         <div class="item" >
@@ -53,7 +53,7 @@ export default {
   appName: "四邻联动",
   data() {
     return {
-      keyword:'',
+      residentName:'',
       status: '',
       linksageDate: '',
       isShowDate: false,
@@ -75,7 +75,8 @@ export default {
   },
   methods: {
     search(e) {
-      this.keyword = e
+      this.residentName = e
+      this.getList()
     },
     typeSelect(e) {
       this.list = []
@@ -95,6 +96,7 @@ export default {
           current: this.current,
           status: this.status,
           linksageDate: this.linksageDate,
+          residentName: this.residentName,
         }
       }).then(res=>{
         if (res?.data) {
diff --git a/project/sanjianxi/AppNeighborLinkage/addLinkage.vue b/project/sanjianxi/AppNeighborLinkage/addLinkage.vue
index e79a9c6..82d5cf3 100644
--- a/project/sanjianxi/AppNeighborLinkage/addLinkage.vue
+++ b/project/sanjianxi/AppNeighborLinkage/addLinkage.vue
@@ -75,7 +75,7 @@ export default {
         }
       }).then(res => {
         if(res?.data) {
-          this.form = res.data && JSON.parse(JSON.stringify(res.data))
+          this.form = res.data
         }
       })
     },