Skip to content

S
schedule
Commit c2a03f4a by liang ce
Options

Merge branch 'master' of http://gitlab.roboming.com/fengzhaoyu/schedule

parents 6d85e851 cb0cc127
Showing with 76 additions and 31 deletions
components/mwSelect/mwSelect.acss 0 → 100755
.mwSelect {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
display: flex;
background: rgba(25, 31, 37, 0.4);
flex-direction: column-reverse;
font-family: PingFangSC-Regular;
font-size: 34rpx;
color: #191F25;
}
\ No newline at end of file
components/mwSelect/mwSelect.axml 0 → 100644
<view class="mwSelect">
</view>
\ No newline at end of file
components/mwSelect/mwSelect.js 0 → 100644
Component({
mixins: [],
data: {},
props: {},
didMount() {},
didUpdate() {},
didUnmount() {},
methods: {},
});
components/mwSelect/mwSelect.json 0 → 100644
{
"component": true
}
\ No newline at end of file
pages/addRemark/addRemark.axml
<view>
<view class="remarkInput">
<textarea onInput="getRemark" maxlength="-1" auto-height placeholder="添加内容描述" value="{{remark}}" />
<textarea focus="{{true}}" onInput="getRemark" auto-height placeholder="添加内容描述" value="{{remark}}" />
</view>
<!-- 保存 -->
<view class="confirm" onTap="save">
......
pages/createOrEditSchedule/createOrEditSchedule.axml
......@@ -35,7 +35,7 @@
</view>
</view>
<!-- 地点 -->
<view class="place" a:if="{{!!id?(!!locationName?true:false):true}}">
<view class="place" a:if="{{!!scheduleItem?(!!locationName?true:false):true}}">
<view class="icon iconfont icondingwei">
</view>
<view class="text" data-nextPage="place" onTap="nextPage">
......@@ -122,8 +122,8 @@
</view>
</view>
<!-- 编辑列表 -->
<view class="editList" a:if="{{!!id}}">
<view a:if="{{!!id?(!!locationName?false:true):true}}" class="listGroup" onTap="editSchedule" data-icon="icondingwei">
<view class="editList" a:if="{{!!scheduleItem}}">
<view a:if="{{!!scheduleItem?(!!locationName?false:true):true}}" class="listGroup" onTap="editSchedule" data-icon="icondingwei">
<view class="listIcon iconfont icondingwei">
</view>
<view class="listText">
......
pages/createOrEditSchedule/createOrEditSchedule.js
......@@ -15,7 +15,7 @@ create.Page({
week2: '',
propsTime: '',
weekList: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
id: '', // 日程ID 从详情页面传过来
scheduleItem: '', // 日程ID 从详情页面传过来
buttonText: '立即创建'
},
onLoad(event) {
......@@ -46,16 +46,17 @@ create.Page({
week1: w,
week2: w,
type: event.type,
id: event.id
})
if (!!event.id) {
this.getScheduleInfo()
if (!!event.scheduleItem) {
let scheduleItem = JSON.parse(event.scheduleItem)
dd.setNavigationBar({
title: '编辑会议'
})
this.setData({
buttonText: '保存编辑'
buttonText: '保存编辑',
scheduleItem: scheduleItem
})
this.getScheduleInfo()
}
},
onShow() {
......@@ -190,11 +191,13 @@ create.Page({
},
// 保存
saveCreate() {
if (!!this.data.id) {
if (!!this.data.scheduleItem) {
let data = {
modifyModel: 'only',
planDate: this.data.scheduleItem.planDate,
title: this.data.title || '无主题',
scheduleId: this.data.id,
scheduleId: this.data.scheduleItem.id,
templateId: this.data.scheduleItem.scheduleTemplateId,
location: {
longitude: '10',
latitude: '10',
......@@ -212,8 +215,8 @@ create.Page({
remark: this.store.data.remark
}
modifySchedule(data).then(res => {
dd.redirectTo({
url: '/pages/index/index'
dd.navigateBack({
delta: 2
})
})
......@@ -287,8 +290,11 @@ create.Page({
// 编辑时获取详情页内容
getScheduleInfo() {
let data = {
id: this.data.id
id: this.data.scheduleItem.id,
planDate: this.data.scheduleItem.planDate,
templateId: this.data.scheduleItem.scheduleTemplateId
}
console.log(this.data.scheduleItem)
getScheduleDetail(data).then(res => {
console.log(res.data.data.title)
let participatorUserId = []
......@@ -300,7 +306,7 @@ create.Page({
this.store.data.locationName = res.data.data.location.locationName
this.store.data.participatorUserId = participatorUserId
this.store.data.participatorList = participatorList
this.store.data.remark = res.data.data.remark
this.store.data.remark = res.data.data.remark || ''
this.store.data.recurrenceModel = res.data.data.recurrenceModel
this.setData({
......
pages/index/index.axml
<!-- <mw-select></mw-select> -->
<scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" style="height: 100vh;" scroll-into-view="{{todayStr}}">
<block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
<block a:for="{{scheduleYearList}}">
......@@ -27,7 +28,7 @@
<text>{{item.value.day}}</text>
</view>
<view class="dataSchedule">
<view a:for="{{item.value.value}}" a:for-item="item2" data-id="{{item2.id}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="nextDetail">
<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>
......
pages/index/index.js
......@@ -215,10 +215,8 @@ Page({
dd.navigateTo({ url: './../createOrEditSchedule/createOrEditSchedule' })
},
nextDetail(e) {
let id = e.target.dataset.id
console.log(11111111)
console.log(id)
dd.navigateTo({ url: `./../scheduleDetail/scheduleDetail?id=${id}` })
let item = e.target.dataset.item
dd.navigateTo({ url: `./../scheduleDetail/scheduleDetail?scheduleItem=${JSON.stringify(item)}` })
},
lower() {
let year = this.data.maxYear + 1
......
pages/index/index.json
{
"defaultTitle": "首页"
"defaultTitle": "首页",
"usingComponents": {
"mw-select": "../../components/mwSelect/mwSelect"
}
}
\ No newline at end of file
pages/scheduleDetail/scheduleDetail.axml
......@@ -88,15 +88,15 @@
</view>
<view class="buttonGroup" data-nextPage="edit" onTap="nextPage">
<text class="icondidianmiaoshu iconfont"></text>
<text>编辑</text>
<text>删除</text>
</view>
<view class="buttonGroup" data-nextPage="edit" onTap="nextPage">
<text class="icondidianmiaoshu iconfont"></text>
<text>编辑</text>
<text>参加</text>
</view>
<view class="buttonGroup" data-nextPage="edit" onTap="nextPage">
<text class="icondidianmiaoshu iconfont"></text>
<text>编辑</text>
<text>不参加</text>
</view>
</view>
</view>
\ No newline at end of file
pages/scheduleDetail/scheduleDetail.js
......@@ -14,17 +14,23 @@ create.Page({
isAcrossDay: true,
uploadSpaceId: '',
previewSpaceId: '',
id: ''
scheduleItem: '',
planDate: '',
scheduleTemplateId: ''
},
onLoad(event) {
let scheduleItem = JSON.parse(event.scheduleItem)
dd.setNavigationBar({
title: '会议详情'
})
this.setData({
id: event.id
scheduleItem: scheduleItem
})
let data = {
id: event.id
id: scheduleItem.id,
planDate: scheduleItem.planDate,
templateId: scheduleItem.scheduleTemplateId
}
getScheduleDetail(data).then(res => {
this.setData({
......@@ -48,8 +54,6 @@ create.Page({
},
// 是否跨天
acrossDay(time1, time2) {
console.log(this.dealTime(time1))
console.log(this.dealTime(time2))
let isAcrossDay = ''
if (JSON.stringify(this.dealTime(time1)) === JSON.stringify(this.dealTime(time2))) {
isAcrossDay = false
......@@ -102,7 +106,8 @@ create.Page({
dd.navigateTo({ url: `./../attendingSituation/attendingSituation?userList=${JSON.stringify(this.store.data.userList)}` })
break;
case 'edit':
dd.navigateTo({ url: `./../createOrEditSchedule/createOrEditSchedule?id=${this.data.id}` })
console.log(this.data.scheduleItem.id)
dd.navigateTo({ url: `./../createOrEditSchedule/createOrEditSchedule?scheduleItem=${JSON.stringify(this.data.scheduleItem)}` })
break;
}
},
......
stores/exampleStore.js
......@@ -11,7 +11,7 @@ class Store {
model:"no_repeat"
},
editList: [{ icon: 'icondingwei', text: '地点' }, { icon: 'iconhuiqiantixing', text: '提醒' }, { icon: 'iconchongfu', text: '重复' }, { icon: 'icondidianmiaoshu', text: '描述' }, { icon: 'iconshanchu', text: '删除' }],
remark: '', // 会议描述
remark: ' 111 ', // 会议描述
aheadTimes: []
}
......
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