Skip to content

Commit 8b85c28

Browse files
authored
Merge pull request #223 from TaleLin/feature/response
更新包, 优化登录界面移动端显示
2 parents ae53a75 + 80959d3 commit 8b85c28

File tree

8 files changed

+7226
-6901
lines changed

8 files changed

+7226
-6901
lines changed

package-lock.json

Lines changed: 7191 additions & 6861 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
"test:unit": "vue-cli-service test:unit"
1414
},
1515
"dependencies": {
16-
"@babel/polyfill": "^7.2.5",
16+
"@babel/polyfill": "^7.4.4",
1717
"@tinymce/tinymce-vue": "^2.1.0",
1818
"axios": "~0.18.0",
19-
"element-ui": "^2.8.2",
20-
"event-source-polyfill": "^0.0.16",
19+
"element-ui": "^2.10.1",
20+
"event-source-polyfill": "^1.0.7",
2121
"fastscan": "^1.0.4",
2222
"good-storage": "^1.1.0",
2323
"js-cookie": "^2.2.0",
@@ -26,41 +26,41 @@
2626
"photoswipe": "^4.1.2",
2727
"screenfull": "^4.2.0",
2828
"tinymce": "^5.0.12",
29-
"vue": "^2.6.8",
29+
"vue": "^2.6.10",
3030
"vue-awesome-swiper": "^3.1.3",
3131
"vue-croppa": "^1.3.8",
32-
"vue-router": "~3.0.1",
33-
"vuex": "~3.0.1",
34-
"vuex-persist": "^2.0.0"
32+
"vue-router": "^3.0.7",
33+
"vuex": "^3.1.1",
34+
"vuex-persist": "^2.0.1"
3535
},
3636
"devDependencies": {
37-
"@vue/cli-plugin-babel": "^3.4.0",
38-
"@vue/cli-plugin-eslint": "^3.4.0",
39-
"@vue/cli-plugin-unit-jest": "^3.7.0",
40-
"@vue/cli-service": "^3.4.0",
41-
"@vue/eslint-config-airbnb": "^4.0.0",
37+
"@vue/cli-plugin-babel": "^3.9.2",
38+
"@vue/cli-plugin-eslint": "^3.9.2",
39+
"@vue/cli-plugin-unit-jest": "^3.9.0",
40+
"@vue/cli-service": "^3.9.2",
41+
"@vue/eslint-config-airbnb": "^4.0.1",
4242
"@vue/test-utils": "1.0.0-beta.29",
4343
"babel-core": "7.0.0-bridge.0",
44-
"babel-eslint": "^10.0.1",
45-
"babel-jest": "^23.6.0",
44+
"babel-eslint": "^10.0.2",
45+
"babel-jest": "^24.8.0",
4646
"babel-plugin-component": "^1.1.1",
4747
"chalk": "^2.4.2",
4848
"child_process": "^1.0.2",
4949
"cz-conventional-changelog": "^2.1.0",
50-
"directory-tree": "^2.2.1",
51-
"ejs": "^2.6.1",
52-
"eslint": "^5.8.0",
53-
"eslint-plugin-vue": "^5.0.0",
54-
"fs-extra": "^7.0.1",
55-
"inquirer": "^6.2.2",
56-
"js-yaml": "^3.12.2",
50+
"directory-tree": "^2.2.3",
51+
"ejs": "^2.6.2",
52+
"eslint": "^6.0.1",
53+
"eslint-plugin-vue": "^5.2.3",
54+
"fs-extra": "^8.1.0",
55+
"inquirer": "^6.5.0",
56+
"js-yaml": "^3.13.1",
5757
"node-sass": "^4.12.0",
5858
"sass-loader": "^7.1.0",
59-
"semver": "^5.6.0",
59+
"semver": "^6.2.0",
6060
"shelljs": "^0.8.3",
6161
"validate-npm-package-name": "^3.0.0",
6262
"vue-markdown-loader": "^2.4.1",
63-
"vue-template-compiler": "^2.6.8",
63+
"vue-template-compiler": "^2.6.10",
6464
"yaml-front-matter": "^4.0.0"
6565
},
6666
"postcss": {

src/components/layout/SideBar.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,8 @@
8080
</template>
8181

8282
<script>
83-
import Utils from '@/lin/utils/util'
84-
/* eslint-disable no-restricted-syntax */
8583
import { mapGetters } from 'vuex'
84+
import Utils from '@/lin/utils/util'
8685
8786
export default {
8887
props: ['isCollapse'],

src/components/layout/User.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@
106106

107107
<script>
108108
import { mapActions, mapGetters } from 'vuex'
109-
import User from '@/lin/models/user'
110109
import Vue from 'vue'
111110
import Croppa from 'vue-croppa'
111+
import User from '@/lin/models/user'
112112
import 'vue-croppa/dist/vue-croppa.css'
113113
import defaultAvatar from '@/assets/img/user/user.png'
114114

src/lin/plugins/axios.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import axios from 'axios'
44
import Config from '@/config'
55
import store from '@/store'
66
import { getToken } from '@/lin/utils/token'
7+
// eslint-disable-next-line import/no-cycle
78
import User from '@/lin/models/user'
89

910

src/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import '@/lin/filter'
77
import '@/lin/plugins'
88
import '@/lin/directives'
99

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

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

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

2324
Vue.config.productionTip = false
2425

src/views/log/Log.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@
6767
</template>
6868

6969
<script>
70+
import { mapGetters } from 'vuex'
7071
import log from 'lin/models/log'
72+
import { searchLogKeyword } from 'lin/utils/search'
7173
import LinSearch from '@/components/base/search/lin-search'
7274
import LinDatePicker from '@/components/base/date-picker/lin-date-picker'
73-
import { searchLogKeyword } from 'lin/utils/search'
74-
import { mapGetters } from 'vuex'
7575
7676
export default {
7777
components: {

src/views/login/Login.vue

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="login">
3-
<div class="team-name">
4-
<img src="@/assets/img/login/team-name.png" alt="">
3+
<div class="team-name hidden-sm-and-down">
4+
<img src="@/assets/img/login/team-name.png" alt="logo">
55
</div>
66
<div class="form-box" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0)">
77
<div class="title">
@@ -10,17 +10,11 @@
1010
<form class="login-form" autocomplete="off" @submit.prevent="throttleLogin()">
1111
<div class="form-item nickname">
1212
<span class="icon account-icon"></span>
13-
<input type="text"
14-
v-model="form.nickname"
15-
autocomplete="off"
16-
placeholder="请填写用户名">
13+
<input type="text" v-model="form.nickname" autocomplete="off" placeholder="请填写用户名">
1714
</div>
1815
<div class="form-item password">
1916
<span class="icon secret-icon"></span>
20-
<input type="password"
21-
v-model="form.password"
22-
autocomplete="off"
23-
placeholder="请填写用户登录密码">
17+
<input type="password" v-model="form.password" autocomplete="off" placeholder="请填写用户登录密码">
2418
</div>
2519
<button class="submit-btn" type="submit">登录</button>
2620
</form>
@@ -29,9 +23,9 @@
2923
</template>
3024

3125
<script>
26+
import { mapActions, mapMutations } from 'vuex'
3227
import User from '@/lin/models/user'
3328
import Utils from '@/lin/utils/util'
34-
import { mapActions, mapMutations } from 'vuex'
3529
3630
export default {
3731
name: 'login',

0 commit comments

Comments
 (0)