diff --git a/src/App.js b/src/App.js index a12698a7..f868f8ae 100644 --- a/src/App.js +++ b/src/App.js @@ -1,24 +1,25 @@ -import React, { Component } from 'react' -import { HashRouter as Router, Route } from 'react-router-dom' -import './App.css' -import './assets/comm.css' -import { Redirect } from 'react-router-dom' -import { lazy, Suspense } from 'react' -import { FullScreenLoading } from 'zent' -const Home = lazy(() => import('./pages/home/home')) -const Login = lazy(() => import('./pages/login/login')) -const ErrPage = lazy(() => import('./pages/errpage/errpage')) +import React, { Component } from 'react'; +import { HashRouter as Router, Route } from 'react-router-dom'; +import './App.css'; +import './assets/comm.css'; +import { Redirect } from 'react-router-dom'; +import { lazy, Suspense } from 'react'; +import { FullScreenLoading } from 'zent'; +const Home = lazy(() => import('./pages/home/home')); +const LoginOrigin = lazy(() => import('./pages/login/login-origin')); +const Login = lazy(() => import('./pages/login/login')); +const ErrPage = lazy(() => import('./pages/errpage/errpage')); const EdittemPlate = lazy(() => import('./pages/exchangepage/edittemplate/main.js') -) +); export default class App extends Component { state = { pathname: '' - } + }; componentWillMount() { - const pathname = window.location.href.lastIndexOf('/') - const pathnamestr = window.location.href.substr(pathname) - this.setState({ pathname: `${pathnamestr}` }) + const pathname = window.location.href.lastIndexOf('/'); + const pathnamestr = window.location.href.substr(pathname); + this.setState({ pathname: `${pathnamestr}` }); } render() { @@ -29,6 +30,7 @@ export default class App extends Component { }> + - ) + ); } } diff --git a/src/assets/api.js b/src/assets/api.js index 52eb88eb..c5fca8ac 100644 --- a/src/assets/api.js +++ b/src/assets/api.js @@ -1,25 +1,25 @@ -import { Notify } from "zent"; +import { Notify } from 'zent'; //镜像环境 // export const baseurl = 'http://pre.marketapi.1688sup.com' // const Version = "v1.3.0"; // window.baseurl = 'http://pre.marketapi.1688sup.com' -let baseurl = ""; -let download_url = "https://ewm.83323.cn"; -if (process.env.NODE_ENV == "test" || process.env.NODE_ENV == "development") { +let baseurl = ''; +let download_url = 'https://ewm.83323.cn'; +if (process.env.NODE_ENV == 'test' || process.env.NODE_ENV == 'development') { // 测试环境 - baseurl = "http://192.168.6.75"; - window.baseurl = "http://192.168.6.75"; + baseurl = 'http://192.168.6.75'; + window.baseurl = 'http://192.168.6.75'; } -if (process.env.NODE_ENV == "production") { +if (process.env.NODE_ENV == 'production') { // 生成环境 - baseurl = "https://marketapi.1688sup.com"; - window.baseurl = "https://marketapi.1688sup.com"; + baseurl = 'https://marketapi.1688sup.com'; + window.baseurl = 'https://marketapi.1688sup.com'; } const upload = (method, url, params, responseType) => { let obj = { method: method, headers: new Headers({ - authorization: sessionStorage.getItem("authorization") + authorization: sessionStorage.getItem('authorization') // Version: Version, }), body: params @@ -38,7 +38,7 @@ const upload = (method, url, params, responseType) => { Notify.clear(); Notify.error(response.message); setTimeout(() => { - window.location.href = "/"; + window.location.href = '/'; }, 2000); } else if (response.code == 401) { Notify.clear(); @@ -54,28 +54,28 @@ const upload = (method, url, params, responseType) => { }); return http .then((response) => response) - .catch((error) => console.error("Error:", error)); + .catch((error) => console.error('Error:', error)); }; const derive = (method, url, params, responseType) => { var obj = { - responseType: "blob", + responseType: 'blob', headers: new Headers({ - authorization: sessionStorage.getItem("authorization") + authorization: sessionStorage.getItem('authorization') // Version: Version, }) }; - if (method == "get") { + if (method == 'get') { if (params) { let paramsArray = []; //拼接参数 Object.keys(params).forEach((key) => - paramsArray.push(key + "=" + params[key]) + paramsArray.push(key + '=' + params[key]) ); if (url.search(/\?/) === -1) { - url += "?" + paramsArray.join("&"); + url += '?' + paramsArray.join('&'); } else { - url += "&" + paramsArray.join("&"); + url += '&' + paramsArray.join('&'); } } } @@ -93,7 +93,7 @@ const derive = (method, url, params, responseType) => { Notify.clear(); Notify.error(response.message); setTimeout(() => { - window.location.href = "/"; + window.location.href = '/'; }, 2000); } else if (response.code == 401) { Notify.clear(); @@ -109,15 +109,15 @@ const derive = (method, url, params, responseType) => { }); return http .then((response) => response) - .catch((error) => console.error("Error:", error)); + .catch((error) => console.error('Error:', error)); }; const getData = (method, url, params, responseType) => { var obj = null; - if (method == "get") { + if (method == 'get') { obj = { headers: new Headers({ - authorization: sessionStorage.getItem("authorization") + authorization: sessionStorage.getItem('authorization') // Version: Version, }) }; @@ -125,18 +125,18 @@ const getData = (method, url, params, responseType) => { let paramsArray = []; //拼接参数 Object.keys(params).forEach((key) => - paramsArray.push(key + "=" + params[key]) + paramsArray.push(key + '=' + params[key]) ); if (url.search(/\?/) === -1) { - url += "?" + paramsArray.join("&"); + url += '?' + paramsArray.join('&'); } else { - url += "&" + paramsArray.join("&"); + url += '&' + paramsArray.join('&'); } } } let http = fetch(url, obj).then((res) => { - window.timeshow = res.headers.get("Date-Time"); + window.timeshow = res.headers.get('Date-Time'); if (res.status == 200) { return res.text(); } else { @@ -150,7 +150,7 @@ const getData = (method, url, params, responseType) => { Notify.clear(); Notify.error(response.message); setTimeout(() => { - window.location.href = "/"; + window.location.href = '/'; }, 2000); } else if (response.code == 401) { Notify.clear(); @@ -167,15 +167,15 @@ const getData = (method, url, params, responseType) => { }); return http .then((response) => response) - .catch((error) => console.error("Error:", error)); + .catch((error) => console.error('Error:', error)); }; const req = (method, url, params, responseType) => { var obj = null; - if (method == "get") { + if (method == 'get') { obj = { headers: new Headers({ - authorization: sessionStorage.getItem("authorization") + authorization: sessionStorage.getItem('authorization') // Version: Version, }) }; @@ -183,40 +183,40 @@ const req = (method, url, params, responseType) => { let paramsArray = []; //拼接参数 Object.keys(params).forEach((key) => - paramsArray.push(key + "=" + params[key]) + paramsArray.push(key + '=' + params[key]) ); if (url.search(/\?/) === -1) { - url += "?" + paramsArray.join("&"); + url += '?' + paramsArray.join('&'); } else { - url += "&" + paramsArray.join("&"); + url += '&' + paramsArray.join('&'); } } } - if (method == "login") { + if (method == 'login') { obj = { - method: "post", + method: 'post', body: JSON.stringify(params), headers: new Headers({ - "Content-Type": "application/json" + 'Content-Type': 'application/json' // Version: Version, }) }; } - if (method == "post" || method == "put" || method == "delete") { + if (method == 'post' || method == 'put' || method == 'delete') { obj = { method: method, body: JSON.stringify(params), headers: new Headers({ - "Content-Type": "application/json", - authorization: sessionStorage.getItem("authorization") + 'Content-Type': 'application/json', + authorization: sessionStorage.getItem('authorization') // Version: Version, }) }; } let http = fetch(url, obj).then((res) => { - window.timeshow = res.headers.get("Date-Time"); + window.timeshow = res.headers.get('Date-Time'); if (res.status == 200) { return res.json(); } else { @@ -230,7 +230,7 @@ const req = (method, url, params, responseType) => { Notify.clear(); Notify.error(response.message); setTimeout(() => { - window.location.href = "/"; + window.location.href = '/'; }, 2000); } else if (response.code == 401) { // Notify.clear() @@ -247,14 +247,14 @@ const req = (method, url, params, responseType) => { }); return http .then((response) => response) - .catch((error) => console.error("Error:", error)); + .catch((error) => console.error('Error:', error)); }; export const handelResponse = (res, cb, errCb) => { if (res && res.code == 200) { cb(res.data, res.message); } else { - if (res && typeof errCb == "function") { + if (res && typeof errCb == 'function') { Notify.clear(); // Notify.error(res.message); errCb(res.message); @@ -263,451 +263,457 @@ export const handelResponse = (res, cb, errCb) => { }; //营销计划列表 export const getPlanList = (params) => { - return req("get", baseurl + "/plan", params); + return req('get', baseurl + '/plan', params); }; //获取key批次列表 export const getKeyList = (params) => { - return req("get", baseurl + "/keys", params); + return req('get', baseurl + '/keys', params); }; //获取营销计划下拉菜单 export const getReSellerOption = (params) => { - return req("get", baseurl + "/reseller/choice", params); + return req('get', baseurl + '/reseller/choice', params); }; //获取分销商下拉菜单 export const getPlanChoseOption = (params) => { - return req("get", baseurl + "/plan/chose_list", params); + return req('get', baseurl + '/plan/chose_list', params); }; //新建营销计划 export const addPlanStep = (id, params) => { - let str = id ? "/" + id : ""; + let str = id ? '/' + id : ''; if (str) { - return req("put", baseurl + "/plan/step" + str, params); + return req('put', baseurl + '/plan/step' + str, params); } - return req("post", baseurl + "/plan/step" + str, params); + return req('post', baseurl + '/plan/step' + str, params); }; //获取营销计划草稿信息 export const getDraftInfo = (id, params) => { - return req("get", baseurl + "/plan/draft/" + id, params); + return req('get', baseurl + '/plan/draft/' + id, params); }; //启用停用 营销计划 export const startOrStopPlan = (id, params) => { - return req("put", baseurl + "/plan/status/" + id, params); + return req('put', baseurl + '/plan/status/' + id, params); }; //创建key批次信息 export const addKeysBatchInfo = (id, params) => { - return req("post", baseurl + "/plan/" + id + "/keys", params); + return req('post', baseurl + '/plan/' + id + '/keys', params); }; //编辑修改 export const putPlanStep = (id, params) => { - return req("put", baseurl + "/plan/edit/" + id, params); + return req('put', baseurl + '/plan/edit/' + id, params); }; //获取key批次信息 export const getKeysBatchInfo = (id, params) => { - return req("get", baseurl + "/keys", params); + return req('get', baseurl + '/keys', params); }; //启用停用key批次信息 export const startOrStopKeybatch = (id, params) => { - return req("put", baseurl + "/keys/status/" + id, params); + return req('put', baseurl + '/keys/status/' + id, params); }; //获取key批次详细信息 export const getKeyBatchDetail = (id, params) => { - return req("get", baseurl + "/keys/" + id, params); + return req('get', baseurl + '/keys/' + id, params); }; //更新key批次详细信息 export const putKeyBatchDetail = (id, params) => { - return req("put", baseurl + "/keys/" + id, params); + return req('put', baseurl + '/keys/' + id, params); }; //发送key批次压缩包和压缩包密码 export const planSend = (id, params) => { - return req("put", baseurl + "/plan/send/" + id, params); + return req('put', baseurl + '/plan/send/' + id, params); }; //是否已经发送过邮件 export const planIsSend = (id) => { - return req("get", baseurl + "/plan/is_send/" + id); + return req('get', baseurl + '/plan/is_send/' + id); }; //重新修改手机号邮箱 export const planReceive = (id, params) => { - return req("put", baseurl + "/plan/receive/" + id, params); + return req('put', baseurl + '/plan/receive/' + id, params); }; //重新发送key批次压缩包和压缩包密码 export const planResend = (id, params) => { - return req("put", baseurl + "/plan/resend/" + id, params); + return req('put', baseurl + '/plan/resend/' + id, params); }; export const keysIsSend = (id, params) => { - return req("get", baseurl + "/keys/is_send/" + id, params); + return req('get', baseurl + '/keys/is_send/' + id, params); }; //作废key批次 export const cancelKey = (id, params) => { - return req("put", baseurl + "/keys/cancel/" + id, params); + return req('put', baseurl + '/keys/cancel/' + id, params); }; //删除草稿key批次 export const deldraftCode = (id) => { - return req("delete", baseurl + "/plan/delete/" + id); + return req('delete', baseurl + '/plan/delete/' + id); }; //发送密钥邮件 export const postKeyEmail = (id, params) => { - return req("put", baseurl + "/keys/send/" + id, params); + return req('put', baseurl + '/keys/send/' + id, params); }; //修改密钥邮件 export const putKeyEmail = (id, params) => { - return req("put", baseurl + "/keys/receive/" + id, params); + return req('put', baseurl + '/keys/receive/' + id, params); }; export const resKeyEmail = (id, params) => { - return req("put", baseurl + "/keys/resend/" + id, params); + return req('put', baseurl + '/keys/resend/' + id, params); }; // 兑换码管理 //兑换码管理列表 export const getCodesList = (params) => { - return getData("get", baseurl + "/codes", params); + return getData('get', baseurl + '/codes', params); }; //获取兑换码明细 export const getCodesDetail = (id) => { - return req("get", baseurl + "/codes/" + id); + return req('get', baseurl + '/codes/' + id); }; //修改兑换码批次 export const putCodesBatch = (id, params) => { - return req("put", baseurl + "/codes/edit/" + id, params); + return req('put', baseurl + '/codes/edit/' + id, params); }; //作废本批次兑换码 export const delCode = (id) => { - return req("delete", baseurl + "/codes/discard/" + id); + return req('delete', baseurl + '/codes/discard/' + id); }; //作废本批次兑换码 export const putCodeStatus = (id, params) => { - return req("put", baseurl + "/codes/status/" + id, params); + return req('put', baseurl + '/codes/status/' + id, params); }; //兑换码商品列表 export const getCodeProductList = (params) => { - return req("get", baseurl + "/codes/products", params); + return req('get', baseurl + '/codes/products', params); }; //删除商品库存信息 export const delCodeProduct = (id) => { - return req("delete", baseurl + "/codes/products/" + id); + return req('delete', baseurl + '/codes/products/' + id); }; //更新单个商品信息 export const putCodeProduct = (batch_id, id, params) => { - return req("put", baseurl + "/codes/products/" + batch_id + "/" + id, params); + return req('put', baseurl + '/codes/products/' + batch_id + '/' + id, params); }; //获取商品库存明细 export const getCodeProduct = (batch_id, id) => { - return req("get", baseurl + "/codes/products/" + batch_id + "/" + id); + return req('get', baseurl + '/codes/products/' + batch_id + '/' + id); }; //获取商品库存明细 export const getIsRequireApproval = (id, data) => { - return req("post", baseurl + "/codes/" + id + "/is_require_approval", data); + return req('post', baseurl + '/codes/' + id + '/is_require_approval', data); }; // //蓝色兄弟映射商品 export const getProductInfoSelect = (params) => { - return req("get", baseurl + "/product/market/products", params); + return req('get', baseurl + '/product/market/products', params); }; // 上传 export const uploadImg = (params) => { - return upload("post", baseurl + "/upload/simple", params); + return upload('post', baseurl + '/upload/simple', params); }; // 订单管理 //订单管理列表 export const getOrderList = (params) => { - return req("get", baseurl + "/order", params); + return req('get', baseurl + '/order', params); }; //订单管理详情 export const getOrderDetails = (id) => { - return req("get", baseurl + "/order/" + id); + return req('get', baseurl + '/order/' + id); }; //订单导出 export const getOrderExport = (params) => { - return req("get", baseurl + "/order/export", params); + return req('get', baseurl + '/order/export', params); }; //订单改为成功 export const putOrderSuccess = (id) => { - return req("put", baseurl + "/order/success/" + id); + return req('put', baseurl + '/order/success/' + id); }; //订单日志 export const getOrderLog = (orderId, params) => { - return req("get", baseurl + "/order/" + orderId + "/log", params); + return req('get', baseurl + '/order/' + orderId + '/log', params); }; //订单作废 export const putOrderCancel = (id) => { - return req("put", baseurl + "/order/cancel/" + id); + return req('put', baseurl + '/order/cancel/' + id); }; // 分销商管理 //分销商管理列表 export const getResellerList = (params) => { - return req("get", baseurl + "/reseller", params); + return req('get', baseurl + '/reseller', params); }; //新建分销商异步校验分销商名称是否重复 export const getExistName = (name) => { - return req("get", baseurl + "/reseller/exist_name?name=" + name); + return req('get', baseurl + '/reseller/exist_name?name=' + name); }; //编辑分销商异步校验分销商名称是否重复 export const geteditExistName = (name, params) => { - return req("get", baseurl + "/reseller/exist_name?name=" + name, params); + return req('get', baseurl + '/reseller/exist_name?name=' + name, params); }; //新建分销商异步校验分销商登陆账号是否重复 export const getExistAccount = (name) => { - return req("get", baseurl + "/reseller/exist_account/" + name); + return req('get', baseurl + '/reseller/exist_account/' + name); }; //编辑分销商异步校验分销商登陆账号是否重复 export const geteditExistAccount = (name, params) => { - return req("get", baseurl + "/reseller/exist_account/" + name, params); + return req('get', baseurl + '/reseller/exist_account/' + name, params); }; //新建分销商-销售人员 export const getPersonnel = () => { - return req("get", baseurl + "/auth/admin/all"); + return req('get', baseurl + '/auth/admin/all'); }; //新建分销商-签约公司 export const getCompany = () => { - return req("get", baseurl + "/auth/company/all"); + return req('get', baseurl + '/auth/company/all'); }; //删除分销商 export const delReseller = (id) => { - return req("delete", baseurl + "/reseller/" + id); + return req('delete', baseurl + '/reseller/' + id); }; //修改分销商状态 export const putResellerStatus = (id, data) => { - return req("put", baseurl + "/reseller/status/" + id, data); + return req('put', baseurl + '/reseller/status/' + id, data); }; //新建分销商 export const postCreateReseller = (data) => { - return req("post", baseurl + "/reseller/create", data); + return req('post', baseurl + '/reseller/create', data); }; //获取分销商详情 export const getReseller = (id) => { - return req("get", baseurl + "/reseller/" + id); + return req('get', baseurl + '/reseller/' + id); }; //编辑分销商 export const putResellerInfo = (id, data) => { - return req("put", baseurl + "/reseller/" + id, data); + return req('put', baseurl + '/reseller/' + id, data); }; //重置分销商密码 export const putResellerPwd = (id, data) => { - return req("put", baseurl + "/reseller/password/" + id, data); + return req('put', baseurl + '/reseller/password/' + id, data); }; //重置分销商密码 export const getResellerSelect = (data) => { - return req("get", baseurl + "/reseller/exist_account/name", data); + return req('get', baseurl + '/reseller/exist_account/name', data); }; // 账号管理 //账号管理列表 export const getAccountList = (params) => { - return req("get", baseurl + "/auth/admin", params); + return req('get', baseurl + '/auth/admin', params); }; //修改账号状态 export const putAccountStatus = (id, params) => { - return req("put", baseurl + "/auth/admin/status/" + id, params); + return req('put', baseurl + '/auth/admin/status/' + id, params); }; // 删除账号 export const delAccount = (id) => { - return req("delete", baseurl + "/auth/admin/" + id); + return req('delete', baseurl + '/auth/admin/' + id); }; // 重置账号密码 export const putModifypwd = (id, data) => { - return req("put", baseurl + "/auth/admin/password/" + id, data); + return req('put', baseurl + '/auth/admin/password/' + id, data); }; //添加账号-获取部门 export const getDepartment = (params) => { - return req("get", baseurl + "/auth/department", params); + return req('get', baseurl + '/auth/department', params); }; //添加账号-获取岗位 export const getDepartmentJob = (params) => { - return req("get", baseurl + "/auth/departmentJob", params); + return req('get', baseurl + '/auth/departmentJob', params); }; //添加账号-获取角色 export const getRole = (params) => { - return req("get", baseurl + "/auth/adminRole", params); + return req('get', baseurl + '/auth/adminRole', params); }; //添加账号-新增账号 export const postAddAcc = (params) => { - return req("post", baseurl + "/auth/admin", params); + return req('post', baseurl + '/auth/admin', params); }; //添加账号-编辑账号 export const putAddAcc = (id, params) => { - return req("put", baseurl + "/auth/admin/" + id, params); + return req('put', baseurl + '/auth/admin/' + id, params); }; //子账号 //获取子账号权限 export const getsubAccount = (id) => { - return req("get", baseurl + "/auth/admin/adminRoleRules/" + id); + return req('get', baseurl + '/auth/admin/adminRoleRules/' + id); }; //新增子账号 export const postAddSubAcc = (params) => { - return req("post", baseurl + "/auth/admin/createSon", params); + return req('post', baseurl + '/auth/admin/createSon', params); }; //修改子账号 export const putAddSubAcc = (id, data) => { - return req("put", baseurl + "/auth/admin/editSon/" + id, data); + return req('put', baseurl + '/auth/admin/editSon/' + id, data); }; //子账号列表 export const getSubAccList = (params) => { - return req("get", baseurl + "/auth/admin/sonIndex", params); + return req('get', baseurl + '/auth/admin/sonIndex', params); }; //获取指定账号下的子账号列表 export const getsubAppoint = (id, params) => { - return req("get", baseurl + "/auth/admin/accountSonIndex/" + id, params); + return req('get', baseurl + '/auth/admin/accountSonIndex/' + id, params); }; // 数据迁移获取角色下主账号(平级) export const getLevelSubList = (id) => { - return req("get", baseurl + "/auth/admin/roleAccounts/" + id); + return req('get', baseurl + '/auth/admin/roleAccounts/' + id); }; //主账号数据向下迁移 export const putAcctransfer = (data) => { - return req("put", baseurl + "/auth/admin/downMigration", data); + return req('put', baseurl + '/auth/admin/downMigration', data); }; // 主账号数据平行迁移 export const putequalMigration = (data) => { - return req("put", baseurl + "/auth/admin/equalMigration", data); + return req('put', baseurl + '/auth/admin/equalMigration', data); }; // 角色管理 //角色管理列表 export const getRoleList = (params) => { - return req("get", baseurl + "/auth/adminRole", params); + return req('get', baseurl + '/auth/adminRole', params); }; //角色获取权限列表 export const getMenuList = (params) => { - return req("get", baseurl + "/auth/menu/tree", params); + return req('get', baseurl + '/auth/menu/tree', params); }; //角色删除 export const delRole = (id) => { - return req("delete", baseurl + "/auth/adminRole/" + id); + return req('delete', baseurl + '/auth/adminRole/' + id); }; //角色添加 export const postRole = (data) => { - return req("post", baseurl + "/auth/adminRole", data); + return req('post', baseurl + '/auth/adminRole', data); }; //角色编辑 export const putEditRole = (id, data) => { - return req("put", baseurl + "/auth/adminRole/" + id, data); + return req('put', baseurl + '/auth/adminRole/' + id, data); }; //岗位列表 //新建公司 export const postCompany = (data) => { - return req("post", baseurl + "/auth/company", data); + return req('post', baseurl + '/auth/company', data); }; //删除公司 export const delCompany = (id) => { - return req("delete", baseurl + "/auth/company/" + id); + return req('delete', baseurl + '/auth/company/' + id); }; //编辑公司 export const postCompanyEdit = (id, data) => { - return req("put", baseurl + "/auth/company/" + id, data); + return req('put', baseurl + '/auth/company/' + id, data); }; //新建部门 export const postDepartment = (data) => { - return req("post", baseurl + "/auth/department", data); + return req('post', baseurl + '/auth/department', data); }; //删除部门 export const delDepartment = (id) => { - return req("delete", baseurl + "/auth/department/" + id); + return req('delete', baseurl + '/auth/department/' + id); }; //编辑部门 export const postDepartmentEdit = (id, data) => { - return req("put", baseurl + "/auth/department/" + id, data); + return req('put', baseurl + '/auth/department/' + id, data); }; //新建岗位 export const postDepartmentJob = (data) => { - return req("post", baseurl + "/auth/departmentJob", data); + return req('post', baseurl + '/auth/departmentJob', data); }; //删除岗位 export const delDepartmentJob = (id) => { - return req("delete", baseurl + "/auth/departmentJob/" + id); + return req('delete', baseurl + '/auth/departmentJob/' + id); }; //编辑岗位 export const postDepartmentJobEdit = (id, data) => { - return req("put", baseurl + "/auth/departmentJob/" + id, data); + return req('put', baseurl + '/auth/departmentJob/' + id, data); }; //枚举 export const getAllEnum = (data) => { - return req("get", baseurl + "/enum", data); + return req('get', baseurl + '/enum', data); }; //菜单维护 //新建菜单 export const postCreateMenu = (data) => { - return req("post", baseurl + "/auth/menu", data); + return req('post', baseurl + '/auth/menu', data); }; //编辑菜单 export const putmodifyMenu = (id, data) => { - return req("put", baseurl + "/auth/menu/" + id, data); + return req('put', baseurl + '/auth/menu/' + id, data); }; //删除菜单 export const delMenu = (id) => { - return req("delete", baseurl + "/auth/menu/" + id); + return req('delete', baseurl + '/auth/menu/' + id); }; //添加定制化模板 export const postThemecustom = (data) => { - return upload("post", baseurl + "/plan/theme/custom", data); + return upload('post', baseurl + '/plan/theme/custom', data); }; //添加定制化模板 export const copyThemecustom = (id, data) => { - return upload("put", baseurl + "/plan/theme/clone/" + id, data); + return upload('put', baseurl + '/plan/theme/clone/' + id, data); }; //登录 export const postLogin = (data) => { - return req("login", baseurl + "/auth/login", data); + return req('login', baseurl + '/auth/login', data); }; + +//登录-备用 +export const postLoginStandby = (data) => { + return req('post', baseurl + '/auth/login/original/mobile', data); +}; + // logout退出登录 //连续输入三次,需验证码校验 export const getVerify = (params) => { - return req("post", baseurl + "/auth/login/verify", params); + return req('post', baseurl + '/auth/login/verify', params); }; //获取用户信息接口 export const getUserinfo = (params) => { - return req("get", baseurl + "/auth/admin/userinfo", params); + return req('get', baseurl + '/auth/admin/userinfo', params); }; //设置登录密码 export const putmodifySelf = (data) => { - return req("put", baseurl + "/auth/admin/setPassword", data); + return req('put', baseurl + '/auth/admin/setPassword', data); }; //验证码登录发送验证码 export const postsendLoginCode = (data) => { - return req("post", baseurl + "/sms/sendLoginCode", data); + return req('post', baseurl + '/sms/sendLoginCode', data); }; // 短信验证码登录 export const postLoginCode = (data) => { - return req("post", baseurl + "/auth/login/mobile", data); + return req('post', baseurl + '/auth/login/mobile', data); }; // { // "mobile": "15184345039", @@ -716,258 +722,258 @@ export const postLoginCode = (data) => { //获取落地页下拉菜单 export const getThemeSel = (id) => { - return req("get", baseurl + "/plan/choice_theme"); + return req('get', baseurl + '/plan/choice_theme'); }; //获取落地页列表 export const getThemeList = (data) => { - return req("get", baseurl + "/plan/plan_theme", data); + return req('get', baseurl + '/plan/plan_theme', data); }; //删除落地页 export const delTheme = (id) => { - return req("delete", baseurl + "/plan/theme/" + id); + return req('delete', baseurl + '/plan/theme/' + id); }; //编辑模板 export const putMyTheme = (id, data) => { - return req("put", baseurl + "/plan/theme/" + id, data); + return req('put', baseurl + '/plan/theme/' + id, data); }; export const getThemeChoice = (data) => { - return req("get", baseurl + "/plan/theme/choice", data); + return req('get', baseurl + '/plan/theme/choice', data); }; //新增落地页模板 export const addTheme = (data) => { - return req("post", baseurl + "/plan/theme", data); + return req('post', baseurl + '/plan/theme', data); }; //编辑落地页模板 export const putTheme = (id, data) => { - return req("put", baseurl + "/plan/plan_theme/" + id, data); + return req('put', baseurl + '/plan/plan_theme/' + id, data); }; //我的模板列表查询 export const getTheme = (data) => { - return req("get", baseurl + "/plan/theme", data); + return req('get', baseurl + '/plan/theme', data); }; //克隆落地页模板 export const cloneTheme = (data) => { - return req("put", baseurl + "/plan/theme/clone", data); + return req('put', baseurl + '/plan/theme/clone', data); }; //获取系统模板 export const getSystemTemplate = (data) => { - return req("get", baseurl + "/plan/theme/system", data); + return req('get', baseurl + '/plan/theme/system', data); }; //编辑系统模板 export const putSystemTemplate = (id, data) => { - return req("put", baseurl + "/plan/theme/system/" + id, data); + return req('put', baseurl + '/plan/theme/system/' + id, data); }; //新增系统模板 export const addSystemTemplate = (data) => { - return req("post", baseurl + "/plan/theme/system", data); + return req('post', baseurl + '/plan/theme/system', data); }; //删除系统模板 export const delSystemTemplate = (id) => { - return req("delete", baseurl + "/plan/theme/system/" + id); + return req('delete', baseurl + '/plan/theme/system/' + id); }; //获取系统模板分类 export const getThemeType = () => { - return req("get", baseurl + "/plan/theme/getThemeType"); + return req('get', baseurl + '/plan/theme/getThemeType'); }; //key码列表 export const getkeyDetailList = (id, data) => { - return req("get", baseurl + "/key/" + id, data); + return req('get', baseurl + '/key/' + id, data); }; //提交审核 export const approvals = (id, data) => { - return req("post", baseurl + "/plan/" + id + "/approvals", data); + return req('post', baseurl + '/plan/' + id + '/approvals', data); }; export const getApprovalsInfo = (id, data) => { return req( - "get", - baseurl + "/approvals/" + id + "/market_approval_data", + 'get', + baseurl + '/approvals/' + id + '/market_approval_data', data ); }; export const terminateApprovals = (id, data) => { - return req("put", baseurl + "/approvals/" + id + "/terminate", data); + return req('put', baseurl + '/approvals/' + id + '/terminate', data); }; export const getApprovalsStatus = (id, data) => { - return req("get", baseurl + "/approvals/" + id + "/status"); + return req('get', baseurl + '/approvals/' + id + '/status'); }; //作废 export const keyBatchCancel = (data) => { - return req("put", baseurl + "/key/batch_cancel", data); + return req('put', baseurl + '/key/batch_cancel', data); }; //作废 export const keyCancel = (data) => { - return req("put", baseurl + "/key/cancel", data); + return req('put', baseurl + '/key/cancel', data); }; //标记使用 export const keyBatchUsage = (data) => { - return req("put", baseurl + "/key/batch_usage", data); + return req('put', baseurl + '/key/batch_usage', data); }; //标记使用 export const keyUsage = (data) => { - return req("put", baseurl + "/key/usage", data); + return req('put', baseurl + '/key/usage', data); }; //获取日志 export const getKeyLog = (data) => { - return req("get", baseurl + "/key/log/list", data); + return req('get', baseurl + '/key/log/list', data); }; //白名单数据校验 export const getAccessVerification = (data) => { - return req("post", baseurl + "/keys/mobileAccessVerification", data); + return req('post', baseurl + '/keys/mobileAccessVerification', data); }; //计划作废 export const planCancel = (id) => { - return req("put", baseurl + "/plan/cancel/" + id); + return req('put', baseurl + '/plan/cancel/' + id); }; //key审批 export const keyApproval = (plan_id, key_id, data) => { return req( - "post", - baseurl + "/plan/" + plan_id + "/keys/" + key_id + "/approval", + 'post', + baseurl + '/plan/' + plan_id + '/keys/' + key_id + '/approval', data ); }; export const keyEditApproval = (key_id, data) => { - return req("post", baseurl + "/keys/" + key_id + "/approval", data); + return req('post', baseurl + '/keys/' + key_id + '/approval', data); }; // logout退出登录 //退出登录接口 export const postLogOut = (data) => { - return req("get", baseurl + "/auth/logout", data); + return req('get', baseurl + '/auth/logout', data); }; // 请求分销商 export const getDirectList = (data) => { - return req("get", baseurl + "/reseller/direct", data); + return req('get', baseurl + '/reseller/direct', data); }; // 获取预警人 export const getVoucherWarningAccount = () => { - return req("get", baseurl + "/auth/admin/voucherWarningAccount"); + return req('get', baseurl + '/auth/admin/voucherWarningAccount'); }; // 加款 export const addFund = (data, id) => { - return req("post", baseurl + `/codes/voucher/fund/${id}`, data); + return req('post', baseurl + `/codes/voucher/fund/${id}`, data); }; // key列表 export const getKeysList = (data) => { - return req("get", baseurl + "/key", data); + return req('get', baseurl + '/key', data); }; export const bachUploadAll = (url, file) => { - return upload("post", baseurl + url, file); + return upload('post', baseurl + url, file); }; export const batchUploadVoid = (data) => { - return req("post", baseurl + `/key/batchUploadVoid`, data); + return req('post', baseurl + `/key/batchUploadVoid`, data); }; export const batchUploadUsed = (data) => { - return req("post", baseurl + `/key/batchUploadUsed`, data); + return req('post', baseurl + `/key/batchUploadUsed`, data); }; //批量发送 export const batchSend = (data) => { - return req("post", baseurl + `/keys/batchSend`, data); + return req('post', baseurl + `/keys/batchSend`, data); }; // 批量导出 export const exportKey = (data) => { - return derive("get", baseurl + "/key/export", data); + return derive('get', baseurl + '/key/export', data); }; // 复制,获取计划详情 export const get_copy_data = (data) => { - return req("get", baseurl + "/plan/get_copy_data/" + data); + return req('get', baseurl + '/plan/get_copy_data/' + data); }; // 获取key批次select export const queryKeyBatch = (data) => { - return req("get", baseurl + "/keys/queryKeyBatch", data); + return req('get', baseurl + '/keys/queryKeyBatch', data); }; // 获取营销计划select export const queryPlans = (data) => { - return req("get", baseurl + "/plan/queryPlan", data); + return req('get', baseurl + '/plan/queryPlan', data); }; // 新增优惠券 export const addCoupon = (data) => { - return req("post", baseurl + `/coupon/add`, data); + return req('post', baseurl + `/coupon/add`, data); }; // 编辑优惠券 export const editCoupon = (id, data) => { - return req("put", baseurl + `/coupon/${id}`, data); + return req('put', baseurl + `/coupon/${id}`, data); }; // 查询优惠券列表 export const getCouponList = (data) => { - return req("get", baseurl + `/coupon`, data); + return req('get', baseurl + `/coupon`, data); }; // 优惠券列表作废 export const delCoupon = (id) => { - return req("put", baseurl + `/coupon/void/${id}`); + return req('put', baseurl + `/coupon/void/${id}`); }; // 启用停用优惠券 export const putCouponStatus = (id, data) => { - return req("put", baseurl + `/coupon/status/${id}`, data); + return req('put', baseurl + `/coupon/status/${id}`, data); }; // 获取优惠券详情 export const getCouponDetails = (id) => { - return req("get", baseurl + `/coupon/${id}`); + return req('get', baseurl + `/coupon/${id}`); }; // 删除优惠券商品范围 export const deleteGoodsScope = (id) => { - return req("delete", baseurl + `/goods/${id}`); + return req('delete', baseurl + `/goods/${id}`); }; // 删除兑换码 export const deleteCode = (id) => { - return req("delete", baseurl + `/codes/delete/${id}`); + return req('delete', baseurl + `/codes/delete/${id}`); }; // 删除优惠券 export const deleteCoupon = (id) => { - return req("delete", baseurl + `/coupon/delete/${id}`); + return req('delete', baseurl + `/coupon/delete/${id}`); }; // 删除key批次 export const deleteKeyBatch = (id) => { - return req("delete", baseurl + `/keybatch/${id}`); + return req('delete', baseurl + `/keybatch/${id}`); }; // 重试退款 export const refund = (orderNumber) => { - return req("put", baseurl + `/order/refund/${orderNumber}`); + return req('put', baseurl + `/order/refund/${orderNumber}`); }; // 手动退款 export const handlerRefund = (orderNumber, data) => { - return req("put", baseurl + `/order/hand_refund/${orderNumber}`, data); + return req('put', baseurl + `/order/hand_refund/${orderNumber}`, data); }; //订单管理-导出订单 @@ -977,17 +983,17 @@ export const handlerRefund = (orderNumber, data) => { //订单下载列表-列表 export const getdownloadList = (data) => { - return req("get", download_url + `/export/excel/marketOrder/record`, data); + return req('get', download_url + `/export/excel/marketOrder/record`, data); }; //订单下载列表-数据下载 export const exportDownload = (md5) => { return derive( - "get", + 'get', download_url + `/export/excel/marketOrder/download/${md5}` ); }; //订单下载列表-记录删除 export const deleteDownload = (md5) => { - return req("get", download_url + `/export/excel/marketOrder/delete/${md5}`); + return req('get', download_url + `/export/excel/marketOrder/delete/${md5}`); }; export { req }; diff --git a/src/pages/login/login-orgin.js b/src/pages/login/login-origin.js similarity index 77% rename from src/pages/login/login-orgin.js rename to src/pages/login/login-origin.js index 2a0a188c..5969b22c 100644 --- a/src/pages/login/login-orgin.js +++ b/src/pages/login/login-origin.js @@ -1,19 +1,19 @@ -import React, { Component } from "react"; -import "./login.less"; -import "@/assets/comm.css"; -import LoginForm from "./loginform"; -import LoginPhone from "./loginPhone"; +import React, { Component } from 'react'; +import './login-origin.less'; +import '@/assets/comm.css'; +import LoginForm from './loginform'; +import LoginPhone from './loginPhone'; export default class App extends Component { constructor(props) { super(props); - window["react"] = this; + window['react'] = this; } state = { - pathname: "", + pathname: '', loginWay: 1 }; componentWillMount() { - const pathname = window.location.href.lastIndexOf("/"); + const pathname = window.location.href.lastIndexOf('/'); const pathnamestr = window.location.href.substr(pathname); this.setState({ pathname: `${pathnamestr}` }); } @@ -22,7 +22,7 @@ export default class App extends Component { } render() { return ( -
+
diff --git a/src/pages/login/login-oring.less b/src/pages/login/login-origin.less similarity index 99% rename from src/pages/login/login-oring.less rename to src/pages/login/login-origin.less index f421e917..79f5d18d 100644 --- a/src/pages/login/login-oring.less +++ b/src/pages/login/login-origin.less @@ -1,4 +1,4 @@ -.loginPage { +.loginPage-origin { width: 100%; height: 100%; background-color: #f5f9ff; diff --git a/src/pages/login/login.js b/src/pages/login/login.js index 66651a02..615b1aa2 100644 --- a/src/pages/login/login.js +++ b/src/pages/login/login.js @@ -148,7 +148,7 @@ export default class App extends Component { diff --git a/src/pages/login/loginform.js b/src/pages/login/loginform.js index 4f877226..b06f9ae3 100644 --- a/src/pages/login/loginform.js +++ b/src/pages/login/loginform.js @@ -1,16 +1,16 @@ -import React, { useEffect, useRef } from "react"; -import "./login.less"; -import { withRouter } from "react-router-dom"; -import "@/assets/comm.css"; +import React, { useEffect, useRef } from 'react'; +import './login.less'; +import { withRouter } from 'react-router-dom'; +import '@/assets/comm.css'; import { postLogin, getAllEnum, handelResponse, getProductInfoSelect, postsendLoginCode, - postLoginCode, + postLoginStandby, getVoucherWarningAccount -} from "@/assets/api.js"; +} from '@/assets/api.js'; import { FormInputField, Form, @@ -18,20 +18,20 @@ import { Validators, Button, Notify -} from "zent"; +} from 'zent'; function FormDom(props) { const form = Form.useForm(FormStrategy.View); const [disabled, setDisabled] = React.useState(true); const [yzmcode, setYzmcode] = React.useState(false); //控制图形验证码 - const [acc, setAcc] = React.useState(""); - const [pwd, setPwd] = React.useState(""); - const [piccode, setPiccode] = React.useState(""); - const [smscode, setSmscode] = React.useState("获取验证码"); - const [uniquestr, setUniquestr] = React.useState(""); - const [auth, setAuth] = React.useState(""); + const [acc, setAcc] = React.useState(''); + const [pwd, setPwd] = React.useState(''); + const [piccode, setPiccode] = React.useState(''); + const [smscode, setSmscode] = React.useState('获取验证码'); + const [uniquestr, setUniquestr] = React.useState(''); + const [auth, setAuth] = React.useState(''); - const [Imgstr, setImgstr] = React.useState(""); + const [Imgstr, setImgstr] = React.useState(''); const code_unique_str = useRef(uniquestr); code_unique_str.current = uniquestr; @@ -41,9 +41,9 @@ function FormDom(props) { const getAccountList = () => { getVoucherWarningAccount().then((res) => { if (!res) { - sessionStorage.setItem("isEarlyWarningMan", false); + sessionStorage.setItem('isEarlyWarningMan', false); } else { - sessionStorage.setItem("isEarlyWarningMan", true); + sessionStorage.setItem('isEarlyWarningMan', true); } }); }; @@ -53,42 +53,42 @@ function FormDom(props) { code: value.notecode, authorization: authorizationCode.current }; - postLoginCode(subdata) + postLoginStandby(subdata) .then((res) => { handelResponse( res, (response, msg) => { - sessionStorage.setItem("authorization", response.authorization); + sessionStorage.setItem('authorization', response.authorization); Notify.clear(); Notify.success(msg); getAllEnum().then((res) => { handelResponse(res, (response, msg) => { - sessionStorage.setItem("enmu", JSON.stringify(response)); + sessionStorage.setItem('enmu', JSON.stringify(response)); }); }); //首次进来进行商品获取 getProductList(); getAccountList(); - sessionStorage.setItem("showflag", true); + sessionStorage.setItem('showflag', true); let menuList = response.menu; if (response.menu && response.menu.length > 0) { sessionStorage.setItem( - "activeMenu", + 'activeMenu', JSON.stringify(response.menu) ); let market = menuList.filter((item) => item.id == 16); if (market && market[0].children.length > 0) { //菜单有营销计划 - sessionStorage.setItem("linkshowname", "营销计划管理"); - sessionStorage.setItem("pathname2", "/home/plan-list"); + sessionStorage.setItem('linkshowname', '营销计划管理'); + sessionStorage.setItem('pathname2', '/home/plan-list'); sessionStorage.setItem( - "menulinklist", + 'menulinklist', JSON.stringify(market[0].children) ); setTimeout(() => { - props.history.replace("/home/plan-list"); + props.history.replace('/home/plan-list'); }, 1000); } else { try { @@ -96,29 +96,29 @@ function FormDom(props) { if (item.children && item.children.length > 0) { item.children.forEach((it) => { if (it.level == 5) { - sessionStorage.setItem("pathname2", it.router); - sessionStorage.setItem("linkshowname", item.title); + sessionStorage.setItem('pathname2', it.router); + sessionStorage.setItem('linkshowname', item.title); sessionStorage.setItem( - "menulinklist", + 'menulinklist', JSON.stringify(item.children) ); setTimeout(() => { props.history.replace(it.router); }, 1000); - throw "终止循环"; + throw '终止循环'; } }); } else { Notify.clear(); - Notify.warn("请先联系管理员配置权限菜单"); + Notify.warn('请先联系管理员配置权限菜单'); } }); } catch (e) {} } } else { Notify.clear(); - Notify.warn("请先联系管理员配置权限菜单"); + Notify.warn('请先联系管理员配置权限菜单'); } }, (err) => { @@ -137,7 +137,7 @@ function FormDom(props) { const forgetFn = () => { Notify.clear(); - Notify.warn("请联系管理员"); + Notify.warn('请联系管理员'); }; useEffect(() => { codeyzm(); @@ -150,23 +150,23 @@ function FormDom(props) { const codeyzm = () => { console.log(145, window.baseurl); const xhr = new XMLHttpRequest(); - xhr.open("GET", window.baseurl + "/auth/login/verify"); + xhr.open('GET', window.baseurl + '/auth/login/verify'); // xhr.setRequestHeader("Version", "v1.3.0"); - xhr.responseType = "arraybuffer"; + xhr.responseType = 'arraybuffer'; xhr.onreadystatechange = function (response) { response.header = { - Accept: "application/json", - "Content-Type": "application/x-www-form-urlencoded;charset=utf-8" + Accept: 'application/json', + 'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8' }; - let uniques = xhr.getResponseHeader("Unique-Str"); + let uniques = xhr.getResponseHeader('Unique-Str'); setUniquestr(uniques); - var img = document.getElementById("captcha_img"); + var img = document.getElementById('captcha_img'); var byteArray = new Uint8Array(response.target.response); - var binary = ""; + var binary = ''; for (var i = 0; i < byteArray.byteLength; i++) { binary += String.fromCharCode(byteArray[i]); } - let str = "data:image/png;base64," + window.btoa(binary); + let str = 'data:image/png;base64,' + window.btoa(binary); setImgstr(str); if (img) { img.src = str; @@ -246,10 +246,10 @@ function FormDom(props) { let timecount = setInterval(() => { let timerId = timer--; if (timerId > 0) { - setSmscode(timerId + "s"); + setSmscode(timerId + 's'); setDisabled(true); } else { - setSmscode("获取验证码"); + setSmscode('获取验证码'); setDisabled(false); clearInterval(timecount); } @@ -280,8 +280,8 @@ function FormDom(props) { handelResponse( res, (req, msg) => { - sessionStorage.setItem("updatetime", Date.now()); - sessionStorage.setItem("productsList", JSON.stringify(req.data)); + sessionStorage.setItem('updatetime', Date.now()); + sessionStorage.setItem('productsList', JSON.stringify(req.data)); }, (err) => {} ); @@ -298,52 +298,52 @@ function FormDom(props) { {" "} + validators={[Validators.required('请输入用户名')]} + />{' '} {" "} + validators={[Validators.required('请输入密码')]} + />{' '} {yzmcode == true ? (
{" "} + validators={[Validators.required('请输入图形验证码')]} + />{' '} {" "} + />{' '}
) : null}
- {" "} -
{" "} + {' '} +
{' '}