Commit c7ec4ccb authored by 武广's avatar 武广

fix: 修改营业日问题

parent 28f8eb5e
......@@ -66,9 +66,7 @@
"omit.js": "^1.0.2",
"path-to-regexp": "^3.1.0",
"qs": "^6.9.0",
"rc-bmap": "^1.0.5",
"react": "^16.8.6",
"react-baidu-map": "^1.3.5",
"react-bmapgl": "^0.2.7",
"react-copy-to-clipboard": "^5.0.1",
"react-dom": "^16.8.6",
......@@ -129,4 +127,4 @@
"scripts/**/*.js"
],
"author": "congmin.hao"
}
}
\ No newline at end of file
......@@ -128,28 +128,39 @@ export default () => {
getAreaAddr();
}, []);
const getWeekSlot = bw => {
const s = bw[0];
let e = bw[0];
const sy = [];
const htmlarr = [];
bw.forEach((item, i) => {
if (s + i === item) {
e = item;
} else {
sy.push(<span key={item}>,{weeks[item]}</span>);
const getWeekSlots = weekArr => {
const htmlArr = [];
if (weekArr && weekArr.length) {
const arr = [];
let brr = [];
weekArr.reduce((prev, cur) => {
if (prev + 1 === cur) {
brr.push(cur);
} else {
arr.push(brr);
brr = [cur];
}
return cur;
}, 0);
arr.push(brr);
if (arr.length) {
arr.forEach(item => {
if (htmlArr.length) {
htmlArr.push(',');
}
if (item.length > 1) {
htmlArr.push(
<span key={item[0]}>
{weeks[item[0]]} ~ {weeks[item[item.length - 1]]}
</span>,
);
} else {
htmlArr.push(<span key={item[0]}>{weeks[item[0]]}</span>);
}
});
}
});
if (s === e) {
htmlarr.push(<span key={s}>{weeks[s]}</span>);
} else {
htmlarr.push(
<span key={s}>
{weeks[s]} ~ {weeks[e]}
</span>,
);
}
return [...htmlarr, ...sy];
return htmlArr;
};
const columns = [
......@@ -171,7 +182,7 @@ export default () => {
width: 150,
render: businessHours => (
<div>
<div>{getWeekSlot(businessHours.weeks)}</div>
<div>{getWeekSlots(businessHours.weeks)}</div>
<div>
{businessHours.hoursItems.map(item => (
<div key={item.begin}>
......
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