|
|
@@ -6,7 +6,7 @@
|
|
|
<i class="el-icon-success" v-else style="color:#C0C4CC;font-size:19px;"></i>
|
|
|
</template>
|
|
|
<template #table-column-avatar="{scope}">
|
|
|
- <cl-avatar shape="circle" :size="24" :src="scope.row.avatarUrl" :style="{ margin: 'auto' }"></cl-avatar>
|
|
|
+ <cl-avatar shape="circle" :size="24" :src="scope.row.avatar" :style="{ margin: 'auto' }"></cl-avatar>
|
|
|
</template>
|
|
|
|
|
|
<template #table-column-incomeNotice="{scope}">
|
|
|
@@ -78,8 +78,8 @@
|
|
|
>
|
|
|
<div class="ad-modal-content">
|
|
|
<el-form :model="adForm" :rules="ruleForm" ref="adForm" label-width="100px" class="demo-form">
|
|
|
- <el-form-item label="姓名" prop="adminName">
|
|
|
- <el-input v-model="adForm.adminName" placeholder="请输入姓名" size="small"></el-input>
|
|
|
+ <el-form-item label="姓名" prop="name">
|
|
|
+ <el-input v-model="adForm.name" placeholder="请输入姓名" size="small"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="角色" prop="roleId">
|
|
|
<el-select v-model="adForm.roleName" size="small" placeholder="请选择角色" @change="selRoleFn">
|
|
|
@@ -165,7 +165,7 @@ export default {
|
|
|
showMiniCode: false,
|
|
|
miniCodeSrc: '',
|
|
|
adForm: {
|
|
|
- adminName: '',
|
|
|
+ name: '',
|
|
|
roleId: '',
|
|
|
roleName: '',
|
|
|
remind: '1',
|
|
|
@@ -175,7 +175,7 @@ export default {
|
|
|
status: '1'
|
|
|
},
|
|
|
ruleForm: {
|
|
|
- adminName: [{ required: true, message: '请输入名称', trigger: 'blur' }],
|
|
|
+ name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
|
|
|
roleName: [{ required: true, message: '请选择角色', trigger: 'change' }],
|
|
|
//userId: [{ required: true, message: '请选择会员', trigger: 'blur' }],
|
|
|
password: { required: true, message: '请输入密码', trigger: 'blur' }
|
|
|
@@ -254,7 +254,7 @@ export default {
|
|
|
this.memberData = {};
|
|
|
|
|
|
this.adForm = {
|
|
|
- adminName: '',
|
|
|
+ name: '',
|
|
|
roleId: '',
|
|
|
roleName: '',
|
|
|
remind: '1',
|
|
|
@@ -361,11 +361,11 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
- prop: 'adminName',
|
|
|
+ prop: 'name',
|
|
|
label: '姓名',
|
|
|
align: 'center',
|
|
|
formatter: row => {
|
|
|
- return row.adminBaseInfo.adminName;
|
|
|
+ return row.adminBaseInfo.name;
|
|
|
}
|
|
|
},
|
|
|
{
|