Skip to content

Commit 30715b5

Browse files
mynuolrsendya
mynuolr
authored and
sendya
committed
FIX: Unite LF. Fixed partial file newline format
Signed-off-by: mynuolr <[email protected]>
1 parent 6a22f08 commit 30715b5

25 files changed

+3572
-3572
lines changed

‎.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[*]
22
charset=utf-8
3-
end_of_line=crlf
3+
end_of_line=lf
44
insert_final_newline=false
55
indent_style=space
66
indent_size=2

‎LICENSE

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
MIT License
2-
3-
Copyright (c) 2018 Anan Yang
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
1+
MIT License
2+
3+
Copyright (c) 2018 Anan Yang
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
SOFTWARE.

‎src/api/index.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
const api = {
2-
Login: '/auth/login',
3-
Logout: '/auth/logout',
4-
ForgePassword: '/auth/forge-password',
5-
Register: '/auth/register',
6-
twoStepCode: '/auth/2step-code',
7-
SendSms: '/account/sms',
8-
SendSmsErr: '/account/sms_err',
9-
// get my info
10-
UserInfo: '/user/info'
11-
}
1+
const api = {
2+
Login: '/auth/login',
3+
Logout: '/auth/logout',
4+
ForgePassword: '/auth/forge-password',
5+
Register: '/auth/register',
6+
twoStepCode: '/auth/2step-code',
7+
SendSms: '/account/sms',
8+
SendSmsErr: '/account/sms_err',
9+
// get my info
10+
UserInfo: '/user/info'
11+
}
1212
export default api

‎src/api/login.js

+60-60
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
1-
import api from './index'
2-
import { axios } from '@/utils/request'
3-
4-
/**
5-
* login func
6-
* parameter: {
7-
* username: '',
8-
* password: '',
9-
* remember_me: true,
10-
* captcha: '12345'
11-
* }
12-
* @param parameter
13-
* @returns {*}
14-
*/
15-
export function login (parameter) {
16-
return axios({
17-
url: '/auth/login',
18-
method: 'post',
19-
data: parameter
20-
})
21-
}
22-
23-
export function getSmsCaptcha (parameter) {
24-
return axios({
25-
url: api.SendSms,
26-
method: 'post',
27-
data: parameter
28-
})
29-
}
30-
31-
export function getInfo () {
32-
return axios({
33-
url: '/user/info',
34-
method: 'get',
35-
headers: {
36-
'Content-Type': 'application/json;charset=UTF-8'
37-
}
38-
})
39-
}
40-
41-
export function logout () {
42-
return axios({
43-
url: '/auth/logout',
44-
method: 'post',
45-
headers: {
46-
'Content-Type': 'application/json;charset=UTF-8'
47-
}
48-
})
49-
}
50-
51-
/**
52-
* get user 2step code open?
53-
* @param parameter {*}
54-
*/
55-
export function get2step (parameter) {
56-
return axios({
57-
url: api.twoStepCode,
58-
method: 'post',
59-
data: parameter
60-
})
1+
import api from './index'
2+
import { axios } from '@/utils/request'
3+
4+
/**
5+
* login func
6+
* parameter: {
7+
* username: '',
8+
* password: '',
9+
* remember_me: true,
10+
* captcha: '12345'
11+
* }
12+
* @param parameter
13+
* @returns {*}
14+
*/
15+
export function login (parameter) {
16+
return axios({
17+
url: '/auth/login',
18+
method: 'post',
19+
data: parameter
20+
})
21+
}
22+
23+
export function getSmsCaptcha (parameter) {
24+
return axios({
25+
url: api.SendSms,
26+
method: 'post',
27+
data: parameter
28+
})
29+
}
30+
31+
export function getInfo () {
32+
return axios({
33+
url: '/user/info',
34+
method: 'get',
35+
headers: {
36+
'Content-Type': 'application/json;charset=UTF-8'
37+
}
38+
})
39+
}
40+
41+
export function logout () {
42+
return axios({
43+
url: '/auth/logout',
44+
method: 'post',
45+
headers: {
46+
'Content-Type': 'application/json;charset=UTF-8'
47+
}
48+
})
49+
}
50+
51+
/**
52+
* get user 2step code open?
53+
* @param parameter {*}
54+
*/
55+
export function get2step (parameter) {
56+
return axios({
57+
url: api.twoStepCode,
58+
method: 'post',
59+
data: parameter
60+
})
6161
}

‎src/components/tools/DetailList.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<script>
2-
/* WARNING: 兼容老引入，请勿继续使用 */
3-
import DescriptionList from '@/components/DescriptionList'
4-
export default DescriptionList
5-
</script>
1+
<script>
2+
/* WARNING: 兼容老引入，请勿继续使用 */
3+
import DescriptionList from '@/components/DescriptionList'
4+
export default DescriptionList
5+
</script>

‎src/components/tools/HeadInfo.vue

+66-66
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
1-
<template>
2-
<div class="head-info" :class="center && 'center'">
3-
<span>{{ title }}</span>
4-
<p>{{ content }}</p>
5-
<em v-if="bordered"/>
6-
</div>
7-
</template>
8-
9-
<script>
10-
export default {
11-
name: 'HeadInfo',
12-
props: {
13-
title: {
14-
type: String,
15-
default: ''
16-
},
17-
content: {
18-
type: String,
19-
default: ''
20-
},
21-
bordered: {
22-
type: Boolean,
23-
default: false
24-
},
25-
center: {
26-
type: Boolean,
27-
default: true
28-
}
29-
}
30-
}
31-
</script>
32-
33-
<style lang="less" scoped>
34-
.head-info {
35-
position: relative;
36-
text-align: left;
37-
padding: 0 32px 0 0;
38-
min-width: 125px;
39-
40-
&.center {
41-
text-align: center;
42-
padding: 0 32px;
43-
}
44-
45-
span {
46-
color: rgba(0, 0, 0, .45);
47-
display: inline-block;
48-
font-size: 14px;
49-
line-height: 22px;
50-
margin-bottom: 4px;
51-
}
52-
p {
53-
color: rgba(0, 0, 0, .85);
54-
font-size: 24px;
55-
line-height: 32px;
56-
margin: 0;
57-
}
58-
em {
59-
background-color: #e8e8e8;
60-
position: absolute;
61-
height: 56px;
62-
width: 1px;
63-
top: 0;
64-
right: 0;
65-
}
66-
}
1+
<template>
2+
<div class="head-info" :class="center && 'center'">
3+
<span>{{ title }}</span>
4+
<p>{{ content }}</p>
5+
<em v-if="bordered"/>
6+
</div>
7+
</template>
8+
9+
<script>
10+
export default {
11+
name: 'HeadInfo',
12+
props: {
13+
title: {
14+
type: String,
15+
default: ''
16+
},
17+
content: {
18+
type: String,
19+
default: ''
20+
},
21+
bordered: {
22+
type: Boolean,
23+
default: false
24+
},
25+
center: {
26+
type: Boolean,
27+
default: true
28+
}
29+
}
30+
}
31+
</script>
32+
33+
<style lang="less" scoped>
34+
.head-info {
35+
position: relative;
36+
text-align: left;
37+
padding: 0 32px 0 0;
38+
min-width: 125px;
39+
40+
&.center {
41+
text-align: center;
42+
padding: 0 32px;
43+
}
44+
45+
span {
46+
color: rgba(0, 0, 0, .45);
47+
display: inline-block;
48+
font-size: 14px;
49+
line-height: 22px;
50+
margin-bottom: 4px;
51+
}
52+
p {
53+
color: rgba(0, 0, 0, .85);
54+
font-size: 24px;
55+
line-height: 32px;
56+
margin: 0;
57+
}
58+
em {
59+
background-color: #e8e8e8;
60+
position: absolute;
61+
height: 56px;
62+
width: 1px;
63+
top: 0;
64+
right: 0;
65+
}
66+
}
6767
</style>

0 commit comments

Comments
 (0)