From c91df9daf5c9dc578506ab6bf191981920005d38 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 30 Dec 2021 13:53:05 +0800
Subject: [PATCH] 26179

---
 src/apps/AppAskForm/AddForm.vue     | 13 ++++++++-----
 src/apps/AppAskForm/FiledConfig.vue |  7 +++----
 src/apps/AppAskForm/Result.vue      |  4 +++-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/apps/AppAskForm/AddForm.vue b/src/apps/AppAskForm/AddForm.vue
index f24a4727..de5d7352 100644
--- a/src/apps/AppAskForm/AddForm.vue
+++ b/src/apps/AppAskForm/AddForm.vue
@@ -184,6 +184,7 @@ export default {
     })
 
     uni.$on('filedConfig', res => {
+      console.log(res)
       if (res.index < 0) {
         this.targetList.push(res.config)
       } else {
@@ -191,6 +192,11 @@ export default {
       }
     })
   },
+
+  onShow () {
+    localStorage.removeItem("toFiledConfig")
+  },
+
   methods: {
     toSetting() {
       let {formConfig} = this
@@ -348,13 +354,10 @@ export default {
       if (index > -1) {
         this.filed = type
         this.filedIndex = index
-        let {filed, filedType} = this
-        localStorage.setItem("toFiledConfig", JSON.stringify({index, filed, filedType}))
+        localStorage.setItem("toFiledConfig", JSON.stringify({index, filed: type, filedType: type.type}))
       } else {
         this.filedIndex = ''
-        this.filedType = type
-        let {filed, filedType} = this
-        localStorage.setItem("toFiledConfig", JSON.stringify({filed, filedType}))
+        localStorage.setItem("toFiledConfig", JSON.stringify({filed: '', filedType: type, index: -1}))
       }
       uni.navigateTo({url: `./FiledConfig`})
     },
diff --git a/src/apps/AppAskForm/FiledConfig.vue b/src/apps/AppAskForm/FiledConfig.vue
index d4693409..d16fddfe 100644
--- a/src/apps/AppAskForm/FiledConfig.vue
+++ b/src/apps/AppAskForm/FiledConfig.vue
@@ -148,12 +148,11 @@ export default {
   data() {
     let params = localStorage.getItem("toFiledConfig")
     params && (params = JSON.parse(params))
-    localStorage.removeItem("toFiledConfig")
-    params.config = params.index > -1 ? params.filed : components?.filter(v => v.type === params.filedType)?.[0] || {}
+    params.config = params.index > -1 ? params.filed : components.filter(v => v.type === params.filedType)[0]
     return {
       ...params,
       isShowType: false,
-      isShowAnswer: false,
+      isShowAnswer: false
     }
   },
   computed: {
@@ -251,7 +250,7 @@ export default {
       this.config.options.splice(index, 1)
     },
 
-    back() {
+    back() {  
       uni.navigateBack({})
     },
 
diff --git a/src/apps/AppAskForm/Result.vue b/src/apps/AppAskForm/Result.vue
index 90360a86..4da4bc8f 100644
--- a/src/apps/AppAskForm/Result.vue
+++ b/src/apps/AppAskForm/Result.vue
@@ -74,7 +74,9 @@ export default {
       })
     },
     confirm() {
-      history.go(2 - history.length)
+      uni.navigateBack({
+        delta: 2
+      })
     }
   },
   onShow() {