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 e3f0a33d..7680814b 100644 --- a/pages/form-input/components/form-input/form-input-base.vue +++ b/pages/form-input/components/form-input/form-input-base.vue @@ -325,6 +325,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({ diff --git a/pages/form-input/components/form-input/form-input.vue b/pages/form-input/components/form-input/form-input.vue index b0c40840..5da6f510 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 @@ - - - {{ overall_config.save_draft_title }} + + + {{ back_icon == 'back' ? $t('common.return') : $t('common.home') }} + @@ -99,6 +102,7 @@ export default { }, data() { return { + back_icon: 'home', data_list: [], form_name: '', img_url: '', @@ -135,6 +139,14 @@ export default { methods: { isEmpty, init() { + // 判断应该显示什么icon + const pages = getCurrentPages(); + const length = pages.length; + if (length > 1) { + this.back_icon = 'back'; + } else { + this.back_icon = 'home'; + } const data = this.propValue; // 公共配置信息 const overall_config = data.config?.overall_config || {}; @@ -157,6 +169,10 @@ export default { }) }, 500); }, + // 返回事件 + top_nav_left_back_event(e) { + app.globalData.page_back_prev_event(); + }, /* * 点击提交按钮触发方法 */ @@ -243,9 +259,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; @@ -283,4 +299,8 @@ export default { background: transparent; z-index: 999; } +// 返回按钮的显示逻辑 +.bottom-line-back { + margin-right: 20rpx; +} \ No newline at end of file