fix: 应用名称修改菜单栏名称修改

852b3fb4 · wangjiankun · 964f6f90 · 852b3fb4 · 852b3fb4 · 852b3fb4
Commit 852b3fb4 authored Aug 18, 2020 by wangjiankun
Showing with 31 additions and 18 deletions

index.html public/index.html +2 -2

tenio-logo.png src/assets/img/tenio-logo.png +0 -0

index.vue src/components/Layout/index.vue +14 -10

Login.vue src/views/Login.vue +15 -6

No files found.
--- a/public/index.html
+++ b/public/index.html
@@ -4,8 +4,8 @@
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>天友设计院-户型查询系统</title>
+    <link rel="icon" href="http://yanfa.tenio.com:2020/webApp/images/icon_tianyou.png">
+    <title>天友设计院-户型地图大数据</title>
  </head>
  <body>
    <noscript>

--- a/src/assets/img/tenio-logo.png
+++ b/src/assets/img/tenio-logo.png
--- a/src/components/Layout/index.vue
+++ b/src/components/Layout/index.vue
@@ -2,8 +2,9 @@
  <div class="app-wrapper">
    <el-container>
      <el-aside :width="isCollapse ? 'auto' : '200px'">
-        <div class="logon-container">
-
+        <div class="logo-title-sign">
+          <img :src="require('@assets/img/tenio-logo.png')" width="21" height="21">
+           <b>户型地图大数据</b>
        </div>
        <transition name="fade">
          <el-menu
@@ -30,7 +31,7 @@
            class="hamburger-container"
          />
          <breadcrumb />
-          <div style="width: 100%">
+          <div style="position: absolute;right: 163px;">
            <async-search class="main-search"></async-search>
          </div>
          <el-dropdown class="avatar-container" trigger="click">
@@ -128,13 +129,16 @@ export default {
    display flex
    flex-direction column
    background:linear-gradient(180deg,rgba(40,102,144,1) 0%,rgba(16,34,68,1) 100%) !important;
-    .logon-container {
-      height 120px
-      width 100%
-      background url("../../assets/img/logo.png");
-      background-repeat no-repeat;
-      background-size 137px 21px;
-      background-position center;
+    .logo-title-sign{
+      width 100%;
+      display flex
+      margin 30px 0
+      justify-content center
+      align-items center
+      b {
+        font-size 18px
+        margin-left 8px
+      }
    }
    .el-menu {
      height 100%

--- a/src/views/Login.vue
+++ b/src/views/Login.vue
 <template>
  <section class="login">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
-      <div align="center" style="margin-bottom: 40px">
-        <img :src="require('@assets/img/logo.png')" width="150" alt="">
-      </div>
-      <h4 class="title">户型查询系统</h4>
-      <el-form-item prop="username">
+    <div class="login-div">
+      <h3 class="title">天友设计院-户型地图大数据</h3>
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="企业登录" name="first">
+          <iframe :src="wxQrCodeUrl" id="iframeTop" style="border: none;">
+
+          </iframe>
+          <!--            <div id="wxQrCode">-->
+
+          <!--            </div>-->
+        </el-tab-pane>
+
+        <el-tab-pane label="用户登录" name="second">
+          <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
+            <el-form-item prop="username">
        <span class="svg-container">
          <svg-icon icon-class="user" />
        </span>