v4.0.17 小程序版本优化

apps/mini-user/src/pages/login/index.tsx

@@ -102,7 +102,7 @@ export default function LoginPage() {
   const [wxSessionKey, setWxSessionKey] = useState<string | null>(initialWxSessionKey);
   const [wxAuthorize, setWxAuthorize] = useState(true);
   const [completeMode, setCompleteMode] = useState<'phone' | 'wechat' | null>(null);
-  const [showSmsForm, setShowSmsForm] = useState(!IS_WEAPP);
+  const [showSmsForm, setShowSmsForm] = useState(true);
   const [logoWideUrl, setLogoWideUrl] = useState(() => getBrandAssetsSync().brandLogoWideUrl);
 
   useEffect(() => {
@@ -393,7 +393,7 @@ export default function LoginPage() {
         ? '绑定手机号'
         : completeMode === 'wechat'
           ? '授权登录'
-          : '手机号快捷登录';
+          : '验证码登录';
 
   return (
     <PageShell variant="plain" className="login-page">
@@ -451,32 +451,9 @@ export default function LoginPage() {
 
             <AgreementRow agreed={agreed} onToggle={() => setAgreed((v) => !v)} />
 
-            {showPhoneQuick ? (
-              <PhoneQuickLoginButton
-                loading={phoneQuickLoading}
-                agreed={agreed}
-                onRequireAgree={() => ensureAgreed()}
-                onGetPhoneNumber={(phoneCode) => void onPhoneQuickLogin(phoneCode)}
-                onFail={(message) => setMsg(message)}
-              />
-            ) : null}
-
-            {showPhoneQuick ? (
-              <View className="login-divider" style={{ marginTop: 20 }}>
-                <View className="login-divider-line" />
-                <Text
-                  className="login-divider-text"
-                  onClick={() => setShowSmsForm((v) => !v)}
-                >
-                  {showSmsForm ? '收起验证码登录' : '使用验证码登录'}
-                </Text>
-                <View className="login-divider-line" />
-              </View>
-            ) : null}
-
             {(showSmsForm || !showPhoneQuick) && (
               <>
-                <View className="login-field" style={showPhoneQuick ? { marginTop: 8 } : undefined}>
+                <View className="login-field">
                   <Text className="login-field-prefix">+86</Text>
                   <Input
                     className="login-field-input"
@@ -526,6 +503,30 @@ export default function LoginPage() {
               </>
             )}
 
+            {showPhoneQuick ? (
+              <>
+                <View className="login-divider" style={{ marginTop: 20 }}>
+                  <View className="login-divider-line" />
+                  <Text className="login-divider-text">或者</Text>
+                  <View className="login-divider-line" />
+                </View>
+                <PhoneQuickLoginButton
+                  loading={phoneQuickLoading}
+                  agreed={agreed}
+                  onRequireAgree={() => ensureAgreed()}
+                  onGetPhoneNumber={(phoneCode) => void onPhoneQuickLogin(phoneCode)}
+                  onFail={(message) => setMsg(message)}
+                />
+                <Text
+                  className="login-divider-text"
+                  style={{ display: 'block', textAlign: 'center', marginTop: 12 }}
+                  onClick={() => setShowSmsForm((v) => !v)}
+                >
+                  {showSmsForm ? '收起验证码登录' : '使用验证码登录'}
+                </Text>
+              </>
+            ) : null}
+
             {displayMsg ? (
               <Text className={`login-msg${sentHint && !msg ? ' login-msg--hint' : ''}`}>
                 {displayMsg}