diff --git a/admin.zip b/admin.zip index 5c7a8d8..8921f9d 100644 Binary files a/admin.zip and b/admin.zip differ diff --git a/src/api/manage/index.js b/src/api/manage/index.js index 31eff28..7cda512 100644 --- a/src/api/manage/index.js +++ b/src/api/manage/index.js @@ -295,4 +295,49 @@ export function alipayUpdate(params) { method: 'post', data: params, }) +} + +// 管理员账号-查询所有的超级管理员 +export function getSuperUserList(params) { + return httpService({ + url: `/user/superUserSetting/list`, + method: 'get', + params: params, + }) +} + +// 管理员账号-添加超级管理员信息 +export function addSuperUser(params) { + return httpService({ + url: `/user/superUserSetting/insert`, + method: 'post', + data: params, + }) +} + +// 管理员账号-根据后台用户主键id查询后台用户信息 +export function findSuperUser(params) { + return httpService({ + url: `/user/superUserSetting/findById`, + method: 'get', + params: params, + }) +} + +// 管理员账号-修改超级管理员信息 +export function updateSuperUser(params) { + return httpService({ + url: `/user/superUserSetting/update`, + method: 'post', + data: params, + }) +} + +// 管理员账号-正常/停用 超级管理员 +export function enableSuperUser(params) { + return httpService({ + url: `/user/superUserSetting/enable`, + method: 'get', + params: params, + }) } \ No newline at end of file diff --git a/src/components/allCity/index.vue b/src/components/allCity/index.vue index 9b1255e..7e82e38 100644 --- a/src/components/allCity/index.vue +++ b/src/components/allCity/index.vue @@ -27,11 +27,11 @@ export default { } }, mounted() { - if(store.getters.getCity.length===0){ + // if(store.getters.getCity.length===0){ allCity().then(res=>{ this.cityList = res.data }) - } + // } } }; diff --git a/src/router/basic.js b/src/router/basic.js index bfafe0b..adcc5e8 100644 --- a/src/router/basic.js +++ b/src/router/basic.js @@ -52,6 +52,14 @@ export default [ component: resolve => require(['@/views/Manage/AdminSet/PaymentSet'], resolve), meta: { title: '支付设置' }, }, + { + path: '/Manage/AdminSet/AccountSet', + name: "AccountSet", + title: "管理员账号", + hide: false, + component: resolve => require(['@/views/Manage/AdminSet/AccountSet'], resolve), + meta: { title: '管理员账号' }, + }, ] }, { diff --git a/src/utils/util.js b/src/utils/util.js index 1403239..54d74d8 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -11,6 +11,10 @@ export default { Vue.prototype.$ImgUrl = (src) => { return process.env.VUE_APP_STATIC + '/' + src } + // 小区识别码 + Vue.prototype.$VillageUrl = (src, code) => { + return 'https://saas.kaidalai.cn/resource/' + code + '/' + src + } // 时间格式化 Vue.prototype.formatDate = (time, fmt) => { if (time > 0) { diff --git a/src/views/Manage/AdminSet/AccountSet/config.js b/src/views/Manage/AdminSet/AccountSet/config.js new file mode 100644 index 0000000..4365e37 --- /dev/null +++ b/src/views/Manage/AdminSet/AccountSet/config.js @@ -0,0 +1,90 @@ +export const columns = [ + { + title: "用户名", + width: "8%", + dataIndex: "userName", + }, + { + title: "姓名", + width: "6%", + dataIndex: "actualName", + }, + { + title: "密码", + width: "10%", + dataIndex: "password", + }, + { + title: "手机号", + width: "10%", + dataIndex: "tel", + }, + { + title: "性别", + width: "6%", + dataIndex: "sex", + customRender: function(status) { + switch(status) { + case 1: return '男'; + case 2: return '女'; + case 3: return '保密'; + } + } + }, + { + title: "员工编号", + width: "10%", + dataIndex: "userCode", + }, + { + title: "是否启用", + width: "6%", + dataIndex: "status", + scopedSlots: { customRender: "status" }, + }, + { + title: "创建时间", + width: "10%", + dataIndex: "createDate", + customRender: function(createDate) { + let date = new Date(createDate).toLocaleString(); + return date + } + }, + { + title: "最后登录ip", + width: "12%", + dataIndex: "lastLoginIp", + }, + { + title: "最后登录时间", + width: "10%", + dataIndex: "lastLoginDate", + }, + { + title: "操作", + dataIndex: "action", + key: "action", + width: "180", + fixed: "right", + scopedSlots: { customRender: "action" }, + }, +] + +export const pagination= { + current: 1, + total: 0, + pageSize: 10, + showTotal: (total) => `共 ${total} 条`, + showSizeChanger: true, + showQuickJumper: true, +}; + +export const rules = { + communityId: [{ required: true, message: "请选择小区", trigger: "change" }], + userName: [{ required: true, message: "请输入用户名", trigger: "blur" }], + password: [{ required: true, message: "请输入密码", trigger: "blur" }], + actualName: [{ required: true, message: "请输入姓名", trigger: "blur" }], + tel: [{ required: true, message: "请输入手机号", trigger: "blur" }], + sex: [{ required: true, message: "请选择性别", trigger: "change" }], +} \ No newline at end of file diff --git a/src/views/Manage/AdminSet/AccountSet/index.vue b/src/views/Manage/AdminSet/AccountSet/index.vue new file mode 100644 index 0000000..477d460 --- /dev/null +++ b/src/views/Manage/AdminSet/AccountSet/index.vue @@ -0,0 +1,251 @@ + + + + + \ No newline at end of file diff --git a/src/views/Manage/OrderManage/index.vue b/src/views/Manage/OrderManage/index.vue index 26bbd09..f091a3f 100644 --- a/src/views/Manage/OrderManage/index.vue +++ b/src/views/Manage/OrderManage/index.vue @@ -167,6 +167,8 @@ export default { }, //分页 handleTableChange(pagination) { + this.pagination.current = pagination.current; + this.pagination.pageSize = pagination.pageSize this.form.size = pagination.pageSize; this.form.pageNum = pagination.current; this.getData(); diff --git a/src/views/Manage/ShopRemain/index.vue b/src/views/Manage/ShopRemain/index.vue index fd274ce..9135323 100644 --- a/src/views/Manage/ShopRemain/index.vue +++ b/src/views/Manage/ShopRemain/index.vue @@ -124,6 +124,7 @@ export default { let obj = {pageNum: this.pagination.current,size: this.pagination.pageSize} getBalanceList(obj).then(res => { let data = res.data; + console.log(data) this.tableData = data.rows; this.pagination.total = data.total }) diff --git a/src/views/Manage/VillageManage/index.vue b/src/views/Manage/VillageManage/index.vue index e22d796..e718914 100644 --- a/src/views/Manage/VillageManage/index.vue +++ b/src/views/Manage/VillageManage/index.vue @@ -32,7 +32,6 @@ > - 修改 @@ -207,23 +206,22 @@ export default { this.addForm.address = data.countyId //回调区 // this.addForm.communityUrls = []; - if (res.data.imgList.length > 0) { - const pic = []; - this.addForm.communityUrls.push(res.data.imgList[0].url) - for (let item of res.data.imgList) { - let obj = { - name: item.url.split("_")[0] + "." + item.url.split(".")[1], - url: this.$ImgUrl(item.url), - uid: item.url.split("_")[1], - status: "done", - thumbUrl: this.$ImgUrl(item.url), - }; - pic.push(obj); - } - this.fileList = pic; - }else{ - this.addForm.communityUrls=[] - } + console.log(res.data) + if (res.data.imgList.length > 0) { + const pic = []; + this.addForm.communityUrls.push(res.data.imgList[0].url) + for (let item of res.data.imgList) { + let obj = { + name: item.url.split("_")[0] + "." + item.url.split(".")[1], + url: this.$ImgUrl(item.url), + uid: item.url.split("_")[1], + status: "done", + thumbUrl: this.$ImgUrl(item.url), + }; + pic.push(obj); + } + this.fileList = pic; + } }) this.chosenId = record.id; //小区id this.visible = true; @@ -302,7 +300,7 @@ export default { if(ele.status == 'done') { this.addForm.communityUrls.push(ele.response.data) } - }) + }); } }, }; diff --git a/src/views/Rule/admin.vue b/src/views/Rule/admin.vue index b438feb..04f168f 100644 --- a/src/views/Rule/admin.vue +++ b/src/views/Rule/admin.vue @@ -1,802 +1,536 @@ diff --git a/src/views/Rule/user.vue b/src/views/Rule/user.vue index 9297ba9..412b6b8 100644 --- a/src/views/Rule/user.vue +++ b/src/views/Rule/user.vue @@ -1,802 +1,505 @@