diff --git a/index.html b/index.html index d15ead4..13b7502 100644 --- a/index.html +++ b/index.html @@ -1,16 +1,14 @@ - + + + + + + vue admin + - - - - - vue admin - - - -
- - - - \ No newline at end of file + +
+ + + diff --git a/src/api/user.js b/src/api/user.js index 6725587..71d021a 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -2,7 +2,7 @@ import request from "@/utils/request.js"; export function login(data) { return request({ method: "POST", - url: "/user/doLogin", + url: "agent/login", data, }); } @@ -26,3 +26,16 @@ export function getNotices(params) { params }) } + +/** + * 注册 + * @param {*} data + * @returns + */ +export function register(data) { + return request({ + method: 'post', + url: '/agent/register', + data + }) +} diff --git a/src/router/index.js b/src/router/index.js index 8c2a785..fbebda2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -17,7 +17,7 @@ router.beforeEach(async (to, from, next) => { NProgress.start(); const token = _hook.useLocalStorage.get("token"); const storeUser = useUser(); - if (to.path === "/login" && !token) { + if ((to.path === "/login" || to.path === "/register") && !token) { next(); NProgress.done(); } else { diff --git a/src/router/routes.js b/src/router/routes.js index 90a8e45..e64543e 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -59,6 +59,15 @@ export const fullScreenRouting = [ isHide: true, }, }, + { + path: "/register", + name: "register", + component: () => import("@/views/register/register.vue"), + meta: { + title: "注册", + isHide: true, + }, + } ]; /** @@ -280,7 +289,7 @@ export const asyncRoutes = [ component: layout, meta: { title: '大机构管理', - roles: ['MG'], + // roles: ['MG'], isHide: true }, redirect: '/organization/big_organization', @@ -310,7 +319,7 @@ export const asyncRoutes = [ component: layout, meta: { title: '小机构管理', - roles: ['FO'], + // roles: ['FO'], isHide: true }, redirect: '/mini_organization_manage/mini_organization', @@ -340,7 +349,7 @@ export const asyncRoutes = [ component: layout, meta: { title: '大代理管理', - roles: ['FO', 'SO'], + // roles: ['FO', 'SO'], isHide: true }, redirect: '/agent_manage/agent_list', @@ -370,7 +379,7 @@ export const asyncRoutes = [ meta: { title: '一级代理', icon: 'User', - roles: ['FO', 'SO', 'AG'] + // roles: ['FO', 'SO', 'AG'] } }, { @@ -379,7 +388,7 @@ export const asyncRoutes = [ meta: { title: '二级代理', icon: 'User', - roles: ['FO', 'SO', 'AG', 'FB'] + // roles: ['FO', 'SO', 'AG', 'FB'] } } ] @@ -389,7 +398,7 @@ export const asyncRoutes = [ component: layout, meta: { title: '商家管理', - roles: ['FO', 'SO', 'AG', 'FB', 'SB'], + // roles: ['FO', 'SO', 'AG', 'FB', 'SB'], icon: 'Handbag' }, redirect: '/shop_manage/shop_list', @@ -428,7 +437,7 @@ export const asyncRoutes = [ component: layout, meta: { title: '提现管理', - roles: ['FO', 'SO'], + // roles: ['FO', 'SO'], isHide: true }, redirect: '/withdraw_manage/withdraw_list', @@ -487,7 +496,7 @@ export const asyncRoutes = [ meta: { title: '推广图片管理', isHide: true, - roles: ['MG'] + // roles: ['MG'] }, redirect: '/promotion/promotion_list', children: [ @@ -507,7 +516,7 @@ export const asyncRoutes = [ meta: { title: 'APP管理', icon: 'Iphone', - roles: ['MG'] + // roles: ['MG'] }, redirect: '/app_manage/menu_list', children: [ @@ -527,7 +536,7 @@ export const asyncRoutes = [ meta: { title: '系统设置', icon: 'Setting', - roles: ['MG'] + // roles: ['MG'] }, redirect: '/setting/appid_manage', children: [ @@ -547,7 +556,7 @@ export const asyncRoutes = [ meta: { title: '消息管理', isHide: true, - roles: ['MG'] + // roles: ['MG'] }, redirect: '/notice/index', children: [ diff --git a/src/store/user.js b/src/store/user.js index 2459dd8..9472a3b 100644 --- a/src/store/user.js +++ b/src/store/user.js @@ -30,9 +30,9 @@ export const useUser = defineStore("useUser", { userlogin(param) { return login(param).then((res) => { // console.log(res); - this.userInfo = res; + this.userInfo = res.userinfo; _hook.useLocalStorage.set("token", this.userInfo.token); - _hook.useLocalStorage.set("userInfo", this.userInfo.user); + _hook.useLocalStorage.set("userInfo", this.userInfo); return this.userInfo; }); }, diff --git a/src/utils/request.js b/src/utils/request.js index 5663e8e..d8d0521 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -39,7 +39,7 @@ service.interceptors.response.use( NProgress.done(); // 对响应数据做点什么 if (+response.status === 200) { - if (+response.data.code == '000000') { + if (+response.data.code == 1) { return response.data.data; } else if (+response.data.code == '999999') { ElMessage.error('登录已过期，请重新登录') @@ -49,8 +49,8 @@ service.interceptors.response.use( return Promise.reject('登录已过期，请重新登录') } else { // 响应错误 - ElMessage.error(response.data.message) - return Promise.reject(response.data.message) + ElMessage.error(response.data.msg) + return Promise.reject(response.data.msg) } } }, diff --git a/src/views/login/login.vue b/src/views/login/login.vue index 11391d9..da66fd0 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -2,23 +2,23 @@
Hello ! - 欢迎来到银收客 + 欢迎登录银收客开放平台代理 + :prefix-icon="User" placeholder="请输入手机号" style="width: 100%;" /> - + +
+ + 注册代理商 + +
登录 @@ -63,8 +68,8 @@ function getCode(code) { } const form = reactive({ - loginName: "", - password: "", + loginName: "15619297569", + password: "123456", userType: 'MG', code: "", }); @@ -107,9 +112,9 @@ async function login() { if (valid) { loading.value = true const params = { - loginName: form.loginName, - password: form.password, - userType: form.userType + account: form.loginName, + password: form.password + // userType: form.userType }; store.userlogin(params).then((res) => { router.replace("/home"); @@ -166,4 +171,11 @@ _hook.useKeyStroke("Enter", login); margin-right: 10px; } } + +.to_register { + display: flex; + justify-content: flex-end; + font-size: 14px; + padding-bottom: 20px; +} diff --git a/src/views/register/register.vue b/src/views/register/register.vue new file mode 100644 index 0000000..e5fa884 --- /dev/null +++ b/src/views/register/register.vue @@ -0,0 +1,187 @@ + + + + + + \ No newline at end of file diff --git a/vite.config.js b/vite.config.js index 4e90c3b..00213a0 100644 --- a/vite.config.js +++ b/vite.config.js @@ -12,8 +12,9 @@ export default defineConfig({ // target: 'http://192.168.2.161:18071/admin/', // target: 'http://newadminapi.sxczgkj.cn/admin/', // target: 'http://admintestapi.sxczgkj.cn/admin/', - target: 'http://gw.sxczgkj.cn/admin/', // 测试 + // target: 'http://gw.sxczgkj.cn/admin/', // 测试 // target: 'http://192.168.2.128:18071/admin/', + target: 'http://192.168.2.23:7777/proxy/', changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '') }