KouJin 1 anno fa
parent
commit
1f27022ee3

+ 2 - 2
.env.local

@@ -28,7 +28,7 @@ VITE_BASE_PATH=/
28 28
 VITE_MALL_H5_DOMAIN='http://localhost:3000'
29 29
 
30 30
 # 验证码的开关
31
-VITE_APP_CAPTCHA_ENABLE=false
31
+VITE_APP_CAPTCHA_ENABLE=true
32 32
 
33 33
 # GoView域名
34
-VITE_GOVIEW_URL='http://127.0.0.1:3000'
34
+VITE_GOVIEW_URL='http://127.0.0.1:3000'

+ 1 - 1
src/layout/components/Logo/src/Logo.vue

@@ -75,7 +75,7 @@ watch(
75 75
         :class="[
76 76
           'ml-10px text-16px font-700',
77 77
           {
78
-            'text-[var(--logo-title-text-color)]': layout === 'classic',
78
+            'text-[var(--logo-title-text-color2)]': layout === 'classic',
79 79
             'text-[var(--top-header-text-color)]':
80 80
               layout === 'topLeft' || layout === 'top' || layout === 'cutMenu'
81 81
           }

+ 1 - 1
src/layout/components/UserInfo/src/components/LockPage.vue

@@ -93,7 +93,7 @@ function handleShowForm(show = false) {
93 93
         <div :class="`${prefixCls}-entry-content`">
94 94
           <div class="flex flex-col items-center">
95 95
             <img :src="avatar" alt="" class="w-70px h-70px rounded-[50%]" />
96
-            <span class="text-14px my-10px text-[var(--logo-title-text-color)]">
96
+            <span class="text-14px my-10px text-[var(--logo-title-text-color2)]">
97 97
               {{ userName }}
98 98
             </span>
99 99
           </div>

+ 1 - 0
src/styles/var.css

@@ -22,6 +22,7 @@
22 22
   --logo-height: 50px;
23 23
 
24 24
   --logo-title-text-color: #fff;
25
+  --logo-title-text-color2: #000000;
25 26
   /* logo end */
26 27
 
27 28
   /* header start */

+ 7 - 1
src/views/system/user/DeptTree.vue

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <div class="head-container">
3
-    <el-input v-model="deptName" class="mb-20px" clearable placeholder="请输入部门名称">
3
+    <el-input v-model="deptName" class="m-10px w-[90%]!"  clearable placeholder="请输入部门名称">
4 4
       <template #prefix>
5 5
         <Icon icon="ep:search" />
6 6
       </template>
@@ -61,3 +61,9 @@ onMounted(async () => {
61 61
   await getTree()
62 62
 })
63 63
 </script>
64
+<style >
65
+.el-input__wrapper {
66
+  box-shadow: 0 0 0 1px rgba(238, 238, 238, 0.7) inset;
67
+
68
+}
69
+</style>

+ 3 - 3
src/views/system/user/index.vue

@@ -5,12 +5,12 @@
5 5
 
6 6
   <el-row :gutter="20">
7 7
     <!-- 左侧部门树 -->
8
-    <el-col :span="4" :xs="24">
9
-      <ContentWrap class="h-1/1">
8
+    <el-col :span="5" :xs="24">
9
+      <ContentWrap body-style="padding:0px" class="h-1/1">
10 10
         <DeptTree @node-click="handleDeptNodeClick" />
11 11
       </ContentWrap>
12 12
     </el-col>
13
-    <el-col :span="20" :xs="24">
13
+    <el-col :span="19" :xs="24">
14 14
       <!-- 搜索 -->
15 15
       <ContentWrap>
16 16
         <el-form