Commit 8548e2b2 by liang ce

修改图标删除冗余代码

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