Merge branch 'master' of https://gitlab.ezijing.com/ezijing/login

.config.dev.js

@@ -36,6 +36,9 @@ module.exports = {
     sofia: {
       url: 'http://sofia-learning2.ezijing.com'
     },
+    kelley: {
+      url: 'http://kelley-learning2.ezijing.com'
+    },
     ciis: {
       url: 'http://ciis-learning2.ezijing.com'
     }

.config.pro.js

@@ -17,6 +17,9 @@ module.exports = {
     sofia: {
       url: 'http://sofia-learning.ezijing.com'
     },
+    kelley: {
+      url: 'http://kelley-learning.ezijing.com'
+    },
     ciis: {
       url: 'http://ciis-learning.ezijing.com'
     }

.config.test.js

@@ -18,6 +18,9 @@ module.exports = {
     sofia: {
       url: 'http://sofia-learning2.ezijing.com'
     },
+    kelley: {
+      url: 'http://kelley-learning2.ezijing.com'
+    },
     ciis: {
       url: 'http://ciis-learning2.ezijing.com'
     }

src/components/languageSwitch.vue

 <template>
-<div class="tap-language-switch">
-  <el-menu class="el-menu-demo" mode="horizontal" @select="handleSelect">
-    <el-submenu index="1">
-      <template slot="title">{{ show }}</template>
-      <template v-for="item in language.arr">
-        <template v-for="(v, k) in item">
-          <el-menu-item :key="k" :index="k">{{v}}</el-menu-item>
+  <div class="tap-language-switch">
+    <el-menu class="el-menu-demo" mode="horizontal" @select="handleSelect">
+      <el-submenu index="1">
+        <template slot="title">{{ show }}</template>
+        <template v-for="item in language.arr">
+          <template v-for="(v, k) in item">
+            <el-menu-item :key="k" :index="k">{{ v }}</el-menu-item>
+          </template>
         </template>
-      </template>
-    </el-submenu>
-  </el-menu>
-</div>
+      </el-submenu>
+    </el-menu>
+  </div>
 </template>
 
 <script>
@@ -18,9 +18,8 @@ import Cookies from 'js-cookie'
 import language from '@/assets/languages/language'
 
 export default {
-  name: 'sLanguage',
-  componentName: 'sLanguage',
-  data () {
+  name: 'LanguageSwitch',
+  data() {
     const _defaultLocale = 'zh-CN'
     const _lang = Cookies.get('lang') || window.navigator.language || window.navigator.userLanguage || ''
     if (_lang) {
@@ -58,9 +57,9 @@ export default {
       language: language[this.$i18n.locale]
     }
   },
-  mounted () {},
+  mounted() {},
   methods: {
-    handleSelect (key, val) {
+    handleSelect(key, val) {
       Cookies.set('lang', key, { expires: 30, domain: '.ezijing.com' })
       this.$i18n.locale = key
       /* 刷新页面 */

src/components/loginAccount.vue

@@ -30,7 +30,7 @@
 import * as api from '@/api/account'
 
 export default {
-  name: 'AccountLogin',
+  name: 'LoginAccount',
   data() {
     return {
       ruleForm: { type: 1, account: '', password: '', RememberMe: false, service: 'https://h5.ezijing.com' },

src/components/loginCode.vue

@@ -33,7 +33,7 @@ import * as api from '@/api/account'
 import countdown from './countdown.vue'
 
 export default {
-  name: 'CodeLogin',
+  name: 'LoginCode',
   components: { countdown },
   data() {
     return {

src/pages/ciis/login.vue

@@ -4,7 +4,6 @@
 
 <script>
 export default {
-  name: 'CiisLogin',
   methods: {
     handleSuccess(response) {
       const { url } = webConf.others.ciis

src/pages/ciis/password.vue

@@ -8,7 +8,7 @@
 </template>
 
 <script>
-export default { name: 'CiisPassword' }
+export default {}
 </script>
 
 <style lang="scss" scoped>

src/pages/kelley/components/layout.vue

+<template>
+  <div class="wrapper">
+    <header class="header">
+      <div class="header-logo">
+        <img src="../assets/logo.png" />
+      </div>
+      <div class="header-title">在线学习系统</div>
+    </header>
+    <section class="main">
+      <router-view></router-view>
+    </section>
+    <footer class="footer">
+      <p class="t1">
+        学习平台服务电话：010-62793299
+        <br />服务时间：9:00-18:00
+      </p>
+      <p class="t2">
+        Copyright © 2020 Zijing Education. All rights reserved.
+        <br />清控紫荆（北京）教育科技股份有限公司 京ICP证150431号 京公网安备 11010802023681号
+      </p>
+    </footer>
+  </div>
+</template>
+
+<script>
+export default { name: 'SofiaLayout' }
+</script>
+
+<style lang="scss" scoped>
+.wrapper {
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+}
+.header {
+  height: 100px;
+  padding: 30px 0 20px;
+  text-align: center;
+}
+.header-title {
+  margin-top: 5px;
+  font-size: 32px;
+  font-weight: 700;
+  letter-spacing: 5px;
+}
+.main {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #981838;
+  padding: 40px 20px;
+}
+.footer {
+  padding: 20px 10px;
+  text-align: center;
+  .t1 {
+    color: #535353;
+  }
+  .t2 {
+    margin-top: 10px;
+    color: #898989;
+  }
+}
+</style>

src/pages/kelley/login.vue

+<template>
+  <div class="login">
+    <el-row type="flex" justify="space-between" align="middle" style="width: 100%">
+      <el-col :span="12" class="hidden-xs-only">
+        <div class="login-logo">
+          <img src="./assets/login_logo.png" />
+        </div>
+      </el-col>
+      <el-col :span="12" :xs="24">
+        <div class="login-box">
+          <router-view @success="handleSuccess"></router-view>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    handleSuccess(response) {
+      const { url } = webConf.others.kelley
+      window.location.href = url
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.login {
+  color: #fff;
+  width: 100%;
+  max-width: 660px;
+  margin: 0 auto;
+}
+</style>

src/pages/kelley/password.vue

+<template>
+  <div class="password">
+    <el-page-header @back="$router.push('login')" title="返回登录" content="忘记密码"></el-page-header>
+    <div class="password-form">
+      <router-view></router-view>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {}
+</script>
+
+<style lang="scss" scoped>
+.password {
+  width: 100%;
+  max-width: 1000px;
+  margin: 0 auto;
+  padding: 20px;
+  background-color: #fff;
+}
+.password-form {
+  max-width: 340px;
+  margin: 40px auto;
+}
+</style>

src/pages/sofia/login.vue

@@ -17,7 +17,6 @@
 
 <script>
 export default {
-  name: 'SofiaLogin',
   methods: {
     handleSuccess(response) {
       const { url } = webConf.others.sofia

src/pages/sofia/password.vue

@@ -8,7 +8,7 @@
 </template>
 
 <script>
-export default { name: 'SofiaPassword' }
+export default {}
 </script>
 
 <style lang="scss" scoped>

src/router/routes.js

@@ -25,6 +25,27 @@ export default [
       }
     ]
   },
+  {
+    path: '/kelley',
+    component: () => import(/* webpackChunkName: "kelley" */ '../pages/kelley/components/layout.vue'),
+    children: [
+      { path: '', redirect: 'login/index' },
+      {
+        path: 'login',
+        component: () => import(/* webpackChunkName: "kelley" */ '../pages/kelley/login.vue'),
+        children: [
+          { path: '', redirect: 'index' },
+          { path: 'index', component: loginAccount },
+          { path: 'code', component: loginCode }
+        ]
+      },
+      {
+        path: 'password',
+        component: () => import(/* webpackChunkName: "kelley" */ '../pages/kelley/password.vue'),
+        children: [{ path: '', component: password }]
+      }
+    ]
+  },
   {
     path: '/ciis',
     component: () => import(/* webpackChunkName: "ciis" */ '../pages/ciis/components/layout.vue'),