diff --git a/src/api/system/user/model/index.ts b/src/api/system/user/model/index.ts index e7a09a6..8323dc1 100644 --- a/src/api/system/user/model/index.ts +++ b/src/api/system/user/model/index.ts @@ -152,6 +152,7 @@ export interface UserParam extends PageParam { sexName?: string; roleId?: string; isAdmin?: number; + isSuperAdmin?: boolean; showProfile?: boolean; isStaff?: boolean; templateId?: number; diff --git a/src/views/shop/shopAdmin/components/admin.vue b/src/views/shop/shopAdmin/components/admin.vue index 2ec8ef1..add1bba 100644 --- a/src/views/shop/shopAdmin/components/admin.vue +++ b/src/views/shop/shopAdmin/components/admin.vue @@ -1,368 +1,42 @@ - - - - - - - - - - - - - {{ record.nickname }} - - - {{ record.phone }} - {{ record.mobile }} - - - - {{ item.roleName }} - - - - - - - - - - ¥{{ formatNumber(record.balance) }} - - - - - ¥{{ formatNumber(record.expendMoney) }} - - - - 是 - 否 - - - - - - - - 修改 - - - - - 删除 - - - + + + + 编辑 + 添加 + - + + + + + {{ item.nickname }} + {{ item.createTime }} + + + + diff --git a/src/views/shop/shopAdmin/components/super-admin.vue b/src/views/shop/shopAdmin/components/super-admin.vue new file mode 100644 index 0000000..b856ea7 --- /dev/null +++ b/src/views/shop/shopAdmin/components/super-admin.vue @@ -0,0 +1,41 @@ + + + + 系统所有者,拥有全部权限 + + + + + + {{ item.nickname }} + {{ item.createTime }} + + + 更换 + + + + + diff --git a/src/views/shop/shopAdmin/index.vue b/src/views/shop/shopAdmin/index.vue index bb9f204..37fa459 100644 --- a/src/views/shop/shopAdmin/index.vue +++ b/src/views/shop/shopAdmin/index.vue @@ -1,16 +1,6 @@ $router.go(-1)"> - - - - - - - - - - - + - 新建 + 添加 { const query = async () => { const info = await listRoles({}) - if(info){ + if (info) { roles.value = info } } diff --git a/src/views/shop/shopCoupon/components/shopCouponEdit.vue b/src/views/shop/shopCoupon/components/shopCouponEdit.vue index 661ae56..1315a2b 100644 --- a/src/views/shop/shopCoupon/components/shopCouponEdit.vue +++ b/src/views/shop/shopCoupon/components/shopCouponEdit.vue @@ -308,10 +308,7 @@ const form = reactive({ sortNumber: 100, status: 0, // 默认显示 deleted: 0, - userId: undefined, tenantId: undefined, - createTime: undefined, - updateTime: undefined, totalCount: -1, // 默认无限制 issuedCount: 0, limitPerUser: -1, // 默认无限制