提交 0cb014b9 编写于 作者: 恪愚's avatar 恪愚

优化自定义事件,优化首页布局

上级 3393c394
...@@ -88,6 +88,9 @@ Component({ ...@@ -88,6 +88,9 @@ Component({
if(dateList[weekIndex][j].dateTime==vm.properties.dateTimes[k].day){ if(dateList[weekIndex][j].dateTime==vm.properties.dateTimes[k].day){
dateList[weekIndex][j].event=vm.properties.dateTimes[k].target dateList[weekIndex][j].event=vm.properties.dateTimes[k].target
} }
if(dateList[weekIndex][j].value==vm.properties.dateTimes[k].day){
dateList[weekIndex][j].event=vm.properties.dateTimes[k].target
}
if(now_date==vm.properties.dateTimes[k].day){ if(now_date==vm.properties.dateTimes[k].day){
vm.setData({ vm.setData({
now_event:vm.properties.dateTimes[k].target now_event:vm.properties.dateTimes[k].target
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
</view> </view>
<view class="calendar_box" wx:for="{{dateList}}" wx:for-item="week" <view class="calendar_box" wx:for="{{dateList}}" wx:for-item="week"
style="{{index==0?'justify-content:flex-end':''}}"> style="{{index==0?'justify-content:flex-end':''}}">
<!-- 此处view的data-不是为了向js传值,而只是自定义属性向css伪元素传attr() -->
<view class="weekday_label {{(item.value==selectedDate)?'active_date':''}} {{(item.value==now_selectedDate)?'active_dates':''}} {{(item.event)?'actived_date':''}}" wx:for="{{week}}" data-event="{{item.event}}"> <view class="weekday_label {{(item.value==selectedDate)?'active_date':''}} {{(item.value==now_selectedDate)?'active_dates':''}} {{(item.event)?'actived_date':''}}" wx:for="{{week}}" data-event="{{item.event}}">
<view class="" bindtap="selectDate" data-date="{{item}}"> <view class="" bindtap="selectDate" data-date="{{item}}">
{{item.date}}</view> {{item.date}}</view>
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
} }
.calendar_panel{ .calendar_panel{
width: 100%; width: 100%;
/* height: 600rpx; */
height: calc(100% - 56rpx); height: calc(100% - 56rpx);
} }
.calendar_panel_two{ .calendar_panel_two{
...@@ -58,14 +57,14 @@ ...@@ -58,14 +57,14 @@
} }
.weekday_label{ .weekday_label{
width: calc(100% / 7); width: calc(100% / 7);
/* float: left; */
/* text-align: center; */
font-size: 27rpx; font-size: 27rpx;
padding: 12rpx 0; padding: 12rpx 0;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.weekday_label>view{ .weekday_label>view{
box-sizing: border-box; box-sizing: border-box;
...@@ -79,9 +78,6 @@ ...@@ -79,9 +78,6 @@
.active_date{ .active_date{
background: rgba(0,0,0,.12); background: rgba(0,0,0,.12);
color: rgba(0,0,0,.6); color: rgba(0,0,0,.6);
/* border-radius: 50%; */
/* padding: 12rpx;
box-sizing: border-box; */
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
......
...@@ -5,7 +5,7 @@ Page({ ...@@ -5,7 +5,7 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
dateTimes:[{day:'10-1',target:'国庆节'},{day:'10-2',target:'中秋节'}], dateTimes:[{day:'10-1',target:'国庆节'},{day:'10-2',target:'中秋节'},{day:'2020-10-24',target:'程序员节'}],
selected:false selected:false
}, },
......
...@@ -2,17 +2,18 @@ Page{ ...@@ -2,17 +2,18 @@ Page{
width: 100%; width: 100%;
min-height: 100vh; min-height: 100vh;
display: flex; display: flex;
flex-direction: column; flex-wrap: wrap;
justify-content: space-around; justify-content: space-around;
align-items: center;
} }
view{ view{
width: 100%; width: 46%;
height: 96rpx; min-height: 231rpx;
background-color: rgba(0,0,0,.2); background-color: rgba(0,0,0,.1);
overflow: hidden; overflow: hidden;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: 26rpx;
margin-bottom: 24rpx;
} }
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册