From 94817e3325e59fe6af631d98ecab53ff3b43a5da Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sun, 12 Mar 2023 15:20:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/auth/authAdmin.js | 9 + src/api/auth/login.js | 37 + src/api/auth/register.js | 54 ++ src/api/basic/basicUnitMaintain.js | 114 +-- src/api/login.js | 18 +- src/api/system/company.js | 27 +- src/api/warehouse/company.js | 77 ++ src/config/app.js | 26 + src/permission.js | 2 +- src/router/index.js | 5 + src/utils/axios.js | 69 ++ src/views/forgetPasswd.vue | 296 ++++++++ src/views/myLogin.vue | 8 + src/views/register.vue | 956 +++++++++++++++++++++--- src/views/userManage/customerManage.vue | 598 +++++++++++++++ src/views/userManage/customerUser.vue | 478 ++++++++++++ src/views/userManage/registerManage.vue | 584 +++++++++++++++ 17 files changed, 3178 insertions(+), 180 deletions(-) create mode 100644 src/api/auth/login.js create mode 100644 src/api/auth/register.js create mode 100644 src/api/warehouse/company.js create mode 100644 src/config/app.js create mode 100644 src/utils/axios.js create mode 100644 src/views/forgetPasswd.vue create mode 100644 src/views/userManage/customerManage.vue create mode 100644 src/views/userManage/customerUser.vue create mode 100644 src/views/userManage/registerManage.vue diff --git a/src/api/auth/authAdmin.js b/src/api/auth/authAdmin.js index 3ee6018..6280c27 100644 --- a/src/api/auth/authAdmin.js +++ b/src/api/auth/authAdmin.js @@ -9,6 +9,15 @@ export function authAdminList(query) { }); } +// 获取角色列表 +export function authAdminRoleList(query) { + return axios({ + url: "/admin/auth/admin/roleList", + method: "get", + params: query + }); +} + //根据当前角色,获取是否为客户角色 export function roleCustomers(query) { diff --git a/src/api/auth/login.js b/src/api/auth/login.js new file mode 100644 index 0000000..2f48ea0 --- /dev/null +++ b/src/api/auth/login.js @@ -0,0 +1,37 @@ +/** + * Created by lk on 17/6/4. + */ +import axios from "@/utils/axios"; +// 获取信息 +export function userInfo(id, token) { + return axios({ + url: "/admin/auth/login/userInfo", + method: "get", + params: { id, token } + }); +} + +export function loginName(username, password) { + console.log(username + " " + password); + return axios({ + url: "/login", + method: "post", + data: { username, password } + }); +} + +export function logout(uid, token) { + return axios({ + url: "/admin/auth/login/out", + method: "post", + data: { uid, token } + }); +} + +export function password(data) { + return axios({ + url: "/admin/auth/login/password", + method: "post", + data: data + }); +} diff --git a/src/api/auth/register.js b/src/api/auth/register.js new file mode 100644 index 0000000..e13eb6d --- /dev/null +++ b/src/api/auth/register.js @@ -0,0 +1,54 @@ +import axios from "@/utils/request"; + +export function getRegisters(query) { + return axios({ + url: "/salewarehouse/register/list", + method: "get", + params: query + }); +} + + +export function register(data) { + return axios({ + url: "/salewarehouse/register/save", + method: "post", + data: data + }); +} + + +export function checkPass(data) { + return axios({ + url: "/salewarehouse/register/check", + method: "post", + data: data + }); +} + +export function getCheckcode(data) { + return axios({ + url: "/salewarehouse/register/getCheckcode", + method: "post", + data: data + }); +} + + +export function deleteRe(data) { + return axios({ + url: "/salewarehouse/register/deleteResiter", + method: "post", + data: data + }); +} + +export function resetPasswd(data) { + return axios({ + url: "/salewarehouse/reset/passwd", + method: "post", + data: data + }); +} + + diff --git a/src/api/basic/basicUnitMaintain.js b/src/api/basic/basicUnitMaintain.js index 4bd03b4..ed2224b 100644 --- a/src/api/basic/basicUnitMaintain.js +++ b/src/api/basic/basicUnitMaintain.js @@ -1,91 +1,91 @@ import axios from "@/utils/request"; export function getBasicUnitMaintains(query) { - return axios({ - url: "/udiwms/basic/unit/maintain/filter", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/basic/unit/maintain/filter", + method: "get", + params: query + }); } export function getCorpFilter(query) { - return axios({ - url: "/sale/info/company/product/corp/filter", - method: "get", - params: query - }); + return axios({ + url: "/sale/info/company/product/corp/filter", + method: "get", + params: query + }); } export function getBasicUnitMaintains2(query) { - return axios({ - url: "/udiwms/basic/unit/maintain/filter2", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/basic/unit/maintain/filter2", + method: "get", + params: query + }); } export function basicUnitMaintainSave(data, formName, method = "post") { - let url = - formName === "add" ? "/udiwms/basic/unit/maintain/save" : "/udiwms/basic/unit/maintain/update"; - return axios({ - url: url, - method: method, - data: data - }); + let url = + formName === "add" ? "/udiwms/basic/unit/maintain/save" : "/udiwms/basic/unit/maintain/update"; + return axios({ + url: url, + method: method, + data: data + }); } export function combine(query) { - return axios({ - url: "/udiwms/basic/unit/maintain/combine", - method: "post", - data: query - }); + return axios({ + url: "/udiwms/basic/unit/maintain/combine", + method: "post", + data: query + }); } export function combineAll(query) { - return axios({ - url: "/udiwms/basic/unit/maintain/combineAll", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/basic/unit/maintain/combineAll", + method: "get", + params: query + }); } export function combineSingle(query) { - return axios({ - url: "/udiwms/basic/unit/maintain/combineSingle", - method: "post", - data: query - }); + return axios({ + url: "/udiwms/basic/unit/maintain/combineSingle", + method: "post", + data: query + }); } export function deleteBasicUnitMaintain(query) { - return axios({ - url: "/udiwms/basic/unit/maintain/delete", - method: "post", - data: query - }); + return axios({ + url: "/udiwms/basic/unit/maintain/delete", + method: "post", + data: query + }); } export function ucloudUnit(query) { - return axios({ - url: "/udiwms/unitMaintain/filterErp", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/unitMaintain/filterErp", + method: "get", + params: query + }); } export function getThrsysUnit(query) { - return axios({ - url: "/udiwms/unitMaintain/thirdSys/detail", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/unitMaintain/thirdSys/detail", + method: "get", + params: query + }); } export function removeRl(query) { - return axios({ - url: "/udiwms/unit/thirdSys/removeRl", - method: "get", - params: query - }); + return axios({ + url: "/udiwms/unit/thirdSys/removeRl", + method: "get", + params: query + }); } export function getSystemParamConfig(query) { diff --git a/src/api/login.js b/src/api/login.js index 33e3e09..d1bde0f 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -21,13 +21,10 @@ export function login(username, password, code, uuid) { // 注册方法 export function register(data) { return request({ - url: '/register', - headers: { - isToken: false - }, - method: 'post', + url: "/salewarehouse/register/save", + method: "post", data: data - }) + }); } // 获取用户详细信息 @@ -58,6 +55,15 @@ export function getCodeImg() { }) } +export function getCheckcode(data) { + return request({ + url: "/salewarehouse/register/getCheckcode", + method: "post", + data: data + }); +} + + // 短信验证码 export function getCodeSms() { return request({ diff --git a/src/api/system/company.js b/src/api/system/company.js index b1559d0..ef94508 100644 --- a/src/api/system/company.js +++ b/src/api/system/company.js @@ -1,9 +1,10 @@ -import axios from "../../utils/request"; +import axios from "@/utils/request"; -export function getCompany() { +export function getCompany(query) { return axios({ url: "/warehouse/info/company", - method: "get" + method: "get", + params:query }); } @@ -14,3 +15,23 @@ export function modifyCompany(query) { data: query }); } + +export function checkCompany(query) { + return axios( + { + url: "/salewarehouse/register/checkCompany", + method: "get", + params: query + } + ); +} + +export function getRegisterConfig(query) { + return axios( + { + url: "/salewarehouse/register/getRegisterConfig", + method: "get", + params: query + } + ); +} diff --git a/src/api/warehouse/company.js b/src/api/warehouse/company.js new file mode 100644 index 0000000..4a23a6f --- /dev/null +++ b/src/api/warehouse/company.js @@ -0,0 +1,77 @@ +import axios from "@/utils/request"; + +export function getCompany(query) { + return axios( + { + url: "/warehouse/info/company", + method: "get", + params: query + } + ); +} + +export function modifyCompany(query) { + return axios( + { + url: "/warehouse/info/modifyCompany", + method: "post", + data: query + } + ); +} + +export function getRefid(query) { + return axios( + { + url: "/sale/info/refid", + method: "get", + params: query + } + ); +} + +export function checkCompany(query) { + return axios( + { + url: "/salewarehouse/register/checkCompany", + method: "get", + params: query + } + ); +} + +export function getRegisterConfig(query) { + return axios( + { + url: "/salewarehouse/register/getRegisterConfig", + method: "get", + params: query + } + ); +} + + +export function getSubCompany(query) { + return axios( + { + url: "/sale/info/getSubCompany", + method: "get", + params: query + } + ); +} + +export function getSubCompany2(query) { + return axios( + { + url: "/sale/info/getSubCompany2", + method: "get", + params: query + } + ); +} + + + + + diff --git a/src/config/app.js b/src/config/app.js new file mode 100644 index 0000000..78b2a2a --- /dev/null +++ b/src/config/app.js @@ -0,0 +1,26 @@ +/** + * 配置编译环境和线上环境之间的切换 + * + * baseUrl: 域名地址 + * routerMode: 路由模式 + * imgBaseUrl: 图片所在域名地址 + * + */ +import '../../public/config' +import '../../public/config.json' +import axios from 'axios' +import myReq from '@/utils/axios' + +let BASE_URL = process.env.VUE_APP_BASE_API +let SERVER_IP = '' +let ROUTER_MODE = '' +let IMG_BASE_URL = BASE_URL +export { BASE_URL, ROUTER_MODE, IMG_BASE_URL, SERVER_IP } +axios.get('./config.json').then((res) => { + // 基础地址 + BASE_URL = res.data.BASE_URL + SERVER_IP = res.data.SERVER_IP + myReq.defaults.baseURL = BASE_URL +}) + + diff --git a/src/permission.js b/src/permission.js index 6bb0a1f..5b950ce 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/auth-redirect', '/bind', '/register'] +const whiteList = ['/login', '/auth-redirect', '/bind', '/register',"/forgetPasswd"] router.beforeEach((to, from, next) => { NProgress.start() diff --git a/src/router/index.js b/src/router/index.js index f15f15e..afe5086 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -51,6 +51,11 @@ export const constantRoutes = [ component: () => import('@/views/register'), hidden: true }, + { + path: '/forgetPasswd', + component: () => import('@/views/forgetPasswd'), + hidden: true + }, { path: '/404', component: () => import('@/views/error/404'), diff --git a/src/utils/axios.js b/src/utils/axios.js new file mode 100644 index 0000000..7d43b0d --- /dev/null +++ b/src/utils/axios.js @@ -0,0 +1,69 @@ +import axios from "axios"; +import { Message } from "element-ui"; +import store from "../store/index"; +import { BASE_URL } from "../config/app"; +import router from "../router/index"; +import "../../public/config"; +// axios.defaults.baseURL = '/api' + + + + +// 创建axios实例 +const service = axios.create({ + baseURL: BASE_URL, // api的base_url + timeout: 15000 // 请求超时时间 + +}); + +// request拦截器 +service.interceptors.request.use( + config => { + // Do something before request is sent + if (store.getters.adminId && store.getters.token) { + // config.params = { + // ADMIN_ID: store.getters.adminId, + // ADMIN_TOKEN: store.getters.token, + // ...config.params + // }; + config.headers={ + ADMIN_ID: store.getters.adminId, + ADMIN_TOKEN: store.getters.token, + }; + } + return config; + }, + error => { + // Do something with request error + Promise.reject(error); + } +); + +// respone拦截器 +service.interceptors.response.use( + response => { + const data = response.data; + if (data.code) { + if (data.code === 2) { + store.dispatch("fedLogout").then(() => { + Message.error("登录失效,请重新登录"); + router.push({ + path: "/login", + query: { redirect: router.currentRoute.fullPath } // 从哪个页面跳转过来 + }); + }); + } + } + return data; + }, + error => { + Message({ + message: error.message, + type: "error", + duration: 5 * 1000 + }); + return Promise.reject(error); + } +); + +export default service; diff --git a/src/views/forgetPasswd.vue b/src/views/forgetPasswd.vue new file mode 100644 index 0000000..e46b70c --- /dev/null +++ b/src/views/forgetPasswd.vue @@ -0,0 +1,296 @@ + + + + diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue index e67102c..15563c7 100644 --- a/src/views/myLogin.vue +++ b/src/views/myLogin.vue @@ -62,6 +62,14 @@ >登录 +
+ 立即注册 + 忘记密码 +
diff --git a/src/views/register.vue b/src/views/register.vue index 3f21986..a05b8be 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -1,150 +1,880 @@ diff --git a/src/views/userManage/customerManage.vue b/src/views/userManage/customerManage.vue new file mode 100644 index 0000000..6834679 --- /dev/null +++ b/src/views/userManage/customerManage.vue @@ -0,0 +1,598 @@ + + + diff --git a/src/views/userManage/customerUser.vue b/src/views/userManage/customerUser.vue new file mode 100644 index 0000000..653d828 --- /dev/null +++ b/src/views/userManage/customerUser.vue @@ -0,0 +1,478 @@ + + + + + diff --git a/src/views/userManage/registerManage.vue b/src/views/userManage/registerManage.vue new file mode 100644 index 0000000..0f73a80 --- /dev/null +++ b/src/views/userManage/registerManage.vue @@ -0,0 +1,584 @@ + + + + +