From cf848a4d9e0f89605a348183ff6f7c445482930b Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Mon, 6 Sep 2021 09:48:37 +0800 Subject: [PATCH 1/3] init --- src/api/modules/api.js | 8 ++++++ src/page/check/chose.vue | 55 ++++++++++++++++++++++++++++++++++-- src/page/check/index.vue | 2 +- src/page/index/top/index.vue | 2 +- 4 files changed, 62 insertions(+), 5 deletions(-) diff --git a/src/api/modules/api.js b/src/api/modules/api.js index 5030099..7d725c8 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -185,3 +185,11 @@ export function zkagentPage(query) { params: query }) } +// 获取公司列表 +export function zkorg(query) { + return request({ + url: '/autoSR/zkorg/page', + method: 'get', + params: query + }) +} diff --git a/src/page/check/chose.vue b/src/page/check/chose.vue index 5eac998..737b48c 100644 --- a/src/page/check/chose.vue +++ b/src/page/check/chose.vue @@ -68,7 +68,38 @@ --> -
这是公司
+
+ +
+
+
{{ item.agentName }}
+ +
{{ item.address }}
+
+
+
这是楼盘
@@ -91,6 +122,8 @@ export default { flag: 1, currentPage: 1, agentName: "", //代理商名称 + companyName:'', + total:20, list: [], }; }, @@ -105,6 +138,7 @@ export default { this.getAgentList(); } else if (this.flag == 2) { // 获取公司 + this.getCompanyList() } else { // 获取楼盘 } @@ -115,13 +149,28 @@ export default { getAgentList() { this.$api.api .zkagentPage({ - pageNum: this.currentPage, + current: this.currentPage, pageSize: 10, agentName: this.agentName, }) .then((res) => { console.log(res); this.list = res.data.records; + this.total=res.data.total + }); + }, + getCompanyList() { + this.$api.api + .zkorg({ + current: this.currentPage, + pageSize: 10, + name: this.companyName, + orgType:localStorage.getItem('orgType') + }) + .then((res) => { + console.log(res); + this.list = res.data.records; + this.total=res.data.total }); }, chose(item) { diff --git a/src/page/check/index.vue b/src/page/check/index.vue index 37e4ed1..30a2af0 100644 --- a/src/page/check/index.vue +++ b/src/page/check/index.vue @@ -46,7 +46,7 @@ export default { }, computed: {}, mounted() { - console.log(this.$route.query.backFlag); + // console.log(this.$route.query.backFlag); if (this.$route.query.backFlag) { this.backFlag = this.$route.query.backFlag; } diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index cb0a8b2..c83c178 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -12,7 +12,7 @@
-
+
代理商
{{companyName}} 切换 From 345742f1daa7c3f43f5588fd3450620f7707ec31 Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Mon, 6 Sep 2021 10:01:00 +0800 Subject: [PATCH 2/3] init --- vue.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vue.config.js b/vue.config.js index 21d84b8..c048c6f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,9 +3,9 @@ * https://cli.vuejs.org/zh/config/ */ // const url = 'http://pigx-gateway' -// const url = 'http://39.97.167.65:9999' //测试 +const url = 'http://39.97.167.65:9999' //测试 // const url = 'http://192.168.31.161:9999' //长龙 -const url = 'http://192.168.31.128:9999' //嘉豪 +// const url = 'http://192.168.31.128:9999' //嘉豪 const CompressionWebpackPlugin = require('compression-webpack-plugin') const productionGzipExtensions = ['js', 'css'] From ce0155b284c79f0baa27356ddf90fe55b289d49c Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Mon, 6 Sep 2021 20:00:09 +0800 Subject: [PATCH 3/3] init --- src/api/admin/dept.js | 17 - src/api/admin/user.js | 9 +- src/api/modules/api.js | 26 ++ src/page/check/chose.vue | 10 +- src/page/check/index.vue | 13 +- src/page/index/top/index.vue | 51 ++- src/page/login/userlogin.vue | 38 ++- src/views/admin/user/index.vue | 588 +++++++++++++++++++-------------- vue.config.js | 4 +- 9 files changed, 467 insertions(+), 289 deletions(-) diff --git a/src/api/admin/dept.js b/src/api/admin/dept.js index b64db69..65f08b2 100644 --- a/src/api/admin/dept.js +++ b/src/api/admin/dept.js @@ -1,20 +1,3 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - import request from '@/router/axios' export function fetchTree(query) { diff --git a/src/api/admin/user.js b/src/api/admin/user.js index b36c521..c9a9f80 100644 --- a/src/api/admin/user.js +++ b/src/api/admin/user.js @@ -42,10 +42,17 @@ export function getObj(id) { export function delObj(id) { return request({ - url: '/admin/user/' + id, + url: '/admin/user/registerDel/' + id, method: 'delete' }) } +export function delObj1(query) { + return request({ + url: '/admin/user/orgDel', + method: 'delete', + params:query + }) +} export function putObj(obj) { return request({ diff --git a/src/api/modules/api.js b/src/api/modules/api.js index 7d725c8..b310d09 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -193,3 +193,29 @@ export function zkorg(query) { params: query }) } + + +// 获取注册用户列表 +export function registerUserList(query) { + return request({ + url: '/admin/user/registerUserList', + method: 'get', + params: query + }) +} + +// 获取组织用户列表 +export function orgUserList(query) { + return request({ + url: '/admin/user/orgUserList', + method: 'get', + params: query + }) +} +// 验证电话号码是否存在 +export function verPhone(username) { + return request({ + url: 'admin/user/info/'+username, + method: 'get', + }) +} diff --git a/src/page/check/chose.vue b/src/page/check/chose.vue index e56d6a5..c066fb3 100644 --- a/src/page/check/chose.vue +++ b/src/page/check/chose.vue @@ -86,8 +86,8 @@ >
-
-
{{ item.agentName }}
+
+
{{ item.name }}
-
{{ item.address }}
+
区域位置:{{ item.address||'暂无' }}
@@ -108,7 +108,6 @@ @current-change="handleCurrentChange" :current-page="currentPage" :page-size="10" - layout="total, sizes, prev, pager, next, jumper" :total="total" > @@ -163,7 +162,7 @@ export default { this.$api.api .zkorg({ current: this.currentPage, - pageSize: 10, + size: 10, name: this.companyName, orgType:localStorage.getItem('orgType') }) @@ -191,6 +190,7 @@ export default { this.getAgentList(); } else if (this.flag == 2) { // 获取公司 + this.getCompanyList() } else { // 获取楼盘 } diff --git a/src/page/check/index.vue b/src/page/check/index.vue index c2ccf57..cbf2dab 100644 --- a/src/page/check/index.vue +++ b/src/page/check/index.vue @@ -9,19 +9,19 @@
选择后台
-
+
质控管家后台
-
+
代理商后台
-
+
公司后台
-
+
楼盘后台
@@ -58,6 +58,11 @@ export default { this.$api.api.getTab().then((res) => { // console.log(res) // 循环数组,给定各种标志 + this.tabFlag1 = true; + this.tabFlag2 = true; + this.tabFlag3 = true; + this.tabFlag4 = true; + return res.data.map((item) => { if (item.orgType == 0) { this.tabFlag1 = true; diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index c83c178..792da2d 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -12,9 +12,19 @@
-
+
代理商
- {{companyName}} + {{ + companyName + }} 切换 -
+
+
注册用户
+
组织用户
+
+ +
- - + + + + + + + + + + + + + - - + + - - - - + + 查询 + 重置 + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + - - - - + + + + - 查询 - 重置 + 查询 + 重置
+ +
- 批量删除 + 添加
- - + prop="name" + label="用户名"> + > + prop="userRoleTypeName" + label="性别"> + - + prop="orgName" + label="所属组织"> + prop="createTime" + label="注册时间"> + prop="address" + label="操作"> + + + + type="selection" + width="55" + > + + + label="登录手机" + prop="username" + > - - + prop="userRoleTypeName" + label="性别"> + + + + - - + + + + + @@ -375,10 +314,20 @@
- + + + + + + +
+ 取 消 + 确 定 +
+
- + @@ -393,7 +342,7 @@ - diff --git a/vue.config.js b/vue.config.js index c048c6f..af76f5c 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,8 +3,8 @@ * https://cli.vuejs.org/zh/config/ */ // const url = 'http://pigx-gateway' -const url = 'http://39.97.167.65:9999' //测试 -// const url = 'http://192.168.31.161:9999' //长龙 +// const url = 'http://39.97.167.65:9999' //测试 +const url = 'http://192.168.31.161:9999' //长龙 // const url = 'http://192.168.31.128:9999' //嘉豪 const CompressionWebpackPlugin = require('compression-webpack-plugin')