Skip to content

W
wechatapp.shangjiadao.com
Commit e896dbff authored by wangxuelai's avatar wangxuelai
Browse files
Options

Merge remote-tracking branch 'origin/sj-dev-v8' into wxl-develop

parents eb8e67e1 3289cb88
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
components/calendar/main.js
View file @ e896dbff
...@@ -166,7 +166,7 @@ const conf = { ...@@ -166,7 +166,7 @@ const conf = {
const { todoLabels } = getData('calendar') || {}; const { todoLabels } = getData('calendar') || {};
const { afterCalendarRender } = getCalendarConfig(); const { afterCalendarRender } = getCalendarConfig();
if (todoLabels && todoLabels instanceof Array) { if (todoLabels && todoLabels instanceof Array) {
conf.setTodoLabels(); conf.setTodoLabels({days:todoLabels});
} }
if ( if (
...@@ -530,11 +530,11 @@ const conf = { ...@@ -530,11 +530,11 @@ const conf = {
if (target.showTodoLabel && item.todoText) { if (target.showTodoLabel && item.todoText) {
target.todoText = item.todoText; target.todoText = item.todoText;
} }
days.forEach(day=>{ // days.forEach(day=>{
if(Number(day.day) === Number(item.day)){ // if(Number(day.day) === Number(item.day)){
day.todoText = item.todoText; // day.todoText = item.todoText;
} // }
}) // })
}); });
const o = { const o = {
'calendar.days': days, 'calendar.days': days,
......
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