Commit f865226b by caoyanzhi

update: 修复bug

parent af831271
......@@ -77,7 +77,22 @@ router.beforeEach((to, from, next) => {
}
const { fromPath = [] } = from.meta || {};
from.meta.keepAlive = fromPath.includes(to.path);
if (Array.isArray(fromPath)) {
from.meta.keepAlive = fromPath.some(el => {
let menuUrlReg = el;
let pathConfigReg = /(:.*)(\/?)/;
const pathRegStr = '([\\d\\w]+[\\-]*[\\d\\w]*)';
while (pathConfigReg.test(menuUrlReg)) {
menuUrlReg = menuUrlReg.replace(pathConfigReg, `${pathRegStr}$2`);
}
pathConfigReg = /(\/\*)(\/?)/;
while (pathConfigReg.test(menuUrlReg)) {
menuUrlReg = menuUrlReg.replace(pathConfigReg, `${pathRegStr}$2`);
}
const reg = new RegExp(menuUrlReg);
return reg.test(to.path);
});
}
next();
});
......
......@@ -171,7 +171,11 @@ export const constantRouterMap = [
{
path: '/grStoreList', // 群发任务-门店视图
name: '门店视图',
component: _import('salesleads/groupSend', 'grStoreList')
component: _import('salesleads/groupSend', 'grStoreList'),
meta: {
keepAlive: true,
fromPath: ['/grStoreDetail/:id']
}
},
{
path: '/grStoreDetail/:id', // 群发任务-门店视图-任务详情
......
......@@ -175,11 +175,14 @@ export default {
...this.pageParams,
enterpriseId: this.brandId,
qywxEnterpriseId: JSON.parse(sessionStorage.getItem('userInfos')).wxEnterpriseId,
startTime: this.pageParams.date[0],
endTime: this.pageParams.date[1],
selectType: this.selectRadio,
selectIdList: this.selectRadio == 1 ? '' : this.multipleSelection.map(ele => ele.ecmPlanId).join(',')
};
if (Array.isArray(para.date)) {
para.startTime = `${para.date[0]} 00:00:00`;
para.endTime = `${para.date[1]} 23:59:59`;
delete para.date;
}
postExcel('/haoban-task-manage-web/market/clue/export/plan-view', para)
.then(res => {
this.loadingBtn = false;
......@@ -272,8 +275,8 @@ export default {
qywxEnterpriseId: JSON.parse(sessionStorage.getItem('userInfos')).wxEnterpriseId
};
if (para.date) {
para.startTime = para.date[0];
para.endTime = para.date[1];
para.startTime = `${para.date[0]} 00:00:00`;
para.endTime = `${para.date[1]} 23:59:59`;
delete para.date;
}
getRequest('/haoban-task-manage-web/market/clue/web/plan-list', para)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment