From f7ce96193e387313f31677c71746a94cf576190c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 十二月 2023 09:49:41 +0800
Subject: [PATCH] 1、登录页面确定登录按钮下增加警告文字 2、全局顶部导航栏logo旁增加警告文字，主题改为深色

---
 src/components/tools/Logo.vue        |    2 
 src/views/user/Login.vue             |    6 +++
 src/components/page/GlobalHeader.vue |   56 ++++++++++++++++++++++++++-
 src/defaultSettings.js               |    2 
 4 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue
index aceaf87..e9b6418 100644
--- a/src/components/page/GlobalHeader.vue
+++ b/src/components/page/GlobalHeader.vue
@@ -26,6 +26,10 @@
       <div class="header-index-wide">
         <div class="header-index-left" :style="topMenuStyle.headerIndexLeft">
           <logo class="top-nav-header" :show-title="device !== 'mobile'" :style="topMenuStyle.topNavHeader"/>
+          <div class="top-nav-text">
+            <div style="width:100%;height: 50%;line-height:35px">瀵嗙骇锛氬唴閮�</div>
+            <div style="width:100%;height: 50%;line-height:25px">璀﹀憡锛氭湰绯荤粺绂佹瀛樺偍銆佸鐞嗐�佷紶杈撴秹瀵嗕俊鎭�</div>
+          </div>
           <div v-if="device !== 'mobile'" :style="topMenuStyle.topSmenuStyle">
             <s-menu
               mode="horizontal"
@@ -58,7 +62,7 @@
     components: {
       UserMenu,
       SMenu,
-      Logo,
+      Logo
     },
     mixins: [mixin],
     props: {
@@ -97,7 +101,7 @@
           headerIndexRight: {},
           topSmenuStyle: {}
         },
-        chatStatus: '',
+        chatStatus: ''
       }
     },
     watch: {
@@ -162,7 +166,7 @@
       // update-begin-author:sunjianlei date:20210508 for: 淇鍔ㄦ�佸姛鑳芥祴璇曡彍鍗曘�佸甫鍙傛暟鑿滃崟鏍囬閿欒銆佸睍寮�閿欒鐨勯棶棰�
       handleUpdateMenuTitle(value) {
         this.$emit('updateMenuTitle', value)
-      },
+      }
       // update-end-author:sunjianlei date:20210508 for: 淇鍔ㄦ�佸姛鑳芥祴璇曡彍鍗曘�佸甫鍙傛暟鑿滃崟鏍囬閿欒銆佸睍寮�閿欒鐨勯棶棰�
 
     }
@@ -223,4 +227,50 @@
 
   /* update_end author:scott date:20190220 for: 缂╁皬棣栭〉甯冨眬椤堕儴鐨勯珮搴�*/
 
+  .top-nav-text {
+    color: #f00;
+    height: 100%
+  }
+
+  @media screen and (min-width: 1920px) {
+    .top-nav-text {
+      width: 400px;
+    }
+  }
+
+  @media screen and (min-width: 1680px) and (max-width: 1920px) {
+    .top-nav-text {
+      width: 400px;
+    }
+  }
+
+  @media screen and (min-width: 1400px) and (max-width: 1680px) {
+    .top-nav-text {
+      width: 500px;
+    }
+
+    .top-nav-header {
+      display: none;
+    }
+  }
+
+  @media screen and (min-width: 1280px) and (max-width: 1400px) {
+    .top-nav-text {
+      width: 600px;
+    }
+
+    .top-nav-header {
+      display: none;
+    }
+  }
+
+  @media screen and (max-width: 1280px) {
+    .top-nav-text {
+      width: 600px;
+    }
+
+    .top-nav-header {
+      display: none;
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/src/components/tools/Logo.vue b/src/components/tools/Logo.vue
index 29a1be8..c02d0fd 100644
--- a/src/components/tools/Logo.vue
+++ b/src/components/tools/Logo.vue
@@ -21,7 +21,7 @@
     props: {
       title: {
         type: String,
-        default: '缁熻鍒嗘瀽',
+        default: 'MDC鏅烘収杞﹂棿',
         required: false
       },
       showTitle: {
diff --git a/src/defaultSettings.js b/src/defaultSettings.js
index 150475c..2d337e1 100644
--- a/src/defaultSettings.js
+++ b/src/defaultSettings.js
@@ -15,7 +15,7 @@
 
 export default {
   primaryColor: '#000000', // primary color of ant design
-  navTheme: 'light', // theme for nav menu
+  navTheme: 'dark', // theme for nav menu
   layout: 'topmenu', // nav menu position: sidemenu or topmenu
   contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu
   fixedHeader: true, // sticky header
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index b2a732b..829f4dd 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -49,6 +49,10 @@
         </a-button>
       </a-form-item>
 
+      <a-form-model-item style="color: red">
+        瀵嗙骇锛氬唴閮�&nbsp;&nbsp;&nbsp;&nbsp;璀﹀憡锛氭湰绯荤粺绂佹瀛樺偍銆佸鐞嗐�佷紶杈撴秹瀵嗕俊鎭�
+      </a-form-model-item>
+
     </a-form-model>
 
     <!--<two-step-captcha v-if="requiredTwoStepCaptcha" :visible="stepCaptchaVisible" @success="stepCaptchaSuccess" @cancel="stepCaptchaCancel"></two-step-captcha>-->
@@ -73,9 +77,11 @@
 import LoginPhone from './LoginPhone'
 import store from '@/store'
 import { getAction } from '../../api/manage'
+import AFormModelItem from 'ant-design-vue/es/form-model/FormItem'
 
 export default {
   components: {
+    AFormModelItem,
     LoginSelectTenant,
     TwoStepCaptcha,
     // ThirdLogin,

--
Gitblit v1.9.3