Skip to content

S
schedule
Commit f4bf6607 by liang ce
Options

修改index覆盖代码

parent 7dae1c80
Showing with 462 additions and 6 deletions
PageComponents/scheduleList/scheduleList.axml
...@@ -99,10 +99,10 @@ ...@@ -99,10 +99,10 @@
<view class="sidebarLogo"> <view class="sidebarLogo">
<view> <view>
<image a:if="{{userMsg.headUrl}}" mode="scaleToFill" src="{{userMsg.headUrl}}" /> <image a:if="{{userMsg.headUrl}}" mode="scaleToFill" src="{{userMsg.headUrl}}" />
<text a:else>{{ userMsg.username.slice(-1) }}</text> <text a:else>{{ userMsg.userName.slice(-1) }}</text>
</view> </view>
<view> <view>
{{ userMsg.username }} {{ userMsg.userName }}
</view> </view>
</view> </view>
<view class="hasAssociated"> <view class="hasAssociated">
......
PageComponents/scheduleList/scheduleList.js
...@@ -28,6 +28,11 @@ create.Component({ ...@@ -28,6 +28,11 @@ create.Component({
props: {}, props: {},
didMount() { didMount() {
this.getDate(); this.getDate();
let userMsg = {
headUrl: getApp().globalData.avatar || "",
userName: getApp().globalData.name
};
console.log(userMsg);
this.setData({ this.setData({
userMsg: { userMsg: {
headUrl: getApp().globalData.avatar || "", headUrl: getApp().globalData.avatar || "",
......
pages/index/index.axml
...@@ -11,14 +11,17 @@ ...@@ -11,14 +11,17 @@
<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">
......
pages/index/index.js
...@@ -4,8 +4,13 @@ create.Page({ ...@@ -4,8 +4,13 @@ create.Page({
data: { data: {
tabBarIndex: "0", tabBarIndex: "0",
$data: null, $data: null,
iconDay: ""
}, },
onLoad() { onLoad() {
let iconDay = new Date().getDate();
this.setData({
iconDay: iconDay
});
}, },
onShow() { onShow() {
setTimeout(res => { setTimeout(res => {
......
pages/index2/index2.acss 0 → 100644
page {
background: #FFFFFF;
}
.scheduleHeader {
/* position: fixed;
top: 0;
left: 0; */
width: 100%;
height: 88rpx;
background: #FFFFFF;
line-height: 88rpx;
padding: 0 32rpx;
display: flex;
justify-content: space-between;
box-shadow: 0 1rpx 8rpx 0 rgba(0, 0, 0, 0.04);
z-index: 9;
}
.scheduleHeader view:nth-of-type(1) {
flex: 1;
}
.scheduleHeader view:nth-of-type(2) {
width: 40rpx;
height: 40rpx;
}
.sidebar {
position: fixed;
left: -750rpx;
top: 0;
width: 750rpx;
height: 100%;
/* background: rgba(0, 0, 0, 0.19); */
z-index: 99;
}
.headerIcon {
position: relative;
}
.headerIcon>view {
position: absolute;
left: 28rpx;
top: 52rpx;
width: 12rpx;
height: 12rpx;
border: 2rpx solid #FFFFFF;
border-radius: 50%;
background: #EA0C28;
}
.headerIcon .iconicon_app1 {
font-size: 44rpx;
color: rgba(27, 38, 61, 0.4);
}
.siderbarShow {
transform: translateX(750rpx);
transition: all 400ms linear 0s;
}
.siderbarHidden {
transform: translateX(-750rpx);
transition: all 400ms linear 0s;
}
.sidebarContent {
background: #FFFFFF;
width: 640rpx;
height: 100%;
padding: 32rpx 0 32rpx 32rpx;
}
.sidebarLogo {
margin-bottom: 18rpx;
line-height: 64rpx;
font-size: 26rpx;
color: rgba(27, 38, 61, .56);
display: flex;
}
.sidebarLogo view:nth-of-type(1) {
margin-right: 34rpx;
width: 64rpx;
height: 64rpx;
border-radius: 50%;
background: #3070F2;
color: white;
overflow: hidden;
}
.sidebarLogo view:nth-of-type(1) image {
width: 64rpx;
height: 64rpx;
}
.hasAssociated, .unAssociated {
margin-top: 48rpx;
}
.associated {
font-size: 24rpx;
color: rgba(25, 31, 37, .56);
line-height: 34px;
margin-bottom: 16rpx;
}
.applicationList {
height: 104rpx;
display: flex;
align-items: center;
}
.applicationLogo {
width: 72rpx;
height: 72rpx;
margin-right: 24rpx;
}
.applicationMsg {
flex: 1;
display: flex;
border-bottom: 1px solid rgba(241, 243, 249, 1);
height: 104rpx;
align-items: center;
padding-right: 32rpx;
}
.applicationMsg>view:nth-of-type(1) {
flex: 1;
}
.applicationMsg>view:nth-of-type(1)>view:nth-of-type(1) {
font-size: 28rpx;
color: #191F25;
margin-bottom: 8rpx;
}
.applicationMsg>view:nth-of-type(1)>view:nth-of-type(2) {
opacity: 0.56;
font-size: 20rpx;
color: #191F25;
}
.operateIcon {
width: 32rpx;
height: 32rpx;
}
.operateIcon .iconright {
font-size: 22rpx;
color: rgba(27, 38, 61, .5)
}
.scheduleList {
margin-bottom: 48rpx;
}
.month {
padding: 0 32rpx;
height: 48rpx;
line-height: 48rpx;
margin-bottom: 50rpx;
font-weight: bold;
font-family: 'DINAlternate-Bold';
font-size: 48rpx;
}
.manyWeeks {
font-size: 26rpx;
color: rgba(25, 31, 37, 0.56);
height: 37rpx;
padding-left: 120rpx;
line-height: 37rpx;
margin: 48rpx 0;
}
.date {
display: flex;
padding: 0 32rpx;
margin-bottom: 48rpx;
}
.dateTime {
margin-right: 34rpx;
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: center;
padding-top: 16rpx;
}
.dateTime>view {
font-size: 22rpx;
line-height: 24rpx;
font-weight: bolder;
color: #191F25;
margin-bottom: 4rpx;
}
.dateTime>text {
margin-left: 3rpx;
font-family: DINAlternate-Bold;
font-size: 42rpx;
color: #191F25;
line-height: 42rpx;
}
.dataSchedule>view {
width: 604rpx;
border-radius: 8rpx;
font-size: 26rpx;
color: rgba(10, 10, 10, 0.72);
height: 90rpx;
overflow: hidden;
background: rgba(10, 10, 10, 0.05);
margin-bottom: 16rpx;
}
.NoSchedule {
width: 604rpx;
border-radius: 8rpx;
font-size: 26rpx;
height: 90rpx;
padding-left: 16rpx;
box-sizing: border-box;
margin-bottom: 16rpx;
line-height: 0.9rem;
}
.NoSchedule>view:nth-of-type(1) text:nth-of-type(1) {
color: rgba(25, 31, 37, 0.56);
}
.NoSchedule>view:nth-of-type(1) text:nth-of-type(2) {
color: #3296FA;
}
.dataSchedule {
position: relative;
}
.dataSchedule .overdue {
background: rgba(10, 10, 10, .034);
color: rgba(10, 10, 10, .353);
}
.thisDay>view {
color: rgb(50, 150, 250);
}
.thisDay>text {
color: rgb(50, 150, 250);
}
.thisDayLine {
position: relative;
height: 2rpx;
background: #F25643;
width: 100%;
overflow: visible;
}
.dataSchedule .thisDayHavaMeeting {
height: 2rpx !important;
background: #F25643 !important;
overflow: visible !important;
position: absolute;
left: 0;
top: -8rpx;
}
.thisDayLine::after {
content: '';
position: absolute;
left: 0;
bottom: -3rpx;
width: 8rpx;
height: 8rpx;
border-radius: 50%;
background: #F25643;
z-index: 99;
box-sizing: border-box;
}
.dataSchedule .cancel {
width: 602rpx;
overflow: hidden;
background: url(../../assests/cancel.png) center /100% 100%;
border: 1rpx solid rgba(25, 31, 37, 0.28);
color: rgba(25, 31, 37, 0.56);
}
.dataSchedule .cancel text {
text-decoration: line-through;
}
.dataSchedule>view>view {
margin-left: 16rpx;
}
.dataScheduleName {
margin-top: 16rpx;
margin-bottom: 8rpx;
font-family: PingFangSC-Medium;
}
.dataSchedule>view:last-child {
margin-bottom: 0;
}
.dataScheduleTime {
font-size: 22rpx;
}
.createSchedule {
vertical-align: top;
font-size: 40rpx;
width: 98rpx;
height: 98rpx;
border-radius: 50%;
position: fixed;
right: 32rpx;
bottom: 98rpx;
color: white;
text-align: center;
line-height: 98rpx;
background: #3296FA;
box-shadow: 0 8px 14px 0 rgba(50, 150, 250, 0.30);
}
.startPage {
position: fixed;
height: 100%;
top: 0;
width: 100%;
background: #fff;
z-index: 99;
}
.startPage>image {
width: 603rpx;
height: 444rpx;
vertical-align: top;
margin-top: 300rpx;
margin-left: 82rpx;
z-index: 9999999;
}
.startText {
margin-top: 80rpx;
text-align: center;
font-size: 46rpx;
}
.text1 {
margin-right: 32rpx;
}
.indexScrollView {
height: calc( 100vh - 88rpx);
}
.position {
position: fixed;
top: 0;
left: 0;
}
.content {
height: 100vh;
}
/* list */
.longListLi {
height: 100rpx;
border-bottom: 1px solid #cccccc;
line-height: 100rpx;
}
.longListUl {
height: 5000rpx
}
\ No newline at end of file
pages/index2/index2.axml 0 → 100644
<view class="position">
</view>
<view class="content">
<view class="longListUl">
<view class="longListLi" a:for="{{list}}">
{{item.key}}-{{item.value}}
</view>
</view>
</view>
<!--<block a:for="{{pageScheduleList}}"><view class="month" a:if="{{item.type == 'year'}}">
{{item.value}}年</view><view class="month" a:elif="{{item.type == 'month'}}">
{{item.value}}月</view><view class="week" a:elif="{{item.type == 'week'}}" id="{{item.dayStr}}"><view class="manyWeeks">
{{item.value}}</view></view><view class="date" a:elif="{{item.type == 'day'}}"><view class="dateTime {{item.isThisDay}}"><view>
{{item.value.week}}</view><text>{{item.value.day}}</text></view><view class="dataSchedule"><view a:for="{{item.value.value}}" a:for-item="item2" data-item="{{item2}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="nextDetail"><view class="dataScheduleName"><text>{{item2.title}}{{item2.isfirstDayOrEndDay ? `（第${item2.isFewDays}天，共${item2.duration}天）` : '' }}</text></view><view class="dataScheduleTime"><text a:if="{{item2.isfirstDayOrEndDay && item2.isfirstDayOrEndDay === '0'}}">{{item2.thisDayStartTime}}</text><text a:elif="{{item2.isfirstDayOrEndDay && item2.isfirstDayOrEndDay === '1'}}">全天</text><text a:elif="{{item2.isfirstDayOrEndDay && item2.isfirstDayOrEndDay === '2'}}">直到{{item2.thisDayEndTime}}</text><text a:else>{{item2.thisDayStartTime}} - {{item2.thisDayEndTime}}</text></view></view></view></view><view class="date" a:elif="{{item.type == 'today'}}" id="{{item.value.dateStr}}"><view class="dateTime {{item.isThisDay}}"><view>
今天</view><text>{{item.value.day}}</text></view><view class="dataSchedule"><view a:for="{{item.value.value}}" a:for-item="item2" data-item="{{item2}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="nextDetail"><view class="dataScheduleName"><text>{{item2.title}}{{item2.isfirstDayOrEndDay ? `（第${item2.isFewDays}天，共${item2.duration}天）` : '' }}</text></view><view class="dataScheduleTime"><text a:if="{{item2.isfirstDayOrEndDay && item2.isfirstDayOrEndDay === '0'}}">{{item2.thisDayStartTime}}</text><text a:elif="{{item2.isfirstDayOrEndDay && item2.isfirstDayOrEndDay === '1'}}">全天</text><text a:elif="{{item2.isfirstDayOrEndDay && item2.isfirstDayOrEndDay === '2'}}">直到{{item2.thisDayEndTime}}</text><text a:else>{{item2.thisDayStartTime}} - {{item2.thisDayEndTime}}</text></view></view></view></view><view class="date" a:elif="{{item.type == 'thisDay'}}" id="{{item.value.dateStr}}"><view class="dateTime thisDay"><view>
{{item.value.week}}</view><text>{{item.value.day}}</text></view><view class="NoSchedule"><view><text>暂无日程安排，</text><text onTap="nextPage">创建日程</text></view></view></view></block> -->
\ No newline at end of file
pages/index2/index2.js 0 → 100644
import { RRule, RRuleSet, rrulestr } from "rrule";
import { getHomeUserSchedule1 } from "../../api/request";
import {
getFormatDate,
getCurrentMonthFirst,
getCurrentMonthLast,
throttle
} from "../../utils/utils";
import create from "dd-store";
create.Page({
mixins: [],
data: {
list: [],
allList: [],
startIndex: 0,
endIndex: 50
},
onLoad() {
let list = [];
for (let i = 0; i < 2000; i++) {
list.push({
key: i,
value: `列表${i}`
});
}
this.setData({
list: list.slice(0, 50),
allList: list
});
},
onPageScroll(e) {
console.log(e);
}
});
pages/index2/index2.json 0 → 100644
{
"usingComponents": {
"popup": "../../components/popup/index"
}
}
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