Просмотр исходного кода

修改首页图标及所提出的样式和字体问题

秦鹏 3 лет назад
Родитель
Сommit
e896bc5625

BIN
src/assets/login/dropdownIcon.png


BIN
src/assets/login/project1-1-1.png


BIN
src/assets/login/project2-2.png


BIN
src/assets/login/project3-3.png


BIN
src/assets/login/project4-4.png


BIN
src/assets/login/project5-5.png


BIN
src/assets/login/project6-6.png


BIN
src/assets/login/project8-8-8.png


BIN
src/assets/login/project8-8.png


+ 31 - 14
src/components/login/LoginNav.vue

@@ -20,7 +20,8 @@
             >
               {{ projectName }}
               <!-- SYSTEM -->
-              <i class="el-icon-arrow-down el-icon--right"></i>
+              <img class="dropdownIcon" src="../../assets/login/dropdownIcon.png" alt="">
+              <!-- <i class="el-icon-arrow-down el-icon--right"></i> -->
             </span>
             <el-dropdown-menu slot="dropdown" style="width: 300px">
               <el-dropdown-item
@@ -93,10 +94,13 @@
           :src="
             userMessage.image_url
               ? userMessage.image_url
-              : require('../../assets/login/Group3214.png')"
+              : require('../../assets/login/Group3214.png')
+          "
           alt=""
         />
-        <span @click="userShow = !userShow">{{ userMessage.user_real_name }}</span>
+        <span @click="userShow = !userShow">{{
+          userMessage.user_real_name
+        }}</span>
         <div class="userShow" v-show="userShow">
           <p @click="gotoPersonalcenter">
             <img src="../../assets/login/project7.png" alt="" />
@@ -141,7 +145,7 @@ export default {
         {
           id: 0,
           name: "教学中心",
-          img: "project5",
+          img: "project1",
         },
 
         {
@@ -167,7 +171,7 @@ export default {
         {
           id: 4,
           name: "考试中心",
-          img: "project1",
+          img: "project5",
         },
       ],
       teacherProList: [
@@ -175,7 +179,7 @@ export default {
         {
           id: 0,
           name: "教学中心",
-          img: "project5",
+          img: "project1",
         },
 
         {
@@ -204,7 +208,7 @@ export default {
         {
           id: 0,
           name: "教学中心",
-          img: "project5",
+          img: "project1",
         },
         {
           id: 5,
@@ -384,7 +388,6 @@ export default {
             name: "学习中心",
             img: "project4",
           },
-
           {
             id: 6,
             name: "个人中心",
@@ -400,8 +403,7 @@ export default {
             projectList.push({
               id: 1,
               name: "教材管理系统",
-              img: "project1-1",
-              selectImg: "project1-1-1",
+              img: "project2",
             });
           }
           if (code == 2000005) {
@@ -419,7 +421,7 @@ export default {
             projectList.push({
               id: 0,
               name: "教学管理系统",
-              img: "project5",
+              img: "project1",
             });
           } else if (code == 2000003) {
             projectList.push({
@@ -451,8 +453,7 @@ export default {
           id: 6,
           // Teacher training center
           name: "个人中心",
-          img: "project3-3-3",
-          selectImg: "project3-3",
+          img: "project7",
           text: "您收集和购买的所有资源都可以在这里轻松找到。",
         });
       }
@@ -525,6 +526,11 @@ export default {
         background: none;
       }
     }
+    .dropdownIcon{
+      margin-left: 8px;
+      width: 8px;
+      height: 4px;
+    }
     // 取消组件默认的样式
     .el-menu.el-menu--horizontal {
       border-bottom: none;
@@ -634,8 +640,19 @@ export default {
   }
 }
 </style>
-<style lang="scss" scoped>
+<style lang="scss">
 .downsele {
   background: #ff9900;
 }
+.LoginNav {
+  .el-menu-item {
+    font-size: 16px;
+  }
+  .is-active{
+    font-weight: bold;
+  }
+  .el-menu-item i {
+    color: white;
+  }
+}
 </style>

+ 31 - 4
src/components/login/login.vue

@@ -26,7 +26,7 @@
           <img
             v-if="TorS == 'teacher'"
             class="leftimg"
-            src="../../assets/login/lock2.png"
+            src="../../assets/login/email.png"
             alt=""
           />
           <img
@@ -325,6 +325,7 @@ export default {
       text-align: center;
       font-size: 20px;
       color: #ff9900;
+      font-weight: bold;
     }
   }
   .teacherAndStudent {
@@ -344,11 +345,14 @@ export default {
       align-items: center;
       justify-content: center;
       cursor: pointer;
+      color: #a6a6a6;
     }
     .select {
       background: #ffffff;
       box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.1);
       border-radius: 2px;
+      font-weight: bold;
+      color: #ff9900;
     }
   }
   .main {
@@ -450,6 +454,8 @@ export default {
         margin: 0;
         color: #ff9900;
         cursor: pointer;
+        font-size: 16px;
+        font-weight: bold;
       }
     }
     .btnLogin {
@@ -466,6 +472,7 @@ export default {
       p {
         width: 100%;
         height: 100%;
+        font-weight: bold;
       }
       img {
         vertical-align: middle;
@@ -473,6 +480,7 @@ export default {
       }
     }
     .agreement {
+      font-size: 16px;
       span {
         color: #ff9900;
       }
@@ -498,8 +506,27 @@ export default {
   }
 }
 </style>
-<style>
-input::-ms-reveal {
-  display: none;
+<style lang="scss">
+.login {
+  input::-ms-reveal {
+    display: none;
+  }
+  .el-checkbox__inner::after {
+    box-sizing: content-box;
+    content: "";
+    border: 1px solid black;
+    border-left: 0;
+    border-top: 0;
+    height: 7px;
+    left: 4px;
+    position: absolute;
+    top: 1px;
+  }
+  .el-checkbox__input.is-checked .el-checkbox__inner,
+  .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+    background-color:white;
+    border-color:black;
+
+  }
 }
 </style>

+ 32 - 21
src/views/login/index.vue

@@ -61,14 +61,26 @@
       <div class="bottom" v-if="LoginOrRegistration != 'signin'">
         <div>
           <span> About us </span>
-          <span> office: hzmd@160.com </span>
-          <span>Tell:800-820-8820</span>
-          <span>site: 123 walton gorgla street town hall,beijing.CH</span>
+          <span>
+            <span style="margin-right: 16px"> Office: </span>
+
+            hzmd@160.com
+          </span>
+          <span>
+            <span style="margin-right: 16px"> Tell: </span>
+            800-820-8820</span
+          >
+          <span>
+            <span style="margin-right: 16px"> Site: </span>
+            123 walton gorgla street town hall,beijing.CH</span
+          >
+        </div>
+        <div>
+          <span style="font-weight: bold"> Copyright </span>
+          © 2010-2021 HugeMind All rights reserved.
         </div>
-        <div>Copyright © 2010-2021 HugeMind All rights reserved.</div>
       </div>
     </div>
-
     <!-- <div v-if="LoginOrRegistration == 'signin'" class="signin">
       <LoginNav2
         :changeLoginReg="changeLoginReg"
@@ -121,7 +133,7 @@ export default {
         {
           id: 1,
           name: "教材管理系统",
-          img: "project1-1",
+          img: "project8-8",
           selectImg: "project1-1-1",
           text: "帮您快速定制生动、有趣、实用的数字教材。",
         },
@@ -143,8 +155,8 @@ export default {
         {
           id: 4,
           name: "考试中心",
-          img: "project6-6-6",
-          selectImg: "project6-6",
+          img: "project5-5-5",
+          selectImg: "project5-5",
           text: "丰富的教学资料和珍贵的文献可以在线查看或下载。",
         },
         {
@@ -213,7 +225,6 @@ export default {
         },
         {
           id: 5,
-
           name: "学习中心",
           img: "project4-4-4",
           selectImg: "project4-4",
@@ -404,8 +415,8 @@ export default {
             projectList.push({
               id: 1,
               name: "教材管理系统",
-              img: "project1-1",
-              selectImg: "project1-1-1",
+              img: "project8-8",
+              selectImg: "project8-8-8",
               text: "帮您快速定制生动、有趣、实用的数字教材。",
             });
           }
@@ -425,17 +436,17 @@ export default {
           if (code == 2000002) {
             projectList.push({
               id: 0,
-              name: "教学管理系统",
-              img: "project1-1-1",
-              selectImg: "project1-1",
+              name: "教学中心",
+              img: "project1-1",
+              selectImg: "project1-1-1",
               text: "帮助您快速完成课程及任务安排,快速清晰的完成学习任务。",
             });
           } else if (code == 2000003) {
             projectList.push({
               id: 1,
               name: "教材管理系统",
-              img: "project1-1",
-              selectImg: "project1-1-1",
+              img: "project8-8",
+              selectImg: "project8-8-8",
               text: "帮您快速定制生动、有趣、实用的数字教材。",
             });
           } else if (code == 2000004) {
@@ -594,18 +605,18 @@ export default {
       text-align: center;
       font-size: 20px;
       color: rgb(180, 179, 179);
-      span {
+      >span {
         margin-left: 40px;
       }
     }
-    :first-child {
+    > :first-child {
       // height: 80px;
       // line-height: 80px;
       margin-bottom: 24px;
-      :first-child {
+      > :first-child {
         color: white;
       }
-      :first-child::before {
+      > :first-child::before {
         content: "|";
         background: white;
         width: 6px;
@@ -650,7 +661,7 @@ export default {
       }
       > p {
         width: 304px;
-        margin: 5px auto;
+        margin: 16px auto;
         font-size: 14px;
         color: #666666;
         opacity: 0.7;

+ 107 - 109
vue.config.js

@@ -3,7 +3,7 @@ const path = require('path')
 const defaultSettings = require('./src/settings.js')
 
 function resolve(dir) {
-  return path.join(__dirname, dir)
+    return path.join(__dirname, dir)
 }
 
 const name = defaultSettings.title || '登录' // page title
@@ -17,118 +17,116 @@ const port = process.env.port || process.env.npm_config_port || 9528 // dev port
 
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
-  /**
-   * You will need to set publicPath if you plan to deploy your site under a sub path,
-   * for example GitHub Pages. If you plan to deploy your site to https://foo.github.io/bar/,
-   * then publicPath should be set to "/bar/".
-   * In most cases please use '/' !!!
-   * Detail: https://cli.vuejs.org/config/#publicpath
-   */
-  publicPath: '/',
-  outputDir: 'dist',
-  assetsDir: 'static',
-  lintOnSave: false,
-  productionSourceMap: false,
-  devServer: {
-    port: port,
-    open: true,
-    overlay: {
-      warnings: false,
-      errors: true
+    /**
+     * You will need to set publicPath if you plan to deploy your site under a sub path,
+     * for example GitHub Pages. If you plan to deploy your site to https://foo.github.io/bar/,
+     * then publicPath should be set to "/bar/".
+     * In most cases please use '/' !!!
+     * Detail: https://cli.vuejs.org/config/#publicpath
+     */
+    publicPath: '/',
+    outputDir: 'dist',
+    assetsDir: 'static',
+    lintOnSave: false,
+    productionSourceMap: false,
+    devServer: {
+        port: port,
+        open: true,
+        overlay: {
+            warnings: false,
+            errors: true
+        },
+        proxy: {
+            // change xxx-api/login => mock/login
+            // detail: https://cli.vuejs.org/config/#devserver-proxy
+            [process.env.VUE_APP_BASE_API]: {
+                target: `http://gcls.helxsoft.cn`,
+                changeOrigin: true,
+                pathRewrite: {
+                    ['^' + process.env.VUE_APP_BASE_API]: ''
+                }
+            }
+        },
+        after: require('./mock/mock-server.js')
     },
-    proxy: {
-      // change xxx-api/login => mock/login
-      // detail: https://cli.vuejs.org/config/#devserver-proxy
-      [process.env.VUE_APP_BASE_API]: {
-        target: `http://gcls.helxsoft.cn`,
-        changeOrigin: true,
-        pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
+    configureWebpack: {
+        // provide the app's title in webpack's name field, so that
+        // it can be accessed in index.html to inject the correct title.
+        name: name,
+        resolve: {
+            alias: {
+                '@': resolve('src')
+            }
         }
-      }
     },
-    after: require('./mock/mock-server.js')
-  },
-  configureWebpack: {
-    // provide the app's title in webpack's name field, so that
-    // it can be accessed in index.html to inject the correct title.
-    name: name,
-    resolve: {
-      alias: {
-        '@': resolve('src')
-      }
-    }
-  },
-  chainWebpack(config) {
-    // it can improve the speed of the first screen, it is recommended to turn on preload
-    config.plugin('preload').tap(() => [
-      {
-        rel: 'preload',
-        // to ignore runtime.js
-        // https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/cli-service/lib/config/app.js#L171
-        fileBlacklist: [/\.map$/, /hot-update\.js$/, /runtime\..*\.js$/],
-        include: 'initial'
-      }
-    ])
-
-    // when there are many pages, it will cause too many meaningless requests
-    config.plugins.delete('prefetch')
+    chainWebpack(config) {
+        // it can improve the speed of the first screen, it is recommended to turn on preload
+        config.plugin('preload').tap(() => [{
+            rel: 'preload',
+            // to ignore runtime.js
+            // https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/cli-service/lib/config/app.js#L171
+            fileBlacklist: [/\.map$/, /hot-update\.js$/, /runtime\..*\.js$/],
+            include: 'initial'
+        }])
 
-    // set svg-sprite-loader
-    config.module
-      .rule('svg')
-      .exclude.add(resolve('src/icons'))
-      .end()
-    config.module
-      .rule('icons')
-      .test(/\.svg$/)
-      .include.add(resolve('src/icons'))
-      .end()
-      .use('svg-sprite-loader')
-      .loader('svg-sprite-loader')
-      .options({
-        symbolId: 'icon-[name]'
-      })
-      .end()
+        // when there are many pages, it will cause too many meaningless requests
+        config.plugins.delete('prefetch')
 
-    config
-      .when(process.env.NODE_ENV !== 'development',
-        config => {
-          config
-            .plugin('ScriptExtHtmlWebpackPlugin')
-            .after('html')
-            .use('script-ext-html-webpack-plugin', [{
-              // `runtime` must same as runtimeChunk name. default is `runtime`
-              inline: /runtime\..*\.js$/
-            }])
+        // set svg-sprite-loader
+        config.module
+            .rule('svg')
+            .exclude.add(resolve('src/icons'))
             .end()
-          config
-            .optimization.splitChunks({
-              chunks: 'all',
-              cacheGroups: {
-                libs: {
-                  name: 'chunk-libs',
-                  test: /[\\/]node_modules[\\/]/,
-                  priority: 10,
-                  chunks: 'initial' // only package third parties that are initially dependent
-                },
-                elementUI: {
-                  name: 'chunk-elementUI', // split elementUI into a single package
-                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
-                },
-                commons: {
-                  name: 'chunk-commons',
-                  test: resolve('src/components'), // can customize your rules
-                  minChunks: 3, //  minimum common number
-                  priority: 5,
-                  reuseExistingChunk: true
-                }
-              }
+        config.module
+            .rule('icons')
+            .test(/\.svg$/)
+            .include.add(resolve('src/icons'))
+            .end()
+            .use('svg-sprite-loader')
+            .loader('svg-sprite-loader')
+            .options({
+                symbolId: 'icon-[name]'
             })
-          // https:// webpack.js.org/configuration/optimization/#optimizationruntimechunk
-          config.optimization.runtimeChunk('single')
-        }
-      )
-  }
-}
+            .end()
+
+        config
+            .when(process.env.NODE_ENV !== 'development',
+                config => {
+                    config
+                        .plugin('ScriptExtHtmlWebpackPlugin')
+                        .after('html')
+                        .use('script-ext-html-webpack-plugin', [{
+                            // `runtime` must same as runtimeChunk name. default is `runtime`
+                            inline: /runtime\..*\.js$/
+                        }])
+                        .end()
+                    config
+                        .optimization.splitChunks({
+                            chunks: 'all',
+                            cacheGroups: {
+                                libs: {
+                                    name: 'chunk-libs',
+                                    test: /[\\/]node_modules[\\/]/,
+                                    priority: 10,
+                                    chunks: 'initial' // only package third parties that are initially dependent
+                                },
+                                elementUI: {
+                                    name: 'chunk-elementUI', // split elementUI into a single package
+                                    priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+                                    test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+                                },
+                                commons: {
+                                    name: 'chunk-commons',
+                                    test: resolve('src/components'), // can customize your rules
+                                    minChunks: 3, //  minimum common number
+                                    priority: 5,
+                                    reuseExistingChunk: true
+                                }
+                            }
+                        })
+                        // https:// webpack.js.org/configuration/optimization/#optimizationruntimechunk
+                    config.optimization.runtimeChunk('single')
+                }
+            )
+    }
+}