Merge branch 'beta' into 'master'

chore: 自定义弹窗底部样式调整

See merge request !29

src/components/custom-modal/custom-modal.vue

@@ -94,15 +94,17 @@ function handleConfirm() {
       <slot v-if="slots.footer" name="footer" />
 
       <div v-else class="flex w-full items-center justify-end">
-        <NButton class="h-[34px]! rounded-full! px-6! min-w-[96px]!" @click="handleCloseModal">
+        <NButton color="#F5F5F5" round class="h-[34px]! px-6! min-w-[96px]! text-font-color!" @click="handleCloseModal">
           {{ t(cancelBtnText) }}
         </NButton>
         <NButton
           :loading="btnLoading"
           type="primary"
+          color="#6F77FF"
+          round
           :bordered="false"
           :disabled="btnDisabled"
-          class="h-[34px]! px-6! rounded-full! ml-4! min-w-[96px]!"
+          class="h-[34px]! px-6! ml-4! min-w-[96px]!"
           @click="handleConfirm"
         >
           {{ t(confirmBtnText) }}