From cc06626dcd0f79a78e7c6df45c220723e29dfa3a Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Fri, 6 Aug 2021 10:20:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=99=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../img/{login_bg.jpg => login_bg2.jpg}       | Bin
 src/views/common/login.vue                    |  29 ++++++++++++------
 src/views/main.vue                            |   1 +
 src/views/modules/sys/user-add-or-update.vue  |   5 ++-
 4 files changed, 24 insertions(+), 11 deletions(-)
 rename src/assets/img/{login_bg.jpg => login_bg2.jpg} (100%)

diff --git a/src/assets/img/login_bg.jpg b/src/assets/img/login_bg2.jpg
similarity index 100%
rename from src/assets/img/login_bg.jpg
rename to src/assets/img/login_bg2.jpg
diff --git a/src/views/common/login.vue b/src/views/common/login.vue
index c355ed7..375306f 100644
--- a/src/views/common/login.vue
+++ b/src/views/common/login.vue
@@ -2,12 +2,8 @@
   <div class="site-wrapper site-page--login">
     <div class="site-content__wrapper">
       <div class="site-content">
-        <div class="brand-info">
-          <h2 class="brand-info__text">xujie-fast-vue</h2>
-          <p class="brand-info__intro">xujie-fast-vue基于vue、element-ui构建开发，实现xujie-fast后台管理前端功能，提供一套更优的前端解决方案。</p>
-        </div>
         <div class="login-main">
-          <h3 class="login-title">管理员登录</h3>
+          <h3 class="login-title">用户登陆</h3>
           <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" status-icon>
             <el-form-item prop="userName">
               <el-input v-model="dataForm.userName" placeholder="帐号"></el-input>
@@ -92,14 +88,14 @@
     right: 0;
     bottom: 0;
     left: 0;
-    background-color: rgba(38, 50, 56, .6);
+    background-color: rgba(38, 50, 56, 0);
     overflow: hidden;
     &:before {
       position: fixed;
       top: 0;
       left: 0;
       z-index: -1;
-      width: 100%;
+      width: 65%;
       height: 100%;
       content: "";
       background-image: url(~@/assets/img/login_bg.jpg);
@@ -119,7 +115,7 @@
     }
     .site-content {
       min-height: 100%;
-      padding: 30px 500px 30px 30px;
+      padding: 15% 500px 30px 30px;
     }
     .brand-info {
       margin: 220px 100px 0 90px;
@@ -141,13 +137,13 @@
       position: absolute;
       top: 0;
       right: 0;
-      padding: 150px 60px 180px;
+      padding: 15% 60px 180px;
       width: 470px;
       min-height: 100%;
       background-color: #fff;
     }
     .login-title {
-      font-size: 16px;
+      font-size: 30px;
     }
     .login-captcha {
       overflow: hidden;
@@ -160,5 +156,18 @@
       width: 100%;
       margin-top: 38px;
     }
+    .el-input__inner {
+      font-size: 30px;
+    }
+
+    .login-main .el-input__inner{
+      margin-top: 10px;
+      height: 45px;
+    }
+    .el-button--medium {
+      padding: 5px 11px;
+      font-size: 30px;
+      border-radius: 4px;
+    }
   }
 </style>
diff --git a/src/views/main.vue b/src/views/main.vue
index 2a0c2bd..d668a56 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -94,6 +94,7 @@
             this.loading = false
             this.userId = data.user.userId
             this.userName = data.user.username
+            this.site = data.user.site
             this.languageDefault = data.user.languageDefault
             this.userDisplay = data.user.userDisplay
           }
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index e4dd4e7..2ccf068 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -1,9 +1,12 @@
 <template>
   <el-dialog
+    width="25%"
+    v-drag
     :title="!dataForm.id ? '新增' : '修改'"
     :close-on-click-modal="false"
     :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+    <!-- 取消    :rules="dataRule"-->
+    <el-form :model="dataForm"  ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
       <el-form-item label="用户名" prop="userName">
         <el-input v-model="dataForm.userName" placeholder="登录帐号"></el-input>
       </el-form-item>