Commit 8548e2b2 by liang ce

修改图标删除冗余代码

parent 3f4821d7
......@@ -18,10 +18,6 @@ create.Component({
thisYear: "",
maxYear: "",
minYear: "",
startPageOnLoad: false,
startPageOnShow: false,
isFirstLoad: true,
isShowSidebar: "",
pageStartTime: "",
pageEndTime: "",
show: false,
......@@ -31,7 +27,6 @@ create.Component({
},
props: {},
didMount() {
console.log(getApp().globalData);
this.getDate();
this.setData({
userMsg: {
......@@ -62,6 +57,7 @@ create.Component({
},
() => {
let now = new Date();
console.log(now.getTime());
let year = now.getFullYear();
let scheduleList = [];
for (let i = 0; i <= year - 2019; i++) {
......@@ -76,16 +72,11 @@ create.Component({
scheduleList: scheduleList,
todayStr: finalDate.toLocaleDateString(),
thisYear: year,
maxYear: year,
startPageOnShow: true,
isFirstLoad: false
maxYear: year
},
() => {
console.log(new Date().getTime());
}
// ,
// () => {
// that.setData({
// });
// }
);
}
);
......@@ -159,7 +150,6 @@ create.Component({
: initialTimeDate.getDate();
let startTimeList = item.startTime.split(":");
let DTSTART = `${initialTimeDateyear}${initialTimeDatemonth}${initialTimeDateday}T${startTimeList[0]}${startTimeList[1]}00Z`;
console.log(DTSTART);
let rule = RRule.fromString(
`${item.recurrenceModel.recurrenceRule};DTSTART=${DTSTART}`
);
......
......@@ -56,23 +56,38 @@
height: 116rpx;
}
.tabBarView text {
.tabBarView>view {
display: block;
color: rgba(10, 10, 10, .4)
}
.tabBarView text:nth-of-type(1) {
.tabBarView>view:nth-of-type(1) {
width: 42rpx;
height: 42rpx;
font-size: 42rpx;
margin-bottom: 11rpx;
}
.tabBarView text:nth-of-type(2) {
.tabBarView>view:nth-of-type(2) {
height: 10rpx;
font-size: 20rpx;
}
.ischooseTabBar text {
.ischooseTabBar>view {
color: rgba(10, 10, 10, 1) !important;
}
.iconicon_Calendarbox1 {
position: relative;
}
.iconicon_days {
position: absolute;
left: 5rpx;
top: 5rpx;
font-size: 30rpx;
}
.tabBarView .iconicon_days {
color: #FFFFFF !important;
}
\ No newline at end of file
......@@ -9,17 +9,20 @@
<view class="tabBar">
<view onTap="changeTabBar" data-tabbar='0'>
<view class="tabBarView {{tabBarIndex === '0' ? 'ischooseTabBar' : ''}}">
<text class="iconfont iconicon_dynamic"></text>
<text>动态</text>
<view class="iconfont iconicon_dynamic"></view>
<view>动态</view>
</view>
</view>
<view onTap="changeTabBar" data-tabbar='1'>
<view class="tabBarView {{tabBarIndex === '1' ? 'ischooseTabBar' : ''}}">
<text class="iconfont iconicon_Calendarbox1"></text>
<text>日程</text>
<view class="iconfont iconicon_Calendarbox1">
<text class="iconfont iconicon_days iconicon_days{{iconDay}}">
</text>
</view>
<view>日程</view>
</view>
</view>
<view class="createMeeting" onTap="createMeeting">
<text class="iconfont iconicon_add1"></text>
<view class="iconfont iconicon_add1"></view>
</view>
</view>
\ No newline at end of file
......@@ -6,6 +6,10 @@ create.Page({
$data: null,
},
onLoad() {
let iconDay = new Date().getDate()
this.setData({
iconDay: iconDay
})
},
onShow() {
setTimeout(res => {
......
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