Skip to content

更新包, 优化登录界面移动端显示 #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14,052 changes: 7,191 additions & 6,861 deletions package-lock.json

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"test:unit": "vue-cli-service test:unit"
},
"dependencies": {
"@babel/polyfill": "^7.2.5",
"@babel/polyfill": "^7.4.4",
"@tinymce/tinymce-vue": "^2.1.0",
"axios": "~0.18.0",
"element-ui": "^2.8.2",
"event-source-polyfill": "^0.0.16",
"element-ui": "^2.10.1",
"event-source-polyfill": "^1.0.7",
"fastscan": "^1.0.4",
"good-storage": "^1.1.0",
"js-cookie": "^2.2.0",
Expand All @@ -26,41 +26,41 @@
"photoswipe": "^4.1.2",
"screenfull": "^4.2.0",
"tinymce": "^5.0.12",
"vue": "^2.6.8",
"vue": "^2.6.10",
"vue-awesome-swiper": "^3.1.3",
"vue-croppa": "^1.3.8",
"vue-router": "~3.0.1",
"vuex": "~3.0.1",
"vuex-persist": "^2.0.0"
"vue-router": "^3.0.7",
"vuex": "^3.1.1",
"vuex-persist": "^2.0.1"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.4.0",
"@vue/cli-plugin-eslint": "^3.4.0",
"@vue/cli-plugin-unit-jest": "^3.7.0",
"@vue/cli-service": "^3.4.0",
"@vue/eslint-config-airbnb": "^4.0.0",
"@vue/cli-plugin-babel": "^3.9.2",
"@vue/cli-plugin-eslint": "^3.9.2",
"@vue/cli-plugin-unit-jest": "^3.9.0",
"@vue/cli-service": "^3.9.2",
"@vue/eslint-config-airbnb": "^4.0.1",
"@vue/test-utils": "1.0.0-beta.29",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^23.6.0",
"babel-eslint": "^10.0.2",
"babel-jest": "^24.8.0",
"babel-plugin-component": "^1.1.1",
"chalk": "^2.4.2",
"child_process": "^1.0.2",
"cz-conventional-changelog": "^2.1.0",
"directory-tree": "^2.2.1",
"ejs": "^2.6.1",
"eslint": "^5.8.0",
"eslint-plugin-vue": "^5.0.0",
"fs-extra": "^7.0.1",
"inquirer": "^6.2.2",
"js-yaml": "^3.12.2",
"directory-tree": "^2.2.3",
"ejs": "^2.6.2",
"eslint": "^6.0.1",
"eslint-plugin-vue": "^5.2.3",
"fs-extra": "^8.1.0",
"inquirer": "^6.5.0",
"js-yaml": "^3.13.1",
"node-sass": "^4.12.0",
"sass-loader": "^7.1.0",
"semver": "^5.6.0",
"semver": "^6.2.0",
"shelljs": "^0.8.3",
"validate-npm-package-name": "^3.0.0",
"vue-markdown-loader": "^2.4.1",
"vue-template-compiler": "^2.6.8",
"vue-template-compiler": "^2.6.10",
"yaml-front-matter": "^4.0.0"
},
"postcss": {
Expand Down
3 changes: 1 addition & 2 deletions src/components/layout/SideBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,8 @@
</template>

<script>
import Utils from '@/lin/utils/util'
/* eslint-disable no-restricted-syntax */
import { mapGetters } from 'vuex'
import Utils from '@/lin/utils/util'

export default {
props: ['isCollapse'],
Expand Down
2 changes: 1 addition & 1 deletion src/components/layout/User.vue
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@

<script>
import { mapActions, mapGetters } from 'vuex'
import User from '@/lin/models/user'
import Vue from 'vue'
import Croppa from 'vue-croppa'
import User from '@/lin/models/user'
import 'vue-croppa/dist/vue-croppa.css'
import defaultAvatar from '@/assets/img/user/user.png'

Expand Down
1 change: 1 addition & 0 deletions src/lin/plugins/axios.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import axios from 'axios'
import Config from '@/config'
import store from '@/store'
import { getToken } from '@/lin/utils/token'
// eslint-disable-next-line import/no-cycle
import User from '@/lin/models/user'


Expand Down
3 changes: 2 additions & 1 deletion src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import '@/lin/filter'
import '@/lin/plugins'
import '@/lin/directives'

import CollapseTransition from 'element-ui/lib/transitions/collapse-transition'
import router from '@/router'
import store from '@/store'
import App from '@/App.vue'
Expand All @@ -15,10 +16,10 @@ import StickyTop from '@/components/base/sticky-top/sticky-top'
import LIcon from '@/components/base/icon/lin-icon'
import SourceCode from '@/components/base/source-code/source-code'

import CollapseTransition from 'element-ui/lib/transitions/collapse-transition'

import '@/assets/styles/index.scss' // eslint-disable-line
import '@/assets/styles/realize/element-variables.scss'
import 'element-ui/lib/theme-chalk/display.css'

Vue.config.productionTip = false

Expand Down
4 changes: 2 additions & 2 deletions src/views/log/Log.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@
</template>

<script>
import { mapGetters } from 'vuex'
import log from 'lin/models/log'
import { searchLogKeyword } from 'lin/utils/search'
import LinSearch from '@/components/base/search/lin-search'
import LinDatePicker from '@/components/base/date-picker/lin-date-picker'
import { searchLogKeyword } from 'lin/utils/search'
import { mapGetters } from 'vuex'

export default {
components: {
Expand Down
16 changes: 5 additions & 11 deletions src/views/login/Login.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="login">
<div class="team-name">
<img src="@/assets/img/login/team-name.png" alt="">
<div class="team-name hidden-sm-and-down">
<img src="@/assets/img/login/team-name.png" alt="logo">
</div>
<div class="form-box" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0)">
<div class="title">
Expand All @@ -10,17 +10,11 @@
<form class="login-form" autocomplete="off" @submit.prevent="throttleLogin()">
<div class="form-item nickname">
<span class="icon account-icon"></span>
<input type="text"
v-model="form.nickname"
autocomplete="off"
placeholder="请填写用户名">
<input type="text" v-model="form.nickname" autocomplete="off" placeholder="请填写用户名">
</div>
<div class="form-item password">
<span class="icon secret-icon"></span>
<input type="password"
v-model="form.password"
autocomplete="off"
placeholder="请填写用户登录密码">
<input type="password" v-model="form.password" autocomplete="off" placeholder="请填写用户登录密码">
</div>
<button class="submit-btn" type="submit">登录</button>
</form>
Expand All @@ -29,9 +23,9 @@
</template>

<script>
import { mapActions, mapMutations } from 'vuex'
import User from '@/lin/models/user'
import Utils from '@/lin/utils/util'
import { mapActions, mapMutations } from 'vuex'

export default {
name: 'login',
Expand Down