Commit c7ec4ccb authored by 武广's avatar 武广

fix: 修改营业日问题

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