优化管理端商家端冗余以及配置内容。抽出公共主题颜色、站点标题等内容。分离config中api配置,修改商家发布中拖拽以及控制台出错的bug。

This commit is contained in:
lemon橪
2021-09-22 15:08:34 +08:00
parent 53cc6f46d1
commit 2037b57a5d
50 changed files with 393 additions and 861 deletions

View File

@@ -1,31 +1,36 @@
import axios from "axios";
import config from "@/config";
import {getStore, setStore} from "./storage.js";
import {router} from "../router/index";
import {Message} from "view-design";
import { getStore, setStore } from "./storage.js";
import { router } from "../router/index";
import { Message } from "view-design";
import Cookies from "js-cookie";
import {handleRefreshToken} from "../api/index"
import { handleRefreshToken } from "../api/index";
// 统一请求路径前缀
export const commonUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.common : config.api_prod.common);
export const managerUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.manager : config.api_prod.manager) + config.baseUrlPrefix;
export const commonUrl =
process.env.NODE_ENV === "development"
? BASE.API_DEV.common
: BASE.API_PROD.common;
export const managerUrl =
(process.env.NODE_ENV === "development"
? BASE.API_DEV.manager
: BASE.API_PROD.manager) + BASE.PREFIX;
const service = axios.create({
timeout: 8000,
baseURL: managerUrl
})
});
var isRefreshToken = 0;
const refreshToken = getTokenDebounce()
const refreshToken = getTokenDebounce();
service.interceptors.request.use(
config => {
if (config.method == 'get') {
if (config.method == "get") {
config.params = {
_t: Date.parse(new Date()) / 1000,
...config.params
}
};
}
const uuid = getStore('uuid');
config.headers['uuid'] = uuid;
const uuid = getStore("uuid");
config.headers["uuid"] = uuid;
return config;
},
err => {
@@ -36,7 +41,7 @@ service.interceptors.request.use(
// http response 拦截器
service.interceptors.response.use(
(response) => {
response => {
const data = response.data;
// 根据返回的code值来做不同的处理(和后端约定)
if (!data.success && data.message) {
@@ -76,7 +81,7 @@ service.interceptors.response.use(
return data;
}
},
async (error) => {
async error => {
// 返回状态码不为200时候的错误处理
if (error.response) {
if (error.response.status === 401) {
@@ -85,80 +90,79 @@ service.interceptors.response.use(
// 避免刷新token报错
} else if (error.response.status === 403) {
isRefreshToken++;
if(isRefreshToken === 1) {
if (isRefreshToken === 1) {
const getTokenRes = await refreshToken();
if (getTokenRes === 'success') { // 刷新token
if (getTokenRes === "success") {
// 刷新token
if (isRefreshToken === 1) {
error.response.config.headers.accessToken = getStore('accessToken')
return service(error.response.config)
error.response.config.headers.accessToken = getStore(
"accessToken"
);
return service(error.response.config);
} else {
router.go(0)
router.go(0);
}
} else {
Cookies.set("userInfoManager", "");
router.push('/login')
router.push("/login");
}
isRefreshToken = 0
isRefreshToken = 0;
}
} else {
// 其他错误处理
console.log(error.response.data);
Message.error(error.response.data.message)
Message.error(error.response.data.message);
}
}
/* router.push("/login") */
return Promise.resolve(error);
}
)
);
// 防抖闭包来一波
function getTokenDebounce() {
let lock = false
let success = false
return function () {
let lock = false;
let success = false;
return function() {
if (!lock) {
lock = true
lock = true;
let oldRefreshToken = getStore("refreshToken");
handleRefreshToken(oldRefreshToken).then(res => {
if (res.success) {
let {
accessToken,
refreshToken
} = res.result;
setStore("accessToken", accessToken);
setStore("refreshToken", refreshToken);
handleRefreshToken(oldRefreshToken)
.then(res => {
if (res.success) {
let { accessToken, refreshToken } = res.result;
setStore("accessToken", accessToken);
setStore("refreshToken", refreshToken);
success = true
lock = false
} else {
success = false
lock = false
router.push('/login')
}
}).catch((err) => {
success = false
lock = false
})
success = true;
lock = false;
} else {
success = false;
lock = false;
router.push("/login");
}
})
.catch(err => {
success = false;
lock = false;
});
}
return new Promise(resolve => {
// 一直看lock,直到请求失败或者成功
const timer = setInterval(() => {
if (!lock) {
clearInterval(timer)
clearInterval(timer);
if (success) {
resolve('success')
resolve("success");
} else {
resolve('fail')
resolve("fail");
}
}
}, 500) // 轮询时间间隔
})
}
}, 500); // 轮询时间间隔
});
};
}
export const getRequest = (url, params) => {
let accessToken = getStore("accessToken");
return service({
@@ -180,19 +184,19 @@ export const postRequest = (url, params, headers) => {
transformRequest: headers
? undefined
: [
function (data) {
let ret = "";
for (let it in data) {
ret +=
encodeURIComponent(it) +
"=" +
encodeURIComponent(data[it]) +
"&";
function(data) {
let ret = "";
for (let it in data) {
ret +=
encodeURIComponent(it) +
"=" +
encodeURIComponent(data[it]) +
"&";
}
ret = ret.substring(0, ret.length - 1);
return ret;
}
ret = ret.substring(0, ret.length - 1);
return ret;
}
],
],
headers: {
"Content-Type": "application/x-www-form-urlencoded",
accessToken: accessToken,
@@ -238,19 +242,19 @@ export const putRequest = (url, params, headers) => {
transformRequest: headers
? undefined
: [
function (data) {
let ret = "";
for (let it in data) {
ret +=
encodeURIComponent(it) +
"=" +
encodeURIComponent(data[it]) +
"&";
function(data) {
let ret = "";
for (let it in data) {
ret +=
encodeURIComponent(it) +
"=" +
encodeURIComponent(data[it]) +
"&";
}
ret = ret.substring(0, ret.length - 1);
return ret;
}
ret = ret.substring(0, ret.length - 1);
return ret;
}
],
],
headers: {
"Content-Type": "application/x-www-form-urlencoded",
accessToken: accessToken,
@@ -321,7 +325,6 @@ export const getRequestWithNoToken = (url, params) => {
});
};
/**
* 无需token验证的请求 避免旧token过期导致请求失败
* @param {*} url
@@ -334,4 +337,3 @@ export const postRequestWithNoToken = (url, params) => {
params: params
});
};

View File

@@ -1,21 +1,16 @@
import axios from 'axios';
import {
getCurrentPermissionList
} from '@/api/index';
import lazyLoading from './lazyLoading.js';
import router from '@/router/index';
import { getCurrentPermissionList } from "@/api/index";
import lazyLoading from "./lazyLoading.js";
import Cookies from "js-cookie";
let util = {
let util = {};
};
util.title = function (title) {
title = title || 'lili 运营后台';
util.title = function(title) {
title = title || "运营后台";
window.document.title = title;
};
// 判断元素是否存在于数组中
util.oneOf = function (ele, targetArr) {
util.oneOf = function(ele, targetArr) {
if (targetArr.indexOf(ele) >= 0) {
return true;
} else {
@@ -24,7 +19,7 @@ util.oneOf = function (ele, targetArr) {
};
// 打开新的页面
util.openNewPage = function (vm, name, argu, query) {
util.openNewPage = function(vm, name, argu, query) {
if (!vm.$store) {
return;
}
@@ -33,8 +28,9 @@ util.openNewPage = function (vm, name, argu, query) {
let i = 0;
let tagHasOpened = false;
while (i < openedPageLen) {
if (name == pageOpenedList[i].name) { // 页面已经打开
vm.$store.commit('pageOpenedList', {
if (name == pageOpenedList[i].name) {
// 页面已经打开
vm.$store.commit("pageOpenedList", {
index: i,
argu: argu,
query: query
@@ -45,7 +41,7 @@ util.openNewPage = function (vm, name, argu, query) {
i++;
}
if (!tagHasOpened) {
let tag = vm.$store.state.app.tagsList.filter((item) => {
let tag = vm.$store.state.app.tagsList.filter(item => {
if (item.children) {
return name == item.children[0].name;
} else {
@@ -61,17 +57,21 @@ util.openNewPage = function (vm, name, argu, query) {
if (query) {
tag.query = query;
}
vm.$store.commit('increateTag', tag);
vm.$store.commit("increateTag", tag);
}
}
};
util.toDefaultPage = function (routers, name, route, next) {
util.toDefaultPage = function(routers, name, route, next) {
let len = routers.length;
let i = 0;
let notHandle = true;
while (i < len) {
if (routers[i].name == name && routers[i].children && routers[i].redirect == undefined) {
if (
routers[i].name == name &&
routers[i].children &&
routers[i].redirect == undefined
) {
route.replace({
name: routers[i].children[0].name
});
@@ -86,21 +86,24 @@ util.toDefaultPage = function (routers, name, route, next) {
}
};
util.initRouter = function (vm) { // 初始化路由
util.initRouter = function(vm) {
// 初始化路由
const constRoutes = [];
const otherRoutes = [];
// 404路由需要和动态路由一起加载
const otherRouter = [{
path: '/*',
name: 'error-404',
meta: {
title: '404-页面不存在'
},
frontRoute: 'error-page/404'
}];
const otherRouter = [
{
path: "/*",
name: "error-404",
meta: {
title: "404-页面不存在"
},
frontRoute: "error-page/404"
}
];
// 判断用户是否登录
let userInfo = Cookies.get('userInfoManager')
let userInfo = Cookies.get("userInfoManager");
if (!userInfo) {
// 未登录
return;
@@ -114,13 +117,13 @@ util.initRouter = function (vm) { // 初始化路由
// 格式化数据,设置 空children 为 null
for (let i = 0; i < menuData.length; i++) {
let t = menuData[i].children
let t = menuData[i].children;
for (let k = 0; k < t.length; k++) {
let tt = t[k].children;
for (let z = 0; z < tt.length; z++) {
tt[z].children = null
tt[z].children = null;
// 给所有三级路由添加字段显示一级菜单name方便点击页签时的选中筛选
tt[z].firstRouterName = menuData[i].name
tt[z].firstRouterName = menuData[i].name;
}
}
}
@@ -131,20 +134,23 @@ util.initRouter = function (vm) { // 初始化路由
util.initAllMenuData(constRoutes, menuData);
util.initRouterNode(otherRoutes, otherRouter);
// 添加所有主界面路由
vm.$store.commit('updateAppRouter', constRoutes.filter(item => item.children.length > 0));
vm.$store.commit(
"updateAppRouter",
constRoutes.filter(item => item.children.length > 0)
);
// 添加全局路由
vm.$store.commit('updateDefaultRouter', otherRoutes);
vm.$store.commit("updateDefaultRouter", otherRoutes);
// 添加菜单路由
util.initMenuData(vm, menuData);
// 缓存数据 修改加载标识
window.localStorage.setItem('menuData', JSON.stringify(menuData));
vm.$store.commit('setAdded', true);
window.localStorage.setItem("menuData", JSON.stringify(menuData));
vm.$store.commit("setAdded", true);
});
} else {
// 读取缓存数据
let data = window.localStorage.getItem('menuData');
let data = window.localStorage.getItem("menuData");
if (!data) {
vm.$store.commit('setAdded', false);
vm.$store.commit("setAdded", false);
return;
}
let menuData = JSON.parse(data);
@@ -154,21 +160,20 @@ util.initRouter = function (vm) { // 初始化路由
};
// 添加所有顶部导航栏下的菜单路由
util.initAllMenuData = function (constRoutes, data) {
util.initAllMenuData = function(constRoutes, data) {
let allMenuData = [];
data.forEach(e => {
if (e.level == 0) {
e.children.forEach(item => {
allMenuData.push(item);
})
});
}
})
});
util.initRouterNode(constRoutes, allMenuData);
}
};
// 生成菜单格式数据
util.initMenuData = function (vm, data) {
util.initMenuData = function(vm, data) {
const menuRoutes = [];
let menuData = data;
// 顶部菜单
@@ -177,29 +182,29 @@ util.initMenuData = function (vm, data) {
let nav = {
name: e.name,
title: e.title
}
};
navList.push(nav);
})
});
if (navList.length < 1) {
return;
}
// 存入vuex
vm.$store.commit('setNavList', navList);
let currNav = window.localStorage.getItem('currNav')
vm.$store.commit("setNavList", navList);
let currNav = window.localStorage.getItem("currNav");
if (currNav) {
// 读取缓存title
for (var item of navList) {
if (item.name == currNav) {
vm.$store.commit('setCurrNavTitle', item.title);
vm.$store.commit("setCurrNavTitle", item.title);
break;
}
}
} else {
// 默认第一个
currNav = navList[0].name;
vm.$store.commit('setCurrNavTitle', navList[0].title);
vm.$store.commit("setCurrNavTitle", navList[0].title);
}
vm.$store.commit('setCurrNav', currNav);
vm.$store.commit("setCurrNav", currNav);
for (let item of menuData) {
if (item.name == currNav) {
// 过滤
@@ -209,21 +214,25 @@ util.initMenuData = function (vm, data) {
}
util.initRouterNode(menuRoutes, menuData);
// 刷新界面菜单
vm.$store.commit('updateMenulist', menuRoutes.filter(item => item.children.length > 0));
vm.$store.commit(
"updateMenulist",
menuRoutes.filter(item => item.children.length > 0)
);
let tagsList = [];
vm.$store.state.app.routers.map((item) => {
vm.$store.state.app.routers.map(item => {
if (item.children.length <= 1) {
tagsList.push(item.children[0]);
} else {
tagsList.push(...item.children);
}
});
vm.$store.commit('setTagsList', tagsList);
vm.$store.commit("setTagsList", tagsList);
};
// 生成路由节点
util.initRouterNode = function (routers, data) { // data为所有子菜单数据
util.initRouterNode = function(routers, data) {
// data为所有子菜单数据
for (let item of data) {
let menu = Object.assign({}, item);
@@ -237,8 +246,8 @@ util.initRouterNode = function (routers, data) { // data为所有子菜单数据
let meta = {};
// 给页面添加标题、父级菜单name方便左侧菜单选中
meta.title = menu.title ? menu.title + " - lilishop 运营后台" : null;
meta.firstRouterName = item.firstRouterName
meta.title = menu.title ? menu.title + " - 运营后台" : null;
meta.firstRouterName = item.firstRouterName;
menu.meta = meta;
routers.push(menu);