Skip to content

Commit ad8809d

Browse files
Zhao-githubgitee-org
Zhao-github
authored and
gitee-org
committed
!2 修复及优化
Merge pull request !2 from Stefan阿钢/master
2 parents f20f7fe + 37adf11 commit ad8809d

File tree

9 files changed

+42
-32
lines changed

9 files changed

+42
-32
lines changed

‎src/api/interface.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ export const del = (hash) => {
4747
/**
4848
* 启用/禁用接口
4949
* @param status
50-
* @param id
50+
* @param hash
5151
* @returns {wx.RequestTask | never}
5252
*/
53-
export const changeStatus = (status, id) => {
53+
export const changeStatus = (status, hash) => {
5454
return axios.request({
5555
url: 'InterfaceList/changeStatus',
5656
method: 'get',
5757
params: {
5858
status: status,
59-
id: id
59+
hash: hash
6060
}
6161
})
6262
}

‎src/components/main/main.vue

+4-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Layout>
1313
<Header class="header-con">
1414
<header-bar :collapsed="collapsed" @on-coll-change="handleCollapsedChange">
15-
<user :user-avator="userAvator"/>
15+
<user :user-avator="userAvatar"/>
1616
<language v-if="$config.useI18n" @on-lang-change="setLocal" style="margin-right: 10px;" :lang="local"/>
1717
<fullscreen v-model="isFullscreen" style="margin-right: 10px;"/>
1818
</header-bar>
@@ -71,15 +71,11 @@ export default {
7171
tagNavList () {
7272
return this.$store.state.app.tagNavList
7373
},
74-
tagRouter () {
75-
return this.$store.state.app.tagRouter
76-
},
77-
userAvator () {
78-
return typeof this.$store.state.user.userInfo.userData.head_img !== 'undefined' && this.$store.state.user.userInfo.userData.head_img ? this.$store.state.user.userInfo.userData.head_img : defaultImg
74+
userAvatar () {
75+
return JSON.stringify(this.$store.state.user.userInfo) !== '{}' && this.$store.state.user.userInfo.userData.head_img ? this.$store.state.user.userInfo.userData.head_img : defaultImg
7976
},
8077
cacheList () {
81-
const list = ['ParentView', ...this.tagNavList.length ? this.tagNavList.filter(item => !(item.meta && item.meta.notCache)).map(item => item.name) : []]
82-
return list
78+
return ['ParentView', ...this.tagNavList.length ? this.tagNavList.filter(item => !(item.meta && item.meta.notCache)).map(item => item.name) : []]
8379
},
8480
menuList () {
8581
return this.$store.getters.menuList

‎src/view/app/list.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ export default {
297297
},
298298
ruleValidate: {
299299
app_name: [
300-
{ required: true, message: '用户名不能为空', trigger: 'blur' }
300+
{ required: true, message: '应用名称不能为空', trigger: 'blur' }
301301
]
302302
},
303303
checkAllStatus: {},

‎src/view/interface/list.vue

+6-2
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
<p>刷新路由是一个非常危险的操作，它有可能影响到您现有接口的访问，请确认无误后刷新！！</p>
113113
</div>
114114
<div slot="footer">
115-
<Button type="error" size="large" long @click="refreshRoute">确定刷新</Button>
115+
<Button type="error" size="large" long :loading="refreshLoading" @click="refreshRoute">确定刷新</Button>
116116
</div>
117117
</Modal>
118118
</div>
@@ -223,6 +223,7 @@ export default {
223223
data () {
224224
return {
225225
confirmRefresh: false,
226+
refreshLoading: false,
226227
columnsList: [
227228
{
228229
title: '序号',
@@ -359,7 +360,7 @@ export default {
359360
id: 0
360361
},
361362
ruleValidate: {
362-
apiClass: [
363+
api_class: [
363364
{ required: true, message: '真实类库不能为空', trigger: 'blur' }
364365
],
365366
info: [
@@ -450,11 +451,14 @@ export default {
450451
},
451452
refreshRoute () {
452453
let vm = this
454+
vm.refreshLoading = true
453455
refresh().then(response => {
454456
vm.$Message.success(response.data.msg)
455457
vm.confirmRefresh = false
458+
vm.refreshLoading = false
456459
}).catch(() => {
457460
vm.confirmRefresh = false
461+
vm.refreshLoading = false
458462
})
459463
}
460464
}

‎src/view/login/login.vue

+10-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</Input>
2424
</FormItem>
2525
<FormItem style="margin-bottom: 15px;">
26-
<Button @click="handleSubmit" type="primary" long>登录</Button>
26+
<Button type="primary" long :loading="loading" @click="handleSubmit">登录</Button>
2727
</FormItem>
2828
</Form>
2929
<div style="padding-top:10px;font-size: 11px;border-top: 1px solid #e9eaec;">
@@ -61,8 +61,8 @@ export default {
6161
qq_login,
6262
wx_login,
6363
form: {
64-
username: '',
65-
password: ''
64+
username: 'root',
65+
password: '123456'
6666
},
6767
rules: {
6868
username: [
@@ -73,7 +73,8 @@ export default {
7373
]
7474
},
7575
wxQrModel: false,
76-
wxQrUrl: ''
76+
wxQrUrl: '',
77+
loading: false
7778
}
7879
},
7980
created () {
@@ -121,11 +122,15 @@ export default {
121122
let password = vm.form.password
122123
vm.$refs.loginForm.validate((valid) => {
123124
if (valid) {
124-
vm.handleLogin({ username, password }).then(res => {
125+
vm.loading = true
126+
vm.handleLogin({ username, password }).then(() => {
125127
sessionStorage.setItem('ApiAdmin_AppInfo', '管理员')
126128
vm.$router.push({
127129
name: 'home'
128130
})
131+
vm.loading = false
132+
}).catch(() => {
133+
vm.loading = false
129134
})
130135
}
131136
})

‎src/view/single-page/own/own.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</FormItem>
1919
<FormItem label="用户昵称" prop="nickname">
2020
<div style="display:inline-block;width:300px">
21-
<Input v-model="formItem.nickname"></Input>
21+
<Input v-model="formItem.nickname" placeholder="请输入昵称"></Input>
2222
</div>
2323
</FormItem>
2424
<FormItem label="用户头像" prop="headImg">
@@ -77,7 +77,7 @@
7777
<p>个人信息修改后，将会退出系统重新登录，请明确后修改！</p>
7878
</div>
7979
<div slot="footer">
80-
<Button type="error" size="large" long @click="submit">确定修改</Button>
80+
<Button type="error" size="large" long :loading="saveLoading" @click="submit">确定修改</Button>
8181
</div>
8282
</Modal>
8383
</div>
@@ -127,7 +127,7 @@ export default {
127127
},
128128
ruleValidate: {
129129
nickname: [
130-
{ required: true, message: '请输入姓名', trigger: 'blur' }
130+
{ required: true, message: '请输入用户昵称', trigger: 'blur' }
131131
],
132132
password: [
133133
{ min: 6, message: '请至少输入6个字符', trigger: 'blur' },

‎src/view/system/auth.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ export default {
275275
key: 'username'
276276
},
277277
{
278-
title: '真实姓名',
278+
title: '用户昵称',
279279
align: 'center',
280280
key: 'nickname',
281281
width: 90

‎src/view/system/user.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<FormItem style="margin-bottom: 0">
1717
<Select v-model="searchConf.type" clearable placeholder="请选择类别" style="width:100px">
1818
<Option :value="1">用户账号</Option>
19-
<Option :value="2">真实姓名</Option>
19+
<Option :value="2">用户昵称</Option>
2020
</Select>
2121
</FormItem>
2222
<FormItem style="margin-bottom: 0">
@@ -55,8 +55,8 @@
5555
<FormItem label="用户账号" prop="username">
5656
<Input v-model="formItem.username" placeholder="请输入账号"></Input>
5757
</FormItem>
58-
<FormItem label="真实姓名" prop="nickname">
59-
<Input v-model="formItem.nickname" placeholder="请输入账号"></Input>
58+
<FormItem label="用户昵称" prop="nickname">
59+
<Input v-model="formItem.nickname" placeholder="请输入昵称"></Input>
6060
</FormItem>
6161
<FormItem label="用户密码" prop="password">
6262
<Input v-model="formItem.password" type="password" placeholder="用户密码"></Input>
@@ -150,7 +150,7 @@ export default {
150150
minWidth: 120
151151
},
152152
{
153-
title: '真实姓名',
153+
title: '用户昵称',
154154
align: 'center',
155155
key: 'nickname',
156156
width: 120
@@ -250,7 +250,7 @@ export default {
250250
},
251251
ruleValidate: {
252252
username: [
253-
{ required: true, message: '用户名不能为空', trigger: 'blur' }
253+
{ required: true, message: '用户账号不能为空', trigger: 'blur' }
254254
],
255255
nickname: [
256256
{ required: true, message: '用户昵称不能为空', trigger: 'blur' }

‎src/view/wiki/login.vue

+9-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</Input>
2424
</FormItem>
2525
<FormItem style="margin-bottom: 15px;">
26-
<Button @click="handleSubmit" type="primary" long>登录</Button>
26+
<Button type="primary" long :loading="loading" @click="handleSubmit">登录</Button>
2727
</FormItem>
2828
</Form>
2929
<div class="wiki-login-tip">
@@ -42,8 +42,8 @@ export default {
4242
data () {
4343
return {
4444
form: {
45-
username: '',
46-
password: ''
45+
username: '49686770',
46+
password: 'RdZsbOQNeylhdacRXGTxUpWlrCQuOOnG'
4747
},
4848
rules: {
4949
username: [
@@ -52,21 +52,26 @@ export default {
5252
password: [
5353
{ required: true, message: 'AppSecret不能为空', trigger: 'blur' }
5454
]
55-
}
55+
},
56+
loading: false
5657
}
5758
},
5859
methods: {
5960
handleSubmit () {
6061
let vm = this
6162
this.$refs['loginForm'].validate((valid) => {
6263
if (valid) {
64+
vm.loading = true
6365
login(vm.form).then(response => {
6466
vm.$Message.success(response.data.msg)
6567
setToken(response.data.data.apiAuth)
6668
sessionStorage.setItem('ApiAdmin_AppInfo', response.data.data.app_id)
6769
vm.$router.push({
6870
name: 'wiki_list'
6971
})
72+
vm.loading = false
73+
}).catch(() => {
74+
vm.loading = false
7075
})
7176
}
7277
})

0 commit comments

Comments
 (0)