From f59c3beb2ad45de1c5c01a073fe2ebe5d91b1e6d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 12 一月 2023 19:48:02 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/pc/components/login/normal-login/options.jsx |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/pc/components/login/normal-login/options.jsx b/src/pc/components/login/normal-login/options.jsx
index 054fd0a..0c49d34 100644
--- a/src/pc/components/login/normal-login/options.jsx
+++ b/src/pc/components/login/normal-login/options.jsx
@@ -73,12 +73,21 @@
     {
       type: 'styleInput',
       field: 'height',
-      label: '楂樺害',
+      label: '鏈�灏忛珮搴�',
       initval: wrap.height || '',
       tooltip: '缁勪欢鍗犵敤鐨勬渶灏忛珮搴︼紝鐢ㄤ簬椤甸潰甯冨眬銆�',
       required: false,
       options: ['px', 'vh', 'vw', '%']
     },
+    // {
+    //   type: 'styleInput',
+    //   field: 'maxWidth',
+    //   label: '鏈�澶у搴�',
+    //   initval: wrap.maxWidth || '',
+    //   tooltip: '缁勪欢鍗犵敤鐨勬渶澶у搴︼紝鐢ㄤ簬椤甸潰甯冨眬銆�',
+    //   required: false,
+    //   options: ['px', 'vh', 'vw', '%']
+    // },
     {
       type: 'radio',
       field: 'topTip',

--
Gitblit v1.8.0