From 2b486b3759f1d6b4cc536bf7b74333b67fa455dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Wed, 15 Oct 2025 11:29:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/form-input/form-input.vue      | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/pages/form-input/components/form-input/form-input.vue b/pages/form-input/components/form-input/form-input.vue
index 8adb1409..50e63073 100644
--- a/pages/form-input/components/form-input/form-input.vue
+++ b/pages/form-input/components/form-input/form-input.vue
@@ -40,10 +40,13 @@
             </template>
             <view class="bottom-line-exclude">
                 <view class="form-footer flex-row align-c">
-                    <view v-if="overall_config.is_show_save_draft == '1'" class="save_draft_title flex-col jc-c align-c">
-                        <iconfont name="icon-detail" size="30rpx" color="#666" propContainerDisplay="flex" ></iconfont>
-                        {{ overall_config.save_draft_title }}
+                    <view class="save_draft_title flex-col jc-c align-c" @tap="top_nav_left_back_event">
+                        <iconfont :name="'icon-' + back_icon" size="30rpx" color="#666" propContainerDisplay="flex" ></iconfont>
+                        {{ back_icon == 'back' ? $t('common.return') : $t('common.home') }}
                     </view>
+                    <!-- <view class="bottom-line-back" @tap.stop="bottom_line_back">
+                        <iconfont :name="'icon-' + back_icon" size="46rpx" color="#666" propContainerDisplay="flex" ></iconfont>
+                    </view> -->
                     <button v-if="overall_config.is_show_submit == '1'" class="flex-1 submit_title flex-row align-c jc-c" :style="'background:' + submit_bg_color" type="default" :disabled="is_submit_disable" @tap="on_submit_event">{{ overall_config.submit_title }}</button>
                 </view>
             </view>
@@ -93,6 +96,7 @@ export default {
     },
     data() {
         return {
+            back_icon: 'home',
             data_list: [],
             form_name: '',
             img_url: '',
@@ -129,6 +133,14 @@ export default {
     methods: {
         isEmpty,
         init() {
+            // 判断应该显示什么icon
+            let pages = getCurrentPages();
+            let length = pages.length;
+            if (length > 1) {
+                this.back_icon = 'back';
+            } else {
+                this.back_icon = 'back';
+            }
             const data = this.propValue;
             // 公共配置信息
             const overall_config = data.config?.overall_config || {};
@@ -151,6 +163,10 @@ export default {
                 })
             }, 500);
         },
+        // 返回事件
+        top_nav_left_back_event(e) {
+            app.globalData.page_back_prev_event();
+        },
         /*
         * 点击提交按钮触发方法
         */
@@ -236,9 +252,9 @@ export default {
     width: 100%;
     border-top: 2rpx solid #eee;
     .save_draft_title {
-        min-width: 180rpx;
+        min-width: 120rpx;
         font-size: 24rpx;
-        margin: 0 20rpx 0 0;
+        // margin: 0 20rpx 0 0;
     }
     .submit_title {
         text-align: center;
@@ -276,4 +292,8 @@ export default {
     background: transparent;
     z-index: 999;
 }
+// 返回按钮的显示逻辑
+.bottom-line-back {
+    margin-right: 20rpx;
+}
 </style>
\ No newline at end of file

From 274a13bc188140e3fccdb97dea631bc11380f115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Wed, 15 Oct 2025 11:30:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/form-input/components/form-input/form-input.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/form-input/components/form-input/form-input.vue b/pages/form-input/components/form-input/form-input.vue
index 50e63073..669fe310 100644
--- a/pages/form-input/components/form-input/form-input.vue
+++ b/pages/form-input/components/form-input/form-input.vue
@@ -134,12 +134,12 @@ export default {
         isEmpty,
         init() {
             // 判断应该显示什么icon
-            let pages = getCurrentPages();
-            let length = pages.length;
+            const pages = getCurrentPages();
+            const length = pages.length;
             if (length > 1) {
                 this.back_icon = 'back';
             } else {
-                this.back_icon = 'back';
+                this.back_icon = 'home';
             }
             const data = this.propValue;
             // 公共配置信息

From a20d3db88cf1485823b76ccb3061a6098b590108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Wed, 15 Oct 2025 14:01:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/form-input/components/form-input/form-input-base.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pages/form-input/components/form-input/form-input-base.vue b/pages/form-input/components/form-input/form-input-base.vue
index 9fd7b563..4c47ebd0 100644
--- a/pages/form-input/components/form-input/form-input-base.vue
+++ b/pages/form-input/components/form-input/form-input-base.vue
@@ -324,6 +324,9 @@ export default {
                                 child.com_data.common_style = this.get_form_border_style(child.com_data.common_config, mobile.arrang == 'direction' ? (emobile.flex_direction || 'row') : 'column', overall_config.type_value);
                                 if (!isEmpty(item1[child.id])) {
                                     child.com_data.form_value = item1[child.id];
+                                    if (!isEmpty(item1[child.id + '_custom_option_list'])) {
+                                        child.com_data.custom_option_list = item1[child.id + '_custom_option_list'];
+                                    }
                                 }
                             });
                             data_list.push({