|
@@ -80,6 +80,7 @@
|
|
|
let _this = this
|
|
|
this.status = "loading"
|
|
|
getPowerRoleList(Object.assign({pageNo: this.pageNo, pageSize: this.pageSize}, this.queryParam)).then(res => {
|
|
|
+ uni.hideLoading()
|
|
|
if (res.code == 200 || res.status == 204 || res.status == 200) {
|
|
|
if(_this.pageNo>1){
|
|
|
_this.roleList = _this.roleList.concat(res.data.list || [])
|
|
@@ -99,11 +100,17 @@
|
|
|
})
|
|
|
},
|
|
|
getCurrUserInfo(){
|
|
|
+ uni.showLoading({
|
|
|
+ mask:true,
|
|
|
+ title: '正在加载...'
|
|
|
+ })
|
|
|
getCurrUserInfo().then(res => {
|
|
|
if(res.data){
|
|
|
- this.formData = Object.assign({},this.formData,res.data)
|
|
|
+ this.formData = Object.assign({},this.formData,{id:res.data.id})
|
|
|
this.pageNo = 1
|
|
|
this.getRoleList()
|
|
|
+ }else{
|
|
|
+ uni.hideLoading()
|
|
|
}
|
|
|
})
|
|
|
},
|