fine-tune the new UI theme, merge the code and fixed conflicts

web/src/components/BindMobile.vue

@@ -19,7 +19,7 @@
               <el-input v-model="form.code" maxlength="6"/>
             </el-col>
             <el-col :span="8" style="padding-left: 10px">
-              <send-msg :receiver="form.mobile" type="mobile"/>
+              <send-msg :receiver="form.mobile" size="default" type="mobile"/>
             </el-col>
           </el-row>
         </el-form-item>

web/src/components/ChatReply.vue

@@ -257,7 +257,8 @@ const reGenerate = (prompt) => {
             code {
               // color:var(--theme-text-color-primary);
               color:#fff
-              background-color var(--el-color-primary-light-3)
+              // background-color var(--el-color-primary-light-3)
+              background-color: var(--el-color-primary);
               padding 3px 5px;
               border-radius 5px;
             }
@@ -349,7 +350,6 @@ const reGenerate = (prompt) => {
           padding 10px 10px 10px 0;
 
           .bar-item {
-            background-color var( --little-btn-bg);
             padding 3px 5px;
             margin-right 10px;
             border-radius 5px;

web/src/components/InviteList.vue

@@ -6,13 +6,6 @@
         :row-key="(row) => row.id"
         table-layout="auto"
         border
-        style="
-          --el-table-border-color: #373c47;
-          --el-table-tr-bg-color: #2d323b;
-          --el-table-row-hover-bg-color: #373c47;
-          --el-table-header-bg-color: #474e5c;
-          --el-table-text-color: #d1d1d1;
-        "
       >
         <el-table-column prop="username" label="用户" />
         <el-table-column prop="invite_code" label="邀请码" />

web/src/components/RedeemVerify.vue

@@ -8,7 +8,7 @@
   >
     <div class="form" id="bind-mobile-form">
       <el-form :model="form">
-        <el-form-item label="兑换码">
+        <el-form-item>
           <el-input v-model="form.code"/>
         </el-form-item>
       </el-form>

web/src/components/SendMsg.vue

@@ -1,12 +1,10 @@
 <template>
   <el-container class="send-verify-code">
     <el-button
-      type="primary"
-      class="btn-normal"
+        type="success"
       :size="props.size"
       :disabled="!canSend"
       @click="sendMsg"
-      plain
     >
       {{ btnText }}
     </el-button>
@@ -17,12 +15,12 @@
 
 <script setup>
 // 发送短信验证码组件
-import { ref } from "vue";
-import { validateEmail, validateMobile } from "@/utils/validate";
-import { httpPost } from "@/utils/http";
-import { showMessageError, showMessageOK } from "@/utils/dialog";
+import {ref} from "vue";
+import {validateEmail, validateMobile} from "@/utils/validate";
+import {httpPost} from "@/utils/http";
+import {showMessageError, showMessageOK} from "@/utils/dialog";
 import Captcha from "@/components/Captcha.vue";
-import { getSystemInfo } from "@/store/cache";
+import {getSystemInfo} from "@/store/cache";
 
 // eslint-disable-next-line no-undef
 const props = defineProps({

web/src/components/admin/AdminSidebar.vue

@@ -1,6 +1,6 @@
 <template>
   <div :class="'sidebar '+theme">
-    <a class="logo" href="/" target="_blank">
+    <a class="logo w-full" href="/" target="_blank">
       <el-image :src="logo"/>
       <span class="text" v-show="!sidebar.collapse">{{ title }}</span>
     </a>
@@ -212,7 +212,6 @@ setMenuItems(items)
 
   .logo {
     display flex
-    width 219px
     background-color #324157
     padding 6px 15px;
     cursor pointer