【调整】申请证书-证书颁发机构/授权（可选）的顺序

frontend/apps/allin-ssl/src/components/CAProviderSelect/index.tsx

@@ -109,7 +109,7 @@ export default defineComponent<CAProviderSelectProps>({
 		return () => (
 			<NSpin show={isLoading.value}>
 				<NGrid cols={24} class={props.customClass}>
-					<NFormItemGi span={13} label={$t('t_1_1747990228492')} path={props.path}>
+					<NFormItemGi span={13} label={$t('证书颁发机构/授权（可选）')} path={props.path}>
 						<NSelect
 							class="flex-1 w-full"
 							options={caProviderRef.value}
@@ -128,7 +128,7 @@ export default defineComponent<CAProviderSelectProps>({
 											class="flex items-center cursor-pointer hover:text-[#333] hover:bg-[#eee]"
 											onClick={() => goToAddCAProvider('addCAForm')}
 										>
-											{$t('t_0_1747990626044')}
+											{$t('添加Zerossl、Google，CA证书授权')}
 										</div>
 									)
 								},
@@ -139,15 +139,10 @@ export default defineComponent<CAProviderSelectProps>({
 						/>
 					</NFormItemGi>
 					<NFormItemGi span={11}>
-						<NButton class="mx-[8px]" onClick={()=>goToAddCAProvider('caManage')} disabled={props.disabled}>
+						<NButton class="mx-[8px]" onClick={() => goToAddCAProvider('caManage')} disabled={props.disabled}>
 							{$t('t_0_1747903670020')}
 						</NButton>
-						<NButton
-							class="mx-[8px]"
-							onClick={() => loadCAProviders()}
-							loading={isLoading.value}
-							disabled={props.disabled}
-						>
+						<NButton onClick={() => loadCAProviders()} loading={isLoading.value} disabled={props.disabled}>
 							{$t('t_0_1746497662220')}
 						</NButton>
 					</NFormItemGi>

frontend/apps/allin-ssl/src/views/autoDeploy/children/workflowView/node/apply/model.tsx

@@ -53,11 +53,6 @@ export default defineComponent({
 						param.value.domains = val.replace(/，/g, ',').replace(/;/g, ',') // 中文逗号分隔
 					},
 				}),
-				useFormInput($t('t_1_1745735764953'), 'email', {
-					placeholder: $t('t_2_1745735773668'),
-					allowInput: noSideSpace,
-					readonly: param.value.ca !== 'letsencrypt',
-				}),
 				{
 					type: 'custom' as const,
 					render: () => {
@@ -78,6 +73,31 @@ export default defineComponent({
 						)
 					},
 				},
+				{
+					type: 'custom' as const,
+					render: () => {
+						return (
+							<CAProviderSelect
+								path="eabId"
+								value={param.value.eabId}
+								email={param.value.email}
+								ca={param.value.ca}
+								{...{
+									'onUpdate:value': (val: { value: string; ca: string; email: string }) => {
+										param.value.eabId = val.value
+										param.value.ca = val.ca
+										if (val.value) param.value.email = val.email
+									},
+								}}
+							/>
+						)
+					},
+				},
+				useFormInput($t('邮件'), 'email', {
+					placeholder: $t('请输入邮箱信息，用于接收证书验证邮件'),
+					allowInput: noSideSpace,
+				}),
+
 				{
 					type: 'custom' as const,
 					render: () => {
@@ -95,27 +115,6 @@ export default defineComponent({
 				useFormMore(advancedOptions),
 				...(advancedOptions.value
 					? [
-							{
-								type: 'custom' as const,
-								render: () => {
-									return (
-										<CAProviderSelect
-											path="eabId"
-											value={param.value.eabId}
-											email={param.value.email}
-											ca={param.value.ca}
-											{...{
-												'onUpdate:value': (val: { value: string; ca: string; email: string }) => {
-													param.value.eabId = val.value
-													param.value.ca = val.ca
-													if (val.value) param.value.email = val.email
-												},
-											}}
-										/>
-									)
-								},
-							},
-
 							useFormSelect(
 								$t('t_0_1747647014927'),
 								'algorithm',
@@ -165,11 +164,9 @@ export default defineComponent({
 				useFormHelp([
 					{
 						content: $t('t_0_1747040228657'),
-						isHtml: false,
 					},
 					{
 						content: $t('t_1_1747040226143'),
-						isHtml: false,
 					},
 				]),
 			]