Skip to content

Fix #221

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 24 commits into from
Jul 30, 2019
Merged

Fix #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e96ddff
Merge branch 'feature/menutab' into develop
Apr 6, 2019
d79b814
fix:删除iconfont.js
Apr 6, 2019
c4fd9a4
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Apr 11, 2019
9878226
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Apr 13, 2019
6434b13
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Apr 16, 2019
15f7717
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Apr 21, 2019
c1a0dc5
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Apr 24, 2019
4de6469
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Apr 24, 2019
dc3580c
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Apr 30, 2019
a794036
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 2, 2019
383d81e
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 3, 2019
b450669
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 5, 2019
93974e2
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 5, 2019
946f926
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 12, 2019
fc620ea
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 12, 2019
9e6c6de
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 12, 2019
ccd5a57
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 13, 2019
3b15688
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
May 19, 2019
d06f1ff
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Jun 30, 2019
9ad3352
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Jul 14, 2019
402f607
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Jul 14, 2019
a1ece32
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Jul 21, 2019
95b2c03
Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop
Jul 28, 2019
544728a
fix:修复没有分组时,新建用户选择分组的时候会显示0的bug
Jul 28, 2019
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
2 changes: 1 addition & 1 deletion src/config/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const Config = {
baseUrl: 'http://dev.lin.colorful3.com/',
baseUrl: process.env.VUE_APP_BASE_URL,
stagnateTime: 1 * 60 * 60 * 1000, // 无操作停滞时间 默认1小时
openAutoJumpOut: true, // 是否开启无操作跳出
notLoginRoute: ['login'], // 无需登录即可访问的路由 name,
Expand Down
6 changes: 3 additions & 3 deletions src/views/admin/user/UserInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
>
<el-input size="medium" clearable type="password" v-model="form.confirm_password" autocomplete="off"></el-input>
</el-form-item>
<el-form-item v-if="pageType !== 'password'" label="选择分组">
<el-select size="medium" filterable v-model="form.group_id" placeholder="请选择分组">
<el-form-item v-if="pageType !== 'password'" label="选择分组" >
<el-select size="medium" filterable v-model="form.group_id" :disabled="groups.length === 0" placeholder="请选择分组">
<el-option
v-for="item in groups"
:key="item.id"
Expand Down Expand Up @@ -122,7 +122,7 @@ export default {
password: '',
confirm_password: '',
email: '',
group_id: 0,
group_id: '请先创建分组',
},
// 验证规则
rules: {
Expand Down