From 7e935bc4c65218d140c857488229b41ffc311b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 31 Dec 2021 10:59:00 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppWalkask/AppWalkask.vue | 10 +++++-----
 src/apps/AppWalkask/add.vue        |  5 ++++-
 src/apps/AppWalkask/selectType.vue |  4 +++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue
index 9b2c106a..85c884fb 100644
--- a/src/apps/AppWalkask/AppWalkask.vue
+++ b/src/apps/AppWalkask/AppWalkask.vue
@@ -9,11 +9,11 @@
         <div class="currentLeft">
           <div class="currentLeft-top">
             <div class="left">
-              <AiAreaPicker v-model="areaId" all :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color:#fff;">
-                <img :src="$cdn+'location.svg'" alt="" style="width:18px;height:18px;margin-right:4px;vertical-align: middle;">
+              <AiAreaPicker v-model="areaId" all :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #fff">
+                <img :src="$cdn + 'location.svg'" alt="" style="width: 18px; height: 18px; margin-right: 4px; vertical-align: middle" />
                 <span class="label" v-if="areaName">{{ areaName }}</span>
                 <span v-else>请选择</span>
-                <u-icon name="arrow-down" color="#fff" size="28" style="margin-left:4px;" />
+                <u-icon name="arrow-down" color="#fff" size="28" style="margin-left: 4px" />
               </AiAreaPicker>
             </div>
 
@@ -25,8 +25,8 @@
               <template #custom>
                 <div class="cards-left">
                   <span class="walkName">走访对象：{{ item.name }}</span>
-                  <span class="tags">{{ item.menuLevel3Name }}</span>
-                  <span class="tags">{{ $dict.getLabel('realityStatus', item.reality) }}</span>
+                  <span class="tags" v-if="item.menuLevel3Name">{{ item.menuLevel3Name }}</span>
+                  <span class="tags" v-if="item.reality">{{ $dict.getLabel('realityStatus', item.reality) }}</span>
                 </div>
 
                 <div class="cards-hint">{{ item.title }}</div>
diff --git a/src/apps/AppWalkask/add.vue b/src/apps/AppWalkask/add.vue
index 3a48b124..8e443618 100644
--- a/src/apps/AppWalkask/add.vue
+++ b/src/apps/AppWalkask/add.vue
@@ -75,6 +75,7 @@ export default {
         reality: '',
         realityValue: '',
         menuLevel3Name: '',
+        applicationId: '',
         title: '',
         description: '',
         images: [],
@@ -106,6 +107,7 @@ export default {
     uni.$on('goBack', (data) => {
       console.log(data)
       this.forms.menuLevel3Name = data.applicationName
+      this.forms.applicationId = data.applicationId
       this.forms.name = data.selectUser.name
       this.forms.optionId = data.selectUser.id
     })
@@ -165,7 +167,8 @@ export default {
               applicationId: this.forms.applicationId,
               name: this.forms.name,
               optionId: this.forms.optionId,
-              menuLevel3Name: this.forms.menuLevel3Name,
+              // menuLevel3Name: this.forms.menuLevel3Name,
+              applicationId: this.forms.applicationId,
 
               reality: this.forms.realityValue ? this.forms.realityValue : this.forms.reality,
               title: this.forms.title,
diff --git a/src/apps/AppWalkask/selectType.vue b/src/apps/AppWalkask/selectType.vue
index 0539617b..bb58c2fa 100644
--- a/src/apps/AppWalkask/selectType.vue
+++ b/src/apps/AppWalkask/selectType.vue
@@ -71,6 +71,7 @@ export default {
       current: 1,
       showType: true,
       applicationName: '',
+      applicationId: '',
       selectUser: {},
     }
   },
@@ -105,6 +106,7 @@ export default {
     },
 
     getUser(data) {
+      this.applicationId = data.id
       this.$http.post(`/app/appapplicationinfo/list?appId=${data.id}&current=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => {
         if (res.code == 0) {
           res.data.records.map((item) => {
@@ -116,7 +118,7 @@ export default {
     },
 
     submit() {
-      uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName })
+      uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName, applicationId: this.applicationId })
       uni.navigateBack()
       // uni.navigateTo({ url: `./add` })
     },

From 5ac5516c842b8bcce12f79aa8face593c915dc1f Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 31 Dec 2021 10:59:51 +0800
Subject: [PATCH 02/18] BUG 26225

---
 src/apps/AppAskForm/AddForm.vue     |  5 -----
 src/apps/AppAskForm/FiledConfig.vue | 12 ++++++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/apps/AppAskForm/AddForm.vue b/src/apps/AppAskForm/AddForm.vue
index de5d7352..d6528359 100644
--- a/src/apps/AppAskForm/AddForm.vue
+++ b/src/apps/AppAskForm/AddForm.vue
@@ -192,11 +192,6 @@ export default {
       }
     })
   },
-
-  onShow () {
-    localStorage.removeItem("toFiledConfig")
-  },
-
   methods: {
     toSetting() {
       let {formConfig} = this
diff --git a/src/apps/AppAskForm/FiledConfig.vue b/src/apps/AppAskForm/FiledConfig.vue
index d16fddfe..3e20c751 100644
--- a/src/apps/AppAskForm/FiledConfig.vue
+++ b/src/apps/AppAskForm/FiledConfig.vue
@@ -146,9 +146,13 @@ import {components} from './components/config'
 
 export default {
   data() {
-    let params = localStorage.getItem("toFiledConfig")
-    params && (params = JSON.parse(params))
-    params.config = params.index > -1 ? params.filed : components.filter(v => v.type === params.filedType)[0]
+    let params = localStorage.getItem("toFiledConfig") || {}
+    if (params) {
+      params && (params = JSON.parse(params))
+      params.config = params.index > -1 ? params.filed : JSON.parse(JSON.stringify(components.filter(v => v.type === params.filedType)[0]))
+      localStorage.removeItem("toFiledConfig")
+      console.log(params)
+    }
     return {
       ...params,
       isShowType: false,
@@ -250,7 +254,7 @@ export default {
       this.config.options.splice(index, 1)
     },
 
-    back() {  
+    back() {
       uni.navigateBack({})
     },
 

From 6a81d36beb7d3159e605597262bfe00447231a40 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 31 Dec 2021 11:00:00 +0800
Subject: [PATCH 03/18] BUG 26225

---
 src/apps/AppAskForm/FiledConfig.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/apps/AppAskForm/FiledConfig.vue b/src/apps/AppAskForm/FiledConfig.vue
index 3e20c751..ec30ac62 100644
--- a/src/apps/AppAskForm/FiledConfig.vue
+++ b/src/apps/AppAskForm/FiledConfig.vue
@@ -151,7 +151,6 @@ export default {
       params && (params = JSON.parse(params))
       params.config = params.index > -1 ? params.filed : JSON.parse(JSON.stringify(components.filter(v => v.type === params.filedType)[0]))
       localStorage.removeItem("toFiledConfig")
-      console.log(params)
     }
     return {
       ...params,

From becae6f41c3cd79aa7db7eaea7a676b17902302a Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 31 Dec 2021 11:00:16 +0800
Subject: [PATCH 04/18] BUG 26225

---
 src/apps/AppAskForm/FiledConfig.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppAskForm/FiledConfig.vue b/src/apps/AppAskForm/FiledConfig.vue
index ec30ac62..69a31bed 100644
--- a/src/apps/AppAskForm/FiledConfig.vue
+++ b/src/apps/AppAskForm/FiledConfig.vue
@@ -148,7 +148,7 @@ export default {
   data() {
     let params = localStorage.getItem("toFiledConfig") || {}
     if (params) {
-      params && (params = JSON.parse(params))
+      params = JSON.parse(params)
       params.config = params.index > -1 ? params.filed : JSON.parse(JSON.stringify(components.filter(v => v.type === params.filedType)[0]))
       localStorage.removeItem("toFiledConfig")
     }

From 9c75da02dd2a837bf265e110e5df5b348b36f029 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 31 Dec 2021 11:03:45 +0800
Subject: [PATCH 05/18] BUG 26212

---
 src/apps/AppWalkask/AppWalkask.vue | 93 +++++++++++++++++-------------
 1 file changed, 53 insertions(+), 40 deletions(-)

diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue
index 85c884fb..c12caa6d 100644
--- a/src/apps/AppWalkask/AppWalkask.vue
+++ b/src/apps/AppWalkask/AppWalkask.vue
@@ -2,26 +2,31 @@
   <div class="AppWalkask">
     <template v-if="isList">
       <div class="header-top">
-        <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
+        <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6"
+                inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
       </div>
 
       <div class="header-middle">
         <div class="currentLeft">
           <div class="currentLeft-top">
             <div class="left">
-              <AiAreaPicker v-model="areaId" all :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #fff">
-                <img :src="$cdn + 'location.svg'" alt="" style="width: 18px; height: 18px; margin-right: 4px; vertical-align: middle" />
+              <AiAreaPicker v-model="areaId" all :areaId="user.areaId" @select="areaSelect" :name.sync="areaName"
+                            style="color: #fff">
+                <img :src="$cdn + 'location.svg'" alt=""
+                     style="width: 18px; height: 18px; margin-right: 4px; vertical-align: middle"/>
                 <span class="label" v-if="areaName">{{ areaName }}</span>
                 <span v-else>请选择</span>
-                <u-icon name="arrow-down" color="#fff" size="28" style="margin-left: 4px" />
+                <u-icon name="arrow-down" color="#fff" size="28" style="margin-left: 4px"/>
               </AiAreaPicker>
             </div>
 
-            <u-search v-model="keyword" :clearabled="true" placeholder="请输入标题" :show-action="false" bg-color="#1F5CAF" search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch" @clear="handerClear"></u-search>
+            <u-search v-model="keyword" :clearabled="true" placeholder="请输入标题" :show-action="false" bg-color="#1F5CAF"
+                      search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch"
+                      @clear="handerClear"></u-search>
           </div>
 
           <template v-if="data.length > 0">
-            <AiCard v-for="(item, i) in data" :key="i" @click.native="goDetail(item, 1)">
+            <AiCard v-for="(item, i) in data" :key="i" @click.native="goDetail(item, 1)" :ref="item.id">
               <template #custom>
                 <div class="cards-left">
                   <span class="walkName">走访对象：{{ item.name }}</span>
@@ -32,7 +37,8 @@
                 <div class="cards-hint">{{ item.title }}</div>
 
                 <div class="imgs">
-                  <img :src="items.url" alt="" v-for="(items, i) in item.images" :key="i" @click.stop="previewImage(item.images, items.url)" v-if="i < 3" />
+                  <img :src="items.url" alt="" v-for="(items, i) in item.images" :key="i"
+                       @click.stop="previewImage(item.images, items.url)" v-if="i < 3"/>
                 </div>
 
                 <div class="cards-bottom">
@@ -60,15 +66,16 @@
         </div>
       </div>
 
-      <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true" :show-title="false" @confirm="delet"></u-modal>
+      <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true"
+               :show-title="false" @confirm="delet"></u-modal>
 
-      <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="goDetail()" />
+      <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="goDetail()"/>
     </template>
   </div>
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import {mapState} from 'vuex'
 
 export default {
   name: 'AppWalkask',
@@ -118,37 +125,38 @@ export default {
   onShow() {
     document.title = '走访慰问'
   },
-  mounted() {},
+  mounted() {
+  },
   methods: {
     getList() {
       this.$http
-        .post('/app/appvisitvondolence/list', null, {
-          params: {
-            size: this.size,
-            current: this.current,
-            areaId: this.areaId,
-            createUserId: this.currentTabs == 1 ? this.user.id : '',
-            title: this.keyword,
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            if (this.current > res.data.pages) {
-              return
-            }
-            this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
-            this.pages = res.data.pages
-
-            if (this.data) {
-              this.data.map((item) => {
-                if (item.images) {
-                  item.images = JSON.parse(item.images || '[]')
-                }
-                return item
-              })
-            }
+      .post('/app/appvisitvondolence/list', null, {
+        params: {
+          size: this.size,
+          current: this.current,
+          areaId: this.areaId,
+          createUserId: this.currentTabs == 1 ? this.user.id : '',
+          title: this.keyword,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          if (this.current > res.data.pages) {
+            return
           }
-        })
+          this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
+          this.pages = res.data.pages
+
+          if (this.data) {
+            this.data.map((item) => {
+              if (item.images) {
+                item.images = JSON.parse(item.images || '[]')
+              }
+              return item
+            })
+          }
+        }
+      })
     },
 
     areaSelect(e) {
@@ -164,19 +172,23 @@ export default {
     },
 
     goDetail(item, hint) {
+      if (item?.id) {
+        this.$refs?.[item.id]?.[0]?.handleClose()
+      }
       if (hint == 1) {
-        uni.navigateTo({ url: `./detail?id=${item.id}` })
+        uni.navigateTo({url: `./detail?id=${item.id}`})
       }
       if (hint == 2) {
-        uni.navigateTo({ url: `./add?id=${item.id}` })
+        uni.navigateTo({url: `./add?id=${item.id}`})
       } else {
-        uni.navigateTo({ url: `./add` })
+        uni.navigateTo({url: `./add`})
       }
     },
 
     toDetele(item) {
       this.deletShow = true
       this.deletId = item.id
+      this.$refs?.[item.id]?.[0]?.handleClose()
     },
 
     delet() {
@@ -219,6 +231,7 @@ uni-page-body {
   height: 100%;
   background: #fff;
 }
+
 .AppWalkask {
   height: 100%;
 

From 88a1e7fddf99435b9466509aff3c9b9a6210498a Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 31 Dec 2021 11:05:00 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sass/AppAskForm/AddForm.vue     |  5 -----
 src/sass/AppAskForm/FiledConfig.vue | 11 +++++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/sass/AppAskForm/AddForm.vue b/src/sass/AppAskForm/AddForm.vue
index de5d7352..d6528359 100644
--- a/src/sass/AppAskForm/AddForm.vue
+++ b/src/sass/AppAskForm/AddForm.vue
@@ -192,11 +192,6 @@ export default {
       }
     })
   },
-
-  onShow () {
-    localStorage.removeItem("toFiledConfig")
-  },
-
   methods: {
     toSetting() {
       let {formConfig} = this
diff --git a/src/sass/AppAskForm/FiledConfig.vue b/src/sass/AppAskForm/FiledConfig.vue
index d16fddfe..69a31bed 100644
--- a/src/sass/AppAskForm/FiledConfig.vue
+++ b/src/sass/AppAskForm/FiledConfig.vue
@@ -146,9 +146,12 @@ import {components} from './components/config'
 
 export default {
   data() {
-    let params = localStorage.getItem("toFiledConfig")
-    params && (params = JSON.parse(params))
-    params.config = params.index > -1 ? params.filed : components.filter(v => v.type === params.filedType)[0]
+    let params = localStorage.getItem("toFiledConfig") || {}
+    if (params) {
+      params = JSON.parse(params)
+      params.config = params.index > -1 ? params.filed : JSON.parse(JSON.stringify(components.filter(v => v.type === params.filedType)[0]))
+      localStorage.removeItem("toFiledConfig")
+    }
     return {
       ...params,
       isShowType: false,
@@ -250,7 +253,7 @@ export default {
       this.config.options.splice(index, 1)
     },
 
-    back() {  
+    back() {
       uni.navigateBack({})
     },
 

From 6a62d6fbaf4528b324e5b331567413dc066377d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 31 Dec 2021 11:10:29 +0800
Subject: [PATCH 07/18] 26209

---
 src/apps/AppWalkask/AppWalkask.vue | 11 ++++++++---
 src/apps/AppWalkask/add.vue        |  3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue
index 85c884fb..04e075af 100644
--- a/src/apps/AppWalkask/AppWalkask.vue
+++ b/src/apps/AppWalkask/AppWalkask.vue
@@ -42,7 +42,7 @@
               </template>
 
               <template #menu v-if="item.createUserId == user.id">
-                <div class="menu" @tap.stop="goDetail(item, 2)">编辑</div>
+                <div class="menu" @tap.stop="toAdd(item, 2)">编辑</div>
                 <div class="menu" @tap.stop="toDetele(item)">删除</div>
               </template>
             </AiCard>
@@ -53,7 +53,7 @@
 
             <div class="addBtns">
               <span> 点击</span>
-              <span class="toAdds" @click="goDetail()">新增按钮</span>
+              <span class="toAdds" @click="toAdd()">新增按钮</span>
               <span> 试试试吧~</span>
             </div>
           </div>
@@ -62,7 +62,7 @@
 
       <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true" :show-title="false" @confirm="delet"></u-modal>
 
-      <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="goDetail()" />
+      <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="toAdd()" />
     </template>
   </div>
 </template>
@@ -164,9 +164,14 @@ export default {
     },
 
     goDetail(item, hint) {
+      console.log('详情', hint)
       if (hint == 1) {
         uni.navigateTo({ url: `./detail?id=${item.id}` })
       }
+    },
+
+    toAdd(item, hint) {
+      console.log('编辑', hint)
       if (hint == 2) {
         uni.navigateTo({ url: `./add?id=${item.id}` })
       } else {
diff --git a/src/apps/AppWalkask/add.vue b/src/apps/AppWalkask/add.vue
index 8e443618..c36d3ffa 100644
--- a/src/apps/AppWalkask/add.vue
+++ b/src/apps/AppWalkask/add.vue
@@ -213,7 +213,8 @@ export default {
     },
 
     toWalkObject() {
-      if (this.id) return
+      console.log(1);
+      // if (this.id) return
       // this.addList = false
       // this.comp = 'selectType'
       // this.paramss = 111

From aa9cc87b525ca6da5d2c1048b85b462b9295d0f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 31 Dec 2021 11:28:45 +0800
Subject: [PATCH 08/18] 26211

---
 src/apps/AppWalkask/AppWalkask.vue |  2 --
 src/apps/AppWalkask/add.vue        | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue
index 09c726e7..e1f007bf 100644
--- a/src/apps/AppWalkask/AppWalkask.vue
+++ b/src/apps/AppWalkask/AppWalkask.vue
@@ -164,14 +164,12 @@ export default {
     },
 
     goDetail(item, hint) {
-      console.log('详情',hint)
       if (hint == 1) {
         uni.navigateTo({ url: `./detail?id=${item.id}` })
       }
     },
 
     toAdd(item, hint) {
-      console.log('编辑',hint)
       if (hint == 2) {
         uni.navigateTo({ url: `./add?id=${item.id}` })
       } else {
diff --git a/src/apps/AppWalkask/add.vue b/src/apps/AppWalkask/add.vue
index c36d3ffa..35dbdef3 100644
--- a/src/apps/AppWalkask/add.vue
+++ b/src/apps/AppWalkask/add.vue
@@ -24,17 +24,18 @@
 
           <div class="line"></div>
 
-          <u-form-item label="入户走访事项" prop="title" required label-position="top">
-            <u-input v-model="forms.title" placeholder="请输入入户走访事项(30字以内)" type="textarea" auto-height height="60" maxlength="30" />
-            <div>{{ forms.title.length }}/30</div>
+          <u-form-item label="入户走访事项" prop="title" required label-position="top" :border-bottom="false">
+            <u-input v-model="forms.title" placeholder="请输入入户走访事项(30字以内)" type="textarea" auto-height height="60" :maxlength="30" />
           </u-form-item>
+          <div class="hint">{{ forms.title.length }}/30</div>
 
           <div class="line"></div>
 
-          <u-form-item label="入户走访内容" prop="description" label-position="top">
-            <u-input v-model="forms.description" placeholder="请输入入户走访事项(500字以内)" type="textarea" auto-height height="60" maxlength="500" />
-            <div>{{ forms.description.length }}/500</div>
+          <u-form-item label="入户走访内容" prop="description" label-position="top" :border-bottom="false">
+            <u-input v-model="forms.description" placeholder="请输入入户走访事项(500字以内)" type="textarea" auto-height height="60" :maxlength="500" />
+            <!-- <div>{{ forms.description.length }}/500</div> -->
           </u-form-item>
+          <div class="hint">{{ forms.description.length }}/500</div>
 
           <div class="line"></div>
 
@@ -105,7 +106,6 @@ export default {
     })
 
     uni.$on('goBack', (data) => {
-      console.log(data)
       this.forms.menuLevel3Name = data.applicationName
       this.forms.applicationId = data.applicationId
       this.forms.name = data.selectUser.name
@@ -195,7 +195,6 @@ export default {
     },
 
     areaSelect(e) {
-      console.log(e)
       this.forms.areaId = e
     },
 
@@ -213,11 +212,6 @@ export default {
     },
 
     toWalkObject() {
-      console.log(1);
-      // if (this.id) return
-      // this.addList = false
-      // this.comp = 'selectType'
-      // this.paramss = 111
       uni.navigateTo({ url: `./selectType` })
     },
   },
@@ -287,6 +281,12 @@ export default {
         background: #f3f6f9;
       }
 
+      .hint {
+        padding: 4px 32px 8px 0;
+        text-align: right;
+        color: #999;
+      }
+
       .avatars {
         .u-form-item__body {
           .default {

From b7261fd83861253023711f4d0545bcc58bceebf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 31 Dec 2021 11:44:34 +0800
Subject: [PATCH 09/18] 26262

---
 src/apps/AppWalkask/AppWalkask.vue |  1 +
 src/apps/AppWalkask/selectType.vue | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue
index e1f007bf..9a9e1558 100644
--- a/src/apps/AppWalkask/AppWalkask.vue
+++ b/src/apps/AppWalkask/AppWalkask.vue
@@ -157,6 +157,7 @@ export default {
     },
 
     change(index) {
+      this.data = []
       this.areaId = this.user.areaId
       this.keyword = ''
       this.currentTabs = index
diff --git a/src/apps/AppWalkask/selectType.vue b/src/apps/AppWalkask/selectType.vue
index bb58c2fa..e984b8b1 100644
--- a/src/apps/AppWalkask/selectType.vue
+++ b/src/apps/AppWalkask/selectType.vue
@@ -107,7 +107,12 @@ export default {
 
     getUser(data) {
       this.applicationId = data.id
-      this.$http.post(`/app/appapplicationinfo/list?appId=${data.id}&current=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => {
+      this.appId = data.id
+      this.getUsers()
+    },
+
+    getUsers() {
+      this.$http.post(`/app/appapplicationinfo/list?appId=${this.appId}&current=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => {
         if (res.code == 0) {
           res.data.records.map((item) => {
             item.isChecked = false
@@ -139,17 +144,18 @@ export default {
     },
 
     handerSearch(e) {
-      if (this.showType) {
+      if (!this.showType) {
         this.keyword = e
         this.current = 1
-        this.getUser()
+        // this.getUser()
+        this.getUsers()
       }
     },
 
     handerClear() {
       this.keyword = ''
       this.current = 1
-      this.getUser()
+      this.getUsers()
     },
   },
 }

From c97b6515f0149030f8b757faae378cc24c256a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 31 Dec 2021 11:48:12 +0800
Subject: [PATCH 10/18] 26261

---
 src/apps/AppWalkask/selectType.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppWalkask/selectType.vue b/src/apps/AppWalkask/selectType.vue
index e984b8b1..53f1ec19 100644
--- a/src/apps/AppWalkask/selectType.vue
+++ b/src/apps/AppWalkask/selectType.vue
@@ -123,9 +123,12 @@ export default {
     },
 
     submit() {
-      uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName, applicationId: this.applicationId })
-      uni.navigateBack()
-      // uni.navigateTo({ url: `./add` })
+      if (this.selectUser.length > 0) {
+        uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName, applicationId: this.applicationId })
+        uni.navigateBack()
+      } else {
+        return this.$u.toast('请选择人员')
+      }
     },
 
     toUserSelect(item) {

From 7429e255a5fb891db6aa5cad6f46dbb0a00f0358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 31 Dec 2021 11:53:11 +0800
Subject: [PATCH 11/18] 26206

---
 src/apps/AppWalkask/selectType.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppWalkask/selectType.vue b/src/apps/AppWalkask/selectType.vue
index 53f1ec19..f52af701 100644
--- a/src/apps/AppWalkask/selectType.vue
+++ b/src/apps/AppWalkask/selectType.vue
@@ -40,8 +40,7 @@
 
             <div class="right">
               <div class="applicationNames">{{ e.name }}</div>
-
-              <!-- <img src="./img/2.png" alt="" class="imgs" /> -->
+              <div class="idNumbers">{{ e.idNumber && e.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1******$2') }}</div>
             </div>
           </div>
         </div>
@@ -256,14 +255,14 @@ export default {
           align-items: center;
           margin-left: 32px;
           border-bottom: 1px solid #e4e5e6;
+          padding-right: 20px;
           .applicationNames {
             font-size: 36px;
             font-weight: 500;
             color: #333333;
           }
-          .imgs {
-            width: 40px;
-            height: 40px;
+          .idNumbers {
+            color: #666;
           }
         }
       }

From adeb6f3062e0ded7088d7a30e5861464d3a982c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 31 Dec 2021 14:07:32 +0800
Subject: [PATCH 12/18] 26122

---
 src/apps/AppResidentActivitie/Add.vue | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/apps/AppResidentActivitie/Add.vue b/src/apps/AppResidentActivitie/Add.vue
index 79f41a26..0c8302cf 100644
--- a/src/apps/AppResidentActivitie/Add.vue
+++ b/src/apps/AppResidentActivitie/Add.vue
@@ -207,9 +207,9 @@ export default {
       if (this.showStartTime == true) {
         var nowTime = new Date().getTime() * 1
 
-        var historyTime = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1
+        var beginTimes = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1
 
-        if (nowTime > historyTime) {
+        if (nowTime > beginTimes) {
           this.forms.beginTime = ''
           return this.$u.toast('开始时间应大于当前时间')
         } else {
@@ -217,15 +217,18 @@ export default {
         }
       }
       if (this.showEndTime == true) {
-        var nowTime = new Date().getTime() * 1
+        if (!this.forms.beginTime) {
+          return this.$u.toast('请先选择开始时间')
+        }
+        var beginTimes = new Date(this.forms.beginTime).getTime() * 1
 
-        var historyTime = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1
+        var endTimes = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1
 
-        if (nowTime > historyTime) {
-          this.forms.endTime = ''
-          return this.$u.toast('结束时间应大于当前时间')
-        } else {
+        if (endTimes > beginTimes && endTimes != beginTimes) {
           this.forms.endTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00'
+        } else {
+          this.forms.endTime = ''
+          return this.$u.toast('结束时间应大于开始时间')
         }
       }
     },

From 63928266087df7286b578cee4d52ea88c7af2f71 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 31 Dec 2021 14:13:00 +0800
Subject: [PATCH 13/18] BUG 26212

---
 src/apps/AppWalkask/AppWalkask.vue | 98 +++++++++++++++++-------------
 1 file changed, 56 insertions(+), 42 deletions(-)

diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue
index 09c726e7..42a62bfd 100644
--- a/src/apps/AppWalkask/AppWalkask.vue
+++ b/src/apps/AppWalkask/AppWalkask.vue
@@ -2,26 +2,31 @@
   <div class="AppWalkask">
     <template v-if="isList">
       <div class="header-top">
-        <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
+        <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6"
+                inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
       </div>
 
       <div class="header-middle">
         <div class="currentLeft">
           <div class="currentLeft-top">
             <div class="left">
-              <AiAreaPicker v-model="areaId" all :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #fff">
-                <img :src="$cdn + 'location.svg'" alt="" style="width: 18px; height: 18px; margin-right: 4px; vertical-align: middle" />
+              <AiAreaPicker v-model="areaId" all :areaId="user.areaId" @select="areaSelect" :name.sync="areaName"
+                            style="color: #fff">
+                <img :src="$cdn + 'location.svg'" alt=""
+                     style="width: 18px; height: 18px; margin-right: 4px; vertical-align: middle"/>
                 <span class="label" v-if="areaName">{{ areaName }}</span>
                 <span v-else>请选择</span>
-                <u-icon name="arrow-down" color="#fff" size="28" style="margin-left: 4px" />
+                <u-icon name="arrow-down" color="#fff" size="28" style="margin-left: 4px"/>
               </AiAreaPicker>
             </div>
 
-            <u-search v-model="keyword" :clearabled="true" placeholder="请输入标题" :show-action="false" bg-color="#1F5CAF" search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch" @clear="handerClear"></u-search>
+            <u-search v-model="keyword" :clearabled="true" placeholder="请输入标题" :show-action="false" bg-color="#1F5CAF"
+                      search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch"
+                      @clear="handerClear"></u-search>
           </div>
 
           <template v-if="data.length > 0">
-            <AiCard v-for="(item, i) in data" :key="i" @click.native="goDetail(item, 1)">
+            <AiCard v-for="(item, i) in data" :key="i" @click.native="goDetail(item, 1)" :ref="item.id">
               <template #custom>
                 <div class="cards-left">
                   <span class="walkName">走访对象：{{ item.name }}</span>
@@ -32,7 +37,8 @@
                 <div class="cards-hint">{{ item.title }}</div>
 
                 <div class="imgs">
-                  <img :src="items.url" alt="" v-for="(items, i) in item.images" :key="i" @click.stop="previewImage(item.images, items.url)" v-if="i < 3" />
+                  <img :src="items.url" alt="" v-for="(items, i) in item.images" :key="i"
+                       @click.stop="previewImage(item.images, items.url)" v-if="i < 3"/>
                 </div>
 
                 <div class="cards-bottom">
@@ -60,15 +66,16 @@
         </div>
       </div>
 
-      <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true" :show-title="false" @confirm="delet"></u-modal>
+      <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true"
+               :show-title="false" @confirm="delet"></u-modal>
 
-      <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="toAdd()" />
+      <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="toAdd()"/>
     </template>
   </div>
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import {mapState} from 'vuex'
 
 export default {
   name: 'AppWalkask',
@@ -118,37 +125,38 @@ export default {
   onShow() {
     document.title = '走访慰问'
   },
-  mounted() {},
+  mounted() {
+  },
   methods: {
     getList() {
       this.$http
-        .post('/app/appvisitvondolence/list', null, {
-          params: {
-            size: this.size,
-            current: this.current,
-            areaId: this.areaId,
-            createUserId: this.currentTabs == 1 ? this.user.id : '',
-            title: this.keyword,
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            if (this.current > res.data.pages) {
-              return
-            }
-            this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
-            this.pages = res.data.pages
-
-            if (this.data) {
-              this.data.map((item) => {
-                if (item.images) {
-                  item.images = JSON.parse(item.images || '[]')
-                }
-                return item
-              })
-            }
+      .post('/app/appvisitvondolence/list', null, {
+        params: {
+          size: this.size,
+          current: this.current,
+          areaId: this.areaId,
+          createUserId: this.currentTabs == 1 ? this.user.id : '',
+          title: this.keyword,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          if (this.current > res.data.pages) {
+            return
           }
-        })
+          this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
+          this.pages = res.data.pages
+
+          if (this.data) {
+            this.data.map((item) => {
+              if (item.images) {
+                item.images = JSON.parse(item.images || '[]')
+              }
+              return item
+            })
+          }
+        }
+      })
     },
 
     areaSelect(e) {
@@ -164,24 +172,29 @@ export default {
     },
 
     goDetail(item, hint) {
-      console.log('详情',hint)
+      if (item?.id) {
+        this.$refs?.[item.id]?.[0]?.handleClose()
+      }
       if (hint == 1) {
-        uni.navigateTo({ url: `./detail?id=${item.id}` })
+        uni.navigateTo({url: `./detail?id=${item.id}`})
       }
     },
 
     toAdd(item, hint) {
-      console.log('编辑',hint)
+      if (item?.id) {
+        this.$refs?.[item.id]?.[0]?.handleClose()
+      }
       if (hint == 2) {
-        uni.navigateTo({ url: `./add?id=${item.id}` })
+        uni.navigateTo({url: `./add?id=${item.id}`})
       } else {
-        uni.navigateTo({ url: `./add` })
+        uni.navigateTo({url: `./add`})
       }
     },
 
     toDetele(item) {
       this.deletShow = true
       this.deletId = item.id
+      this.$refs?.[item.id]?.[0]?.handleClose()
     },
 
     delet() {
@@ -224,6 +237,7 @@ uni-page-body {
   height: 100%;
   background: #fff;
 }
+
 .AppWalkask {
   height: 100%;
 

From 09a7c47480c3a66e1a7634239fe3ab79092f3fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 31 Dec 2021 14:18:43 +0800
Subject: [PATCH 14/18] 26269

---
 src/apps/AppWalkask/selectType.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppWalkask/selectType.vue b/src/apps/AppWalkask/selectType.vue
index f52af701..77a11516 100644
--- a/src/apps/AppWalkask/selectType.vue
+++ b/src/apps/AppWalkask/selectType.vue
@@ -122,7 +122,7 @@ export default {
     },
 
     submit() {
-      if (this.selectUser.length > 0) {
+      if (this.selectUser.id != null) {
         uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName, applicationId: this.applicationId })
         uni.navigateBack()
       } else {

From 88eefe7c05d0ad380284ea277daca5bdaa51e908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 31 Dec 2021 14:30:43 +0800
Subject: [PATCH 15/18] 26270

---
 src/apps/AppWalkask/selectType.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppWalkask/selectType.vue b/src/apps/AppWalkask/selectType.vue
index 77a11516..6a011a80 100644
--- a/src/apps/AppWalkask/selectType.vue
+++ b/src/apps/AppWalkask/selectType.vue
@@ -17,7 +17,7 @@
           <div class="cards" v-for="(item, i) in typeList" :key="i" @click="toUserSelect(item)">
             <img src="./img/tx@2x.png" alt="" />
 
-            <div class="right">
+            <div class="rightes">
               <div class="applicationNames">{{ item.applicationName }}</div>
 
               <img src="./img/2.png" alt="" class="imgs" />
@@ -38,7 +38,7 @@
               <img src="./img/tx@2x.png" alt="" class="avatras" />
             </div>
 
-            <div class="right">
+            <div class="rights">
               <div class="applicationNames">{{ e.name }}</div>
               <div class="idNumbers">{{ e.idNumber && e.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1******$2') }}</div>
             </div>
@@ -201,7 +201,7 @@ export default {
           height: 74px;
           border-radius: 8px;
         }
-        .right {
+        .rightes {
           width: 100%;
           display: flex;
           justify-content: space-between;
@@ -248,14 +248,14 @@ export default {
           }
         }
 
-        .right {
+        .rights {
           width: 100%;
           display: flex;
           justify-content: space-between;
           align-items: center;
           margin-left: 32px;
           border-bottom: 1px solid #e4e5e6;
-          padding-right: 20px;
+          padding-right: 40px;
           .applicationNames {
             font-size: 36px;
             font-weight: 500;

From f0ae82ecebbdd8b065d308e6793c8ff15b7e37a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 31 Dec 2021 14:43:20 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppWalkask/selectType.vue | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/apps/AppWalkask/selectType.vue b/src/apps/AppWalkask/selectType.vue
index 6a011a80..0ee707fc 100644
--- a/src/apps/AppWalkask/selectType.vue
+++ b/src/apps/AppWalkask/selectType.vue
@@ -104,15 +104,22 @@ export default {
       })
     },
 
-    getUser(data) {
-      this.applicationId = data.id
-      this.appId = data.id
-      this.getUsers()
-    },
+    // getUser(data) {
+    //   this.applicationId = data.id
+    //   this.appId = data.id
+    //   this.getUsers()
+    // },
 
     getUsers() {
+      uni.showLoading({
+        title: '加载中',
+      })
       this.$http.post(`/app/appapplicationinfo/list?appId=${this.appId}&current=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => {
         if (res.code == 0) {
+          uni.showToast({
+            title: '加载完毕',
+            icon: 'none',
+          })
           res.data.records.map((item) => {
             item.isChecked = false
           })
@@ -132,8 +139,11 @@ export default {
 
     toUserSelect(item) {
       this.applicationName = item.applicationName
+      this.applicationId = item.id
+      this.appId = item.id
+      this.getUsers()
+
       this.showType = false
-      this.getUser(item)
     },
 
     back() {
@@ -173,6 +183,7 @@ export default {
   }
 
   .header-middle {
+    padding-bottom: 140px;
     .hint {
       padding: 0 20px 0 32px;
       height: 112px;

From 357ffcb7936ea75aa40f2fcf94b39f49b7169f5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 31 Dec 2021 14:53:09 +0800
Subject: [PATCH 17/18] 26280

---
 src/apps/AppUniMsg/AppUniMsg.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppUniMsg/AppUniMsg.vue b/src/apps/AppUniMsg/AppUniMsg.vue
index 1bd7805c..f27cbe6e 100644
--- a/src/apps/AppUniMsg/AppUniMsg.vue
+++ b/src/apps/AppUniMsg/AppUniMsg.vue
@@ -85,7 +85,7 @@ export default {
     })
   },
   onShow() {
-    document.title = '通知公告' 
+    document.title = '通知公告'
   },
   methods: {
     getList() {
@@ -172,7 +172,7 @@ uni-page-body {
   height: 100%;
 
   ::v-deep .AiCard {
-    background: #f3f6f9;
+    background: #f5f5f5;
 
     .start {
       background: #fff;
@@ -220,7 +220,7 @@ uni-page-body {
   }
 
   .u-load-more-wrap {
-    background: #f3f6f9 !important;
+    background: #f5f5f5 !important;
     margin: 0 !important;
     padding: 34px 0;
   }

From 821d78433b06f709bf52ea1cc808e70bf5b717dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 31 Dec 2021 15:00:32 +0800
Subject: [PATCH 18/18] 26240 26214

---
 src/apps/AppWalkask/AppWalkask.vue | 85 ++++++++++++++----------------
 1 file changed, 39 insertions(+), 46 deletions(-)

diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue
index cb76b958..42990358 100644
--- a/src/apps/AppWalkask/AppWalkask.vue
+++ b/src/apps/AppWalkask/AppWalkask.vue
@@ -2,27 +2,22 @@
   <div class="AppWalkask">
     <template v-if="isList">
       <div class="header-top">
-        <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6"
-                inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
+        <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
       </div>
 
       <div class="header-middle">
         <div class="currentLeft">
           <div class="currentLeft-top">
             <div class="left">
-              <AiAreaPicker v-model="areaId" all :areaId="user.areaId" @select="areaSelect" :name.sync="areaName"
-                            style="color: #fff">
-                <img :src="$cdn + 'location.svg'" alt=""
-                     style="width: 18px; height: 18px; margin-right: 4px; vertical-align: middle"/>
+              <AiAreaPicker v-model="areaId" all :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #fff">
+                <img :src="$cdn + 'location.svg'" alt="" style="width: 18px; height: 18px; margin-right: 4px; vertical-align: middle" />
                 <span class="label" v-if="areaName">{{ areaName }}</span>
                 <span v-else>请选择</span>
-                <u-icon name="arrow-down" color="#fff" size="28" style="margin-left: 4px"/>
+                <u-icon name="arrow-down" color="#fff" size="28" style="margin-left: 4px" />
               </AiAreaPicker>
             </div>
 
-            <u-search v-model="keyword" :clearabled="true" placeholder="请输入标题" :show-action="false" bg-color="#1F5CAF"
-                      search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch"
-                      @clear="handerClear"></u-search>
+            <u-search v-model="keyword" :clearabled="true" placeholder="请输入标题" :show-action="false" bg-color="#1F5CAF" search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch" @clear="handerClear"></u-search>
           </div>
 
           <template v-if="data.length > 0">
@@ -37,8 +32,7 @@
                 <div class="cards-hint">{{ item.title }}</div>
 
                 <div class="imgs">
-                  <img :src="items.url" alt="" v-for="(items, i) in item.images" :key="i"
-                       @click.stop="previewImage(item.images, items.url)" v-if="i < 3"/>
+                  <img :src="items.url" alt="" v-for="(items, i) in item.images" :key="i" @click.stop="previewImage(item.images, items.url)" v-if="i < 3" />
                 </div>
 
                 <div class="cards-bottom">
@@ -66,16 +60,15 @@
         </div>
       </div>
 
-      <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true"
-               :show-title="false" @confirm="delet"></u-modal>
+      <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true" :show-title="false" @confirm="delet"></u-modal>
 
-      <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="toAdd()"/>
+      <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="toAdd()" />
     </template>
   </div>
 </template>
 
 <script>
-import {mapState} from 'vuex'
+import { mapState } from 'vuex'
 
 export default {
   name: 'AppWalkask',
@@ -125,41 +118,41 @@ export default {
   onShow() {
     document.title = '走访慰问'
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     getList() {
       this.$http
-      .post('/app/appvisitvondolence/list', null, {
-        params: {
-          size: this.size,
-          current: this.current,
-          areaId: this.areaId,
-          createUserId: this.currentTabs == 1 ? this.user.id : '',
-          title: this.keyword,
-        },
-      })
-      .then((res) => {
-        if (res.code == 0) {
-          if (this.current > res.data.pages) {
-            return
-          }
-          this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
-          this.pages = res.data.pages
+        .post('/app/appvisitvondolence/list', null, {
+          params: {
+            size: this.size,
+            current: this.current,
+            areaId: this.areaId,
+            createUserId: this.currentTabs == 1 ? this.user.id : '',
+            title: this.keyword,
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            if (this.current > res.data.pages) {
+              return
+            }
+            this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
+            this.pages = res.data.pages
 
-          if (this.data) {
-            this.data.map((item) => {
-              if (item.images) {
-                item.images = JSON.parse(item.images || '[]')
-              }
-              return item
-            })
+            if (this.data) {
+              this.data.map((item) => {
+                if (item.images) {
+                  item.images = JSON.parse(item.images || '[]')
+                }
+                return item
+              })
+            }
           }
-        }
-      })
+        })
     },
 
     areaSelect(e) {
+      this.data = []
       this.areaId = e
       this.getList()
     },
@@ -177,7 +170,7 @@ export default {
         this.$refs?.[item.id]?.[0]?.handleClose()
       }
       if (hint == 1) {
-        uni.navigateTo({url: `./detail?id=${item.id}`})
+        uni.navigateTo({ url: `./detail?id=${item.id}` })
       }
     },
 
@@ -186,9 +179,9 @@ export default {
         this.$refs?.[item.id]?.[0]?.handleClose()
       }
       if (hint == 2) {
-        uni.navigateTo({url: `./add?id=${item.id}`})
+        uni.navigateTo({ url: `./add?id=${item.id}` })
       } else {
-        uni.navigateTo({url: `./add`})
+        uni.navigateTo({ url: `./add` })
       }
     },