natasha 3 年 前
コミット
95a1248105

+ 18 - 7
src/components/login/LoginNav.vue

@@ -3,7 +3,7 @@
   <div class="LoginNav" :style="{ color: type == 'Live' ? 'black' : 'white' }">
     <div class="logo">
       <!-- <span> logo </span> -->
-      <el-menu
+      <!-- <el-menu
         :default-active="activeIndex"
         class="el-menu-demo"
         mode="horizontal"
@@ -19,7 +19,6 @@
               :style="{ color: LoginNavIndex == 2 ? '#FF9900' : '#fff' }"
             >
               {{ projectName }}
-              <!-- SYSTEM -->
               <img
                 class="dropdownIcon"
                 src="../../assets/login/dropdownIcon.png"
@@ -45,11 +44,12 @@
             </el-dropdown-menu>
           </el-dropdown>
         </el-menu-item>
-      </el-menu>
+      </el-menu> -->
+      <img :src="configInfor.logo_image_url_home" class="logo-img" />
+      <p class="p1">{{ configInfor.title }}</p>
     </div>
     <div class="userName">
       <el-dropdown
-        v-if="userMessage"
         style="margin-right: 16px"
         trigger="click"
         @command="changeLang"
@@ -99,7 +99,7 @@
         </div>
       </div>
       <!-- 消息 铃铛图片 -->
-      <div class="message">
+      <div class="message" v-if="userMessage">
         <img
           @click="gotoPersonalcenter"
           src="../../assets/login/Vector2.png"
@@ -116,7 +116,7 @@ import { getStaticContent, getContent } from "@/api/api";
 import { setI18nLang } from "@/utils/i18n";
 import { getToken, removeToken } from "@/utils/auth";
 export default {
-  props: ["type", "changeLoginReg", "FatheruserMessage", "projectList"],
+  props: ["type", "changeLoginReg", "FatheruserMessage", "projectList", "configInfor"],
   data() {
     return {
       activeIndex: "1",
@@ -219,6 +219,7 @@ export default {
       this.userShow = false;
       this.userMessage = null;
       this.changeLoginReg("login", null);
+      this.projectListArr = []
     },
     getLangList() {
       let MethodName = "language_manager-GetLanguageList";
@@ -237,7 +238,6 @@ export default {
   },
   created() {
     let _this = this;
-    debugger;
     if (this.FatheruserMessage) {
       _this.userMessage = this.FatheruserMessage;
     } else {
@@ -262,6 +262,7 @@ export default {
   padding: 0 60px 0 40px;
   z-index: 999;
   font-family: "sourceR";
+  background: linear-gradient(180deg, #000000 0%, rgba(44, 44, 44, 0) 100%);
   .logo {
     display: flex;
     align-items: center;
@@ -284,6 +285,16 @@ export default {
     .el-menu.el-menu--horizontal {
       border-bottom: none;
     }
+    .logo-img{
+        width: 48px;
+        height: 48px;
+    }
+    .p1{
+        font-size: 18px;
+        line-height: 26px;
+        color: #FFFFFF;
+        margin: 0 10px;
+    }
   }
   .userName {
     display: flex;

+ 9 - 9
src/components/login/login.vue

@@ -41,20 +41,20 @@
             v-model="email_phone"
             @input="Changeemail_phone"
           />
-          <img
+          <!-- <img
             @click="showLoginType"
             class="rightimg"
             src="../../assets/login/Frame3.png"
             alt=""
-          />
+          /> -->
           <div class="selectLoginType" v-show="ShowloginType">
             <div @click="selectLoginType('密码')">
               <img src="../../assets/login/lock.png" alt="" />
-              Password
+              密码
             </div>
             <div @click="selectLoginType('验证码')">
               <img src="../../assets/login/phone2.png" alt="" />
-              CAPTCHA
+              验证码
             </div>
           </div>
         </div>
@@ -93,20 +93,20 @@
             placeholder="手机号"
             v-model="email_phone"
           />
-          <img
+          <!-- <img
             @click="showLoginType"
             class="rightimg"
             src="../../assets/login/Frame3.png"
             alt=""
-          />
+          /> -->
           <div class="selectLoginType" v-show="ShowloginType">
             <div @click="selectLoginType('密码')">
               <img src="../../assets/login/lock.png" alt="" />
-              Password
+              密码
             </div>
             <div @click="selectLoginType('验证码')">
               <img src="../../assets/login/phone2.png" alt="" />
-              CAPTCHA
+              验证码
             </div>
           </div>
         </div>
@@ -117,7 +117,7 @@
             @click="getVerificationCode"
             :class="VerificationCodeShow ? 'waitTime' : 'getVerification'"
           >
-            {{ VerificationCodeShow ? "59s" : "GET" }}
+            {{ VerificationCodeShow ? "59s" : "获取" }}
           </button>
         </div>
       </template>

+ 1 - 1
src/components/login/registration.vue

@@ -124,7 +124,7 @@
             @click.prevent="getVerificationCode"
             class="getVerification"
           >
-            GET
+            获取
           </button>
         </el-form-item>
         <el-form-item prop="password">

+ 14 - 11
src/views/login/index.vue

@@ -6,6 +6,7 @@
           :changeLoginReg="changeLoginReg"
           :FatheruserMessage="userMessage"
           :language_list="language_list"
+          :configInfor="configInfor"
           :projectList="projectList"
         />
 
@@ -465,6 +466,7 @@ export default {
   background-size: cover;
   font-family: "sourceR";
   position: relative;
+  min-width: 1260px;
   .empty {
     background: #fff;
     width: 100%;
@@ -483,16 +485,16 @@ export default {
   .shadow {
     min-height: 100vh;
     height: 100%;
-    background: rgba(0, 0, 0, 0.3);
+    background: rgba(0, 0, 0, 0.5);
     .logoAndlogin {
-      width: 1248px;
+      width: 1260px;
       margin: 0 auto;
       position: relative;
       // display: flex;
       .login {
         position: absolute;
         top: 0;
-        right: 30px;
+        right: 15px;
         z-index: 1;
       }
       .ForgetPassword {
@@ -507,13 +509,13 @@ export default {
       margin-left: 30px;
       display: flex;
       .logo {
-        width: 136px;
-        height: 136px;
+        width: 128px;
+        height: 128px;
         background: #fff;
-        border-radius: 25px;
+        border-radius: 24px;
         color: black;
         text-align: center;
-        line-height: 136px;
+        line-height: 128px;
         display: flex;
         justify-content: center;
         align-items: center;
@@ -524,21 +526,22 @@ export default {
         }
       }
       .text {
-        margin-left: 30px;
+        margin-left: 32px;
         color: white;
         p {
-          width: 700px;
+          width: 533px;
           margin: 0;
         }
         .p1 {
           font-weight: 600;
           font-size: 40px;
+          line-height: 48px;
         }
         .p2 {
-          width: 480px;
+          width: 533px;
           margin-top: 32px;
           font-size: 20px;
-          line-height: 30px;
+          line-height: 28px;
         }
       }
     }