From 006c28475f65518fc5179b91240473b0c8ea76a1 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, 2 Jul 2025 10:26:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=84=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/form-input/address.vue         |  4 ++--
 .../components/form-input/date-group.vue      |  2 +-
 .../form-input/components/form-input/date.vue |  2 +-
 .../components/form-input/form-input.vue      |  8 ++++++-
 .../components/form-input/input.vue           |  2 +-
 .../components/form-input/number.vue          |  2 +-
 .../components/form-input/phone.vue           |  2 +-
 .../form-input/components/form-input/pwd.vue  |  2 +-
 .../components/form-input/select-multi.vue    | 18 +++++---------
 .../components/form-input/select.vue          | 24 +++++++------------
 .../components/form-input/textarea.vue        |  2 +-
 11 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/pages/form-input/components/form-input/address.vue b/pages/form-input/components/form-input/address.vue
index b18cc500..bb9a010b 100644
--- a/pages/form-input/components/form-input/address.vue
+++ b/pages/form-input/components/form-input/address.vue
@@ -77,8 +77,8 @@
                 this.setData({
                     com_data: com_data,
                     address_type: com_data.address_type || 'noDetailed',
-                    placeholder: com_data?.placeholder || '请选择内容...',
-                    form_value: com_data?.form_value || '', 
+                    placeholder: com_data.placeholder,
+                    form_value: com_data.form_value , 
                     detailed_value: com_data?.detailed_value || '',
                     province_id: com_data?.form_value[0] || '',
                     city_id: com_data?.form_value[1] || '',
diff --git a/pages/form-input/components/form-input/date-group.vue b/pages/form-input/components/form-input/date-group.vue
index 6c6696d1..fd0e4c1f 100644
--- a/pages/form-input/components/form-input/date-group.vue
+++ b/pages/form-input/components/form-input/date-group.vue
@@ -86,7 +86,7 @@
                 this.$nextTick(() => {
                     this.setData({
                         com_data: com_data,
-                        placeholder: com_data?.placeholder || '请输入内容...',
+                        placeholder: com_data?.placeholder,
                         form_value: date_list, 
                         date_style: com_data.date_style,
                         date_type: com_data.date_type,
diff --git a/pages/form-input/components/form-input/date.vue b/pages/form-input/components/form-input/date.vue
index b70cc186..ba7fa045 100644
--- a/pages/form-input/components/form-input/date.vue
+++ b/pages/form-input/components/form-input/date.vue
@@ -77,7 +77,7 @@
                 this.$nextTick(() => {
                     this.setData({
                         com_data: com_data,
-                        placeholder: com_data?.placeholder || '请输入内容...',
+                        placeholder: com_data.placeholder,
                         form_value: date, 
                         date_style: com_data.date_style,
                         date_type: com_data.date_type,
diff --git a/pages/form-input/components/form-input/form-input.vue b/pages/form-input/components/form-input/form-input.vue
index 7e763a7e..4382e04b 100644
--- a/pages/form-input/components/form-input/form-input.vue
+++ b/pages/form-input/components/form-input/form-input.vue
@@ -55,6 +55,9 @@
                             <view v-else-if="item.key == 'pwd'" :style="item.com_data.common_style">
                                <componentPwd :propValue="item.com_data" :propKey="propKey" :propDataIndex="index" :propMobile="mobile" :propStyle="component_style" :propDirection="flex_direction" @dataCheck="data_check" @dataChange="data_change"></componentPwd>
                             </view>
+                            <view v-else-if="item.key == 'score'">
+                               <componentScore :propValue="item.com_data" :propKey="propKey" :propDataIndex="index" :propMobile="mobile" :propStyle="component_style" :propDirection="flex_direction" @dataCheck="data_check" @dataChange="data_change"></componentScore>
+                            </view>
                             <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>
@@ -96,6 +99,7 @@ import componentAddress from '@/pages/form-input/components/form-input/address.v
 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 componentRegionPicker from '@/pages/common/components/region-picker/region-picker';
 export default {
     name: 'formInput',
@@ -113,6 +117,8 @@ export default {
         componentRegionPicker,
         componentPhone,
         componentPwd,
+        componentScore,
+
     },
     props: {
         propValue: {
@@ -268,7 +274,7 @@ export default {
             const list = this.data_list;
             list[this.address_index].com_data = {
                 ...list[this.address_index].com_data,
-                form_value: [data.province.id, data.city.id, data.areal.id],
+                form_value: [ data.province.id, data.city.id, data.areal.id ],
                 province_name: data.province.name || '',
                 city_name: data.city.name || '',
                 county_name: data.areal.name || '',
diff --git a/pages/form-input/components/form-input/input.vue b/pages/form-input/components/form-input/input.vue
index 4aa48d73..02d453a7 100644
--- a/pages/form-input/components/form-input/input.vue
+++ b/pages/form-input/components/form-input/input.vue
@@ -50,7 +50,7 @@
                 this.setData({
                     com_data: com_data,
                     max_length: com_data.is_limit_num == '1' && !isEmpty(com_data.max_num) ? com_data.max_num : '-1',
-                    placeholder: com_data?.placeholder || '请输入内容...',
+                    placeholder: com_data.placeholder,
                     form_value: com_data?.form_value || '', 
                 });
             },
diff --git a/pages/form-input/components/form-input/number.vue b/pages/form-input/components/form-input/number.vue
index 06ab256e..f333cc6f 100644
--- a/pages/form-input/components/form-input/number.vue
+++ b/pages/form-input/components/form-input/number.vue
@@ -59,7 +59,7 @@
                 this.setData({
                     com_data: com_data,
                     max_length: com_data.is_limit_num == '1' && !isEmpty(com_data.max_num) ? com_data.max_num : '-1',
-                    placeholder: com_data?.placeholder || '请输入内容...',
+                    placeholder: com_data.placeholder,
                     form_value: com_data?.form_value || '', 
                     decimal_num: com_data.is_decimal == '1' ? com_data.decimal_num : 0,
                     is_thousandths_symbol: com_data.is_thousandths_symbol,
diff --git a/pages/form-input/components/form-input/phone.vue b/pages/form-input/components/form-input/phone.vue
index cb835533..2ae2924a 100644
--- a/pages/form-input/components/form-input/phone.vue
+++ b/pages/form-input/components/form-input/phone.vue
@@ -93,7 +93,7 @@
                 }
                 this.setData({
                     com_data: com_data,
-                    placeholder: com_data?.placeholder || '请输入内容...',
+                    placeholder: com_data.placeholder,
                     form_value: com_data?.form_value || '', 
                     form_value_code: com_data?.form_value_code || '',
                     format: com_data.format,
diff --git a/pages/form-input/components/form-input/pwd.vue b/pages/form-input/components/form-input/pwd.vue
index 5668bc34..89e6359a 100644
--- a/pages/form-input/components/form-input/pwd.vue
+++ b/pages/form-input/components/form-input/pwd.vue
@@ -53,7 +53,7 @@
                 const com_data = this.propValue;
                 this.setData({
                     com_data: com_data,
-                    placeholder: com_data?.placeholder || '请输入密码...',
+                    placeholder: com_data.placeholder,
                     form_value: com_data?.form_value || '', 
                     is_show: true,
                 });
diff --git a/pages/form-input/components/form-input/select-multi.vue b/pages/form-input/components/form-input/select-multi.vue
index 021d72a6..99a32660 100644
--- a/pages/form-input/components/form-input/select-multi.vue
+++ b/pages/form-input/components/form-input/select-multi.vue
@@ -17,7 +17,7 @@
             </template>
         </view>
         <!-- 弹窗 -->
-        <component-popup :propShow="popup_status" propPosition="bottom" @onclose="quick_close_event">
+        <uni-popup ref="selectPopup" type="bottom" @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">
@@ -59,7 +59,7 @@
                     <view class="size-14 cr-blue">添加选项</view>
                 </view>
             </view>
-        </component-popup>
+        </uni-popup>
         <!-- 选项弹出框 -->
         <uni-popup ref="inputDialog" type="dialog">
             <uni-popup-dialog ref="inputClose" mode="input" title="输入内容" :value="dialog_value" before-close placeholder="请输入内容" @close="dialog_input_close" @confirm="dialog_input_confirm"></uni-popup-dialog>
@@ -73,11 +73,7 @@
 
 <script>
     import { get_format_checks, isEmpty, get_color_style, color_change } from '@/common/js/common/common.js';
-    import componentPopup from '@/components/popup/popup';
     export default {
-        components: {
-            componentPopup,
-        },
         props: {
             propValue: {
                 type: Object,
@@ -156,7 +152,7 @@
                 this.setData({
                     com_data: com_data,
                     is_multicolour: com_data.is_multicolour,
-                    placeholder: com_data?.placeholder || '请输入内容...',
+                    placeholder: com_data?.placeholder,
                     option_list: com_data?.option_list.concat(com_data?.custom_option_list || []) || [],
                     custom_option_list: com_data?.custom_option_list || [],
                     color_style: get_color_style(this.propMobile),
@@ -173,8 +169,8 @@
                 this.setData({
                     select_value: count == this.new_option_list.length ? 'all' : '',
                     popup_list: this.form_value,
-                    popup_status: true,
                 });
+                this.$refs.selectPopup.open();
             },
             add_option() {
                 this.setData({
@@ -209,9 +205,7 @@
              * 快速关闭事件
              */
             quick_close_event() {
-                this.setData({
-                    popup_status: false,
-                });
+                this.$refs.selectPopup.close();
             },
             /**
              * 搜索事件
@@ -269,9 +263,9 @@
                 // 重新编辑一下历史数据
                 this.setData({
                     form_value: this.popup_list,
-                    popup_status: false,
                     form_value_data: form_value_data,
                 });
+                this.$refs.selectPopup.close();
                 const { is_error = '0', error_text = '' } = get_format_checks(this.com_data, this.popup_list, true, 'checkbox');
                 // 校验数据
                 this.$emit('dataCheck', { is_error, error_text, value: this.popup_list, index: this.propDataIndex });
diff --git a/pages/form-input/components/form-input/select.vue b/pages/form-input/components/form-input/select.vue
index a7d1b678..0088e5f8 100644
--- a/pages/form-input/components/form-input/select.vue
+++ b/pages/form-input/components/form-input/select.vue
@@ -17,7 +17,7 @@
             </template>
         </view>
         <!-- 弹窗 -->
-        <component-popup :propShow="popup_status" propPosition="bottom" @onclose="quick_close_event">
+        <uni-popup ref="selectPopup" type="bottom" @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">
@@ -47,17 +47,13 @@
                     </template>
                 </view>
             </view>
-        </component-popup>
+        </uni-popup>
     </view>
 </template>
 
 <script>
-    import { get_format_checks, isEmpty, get_color_style } from '@/common/js/common/common.js';
-    import componentPopup from '@/components/popup/popup';
+    import { isEmpty, get_color_style } from '@/common/js/common/common.js';
     export default {
-        components: {
-            componentPopup,
-        },
         props: {
             propValue: {
                 type: Object,
@@ -133,7 +129,7 @@
                 this.setData({
                     com_data: com_data,
                     is_multicolour: com_data.is_multicolour,
-                    placeholder: com_data?.placeholder || '请输入内容...',
+                    placeholder: com_data.placeholder,
                     option_list: com_data?.option_list || [],
                     color_style: get_color_style(this.propMobile),
                     form_value: com_data?.form_value || '',
@@ -144,17 +140,13 @@
              * 下拉框选择事件
              */
             data_value_event() {
-                this.setData({
-                    popup_status: true,
-                });
+                this.$refs.selectPopup.open();
             },
             /**
              * 快速关闭事件
              */
             quick_close_event() {
-                this.setData({
-                    popup_status: false,
-                });
+                this.$refs.selectPopup.close();
             },
             /**
              * 搜索事件
@@ -180,9 +172,11 @@
                 // 重新编辑一下历史数据
                 this.setData({
                     form_value: e.detail.value,
-                    popup_status: false,
                     form_value_data: form_value_data,
                 });
+                // 关闭选择框
+                this.$refs.selectPopup.close();
+
                 this.$emit('dataChange', { value: e.detail.value, index: this.propDataIndex });
             }
         }
diff --git a/pages/form-input/components/form-input/textarea.vue b/pages/form-input/components/form-input/textarea.vue
index e204e36c..ac09bafc 100644
--- a/pages/form-input/components/form-input/textarea.vue
+++ b/pages/form-input/components/form-input/textarea.vue
@@ -51,7 +51,7 @@
                 this.setData({
                     com_data: com_data,
                     max_length: com_data.is_limit_num == '1' && !isEmpty(com_data.max_num) ? com_data.max_num : '-1',
-                    placeholder: com_data?.placeholder || '请输入内容...',
+                    placeholder: com_data?.placeholder,
                     form_value: com_data?.form_value || '', 
                 });
             },