fix(v2): can not set circle style to todo date#396

zhishouxun · Nov 17, 2020 · 27c8ade · 27c8ade
1 parent 2ca1d10
commit 27c8ade
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/component/v2/index.wxml b/src/component/v2/index.wxml
@@ -29,7 +29,7 @@
       <!-- 本月日期格子 -->
       <view wx:for="{{calendar.dates}}" wx:key="index" data-idx="{{index}}" data-info="{{item}}" bindtap="tapDate" class="grid {{item.class ? item.class  : ''}} {{config.theme}}_normal-date b ac pc">
         <view class="date-wrap b cc {{config.emphasisWeek && (item.week === 0 || item.week === 6) ? config.theme + '_weekend-color' : ''}}">
-          <view class="date b ac pc {{item.class ? item.class  : ''}} {{item.isToday && config.highlightToday ? config.theme + '_today' : ''}} {{item.choosed ? config.theme + '_choosed' : ''}} {{item.disable ? config.theme + '_date-disable' : ''}} {{config.chooseAreaMode ? 'date-area-mode' : ''}}">
+          <view class="date b ac pc {{item.class ? item.class  : ''}} {{item.isToday && config.highlightToday ? config.theme + '_today' : ''}} {{item.choosed ? config.theme + '_choosed' : ''}} {{item.disable ? config.theme + '_date-disable' : ''}} {{config.chooseAreaMode ? 'date-area-mode' : ''}}  {{calendar.todoLabelCircle && item.showTodoLabel && !item.choosed ? config.theme + '_todo-circle todo-circle' : '' }}">
                 {{config.markToday && item.isToday ? config.markToday : item.date}}
                 <view
                   wx:if="{{(config.showLunar && item.lunar && !item.showTodoLabel) || (item.showTodoLabel && calendar.todoLabelPos !== 'bottom') || config.showHolidays}}"

diff --git a/src/pages/calendarV2/index.js b/src/pages/calendarV2/index.js
@@ -17,10 +17,10 @@ plugin
 const conf = {
   data: {
     calendarConfig: {
-      // theme: 'elegant',
+      theme: 'elegant'
       // showHolidays: true,
       // emphasisWeek: true,
-      chooseAreaMode: true
+      // chooseAreaMode: true
       // defaultDate: '2020-9-8',
       // autoChoosedWhenJump: true
     },