Skip to content

S
schedule
Commit c65fe18c by fengzhaoyu
Options

111

parent cef4a859
Showing with 441 additions and 23 deletions
app.js
...@@ -14,8 +14,8 @@ App({ ...@@ -14,8 +14,8 @@ App({
avatar: '', avatar: '',
userid: '', userid: '',
name: '', name: '',
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://139.196.213.18:9999' //beta地址 // globalUrl:'http://139.196.213.18:9999' //beta地址
// globalUrl:'http://192.168.1.101:9999', //beta地址 // globalUrl:'http://192.168.1.101:9999', //beta地址
// globalUrl:'http://192.168.1.102:9999' //beta地址 // globalUrl:'http://192.168.1.102:9999' //beta地址
......
app.json
{ {
"pages": [ "pages": [
"pages/index/index", "pages/index/index",
"pages/editMeeting/editMeeting",
"pages/createMeeting/createMeeting", "pages/createMeeting/createMeeting",
"pages/outLookContact/outLookContact", "pages/outLookContact/outLookContact",
"pages/uploadFile/uploadFile", "pages/uploadFile/uploadFile",
......
components/list/list.js
...@@ -7,11 +7,16 @@ Component({ ...@@ -7,11 +7,16 @@ Component({
iconType: 'icon' iconType: 'icon'
}, },
didMount() { didMount() {
console.log(this.props.comSelectListId)
this.setData({ this.setData({
comSelectListId: this.props.comSelectListId || 0 comSelectListId: this.props.comSelectListId || 0
}) })
}, },
didUpdate() { }, didUpdate() {
this.setData({
comSelectListId: this.props.comSelectListId || 0
})
},
didUnmount() { }, didUnmount() { },
methods: { methods: {
comSelectList(event) { comSelectList(event) {
......
pages/createMeeting/createMeeting.acss
...@@ -91,8 +91,8 @@ input { ...@@ -91,8 +91,8 @@ input {
justify-content: space-between; justify-content: space-between;
} }
.meetingWay .close, .place .close,.participator .iconicon_open { .meetingWay .close, .place .close, .participator .iconicon_open {
color:#9599A2; color: #9599A2;
} }
.repeatModal { .repeatModal {
...@@ -106,12 +106,10 @@ input { ...@@ -106,12 +106,10 @@ input {
color: #3070F2 color: #3070F2
} }
.conflict { .conflictStatus {
color: #FF943E; color: #FF943E;
font-size: 28rpx; font-size: 24rpx;
margin-left: 24rpx; margin-left: 24rpx;
transform: scale(0.9);
transform-origin: left center;
} }
.participatorList { .participatorList {
...@@ -160,13 +158,29 @@ input { ...@@ -160,13 +158,29 @@ input {
color: white; color: white;
line-height: 80rpx; line-height: 80rpx;
text-align: center; text-align: center;
overflow: hidden; position: relative;
}
.conflict {
line-height: 13px;
vertical-align: top;
width: 13px;
height: 13px;
position: absolute;
background: #fff;
bottom: 0rpx;
color: #FF943E;
font-size: 12px;
right: -3rpx;
border-radius: 50%;
text-align: center;
} }
.headUrl>image { .headUrl>image {
vertical-align: top; vertical-align: top;
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 50%;
} }
.name { .name {
......
pages/editMeeting/editMeeting.acss 0 → 100644
@import "../../assests/font/iconfont.acss";
page {
background: #fff;
font-family: PingFangSC-Regular;
font-size: 28rpx;
color: #030303;
}
.hideDetail {
padding: 28rpx 32rpx 24rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.08);
}
.hideTitle {
font-family: PingFangSC-Medium;
font-size: 40rpx;
line-height: 56rpx;
color: #1B263D;
}
.hideTime {
margin-top: 16rpx;
opacity: 0.72;
font-family: PingFangSC-Regular;
font-size: 28rpx;
color: #030303;
line-height: 28rpx;
}
.hideIcon {
color: #A7ABB3;
margin-top: 28rpx;
text-align: center;
}
.icon {
vertical-align: middle;
color: #1B263D;
font-size: 34rpx;
}
input {
caret-color: #3070F2;
padding-left: 0;
}
.createTitle {
padding: 14rpx 36rpx 16rpx;
}
.title {
display: flex;
line-height: 1.5;
justify-content: space-between;
text-align: left;
}
.title>input {
padding-left: 0;
font-size: 40rpx;
font-family: PingFangSC-Medium;
width: 100%;
}
.title>.icon {
color: #3070F2;
/* vertical-align: middle; */
line-height: 58rpx;
}
.remark>input {
padding-left: 0;
width: 100%;
opacity: 0.72;
font-size: 14px;
}
.placeholder {
opacity: 0.4;
font-family: PingFangSC-Medium;
font-size: 40rpx;
color: #1B263D;
}
.remark .placeholder {
font-size: 28rpx
}
.place, .time, .participator, .meetingWay {
display: flex;
padding: 0 36rpx;
font-family: PingFangSC-Regular;
color: #191F25;
overflow: hidden;
margin-top: 54rpx;
}
.place>.icon, .time>.icon, .participator>.icon, .meetingWay>.icon {
margin-right: 26rpx;
}
.noPlace, .hasplace, .timeText, .participatorText, .noWay, .hasWay {
height: 38rpx;
font-size: 34rpx;
width: 100%;
line-height: 38rpx;
}
.hasplace, .timeText {
word-break: break-all;
max-width: 540rpx;
overflow: hidden;
}
.placeContaint, .timeContaint, .participatorContaint, .meetingWayContent {
width: 678rpx;
display: flex;
justify-content: space-between;
}
.meetingWay .close, .place .close, .participator .iconicon_open {
color: #9599A2;
}
.repeatModal {
color: #191F25;
margin-top: 24rpx;
font-size: 28Îpx;
opacity: 0.56;
}
.time .iconicon_cycle {
color: #3070F2
}
.conflictStatus {
color: #FF943E;
font-size: 24rpx;
margin-left: 24rpx;
}
.participatorList {
width: 100%;
}
.participatorList>.icon {
color: #1b263d;
}
.participatorListTop {
width: 100%;
display: flex;
justify-content: space-between;
}
.participatorText {
display: flex;
align-items: center;
height: 38rpx;
}
.participatorListBottom {
margin-top: 11rpx;
display: flex;
flex-wrap: wrap;
}
.people, .addPeople {
margin-right: 27rpx;
text-align: center;
width: 80rpx;
height: auto;
margin-top: 22rpx;
}
.people:nth-child(6n) {
margin-right: 0;
}
.headUrl {
width: 80rpx;
height: 80rpx;
border-radius: 50%;
background: #3070F2;
color: white;
line-height: 80rpx;
text-align: center;
position: relative;
}
.conflict {
line-height: 13px;
vertical-align: top;
width: 13px;
height: 13px;
position: absolute;
background: #fff;
bottom: 0rpx;
color: #FF943E;
font-size: 12px;
right: -3rpx;
border-radius: 50%;
text-align: center;
}
.headUrl>image {
vertical-align: top;
width: 100%;
height: 100%;
border-radius: 50%;
}
.name {
font-size: 24rpx;
margin-top: 8rpx;
opacity: 0.56;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.addPeople {
margin-right: 0;
width: 78rpx;
text-align: center;
line-height: 78rpx;
font-size: 50rpx;
height: 80rpx;
border: 1rpx solid #F6F6F6;
border-radius: 50%;
color: #BBBEC5;
}
.save {
position: fixed;
bottom: 0;
left: 0;
right: 0;
padding: 16rpx 32rpx;
background: #fff;
box-shadow: 0 -2px 4px 0 rgba(0, 0, 0, 0.04);
position: fixed;
bottom: 0;
}
.button {
font-family: PingFangSC-Regular;
width: 686rpx;
height: 96rpx;
background: #4D88FF;
border-radius: 48rpx;
font-size: 34rpx;
color: #FFFFFF;
text-align: center;
line-height: 96rpx;
}
/* .iconicon_add {
margin-left: -2rpx;
text-align: left;
vertical-align: middle;
font-size: 92rpx;
} */
\ No newline at end of file
pages/editMeeting/editMeeting.axml 0 → 100644
<view class="createMeeting">
<!-- title remark 标题 描述 -->
<view class="createTitle">
<view class="title">
<input placeholder-class="placeholder" placeholder="请输入主题" class="text" focus="{{true}}" onInput="onInput"
data-type="title" value="{{title}}" />
<view class="icon iconfont iconicon_description" onTap="addRemark">
</view>
</view>
<view class="remark" a:if="{{isShowRemark}}">
<input placeholder-class="placeholder" placeholder="请添加描述" class="text" onInput="onInput"
data-type="remark" />
</view>
</view>
<!-- roomId locationName 地点 -->
<view class="place">
<view class="iconicon_room iconfont icon" a:if="{{roomId}}">
</view>
<view class="iconicon_location iconfont icon" a:else>
</view>
<view class="placeContaint">
<view class="noPlace" a:if="{{!locationName}}" onTap="nextPage" data-nextPage="location">
添加地点
</view>
<view class="hasplace" onTap="nextPage" data-nextPage="location" a:else>
{{locationName}}
</view>
<view class=" icon iconfont iconicon_close close" a:if="{{!!locationName}}" data-close="location"
catchTap="close">
</view>
</view>
</view>
<!-- startTime endTime repeatable recurrenceModel 时间 重复 -->
<view class="time">
<view class="iconicon_time iconfont icon">
</view>
<view class="timeContaint">
<view>
<view class="timeText" catchTap="showPopup" data-type='time'>
<text a:if="{{isAcrossDay}}">
{{`${startTime.substring(5, 7)}月${startTime.substring(8, 10)}日 ${startTime.substring(11, 16)}`}}
- {{`${endTime.substring(5, 7)}月${endTime.substring(8, 10)}日 ${endTime.substring(11, 16)}`}}
</text>
<text a:else>
{{`${startTime.substring(5, 7)}月${startTime.substring(8, 10)}日 ${week} ${startTime.substring(11, 16)}- ${endTime.substring(11, 16)}`}}
</text>
<!-- 3月1日 周日 14:00-16:00 -->
</view>
<view class="repeatModal" a:if="{{comListData.comSelectListId !== 0}}" catchTap="showPopup"
data-type='repeat'>
{{comListData.repeatList[comListData.comSelectListId].text}}重复
</view>
</view>
<view class="icon iconfont iconicon_cycle " catchTap="showPopup" data-type='repeat'
a:if="{{comListData.comSelectListId == 0}}">
</view>
</view>
</view>
<!-- participatorList participatorUserId 参会人 -->
<view class="participator">
<view class="iconicon_attender1 iconfont icon">
</view>
<view class="participatorContaint">
<view class="participatorText" a:if="{{participatorList.length < 2}}" catchTap="showPopup"
data-type='participator'>
添加参会人
</view>
<view class="participatorList" a:else>
<view class="participatorListTop">
<view class="participatorText">
<view>
{{participatorList.length}}位参会人
</view>
<view class="conflictStatus">
3人会议安排冲突
</view>
</view>
<view class="iconicon_open iconfont icon" style=" vertical-align: middle"></view>
</view>
<view class="participatorListBottom">
<view class="people"
a:for="{{participatorList.length > 10 ? [...participatorList].splice(0, 11) : participatorList}}">
<view class="headUrl">
<image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" />
<text
a:else>{{item.platform==="outlook" ? item.username.substring(0, 2) : item.username.substring(item.username.length-2, item.username.length)}}
</text>
<view class="conflict iconicon_conflict iconfont">
</view>
</view>
<view class="name">{{item.name}}</view>
</view>
<view class="addPeople" catchTap="showPopup" data-type='participator'></view>
</view>
</view>
</view>
</view>
<!-- meetingWay 会议方式 -->
<view class="meetingWay">
<view class="iconicon_meet1 iconfont icon">
</view>
<view class="meetingWayContent">
<view class="noWay" a:if="{{comListData.meetingWayModelId == null}}" catchTap="showPopup"
data-type='meetingWayModel'>
会议方式
</view>
<view class="hasWay" a:else catchTap="showPopup" data-type='meetingWayModel'>
{{comListData.meetingWayList[comListData.meetingWayModelId].text}}
</view>
<view class=" icon iconfont iconicon_close close" a:if="{{comListData.meetingWayModelId !== null}}"
data-close="meetingWayModel" catchTap="close">
</view>
</view>
</view>
<!-- 保存 -->
<view class="save" onTap="addSchedule">
<view class="button">
立即创建
</view>
</view>
<popup title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
<meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete"></meeting-time-picker>
<hlist a:if="{{'participator' === comType}}" dataComList="{{comHListData.contactData}}"
onSelectComHList="selectComHList"></hlist>
<list a:if="{{comType=='repeat' || comType=='meetingWayModel'}}"
dataComList="{{comType=='repeat' ? comListData.repeatList : comListData.meetingWayList}}"
onComSelectList="selectComList"
comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : comListData.meetingWayModelId}}"
iconType="{{comListData.iconType}}">
</list>
</popup>
</view>
\ No newline at end of file
pages/editMeeting/editMeeting.json 0 → 100644
{
"usingComponents": {
"popup": "../../components/popup/index",
"list": "../../components/list/list",
"hlist": "../../components/hList/hList",
"meeting-time-picker": "../../components/meetingTimePicker/meetingTimePicker"
}
}
\ No newline at end of file
pages/hhh/hhh.axml deleted 100644 → 0
<view>
New Page
</view>
\ No newline at end of file
pages/hhh/hhh.js deleted 100644 → 0
Page({
data: {},
onLoad() {},
});
pages/hhh/hhh.json deleted 100644 → 0
{}
\ No newline at end of file
stores/exampleStore.js
...@@ -8,9 +8,9 @@ class Store { ...@@ -8,9 +8,9 @@ class Store {
editList: [{ icon: 'icondingwei', text: '地点' }, { icon: 'iconhuiqiantixing', text: '提醒' }, { icon: 'iconchongfu', text: '重复' }, { icon: 'icondidianmiaoshu', text: '描述' }, { icon: 'iconshanchu', text: '删除' }], editList: [{ icon: 'icondingwei', text: '地点' }, { icon: 'iconhuiqiantixing', text: '提醒' }, { icon: 'iconchongfu', text: '重复' }, { icon: 'icondidianmiaoshu', text: '描述' }, { icon: 'iconshanchu', text: '删除' }],
aheadTimes: [], aheadTimes: [],
requireUserList: [], requireUserList: [],
roomId: '',
startTime: '', startTime: '',
endTime: '', endTime: ''
roomId: ''
} }
} }
export default new Store() export default new Store()
\ 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