From 6312c4d24352074f865636569b1cc5c7926e062f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Fri, 4 Jul 2025 15:55:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E9=83=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BD=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/page.css                           |   7 +-
 manifest.json                                 |  23 +-
 pages/diy/components/diy/video.vue            |   4 +-
 .../components/form-input/address.vue         |   8 +-
 .../components/form-input/checkbox.vue        |   2 +-
 .../components/form-input/date-group.vue      |   6 +-
 .../form-input/components/form-input/date.vue |   2 +-
 .../components/form-input/form-input.vue      | 208 +++---------------
 .../modules/my-datetime/my-datetime.vue       |  17 +-
 .../components/form-input/modules/uploads.vue |   2 +-
 .../components/form-input/position.vue        |   6 +-
 .../components/form-input/select-multi.vue    |  12 +-
 .../components/form-input/select.vue          |   7 +-
 .../components/form-input/video.vue           |   4 +-
 14 files changed, 66 insertions(+), 242 deletions(-)

diff --git a/common/css/page.css b/common/css/page.css
index 560502db..ff5361bd 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -568,6 +568,9 @@ button:before {
 .cr-blue-dark {
     color: #B3BFCB !important;
 }
+.cr-gray {
+    color: gray !important;
+}
 
 /**
  * 统一背景色
@@ -1420,8 +1423,4 @@ button[disabled].bg-grey {
 }
 .indicator_about_location .dot-item {
     margin: 0 6rpx;
-}
-
-.popup-bottom .vue-ref {
-    background: #fff !important;
 }
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index c8d9a6ec..444c50b2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -186,19 +186,18 @@
             }
         },
         "__usePrivacyCheck__" : true,
-        "plugins" : {
-            // 腾讯地图路线规划插件（需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件，教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a）
-            // "routePlan" : {
-            //     "version" : "1.0.19",
-            //     "provider" : "wx50b5593e81dd937a"
-            // },
-            // 直播（需要到小程序后台设置->第三方设置->插件管理里面添加【小程序直播组件】插件，教程 https://mp.weixin.qq.com/wxopen/pluginbasicprofile?action=intro&appid=wx2b03c6e691cd7370）
-            // "live-player-plugin" : {
-            //     "version" : "1.3.5",
-            //     "provider" : "wx2b03c6e691cd7370"
-            // }
-        }
+        "plugins" : {}
     },
+    // 腾讯地图路线规划插件（需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件，教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a）
+    // "routePlan" : {
+    //     "version" : "1.0.19",
+    //     "provider" : "wx50b5593e81dd937a"
+    // },
+    // 直播（需要到小程序后台设置->第三方设置->插件管理里面添加【小程序直播组件】插件，教程 https://mp.weixin.qq.com/wxopen/pluginbasicprofile?action=intro&appid=wx2b03c6e691cd7370）
+    // "live-player-plugin" : {
+    //     "version" : "1.3.5",
+    //     "provider" : "wx2b03c6e691cd7370"
+    // }
     "mp-alipay" : {
         "usingComponents" : true,
         "appid" : "2021001173639600"
diff --git a/pages/diy/components/diy/video.vue b/pages/diy/components/diy/video.vue
index c54cd00e..a519dded 100644
--- a/pages/diy/components/diy/video.vue
+++ b/pages/diy/components/diy/video.vue
@@ -4,10 +4,10 @@
         <view :style="style_img_container">
             <view class="video pr" :style="style">
                 <!-- #ifndef APP -->
-                <video :src="video" class="wh-auto ht-auto" :poster="video_img" objectFit="cover" style="object-fit: cover"></video>
+                <video :src="video" class="wh-auto ht-auto" :poster="video_img" objectFit="contain" style="object-fit: contain"></video>
                 <!-- #endif-->
                 <!-- #ifdef APP -->
-                <video-player ref="domVideoPlayer" :poster="video_img" :src="video" objectFit="cover" controls />
+                <video-player ref="domVideoPlayer" :poster="video_img" :src="video" objectFit="contain" controls />
                 <!-- #endif-->
             </view>
         </view>
diff --git a/pages/form-input/components/form-input/address.vue b/pages/form-input/components/form-input/address.vue
index 33fcbd10..f04314d8 100644
--- a/pages/form-input/components/form-input/address.vue
+++ b/pages/form-input/components/form-input/address.vue
@@ -2,7 +2,7 @@
     <view :class="'flex-col' + (propDirection == 'row' ? '' : 'gap-10')">
         <view class="flex-row align-c" :style="com_data.common_style + propStyle" @tap="open_ragion">
             <text v-if="province_name" class="flex-1">{{ province_name }}{{ city_name ? ' / ' + city_name : '' }}{{ county_name ? ' / ' + county_name : '' }}</text>
-            <text v-else class="placeholder flex-1">{{ placeholder }}</text>
+            <text v-else class="cr-gray flex-1">{{ placeholder }}</text>
             <template v-if="propDirection == 'row'">
                 <iconfont name="icon-arrow-right" size="24rpx" color="#666" propContainerDisplay="flex"></iconfont>
             </template>
@@ -103,7 +103,7 @@
                 });
             },
             open_ragion() {
-                this.$emit('openRagion', this.propDataId, this.province_id, this.city_id, this.county_id);
+                this.$emit('openRegion', this.propDataId, this.province_id, this.city_id, this.county_id);
             },
             data_check(val) {
                 const { is_error = '0', error_text = '' } = get_format_checks(this.com_data, val, true, 'number');
@@ -124,10 +124,6 @@
 .number-icon {
     color: #ccc;
 }
-.placeholder {
-    color: #606266;
-    opacity: 0.6;
-}
 .border-line {
     border-top: 2rpx solid #eee;
     margin: 10rpx 0;
diff --git a/pages/form-input/components/form-input/checkbox.vue b/pages/form-input/components/form-input/checkbox.vue
index 41b180ea..a7b6c82b 100644
--- a/pages/form-input/components/form-input/checkbox.vue
+++ b/pages/form-input/components/form-input/checkbox.vue
@@ -99,7 +99,7 @@
                         dialog_value: '',
                     });
                     this.$refs.inputDialog.close();
-                    this.$emit('data_option_change', { list: custom_option_list, value: this.form_value, id: this.propDataId });
+                    this.$emit('dataOptionChange', { list: custom_option_list, value: this.form_value, id: this.propDataId });
                 } else {
                     this.$refs.message.open();
                 }
diff --git a/pages/form-input/components/form-input/date-group.vue b/pages/form-input/components/form-input/date-group.vue
index 546fe28d..13e01fc9 100644
--- a/pages/form-input/components/form-input/date-group.vue
+++ b/pages/form-input/components/form-input/date-group.vue
@@ -2,7 +2,7 @@
     <view class="flex-row align-c wh-auto pr " :style="propStyle">
         <view class="bg-white wh-auto ht-auto flex-row align-c gap-5 oh">
             <template v-if="isEmpty(form_value)">
-                <view class="datetime-placeholder flex-1 flex-row align-c ht-auto gap-5 oh">
+                <view class="flex-1 flex-row align-c ht-auto gap-5 oh cr-gray">
                     <view class="flex-1 flex-row align-c jc-c" :data-index="0" @tap="data_time_change">{{ com_data.start_placeholder }}</view>-
                     <view class="flex-1 flex-row align-c jc-c" :data-index="1" @tap="data_time_change">{{ com_data.end_placeholder }}</view>
                 </view>
@@ -176,10 +176,6 @@
     left: 0;
     width: 0;
 }
-.datetime-placeholder {
-    color: #606266;
-    opacity: 0.6;
-}
 .datetime-value {
     color: #606266;
     line-height: 1.5;
diff --git a/pages/form-input/components/form-input/date.vue b/pages/form-input/components/form-input/date.vue
index b9c2a0d3..21773213 100644
--- a/pages/form-input/components/form-input/date.vue
+++ b/pages/form-input/components/form-input/date.vue
@@ -2,7 +2,7 @@
     <view class="flex-row align-c wh-auto pr" :style="propStyle">
         <view class="bg-white wh-auto ht-auto flex-row align-c" @tap="data_time_change">
             <template v-if="isEmpty(form_value)">
-                <view class="datetime-placeholder flex-1">{{ com_data.placeholder }}</view>
+                <view class="cr-gray flex-1">{{ com_data.placeholder }}</view>
             </template>
             <template v-else>
                 <view class="datetime-value flex-1">{{ form_value }}</view>
diff --git a/pages/form-input/components/form-input/form-input.vue b/pages/form-input/components/form-input/form-input.vue
index 3c12c3fb..cc9d5f51 100644
--- a/pages/form-input/components/form-input/form-input.vue
+++ b/pages/form-input/components/form-input/form-input.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="re oh wh-auto ht-auto">
-        <scroll-view :scroll-y="true" class="scroll-box" scroll-with-animation="true">
+        <scroll-view :scroll-top="scrollTop" :scroll-y="true" :scroll-x="overall_config.type_value == 'default' ? false : true" class="scroll-box" scroll-with-animation> 
             <view class="abs w h" :style="content_style">
                 <template v-if="!isEmpty(img_url)">
                     <image :src="img_url" mode="aspectFit" />
@@ -8,109 +8,26 @@
             </view>
             <view v-if="is_show_heading_title == '1'" class="head-title flex-row bg-white" :style="heading_title_style">{{ form_name }}</view>
             <view class="data-list bg-white">
-                <view v-for="(item, index) in filteredDiyData" :key="index" :class="(flex_direction == 'row' ? 'row-item' : 'column-item mb-10') + (item.com_data.common_config.is_error == '1' ? ' item_error' : '')" :style="( item.key == 'auxiliary-line' ? 'border-bottom: 0rpx' : '')">
-                    <!-- 左右模式 -->
-                    <!-- <template v-if="flex_direction == 'row'"> -->
-                    <view :class="'wh-auto ht-auto ' + (flex_direction == 'row' ? (['video', 'img'].includes(item.key) ? 'flex-row align-s gap-10' : 'flex-row align-b gap-10')  : 'flex-col gap-10')">
-                        <view v-if="!['rich-text', 'auxiliary-line', 'upload-attachments'].includes(item.key)" class="field-label flex-row align-c gap-10" :style="field_label_style">
-                            <view class="flex-row align-c" :style="title_style">{{ item.com_data.title }}<view v-if="item.com_data.is_required == '1'" class="required">*</view></view>
-                            <view v-if="item.com_data.common_config.help_is_show == '1' && !isEmpty(item.com_data.common_config.help_explain)" :data-value="item.com_data.common_config.help_explain" @tap="help_icon_event">
-                                <iconfont name="icon-miaosha-hdgz" :size="help_icon_style" color="#999"></iconfont>
-                            </view>
-                        </view>
-                        <!-- 富文本仅支持H5、APP-PLUS、微信小程序、百度小程序 -->
-                        <!-- #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-BAIDU -->
-                        <view v-if="item.key == 'rich-text'" class="field-label flex-row align-c gap-10" :style="field_label_style">
-                            <view class="flex-row align-c" :style="title_style">{{ item.com_data.title }}<view v-if="item.com_data.is_required == '1'" class="required">*</view></view>
-                            <view v-if="item.com_data.common_config.help_is_show == '1' && !isEmpty(item.com_data.common_config.help_explain)" :data-value="item.com_data.common_config.help_explain" @tap="help_icon_event">
-                                <iconfont name="icon-miaosha-hdgz" :size="help_icon_style" color="#999"></iconfont>
-                            </view>
-                        </view>
-                        <!-- #endif -->
-                        <!-- 上传文件仅支持H5、微信小程序、QQ小程序 -->
-                        <!-- #ifdef H5 || MP-WEIXIN || MP-QQ -->
-                        <view v-if="item.key == 'upload-attachments'" class="field-label flex-row align-c gap-10" :style="field_label_style">
-                            <view class="flex-row align-c" :style="title_style">{{ item.com_data.title }}<view v-if="item.com_data.is_required == '1'" class="required">*</view></view>
-                            <view v-if="item.com_data.common_config.help_is_show == '1' && !isEmpty(item.com_data.common_config.help_explain)" :data-value="item.com_data.common_config.help_explain" @tap="help_icon_event">
-                                <iconfont name="icon-miaosha-hdgz" :size="help_icon_style" color="#999"></iconfont>
-                            </view>
-                        </view>
-                        <!-- #endif -->
-                        <view class="flex-1 wh-auto flex-col gap-5 oh">
-                            <view v-if="['single-text', 'radio-btns', 'select'].includes(item.key) && item.com_data.type == 'single-text'" :style="item.com_data.common_style">
-                                <component-input :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propStyle="component_style" @dataCheck="data_check" @dataChange="data_change"></component-input>
-                            </view>
-                            <view v-else-if="item.key == 'multi-text'" :style="item.com_data.common_style + 'padding: 18rpx 22rpx;'">
-                                <component-textarea :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propStyle="component_style" @dataCheck="data_check" @dataChange="data_change"></component-textarea>
-                            </view>
-                            <view v-else-if="['select-multi', 'checkbox'].includes(item.key) && item.com_data.type == 'checkbox' && flex_direction !== 'row'">
-                                <component-checkbox :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" @dataCheck="data_check" @dataChange="data_change" @data_option_change="data_option_change"></component-checkbox>
-                            </view>
-                            <view v-else-if="['single-text', 'radio-btns', 'select'].includes(item.key) && item.com_data.type == 'radio-btns' && flex_direction !== 'row'">
-                                <component-radio :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" @dataCheck="data_check" @dataChange="data_change"></component-radio>
-                            </view>
-                            <view v-else-if="(['single-text', 'radio-btns', 'select'].includes(item.key) && item.com_data.type == 'select') || (['single-text', 'radio-btns', 'select'].includes(item.key) && item.com_data.type == 'radio-btns' && flex_direction == 'row')" :style="item.com_data.common_style">
-                                <component-select :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propDirection="flex_direction" :propStyle="component_style" @dataCheck="data_check" @dataChange="data_change"></component-select>
-                            </view>
-                            <view v-else-if="(['select-multi', 'checkbox'].includes(item.key) && item.com_data.type == 'select-multi') || (['select-multi', 'checkbox'].includes(item.key) && item.com_data.type == 'checkbox' && flex_direction == 'row')" :style="item.com_data.common_style">
-                                <component-select-multi :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propDirection="flex_direction" :propStyle="component_style" @dataCheck="data_check" @dataChange="data_change" @data_option_change="data_option_change"></component-select-multi>
-                            </view>
-                            <view v-else-if="item.key == 'number'" :style="item.com_data.common_style">
-                               <component-number :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" @dataCheck="data_check" @dataChange="data_change"></component-number>
-                            </view>
-                            <view v-else-if="item.key == 'date'" :style="item.com_data.common_style">
-                               <component-date :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" @dataCheck="data_check" @dataChange="data_change"></component-date>
-                            </view>
-                            <view v-else-if="item.key == 'date-group'" :style="item.com_data.common_style">
-                               <component-date-group :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" @dataCheck="data_check" @dataChange="data_change"></component-date-group>
-                            </view>
-                            <view v-else-if="item.key == 'address'">
-                               <component-address :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" :propDirection="flex_direction" @dataCheck="data_check" @dataChange="data_change" @openRagion="open_ragion" @dataAddressChange="dataAddressChange"></component-address>
-                            </view>
-                            <view v-else-if="item.key == 'phone'">
-                               <component-phone :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" :propDirection="flex_direction" @dataCheck="data_check" @dataChange="data_change" @dataCodeCheck="data_code_check" @dataCodeChage="data_code_chage"></component-phone>
-                            </view>
-                            <view v-else-if="item.key == 'pwd'" :style="item.com_data.common_style">
-                               <component-pwd :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" :propDirection="flex_direction" @dataCheck="data_check" @dataChange="data_change"></component-pwd>
-                            </view>
-                            <view v-else-if="item.key == 'score'">
-                               <component-score :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" :propDirection="flex_direction" @dataCheck="data_check" @dataChange="data_change"></component-score>
-                            </view>
-                            <view v-else-if="item.key == 'img'">
-                               <component-image :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" :propDirection="flex_direction"></component-image>
-                            </view>
-                            <view v-else-if="item.key == 'video'">
-                               <component-video :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" :propDirection="flex_direction"></component-video>
-                            </view>
-                            <view v-else-if="item.key == 'text'">
-                                <component-text :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" :propDirection="flex_direction"></component-text>
-                            </view>
-                            <view v-else-if="item.key == 'attachments'">
-                                <component-attachments :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" :propDirection="flex_direction"></component-attachments>
-                            </view>
-                            <view v-else-if="item.key == 'auxiliary-line'">
-                                <component-auxiliary-line :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" :propDirection="flex_direction"></component-auxiliary-line>
-                            </view>
-                            <view v-else-if="['upload-img', 'upload-video'].includes(item.key)">
-                                <component-upload :propValue="item.com_data" :propType="item.key == 'upload-img' ? 'img' : ( item.key == 'upload-video' ? 'video' : 'file')" :propKey="propKey" :propDataFormId="propDataFormId" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" :propDirection="flex_direction" @dataChange="data_change"></component-upload>
-                            </view>
-                            <view v-else-if="item.key == 'position'">
-                                <component-position :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" :propDirection="flex_direction" @dataChange="data_change"></component-position>
-                            </view>
-                            <!-- #ifdef H5 || MP-WEIXIN || MP-QQ -->
-                            <view v-else-if="item.key == 'upload-attachments'">
-                                <component-upload :propValue="item.com_data" :propType="item.key == 'upload-img' ? 'img' : ( item.key == 'upload-video' ? 'video' : 'file')" :propKey="propKey" :propDataFormId="propDataFormId" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" :propDirection="flex_direction" @dataChange="data_change"></component-upload>
-                            </view>
-                            <!-- #endif -->
-                            <!-- #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-BAIDU -->
-                            <view v-else-if="item.key == 'rich-text'" :style="item.com_data.common_style + 'padding:0;'">
-                                <component-rich-text :propValue="item.com_data" :propKey="propKey" :propDataId="item.id" :propMobile="mobile" :propStyle="component_style" :propDirection="flex_direction" @dataChange="data_change"></component-rich-text>
-                            </view>
-                            <!-- #endif -->
-                            <view v-if="!isEmpty(item.com_data.common_config.error_text)" class="field-invalid-info">{{ item.com_data.common_config.error_text }}</view>
-                        </view>
-                    </view>
-                </view>
+                <!-- 组件显示逻辑 -->
+                <component-show 
+                    :propValue="filteredDiyData" 
+                    :propFieldLabelStyle="field_label_style"
+                    :propTitleStyle="title_style"
+                    :propHelpIconStyle="help_icon_style"
+                    :propDataFormId="propDataFormId" 
+                    :propKey="propKey" 
+                    :propDirection="flex_direction" 
+                    :propMobile="mobile" 
+                    :propComponentStyle="component_style"
+                    @dataChange="data_change"
+                    @dataCheck="data_check"
+                    @dataOptionChange="data_option_change"
+                    @dataCodeChange="data_code_change"
+                    @dataCodeCheck="data_code_check"
+                    @dataAddressChange="data_address_change"
+                    @openRegion="open_region"
+                    @helpIconEvent="help_icon_event"
+                />
             </view>
         </scroll-view>
         <view v-if="overall_config.is_show_save_draft == '1' || overall_config.is_show_submit == '1'"  class="bottom-fixed" :style="bottom_fixed_style">
@@ -136,53 +53,13 @@
 <script>
 import { isEmpty, common_form_styles_computer } from '@/common/js/common/common.js';
 const app = getApp();
-import componentInput from '@/pages/form-input/components/form-input/input.vue';
-import componentTextarea from '@/pages/form-input/components/form-input/textarea.vue';
-import componentCheckbox from '@/pages/form-input/components/form-input/checkbox.vue';
-import componentRadio from '@/pages/form-input/components/form-input/radio.vue';
-import componentSelect from '@/pages/form-input/components/form-input/select.vue';
-import componentNumber from '@/pages/form-input/components/form-input/number.vue';
-import componentDate from '@/pages/form-input/components/form-input/date.vue';
-import componentDateGroup from '@/pages/form-input/components/form-input/date-group.vue';
-import componentAddress from '@/pages/form-input/components/form-input/address.vue';
-import componentSelectMulti from '@/pages/form-input/components/form-input/select-multi.vue';
-import componentPhone from '@/pages/form-input/components/form-input/phone.vue';
-import componentPwd from '@/pages/form-input/components/form-input/pwd.vue';
-import componentScore from '@/pages/form-input/components/form-input/score.vue';
-import componentImage from '@/pages/form-input/components/form-input/image.vue';
-import componentVideo from '@/pages/form-input/components/form-input/video.vue';
-import componentText from '@/pages/form-input/components/form-input/text.vue';
-import componentAttachments from '@/pages/form-input/components/form-input/attachments.vue';
-import componentAuxiliaryLine from '@/pages/form-input/components/form-input/auxiliary-line.vue';
-import componentRichText from '@/pages/form-input/components/form-input/rich-text.vue';
-import componentUpload from '@/pages/form-input/components/form-input/upload.vue';
-import componentPosition from '@/pages/form-input/components/form-input/position.vue';
 import componentRegionPicker from '@/pages/common/components/region-picker/region-picker';
+import componentShow from '@/pages/form-input/components/form-input/modules/component-show/index.vue';
 export default {
     name: 'formInput',
     components: {
-        componentInput,
-        componentTextarea,
-        componentCheckbox,
-        componentRadio,
-        componentNumber,
-        componentSelect,
-        componentSelectMulti,
-        componentDate,
-        componentDateGroup,
-        componentAddress,
         componentRegionPicker,
-        componentPhone,
-        componentPwd,
-        componentScore,
-        componentImage,
-        componentVideo,
-        componentText,
-        componentAttachments,
-        componentAuxiliaryLine,
-        componentRichText,
-        componentUpload,
-        componentPosition
+        componentShow
     },
     props: {
         propValue: {
@@ -222,6 +99,7 @@ export default {
             city_id: '',
             county_id: '',
             region_picker_show: false,
+            scrollTop: 0,
         };
     },
     watch: {
@@ -290,6 +168,11 @@ export default {
                 help_icon_style: `font-size:${mobile.help_icon_size_type == 'big' ? 40 : mobile.help_icon_size_type == 'middle' ? 28 : 24}rpx;`,
                 field_label_style: `${ mobile.flex_direction == 'column'? 'justify-content:flex-start;' : `width:${ mobile.filed_title_width * 2 }rpx;justify-content: ${ mobile.filed_title_justification };` }`,
             });
+            setTimeout(() => {
+                this.setData({
+                    scrollTop: 0.01
+                })
+            }, 500);
         },
         get_form_border_style(item, flex_direction) {
             return flex_direction == 'row' ? '' : common_form_styles_computer(item) + 'padding: 0px 22rpx;box-sizing:content-box;';
@@ -354,7 +237,7 @@ export default {
             });
             this.setData({ data_list: data });
         },
-        dataAddressChange(e) {
+        data_address_change(e) {
             const { value, id } = e;
             // 改变对应id的数据
             const data = [...this.data_list];
@@ -365,11 +248,11 @@ export default {
             });
             this.setData({ data_list: data });
         },
-        help_icon_event(e) {
-            this.setData({ popup_help_content: e.currentTarget.dataset.value });
+        help_icon_event(val) {
+            this.setData({ popup_help_content: val });
             this.$refs.popup.open();
         },
-        open_ragion(id, province_id, city_id, county_id) {
+        open_region(id, province_id, city_id, county_id) {
             this.setData({ 
                 region_picker_show: true, 
                 province_id, 
@@ -439,31 +322,6 @@ export default {
 }
 .data-list {
     padding: 15rpx 0;
-    .row-item {
-        padding: 10rpx 15rpx;
-        border-bottom: 2rpx solid #eee;
-        overflow: hidden;
-    }
-    .row-item:last-child {
-        border-bottom: none;
-    }
-    .column-item {
-        padding: 20rpx 15rpx;
-        padding-bottom: 20rpx;
-    }
-    .item_error {
-        background: #fef6e6;
-    }
-    .field-invalid-info {
-        color: #FF5353;
-        font-size: 24rpx;
-        line-height: 40rpx;
-    }
-}
-.required {
-    color: #FF5353;
-    font-weight: 700;
-    padding-left: 6rpx;
 }
 .popup-content {
     background: #fff;
diff --git a/pages/form-input/components/form-input/modules/my-datetime/my-datetime.vue b/pages/form-input/components/form-input/modules/my-datetime/my-datetime.vue
index e3897d0e..6485c3d1 100644
--- a/pages/form-input/components/form-input/modules/my-datetime/my-datetime.vue
+++ b/pages/form-input/components/form-input/modules/my-datetime/my-datetime.vue
@@ -1,12 +1,12 @@
 <template>
 	<view>
-		<uni-popup ref="popup" type="bottom" :animation="true">
+		<uni-popup ref="popup" type="bottom" background-color="#fff" :animation="true">
 			<view class="popup-content">
 				<view>
 				  <view class="headBox">
-						<view @tap="close"><text class="text1">取消</text></view>
+						<view @tap="close"><text class="text-size-sm">取消</text></view>
 						<!-- <view class="uni-page-head-title" v-if="titleShow">{{timeTitle}}</view> -->
-						<view><text class="text1 blue" @tap="submit_event">确定</text></view>
+						<view><text class="text-size-sm cr-blue" @tap="submit_event">确定</text></view>
 					</view>
 					<picker-view :indicator-style="indicatorStyle" :value="value" @change="bindChange">
 						<picker-view-column v-for="(arr, n) in dateTimeArr" :key="n">
@@ -222,17 +222,6 @@
 	.popup-content{
 		background-color: #FFFFFF;
 	}
-	.text1{
-		padding: 0 28rpx;
-		font-size: 34rpx;
-		line-height: 90rpx;
-		color: #888;
-		float: left;
-	}
-	.blue{
-		float: right;
-		color: #007aff;
-	}
 	.uni-page-head-title {
 		display: inline-block;
 		padding: 0 20rpx;
diff --git a/pages/form-input/components/form-input/modules/uploads.vue b/pages/form-input/components/form-input/modules/uploads.vue
index 91da3e3d..97eaa845 100644
--- a/pages/form-input/components/form-input/modules/uploads.vue
+++ b/pages/form-input/components/form-input/modules/uploads.vue
@@ -45,7 +45,7 @@
                 <view class="popup-close oh" @tap="popup_close">
                     <iconfont name="icon-close" size="32rpx" color="#fff"></iconfont>
                 </view>
-                <video :src="video_src" autoplay controls class="radius-md" objectFit="cover" :style="{ width: popup_width, height: popup_height }"></video>
+                <video :src="video_src" autoplay controls class="radius-md" objectFit="contain" :style="{ width: popup_width, height: popup_height }"></video>
             </view>
         </uni-popup>
     </view>
diff --git a/pages/form-input/components/form-input/position.vue b/pages/form-input/components/form-input/position.vue
index 882668bd..15578ce6 100644
--- a/pages/form-input/components/form-input/position.vue
+++ b/pages/form-input/components/form-input/position.vue
@@ -3,7 +3,7 @@
         <template v-if="propDirection == 'row'">
             <view class="flex-row gap-10 align-c" @tap="choose_user_location">
                 <view class="flex-1 flex-row align-c" :style="propStyle"> 
-                    <view v-if="isEmpty(form_value)" class="placeholder">获取定位</view>
+                    <view v-if="isEmpty(form_value)" class="cr-gray">获取定位</view>
                     <view>{{ form_value.address }}</view>
                 </view>
                 <iconfont name="icon-latitude-location" size="32rpx" color="#666" propContainerDisplay="flex" ></iconfont>
@@ -125,8 +125,4 @@
 .gap-5 {
     gap: 10rpx;
 }
-.placeholder {
-    color: #606266;
-    opacity: 0.6;
-}
 </style>
diff --git a/pages/form-input/components/form-input/select-multi.vue b/pages/form-input/components/form-input/select-multi.vue
index 1c70a46c..3bde88a8 100644
--- a/pages/form-input/components/form-input/select-multi.vue
+++ b/pages/form-input/components/form-input/select-multi.vue
@@ -2,7 +2,7 @@
     <view class="wh-auto">
         <view class="flex-row align-c wh-auto gap-10" :style="propStyle" @tap="data_value_event">
             <view class="flex-1 oh">
-                <template v-if="isEmpty(form_value_data)"><view class="placeholder">{{ placeholder }}</view></template>
+                <template v-if="isEmpty(form_value_data)"><view class="placeholder cr-gray">{{ placeholder }}</view></template>
                 <template v-else>
                     <view :class="'flex-row align-c' + (is_multicolour == '1' ? ' gap-10' : '')">
                         <view class="text-size-sm nowrap" v-for="(item, index) in form_value_data" :key="index" :style="is_multicolour == '1' ? 'background:' + item.color + ';color:' + (item.is_other == '1' ? '#141E31' : '#fff') + ';border-radius:8rpx;' + color_style : color_style + 'padding-left:0rpx;padding-right:0rpx;'">{{ item.name || item.value  }}{{ index != form_value_data.length - 1 && is_multicolour !== '1' ? ',' : ''}}</view>
@@ -17,7 +17,7 @@
             </template>
         </view>
         <!-- 弹窗 -->
-        <uni-popup ref="selectPopup" type="bottom" class="popup-bottom" @onclose="quick_close_event">
+        <uni-popup ref="selectPopup" type="bottom" class="popup-bottom" background-color="#fff" :animation="true" @onclose="quick_close_event">
             <view class="padding-horizontal-main padding-top-main bg-white popup-content flex-col">
                 <!-- 头部的样式 -->
                 <view class="flex-row jc-sb margin-bottom">
@@ -193,7 +193,7 @@
                         dialog_value: '',
                     });
                     this.$refs.inputDialog.close();
-                    this.$emit('data_option_change', { list: custom_option_list, value: this.form_value, id: this.propDataId });
+                    this.$emit('dataOptionChange', { list: custom_option_list, value: this.form_value, id: this.propDataId });
                 } else {
                     this.$refs.message.open();
                 }
@@ -277,9 +277,6 @@
 </script>
 
 <style lang="scss" scoped>
-.placeholder {
-    color: gray;
-}
 .popup-content {
     height: 800rpx;
 }
@@ -298,9 +295,6 @@
 ::v-deep .uni-radio-input {
     transform: scale(0.7);
 }
-::v-deep .vue-ref {
-    background: #fff !important;
-}
 .add-option {
     height: 80rpx;
 }
diff --git a/pages/form-input/components/form-input/select.vue b/pages/form-input/components/form-input/select.vue
index 92949992..67ba3a2b 100644
--- a/pages/form-input/components/form-input/select.vue
+++ b/pages/form-input/components/form-input/select.vue
@@ -2,7 +2,7 @@
     <view class="wh-auto">
         <view class="flex-row align-c wh-auto" :style="propStyle" @tap="data_value_event">
             <view class="flex-1">
-                <template v-if="isEmpty(form_value)"><view class="placeholder">{{ placeholder }}</view></template>
+                <template v-if="isEmpty(form_value)"><view class="placeholder cr-gray">{{ placeholder }}</view></template>
                 <template v-else>
                     <view class="flex-row align-c">
                         <view class="text-size-sm" :style="is_multicolour == '1' ? 'background:' + form_value_data.color + ';color:' + (form_value_data.is_other == '1' ? '#141E31' : '#fff') + ';border-radius:8rpx;' + color_style : color_style + 'padding-left:0rpx;padding-right:0rpx;'">{{ form_value_data.name || form_value  }}</view>
@@ -17,7 +17,7 @@
             </template>
         </view>
         <!-- 弹窗 -->
-        <uni-popup ref="selectPopup" type="bottom" class="popup-bottom" @onclose="quick_close_event">
+        <uni-popup ref="selectPopup" type="bottom" class="popup-bottom" background-color="#fff" :animation="true" @onclose="quick_close_event">
             <view class="padding-horizontal-main padding-top-main bg-white popup-content flex-col gap-10">
                 <!-- 头部的样式 -->
                 <view class="flex-row jc-sb">
@@ -184,9 +184,6 @@
 </script>
 
 <style lang="scss" scoped>
-.placeholder {
-    color: gray;
-}
 .popup-content {
     height: 800rpx;
 }
diff --git a/pages/form-input/components/form-input/video.vue b/pages/form-input/components/form-input/video.vue
index 32db095a..2eaed4fd 100644
--- a/pages/form-input/components/form-input/video.vue
+++ b/pages/form-input/components/form-input/video.vue
@@ -2,10 +2,10 @@
     <!-- 视频 -->
     <view class="video pr" :style="video_style">
         <!-- #ifndef APP -->
-        <video :src="video" class="wh-auto ht-auto" :poster="video_img" objectFit="cover" style="object-fit: cover"></video>
+        <video :src="video" class="wh-auto ht-auto" :poster="video_img" objectFit="contain" style="object-fit: contain"></video>
         <!-- #endif-->
         <!-- #ifdef APP -->
-        <video-player :poster="video_img" :src="video" objectFit="cover" controls />
+        <video-player :poster="video_img" :src="video" objectFit="contain" controls />
         <!-- #endif-->
     </view>
 </template>