diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue index 5c880a2..1bea7aa 100644 --- a/src/components/merchantManagement/memberInfo.vue +++ b/src/components/merchantManagement/memberInfo.vue @@ -86,7 +86,6 @@ 角色: {{ currentMember.role }} - 权限: {{ currentMember.permission }} @@ -490,8 +489,8 @@ export default { agencyRole: this.currentMember.agencyRole + '', aliasName: this.currentMember.aliasName, tel: this.currentMember.tel, - permission: this.currentMember.permission, group: this.currentMember.group, + agencyTeamId: this.currentMember.agencyTeamName, }) }, 200) } else if (type == 'detail') { @@ -553,7 +552,7 @@ export default { if (data.status == 200) { this.$message.success('修改成功') this.visible = false - this.permission = getAgencyPermissionsByRole(1) + this.permission = getAgencyPermissionsByRole() this.permissionName = getAgencyPermissionNameById(this.permission) this.getMemberList() } else { diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue index 858c231..f1b9ced 100644 --- a/src/components/userinfo/usercenter/components/dataStatistics.vue +++ b/src/components/userinfo/usercenter/components/dataStatistics.vue @@ -379,25 +379,25 @@ export default { // scopedSlots: { customRender: 'userName' }, customRender: (text, row, index) => { let sex - if(row.sex == '1'){ - sex ='男' - }else if(row.sex == '2'){ - sex = '女' - }else{ - sex = "未知" - } + if (row.sex == '1') { + sex = '男' + } else if (row.sex == '2') { + sex = '女' + } else { + sex = '未知' + } // switch (row.sex) { - // case 0: + // case '0': // sex = '男女不限' - // case 1: + // case '1': // sex = '男' - // case 2: + // case '2': // sex = '女' // default: // break // } - return text.trim() + '/' + (sex ? sex + '/' : '') + (row.age ? row.age + '/' : '') + (row.nation ? row.nation : '') + return text.trim() + (sex ? '/' + sex : '') + (row.age ? '/' + row.age : '') + (row.nation ? '/' + row.nation : '') }, }, // { @@ -816,10 +816,10 @@ export default {