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 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] =?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({})
     },