Skip to content

Commit ccfe9e0

Browse files
authored
Merge pull request #292 from TaleLin/handle-error
Handle error
2 parents 604a9a1 + 212cf63 commit ccfe9e0

17 files changed

Lines changed: 56 additions & 43 deletions

File tree

README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,16 @@ QQ群搜索:林间有风 或 643205479
9797

9898
## 版本日志
9999

100-
最新版本 `0.2.2`
100+
最新版本 `0.3.1`
101+
102+
### 0.3.1
103+
104+
1. `F` 增加历史栏高度
105+
106+
### 0.3.0
107+
108+
1. `A` 新增一个用户可以属于多个分组
109+
2. `F` 权限相关 auth right 统一替换为 permission
101110

102111
### 0.2.2
103112

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lin-cms",
3-
"version": "0.3.0",
3+
"version": "0.3.1",
44
"private": true,
55
"scripts": {
66
"serve": "node script/plugin-get-config.js && vue-cli-service serve",

src/assets/img/error-page/logo.png

8.23 KB
Loading

src/assets/img/login/team-name.png

-10.5 KB
Loading

src/assets/styles/realize/lin-variables.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ $sidebar-background: #192a5e;
66

77
$navbar-height: 30px;
88
$navbar-padding: 20px;
9-
$header-height: 72px;
10-
$reusetab-height: 29px;
9+
$header-height: 86px;
10+
$reusetab-height: 40px;
1111

1212
$navbar-background: #BECCD8;
1313
$appmain-background: #F9FAFB;

src/components/layout/ReuseTab.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ export default {
229229
230230
.active {
231231
box-sizing: border-box;
232-
height: 30px;
232+
height: 40px;
233233
color: #ffffff;
234234
background: $theme;
235235
border: none;

src/components/layout/SideBar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ export default {
282282
283283
.mobile-logo {
284284
width: 64px;
285-
height: 72px;
285+
height: 86px;
286286
display: flex;
287287
justify-content: center;
288288
align-items: center;

src/components/layout/User.vue

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,12 +312,9 @@ export default {
312312
data: {
313313
nickname: this.nickname,
314314
},
315-
params: {
316-
showBackend: true,
317-
},
315+
showBackend: true,
318316
})
319317
.then(res => {
320-
debugger
321318
if (res.code < window.SUCCESS_CODE) {
322319
this.$message({
323320
type: 'success',

src/config/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const Config = {
66
sideBarLevel: 3, // 侧边栏层级限制, 3表示三级, 可设置 2 和 3
77
showSidebarSearch: true, // 默认打开侧边栏搜索
88
defaultRoute: '/about', // 默认打开的路由
9-
useFrontEndErrorMsg: true, // 默认采用后端返回异常
9+
useFrontEndErrorMsg: false, // 默认采用后端返回异常
1010
}
1111

1212
export default Config

src/lin/models/user.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { post, get, put } from '@/lin/plugins/axios'
1+
import _axios, { post, get, put } from '@/lin/plugins/axios'
22
import { saveTokens } from '../utils/token'
33
import store from '@/store'
44

@@ -8,7 +8,12 @@ export default class User {
88
* @param {object} data 注册信息
99
*/
1010
static register(data) {
11-
return post('cms/user/register', data, { handleError: true })
11+
return _axios({
12+
method: 'post',
13+
url: 'cms/user/register',
14+
data,
15+
handleError: true,
16+
})
1217
}
1318

1419
/**

0 commit comments

Comments
 (0)