Skip to content

S
schedule
Commit 95f3e8cd by fengzhaoyu
Options

会议动态

parents 06d2897e ad674a70
Showing with 158 additions and 104 deletions
PageComponents/myDynamic/myDynamic.js
...@@ -20,7 +20,9 @@ create.Component({ ...@@ -20,7 +20,9 @@ create.Component({
didMount() { didMount() {
this.getPages(1); this.getPages(1);
}, },
didUpdate() { }, didUpdate() {
console.log(this.data.dynamicList, 111)
},
didUnmount() { }, didUnmount() { },
methods: { methods: {
setBodyDisableScroll(isStopBodyScroll) { setBodyDisableScroll(isStopBodyScroll) {
...@@ -47,6 +49,7 @@ create.Component({ ...@@ -47,6 +49,7 @@ create.Component({
} }
const dynamicList = res.data.data.records.map((item, index) => { const dynamicList = res.data.data.records.map((item, index) => {
for (let i = 0; i < item.meetingLogDataList.length; i++) { for (let i = 0; i < item.meetingLogDataList.length; i++) {
item.meetingLogDataList[i].meetingLogResource.groupId = item.groupId
if (item.meetingLogDataList[i].creatorInfo) { if (item.meetingLogDataList[i].creatorInfo) {
item.meetingLogDataList[i].creatorInfo = JSON.parse( item.meetingLogDataList[i].creatorInfo = JSON.parse(
item.meetingLogDataList[i].creatorInfo item.meetingLogDataList[i].creatorInfo
......
app.js
...@@ -20,7 +20,7 @@ App({ ...@@ -20,7 +20,7 @@ App({
userid: '', userid: '',
name: '', name: '',
userInfo: '', userInfo: '',
// globalUrl:'https://gateway2.mingwork.com', // 线上地址 // globalUrl: 'https://gateway2.mingwork.com', // 线上地址
globalUrl: 'https://gateway-beta.mingwork.com' //beta地址 globalUrl: 'https://gateway-beta.mingwork.com' //beta地址
// globalUrl: 'http://192.168.1.111' //beta地址 // globalUrl: 'http://192.168.1.111' //beta地址
// globalUrl:'http://139.196.213.18:9999' //beta地址 // globalUrl:'http://139.196.213.18:9999' //beta地址
......
app.json
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"pages/index/index", "pages/index/index",
"pages/meetingRoomList/meetingRoomList", "pages/meetingRoomList/meetingRoomList",
"pages/scheduleList/scheduleList", "pages/scheduleList/scheduleList",
"pages/scheduleList/scheduleList", "pages/index/index",
"pages/meetingDetail/meetingDetail", "pages/meetingDetail/meetingDetail",
"pages/excutorList/excutorList", "pages/excutorList/excutorList",
"pages/createMeeting/createMeeting", "pages/createMeeting/createMeeting",
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
"window": { "window": {
"allowsBounceVertical": "YES" "allowsBounceVertical": "YES"
} }
} }
\ No newline at end of file
components/relatedApp/relatedApp.axml 0 → 100644
<view class="sidebarContent" catchTap="preventSort">
<view class="sidebarLogo">
<view>
<image a:if="{{userMsg.headUrl}}" mode="scaleToFill" src="{{userMsg.headUrl}}" />
<text a:else>{{ userMsg.userName.slice(-1) }}</text>
</view>
<view>
{{ userMsg.userName }}
</view>
</view>
<view class="hasAssociated">
<view class="associated">
已关联应用
</view>
<view class="applicationList">
<view class="applicationLogo">
</view>
<view class="applicationMsg">
<view>
<view>
Outlook日历
</view>
<view>
支持会议日程双向同步，实时同步日程信息等
</view>
</view>
<view class="operateIcon">
<text class="iconfont iconright"></text>
</view>
</view>
</view>
</view>
<view class="unAssociated">
<view class="associated">
可关联应用
</view>
<view class="applicationList">
<view class="applicationLogo">
</view>
<view class="applicationMsg">
<view>
<view>
Outlook日历
</view>
<view>
支持会议日程双向同步，实时同步日程信息等
</view>
</view>
<view class="operateIcon">
<text class="iconfont iconright"></text>
</view>
</view>
</view>
<view class="applicationList">
<view class="applicationLogo">
</view>
<view class="applicationMsg">
<view>
<view>
Outlook日历
</view>
<view>
支持会议日程双向同步，实时同步日程信息等
</view>
</view>
<view class="operateIcon">
<text class="iconfont iconright"></text>
</view>
</view>
</view>
<view class="applicationList">
<view class="applicationLogo">
</view>
<view class="applicationMsg">
<view>
<view>
Outlook日历
</view>
<view>
支持会议日程双向同步，实时同步日程信息等
</view>
</view>
<view class="operateIcon">
<text class="iconfont iconright"></text>
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
components/relatedApp/relatedApp.js 0 → 100644
Component({
mixins: [],
data: {
userMsg: {}
},
props: {},
didMount() {
this.setData({
userMsg: {
headUrl: getApp().globalData.avatar || "",
userName: getApp().globalData.name
}
});
},
didUpdate() { },
didUnmount() { },
methods: {},
});
components/relatedApp/relatedApp.json 0 → 100644
{
"component": true
}
\ No newline at end of file
components/taskList/taskList.js
...@@ -6,7 +6,9 @@ Component({ ...@@ -6,7 +6,9 @@ Component({
props: { props: {
isCanEdit: true isCanEdit: true
}, },
didMount() { }, didMount() {
console.log(this.props.taskList, 1111)
},
didUpdate() { didUpdate() {
}, },
didUnmount() { }, didUnmount() { },
......
pages/scheduleList/schedule.js
...@@ -6,7 +6,7 @@ export function getDateMap(minYear, maxYear) { ...@@ -6,7 +6,7 @@ export function getDateMap(minYear, maxYear) {
const getOneYear = (year) => { const getOneYear = (year) => {
const yearDays = (year % 4 == 0 && year % 100 != 0) || year % 400 == 0 ? 366 : 365; const yearDays = (year % 4 == 0 && year % 100 != 0) || year % 400 == 0 ? 366 : 365;
for (let i = 1; i <= yearDays; i++) { for (let i = 1; i <= yearDays; i++) {
DateMap.set(new Date(year, 0, i).toLocaleDateString(), []); DateMap.set(toLocaleDateString(new Date(year, 0, i)), []);
} }
} }
for (let i = minYear; i <= maxYear; i++) { for (let i = minYear; i <= maxYear; i++) {
...@@ -60,7 +60,7 @@ export function getNextDateList(startTime, endTime) { ...@@ -60,7 +60,7 @@ export function getNextDateList(startTime, endTime) {
//返回跨天的日期数组 //返回跨天的日期数组
for (let i = 1; i <= days; i++) { for (let i = 1; i <= days; i++) {
const newDate = new Date(startTime); const newDate = new Date(startTime);
const nextDate = new Date(newDate.setDate(newDate.getDate() + i)).toLocaleDateString(); const nextDate = toLocaleDateString(new Date(newDate.setDate(newDate.getDate() + i)));
nextDateList.push(nextDate) nextDateList.push(nextDate)
} }
return nextDateList return nextDateList
...@@ -134,4 +134,15 @@ export function getBlankList(year) { ...@@ -134,4 +134,15 @@ export function getBlankList(year) {
} }
}) })
return DateList; return DateList;
}
export function toLocaleDateString(date) {
if (typeof date === 'string') {
date = new Date(date)
}
return `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`
}
export function getEndIndex() {
} }
\ No newline at end of file
pages/scheduleList/scheduleList.acss
...@@ -268,4 +268,5 @@ ...@@ -268,4 +268,5 @@
.indexScrollView { .indexScrollView {
height: calc( 100vh - 88rpx); height: calc( 100vh - 88rpx);
background: #Fff;
} }
\ No newline at end of file
pages/scheduleList/scheduleList.axml
<import src="../../template/loading/loading.axml"/> <import src="../../template/loading/loading.axml"/>
<view a:if="{{!loading}}"> <view a:if="{{!loading}}">
<view class="scheduleHeader"> <view class="scheduleHeader">
<view>2020年3月</view> <view>{{currentData.split('/')[0]}}年{{currentData.split('/')[1] || '1'}}月</view>
<view onTap="changesidebar" class="headerIcon"> <view onTap="changesidebar" class="headerIcon">
<text class="iconfont iconicon_app1"> <text class="iconfont iconicon_app1">
</text> </text>
...@@ -9,29 +9,29 @@ ...@@ -9,29 +9,29 @@
</view> </view>
</view> </view>
</view> </view>
<scroll-view class="indexScrollView" scroll-y="{{true}}" style="background: #FFFFFF" lower-threshold="100" onScrollToLower="lower" scroll-into-view="{{todayStr}}"> <scroll-view class="indexScrollView" scroll-y="{{true}}" onScroll="scroll" lower-threshold="400" onScrollToLower="lower" scroll-into-view="{{todayStr}}">
<block a:for="{{scheduleList}}" key="{{item.dateStr}}"> <block a:for="{{scheduleList}}" key="{{item.dateStr}}">
<!-- 年 --> <!-- 年 -->
<block a:if="{{item.type == 'year'}}"> <block a:if="{{item.type == 'year'}}">
<view class="year" id="{{item.dateStr}}"> <view class="year li" id="{{item.dateStr}}">
{{item.value}}年 {{item.value}}年
</view> </view>
</block> </block>
<!-- 月 --> <!-- 月 -->
<block a:elif="{{item.type == 'month'}}"> <block a:elif="{{item.type == 'month'}}">
<view class="month" id="{{item.dateStr}}"> <view class="month li" id="{{item.dateStr}}">
{{item.value}}月 {{item.value}}月
</view> </view>
</block> </block>
<!-- 周 --> <!-- 周 -->
<block a:elif="{{item.type == 'week'}}"> <block a:elif="{{item.type == 'week'}}">
<view class="week" id="{{item.dateStr}}"> <view class="week li" id="{{item.dateStr}}">
{{item.value}} {{item.value}}
</view> </view>
</block> </block>
<!-- 天 --> <!-- 天 -->
<block a:elif="{{item.type == 'day' || item.type == 'today'}}"> <block a:elif="{{item.type == 'day' || item.type == 'today'}}">
<view class="date" id="{{item.dateStr}}"> <view class="date li" id="{{ item.dateStr}}">
<view class="hasDateTitle {{item.type == 'today' && item.hasDateLabel ? 'today' : ''}} {{item.value.isBeOverdue ? 'overdueLabel':''}}"> <view class="hasDateTitle {{item.type == 'today' && item.hasDateLabel ? 'today' : ''}} {{item.value.isBeOverdue ? 'overdueLabel':''}}">
<view> <view>
{{item.week}} {{item.week}}
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
</view> </view>
</block> </block>
<!-- 今天有无会议 --> <!-- 今天有无会议 -->
<block a:elif="{{item.type == 'thisDay'}}"> <block a:elif="{{item.type == 'thisday'}}">
<view class="date" id="{{item.dateStr}}"> <view class="date li" id="{{item.dateStr}}">
<view class="hasDateTitle today"> <view class="hasDateTitle today">
<view> <view>
{{item.week}} {{item.week}}
...@@ -69,95 +69,6 @@ ...@@ -69,95 +69,6 @@
</block> </block>
</scroll-view> </scroll-view>
<popup show="{{show}}" onClose="closePop" position="left"> <popup show="{{show}}" onClose="closePop" position="left">
<view class="sidebarContent" catchTap="preventSort">
<view class="sidebarLogo">
<view>
<image a:if="{{userMsg.headUrl}}" mode="scaleToFill" src="{{userMsg.headUrl}}" />
<text a:else>{{ userMsg.userName.slice(-1) }}</text>
</view>
<view>
{{ userMsg.userName }}
</view>
</view>
<view class="hasAssociated">
<view class="associated">
已关联应用
</view>
<view class="applicationList">
<view class="applicationLogo">
</view>
<view class="applicationMsg">
<view>
<view>
Outlook日历
</view>
<view>
支持会议日程双向同步，实时同步日程信息等
</view>
</view>
<view class="operateIcon">
<text class="iconfont iconright"></text>
</view>
</view>
</view>
</view>
<view class="unAssociated">
<view class="associated">
可关联应用
</view>
<view class="applicationList">
<view class="applicationLogo">
</view>
<view class="applicationMsg">
<view>
<view>
Outlook日历
</view>
<view>
支持会议日程双向同步，实时同步日程信息等
</view>
</view>
<view class="operateIcon">
<text class="iconfont iconright"></text>
</view>
</view>
</view>
<view class="applicationList">
<view class="applicationLogo">
</view>
<view class="applicationMsg">
<view>
<view>
Outlook日历
</view>
<view>
支持会议日程双向同步，实时同步日程信息等
</view>
</view>
<view class="operateIcon">
<text class="iconfont iconright"></text>
</view>
</view>
</view>
<view class="applicationList">
<view class="applicationLogo">
</view>
<view class="applicationMsg">
<view>
<view>
Outlook日历
</view>
<view>
支持会议日程双向同步，实时同步日程信息等
</view>
</view>
<view class="operateIcon">
<text class="iconfont iconright"></text>
</view>
</view>
</view>
</view>
</view>
</popup> </popup>
</view> </view>
<template is="loading" a:else> <template is="loading" a:else>
......
template/fullScreen/fullScreen.acss 0 → 100644
.tabBarBottom {
height: 68rpx;
width: 100%;
background: #fff;
}
\ No newline at end of file
template/fullScreen/fullScreen.axml 0 → 100644
<template name="fullScreen">
<view class="tabBarBottom" a:if="{{isIPX}}">
</view>
</template>
\ No newline at end of file
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