Skip to content

S
schedule
Commit b10426fa by fengzhaoyu
Options

换图标

parent 9594fa3d
Showing with 367 additions and 191 deletions
api/request.js
......@@ -255,3 +255,11 @@ export function editFile(data) {
url: `/meet/schedule-accessory/update`
})
}
// 参加 不参加
export function isParticipate(data) {
return $http({
method: 'post',
data: JSON.stringify(data),
url: `/meet/schedule/confirm`
})
}
\ No newline at end of file
font/iconfont.eot
No preview for this file type
font/iconfont.json
......@@ -6,179 +6,263 @@
"description": "",
"glyphs": [
{
"icon_id": "12620785",
"name": "youjinru",
"font_class": "youjinru",
"unicode": "e636",
"unicode_decimal": 58934
"icon_id": "13183878",
"name": "miaoshu",
"font_class": "miaoshu",
"unicode": "e69a",
"unicode_decimal": 59034
},
{
"icon_id": "12620950",
"name": "xuanzhong",
"font_class": "xuanzhong",
"unicode": "e637",
"unicode_decimal": 58935
"icon_id": "13176749",
"name": "sanjiao",
"font_class": "sanjiao1",
"unicode": "e699",
"unicode_decimal": 59033
},
{
"icon_id": "12621118",
"name": "weigouxuan",
"font_class": "weigouxuan",
"unicode": "e638",
"unicode_decimal": 58936
"icon_id": "13176696",
"name": "sanjiao",
"font_class": "sanjiao",
"unicode": "e698",
"unicode_decimal": 59032
},
{
"icon_id": "12621397",
"name": "yigouxuan",
"font_class": "yigouxuan",
"unicode": "e63a",
"unicode_decimal": 58938
"icon_id": "13174828",
"name": "bianji",
"font_class": "bianji",
"unicode": "e696",
"unicode_decimal": 59030
},
{
"icon_id": "12621592",
"name": "beifangren",
"font_class": "beifangren",
"unicode": "e63c",
"unicode_decimal": 58940
"icon_id": "13173695",
"name": "xialakuang",
"font_class": "xialakuang",
"unicode": "e695",
"unicode_decimal": 59029
},
{
"icon_id": "12621601",
"name": "dingwei",
"font_class": "dingwei",
"unicode": "e63d",
"unicode_decimal": 58941
"icon_id": "13173664",
"name": "jiahao",
"font_class": "jiahao",
"unicode": "e694",
"unicode_decimal": 59028
},
{
"icon_id": "12622650",
"name": "xialakuang",
"font_class": "xialakuang",
"unicode": "e63e",
"unicode_decimal": 58942
"icon_id": "13173351",
"name": "shijan",
"font_class": "shijan",
"unicode": "e693",
"unicode_decimal": 59027
},
{
"icon_id": "12623341",
"name": "sousuo",
"font_class": "sousuo",
"unicode": "e63f",
"unicode_decimal": 58943
"icon_id": "13173285",
"name": "hengxian",
"font_class": "hengxian",
"unicode": "e692",
"unicode_decimal": 59026
},
{
"icon_id": "12624539",
"name": "huiyizhuti",
"font_class": "huiyizhuti",
"unicode": "e641",
"unicode_decimal": 58945
"icon_id": "13173282",
"name": "duigou",
"font_class": "duigou",
"unicode": "e691",
"unicode_decimal": 59025
},
{
"icon_id": "12624692",
"name": "huiyimiaoshu",
"font_class": "huiyimiaoshu",
"unicode": "e642",
"unicode_decimal": 58946
"icon_id": "13173264",
"name": "fenxiang",
"font_class": "fenxiang",
"unicode": "e690",
"unicode_decimal": 59024
},
{
"icon_id": "12624721",
"icon_id": "13173248",
"name": "youjinru",
"font_class": "youjinru1",
"unicode": "e68f",
"unicode_decimal": 59023
},
{
"icon_id": "13173200",
"name": "youjinru",
"font_class": "youjinru",
"unicode": "e68d",
"unicode_decimal": 59021
},
{
"icon_id": "13172997",
"name": "xuanzhong",
"font_class": "xuanzhong1",
"unicode": "e68c",
"unicode_decimal": 59020
},
{
"icon_id": "13172977",
"name": "dingwei",
"font_class": "dingwei1",
"unicode": "e68b",
"unicode_decimal": 59019
},
{
"icon_id": "13172955",
"name": "sousuo",
"font_class": "sousuo1",
"unicode": "e68a",
"unicode_decimal": 59018
},
{
"icon_id": "13172911",
"name": "huiyizhuti",
"font_class": "huiyizhuti2",
"unicode": "e689",
"unicode_decimal": 59017
},
{
"icon_id": "13172878",
"name": "shijian",
"font_class": "shijian",
"unicode": "e643",
"unicode_decimal": 58947
"font_class": "shijian1",
"unicode": "e687",
"unicode_decimal": 59015
},
{
"icon_id": "12624765",
"icon_id": "13172852",
"name": "chongfu",
"font_class": "chongfu",
"unicode": "e644",
"unicode_decimal": 58948
"font_class": "chongfu2",
"unicode": "e686",
"unicode_decimal": 59014
},
{
"icon_id": "12624781",
"name": "canhuiren",
"font_class": "canhuiren1",
"unicode": "e646",
"unicode_decimal": 58950
"icon_id": "13172832",
"name": "canhuiren1",
"font_class": "canhuiren",
"unicode": "e684",
"unicode_decimal": 59012
},
{
"icon_id": "12624802",
"icon_id": "13172826",
"name": "huiyishi",
"font_class": "huiyishi",
"unicode": "e647",
"unicode_decimal": 58951
"font_class": "huiyishi2",
"unicode": "e683",
"unicode_decimal": 59011
},
{
"icon_id": "12626853",
"name": "didianmiaoshu",
"font_class": "didianmiaoshu",
"unicode": "e64b",
"unicode_decimal": 58955
"icon_id": "13172743",
"name": "tixing",
"font_class": "tixing",
"unicode": "e67f",
"unicode_decimal": 59007
},
{
"icon_id": "12626991",
"name": "huiqiantixing",
"font_class": "huiqiantixing",
"unicode": "e64c",
"unicode_decimal": 58956
"icon_id": "13172697",
"name": "tianjia",
"font_class": "tianjia1",
"unicode": "e67e",
"unicode_decimal": 59006
},
{
"icon_id": "12627665",
"name": "fuben",
"font_class": "fuben",
"unicode": "e64d",
"unicode_decimal": 58957
"icon_id": "13172692",
"name": "shanchu-2",
"font_class": "shanchu-1",
"unicode": "e67d",
"unicode_decimal": 59005
},
{
"icon_id": "12628220",
"name": "tianjia",
"font_class": "tianjia",
"unicode": "e64e",
"unicode_decimal": 58958
"icon_id": "13172671",
"name": "xuanzhong",
"font_class": "xuanzhong2",
"unicode": "e67b",
"unicode_decimal": 59003
},
{
"icon_id": "12628546",
"name": "shanchu",
"font_class": "shanchu",
"unicode": "e64f",
"unicode_decimal": 58959
"icon_id": "13172636",
"name": "weigouxuan",
"font_class": "weigouxuan",
"unicode": "e67a",
"unicode_decimal": 59002
},
{
"icon_id": "12628872",
"name": "kai",
"font_class": "kai",
"unicode": "e650",
"unicode_decimal": 58960
"icon_id": "13172601",
"name": "shanchu1",
"font_class": "shanchu3",
"unicode": "e679",
"unicode_decimal": 59001
},
{
"icon_id": "12628961",
"name": "guan",
"font_class": "guan",
"unicode": "e651",
"unicode_decimal": 58961
"icon_id": "13172580",
"name": "shangchuanwenjian",
"font_class": "shangchuanwenjian1",
"unicode": "e678",
"unicode_decimal": 59000
},
{
"icon_id": "12645018",
"name": "zhankai",
"font_class": "zhankai",
"unicode": "e652",
"unicode_decimal": 58962
"icon_id": "13172482",
"name": "dongtai",
"font_class": "dongtai1",
"unicode": "e677",
"unicode_decimal": 58999
},
{
"icon_id": "12645078",
"name": "shouqi",
"font_class": "shouqi",
"unicode": "e653",
"unicode_decimal": 58963
"icon_id": "13172468",
"name": "chengshi-2",
"font_class": "chengshi-",
"unicode": "e676",
"unicode_decimal": 58998
},
{
"icon_id": "12827163",
"name": "2xuanzhong",
"font_class": "xuanzhong1",
"unicode": "e654",
"unicode_decimal": 58964
"icon_id": "13172321",
"name": "jianzhu",
"font_class": "jianzhu1",
"unicode": "e675",
"unicode_decimal": 58997
},
{
"icon_id": "12827169",
"name": "weigouxuan",
"font_class": "weigouxuan1",
"unicode": "e655",
"unicode_decimal": 58965
"icon_id": "13172287",
"name": "louceng-3",
"font_class": "louceng-",
"unicode": "e674",
"unicode_decimal": 58996
},
{
"icon_id": "13172270",
"name": "shebei",
"font_class": "shebei",
"unicode": "e673",
"unicode_decimal": 58995
},
{
"icon_id": "13172247",
"name": "bucanjia2",
"font_class": "bucanjia3",
"unicode": "e672",
"unicode_decimal": 58994
},
{
"icon_id": "13172223",
"name": "bucanjia",
"font_class": "bucanjia2",
"unicode": "e671",
"unicode_decimal": 58993
},
{
"icon_id": "13172130",
"name": "canjia",
"font_class": "canjia3",
"unicode": "e670",
"unicode_decimal": 58992
},
{
"icon_id": "13172079",
"name": "canjia2",
"font_class": "canjia2",
"unicode": "e66f",
"unicode_decimal": 58991
},
{
"icon_id": "13172059",
"name": "shanchu",
"font_class": "shanchu2",
"unicode": "e66e",
"unicode_decimal": 58990
}
]
}
font/iconfont.ttf
No preview for this file type
font/iconfont.woff
No preview for this file type
font/iconfont.woff2
No preview for this file type
pages/attendingSituation/attendingSituation.acss
......@@ -94,3 +94,11 @@ page {
.cancel {
background: #E60012 ;
}
.participatorStaus {
width: 20rpx;
height: 20rpx;
border-radius: 50%;
position: absolute;
bottom: 2rpx;
right: -5rpx;
}
\ No newline at end of file
pages/attendingSituation/attendingSituation.axml
......@@ -3,7 +3,7 @@
<view class="headImg">
<image mode="scaleToFill" src="{{item.participator.headUrl}}" a:if="{{item.participator.headUrl.length}}"/>
<text a:else>{{item.participator.username.substring(0,1)}}</text>
<text a:if="{{!!item.participator.confirmAttendance}}" class="tip {{item.participator.confirmAttendance==1?'accept':'cancel'}} " ></text>
<text a:if="{{item.confirmAttendance!=null}}" class="participatorStaus {{item.confirmAttendance==0 || item.participator.userId == organizer?'accept':'cancel'}} " ></text>
</view>
<view class="info">
<text class="name">{{item.participator.username}}</text>
......
pages/attendingSituation/attendingSituation.js
......@@ -5,11 +5,14 @@ create.Page({
useAll: true,
data: {
allUserList: [],
organizer: ''
},
onLoad(event) {
let allUserList = JSON.parse(event.userList)
let organizer = event.organizer
this.setData({
allUserList: allUserList
allUserList: allUserList,
organizer: organizer
})
dd.setNavigationBar({
title: `参会人(${this.data.allUserList.length}人）`
......
pages/createOrEditSchedule/createOrEditSchedule.acss
......@@ -6,7 +6,9 @@ page {
color: #191F25;
padding-bottom: 180rpx;
}
.iconfont {
font-size: 32rpx;
}
::-webkit-scrollbar {
display: none
}
......@@ -120,7 +122,7 @@ page {
}
.icon {
font-size: 40rpx;
/* font-size: 38rpx; */
width: 30rpx;
margin-right: 27rpx;
text-align: center;
......@@ -137,7 +139,7 @@ page {
}
.save {
padding: 32rpx 34rpx;
padding: 24rpx 34rpx;
background: #fff;
position: fixed;
bottom: 0;
......@@ -150,7 +152,7 @@ page {
text-align: center;
line-height: 96rpx;
width: 686rpx;
height: 96rpx;
height: 90rpx;
color: #fff;
background: #3296FA;
border: 1px solid rgba(25, 31, 37, 0.12);
......@@ -195,7 +197,7 @@ page {
height: 58rpx;
text-align: center;
vertical-align: middle;
font-size: 72rpx;
font-size: 61rpx;
border-radius: 50%;
}
......@@ -265,7 +267,7 @@ page {
justify-content: space-between;
}
.iconshanchu {
.iconshanchu-1 {
color: rgba(25, 31, 37, 0.28);
}
......@@ -291,7 +293,6 @@ page {
.listIcon {
line-height: 30rpx;
text-align: center;
font-size: 38rpx;
margin-bottom: 9rpx;
vertical-align: top;
}
......@@ -310,8 +311,7 @@ page {
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
}
.repeat .iconchongfu {
font-size: 40rpx;
.repeat .iconchongfu2 {
vertical-align: top;
margin-right: 27rpx;
text-align: center;
......@@ -347,8 +347,7 @@ page {
display: flex;
}
.describe .icondidianmiaoshu {
font-size: 40rpx;
.describe .iconmiaoshu {
margin-right: 27rpx;
}
......@@ -356,7 +355,7 @@ page {
width: 574rpx;
}
.describe .iconshanchu {
.describe .iconshanchu-1 {
position: absolute;
right: 32rpx;
}
......@@ -384,3 +383,9 @@ page {
.noPermissions {
opacity: 0.6;
}
.iconshanchu3 {
color: #f25643;
}
.iconshanchu3+.listText {
color: #f25643;
}
pages/createOrEditSchedule/createOrEditSchedule.axml
......@@ -9,7 +9,7 @@
</view>
</view>
<!-- 时间 -->
<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}" >
<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view>
<view class="time">
......@@ -48,12 +48,12 @@
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view>
<view class="place" a:if="{{!!scheduleItem?!!locationName:true}}">
<view class="icon iconfont icondingwei">
<view class="icon iconfont icondingwei1">
</view>
<view class="text" data-nextPage="place" onTap="nextPage">
<view class="selectPlace" a:if="{{!!locationName}}">
<text>{{locationName}}</text>
<text class="iconshanchu iconfont" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}" data-icon="icondingwei" catchTap="closeEditList"></text>
<text class="iconshanchu-1 iconfont" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}" data-icon="icondingwei" catchTap="closeEditList"></text>
</view>
<text a:else>
添加地点
......@@ -63,7 +63,7 @@
</view>
<!-- 参会人 -->
<view class="participants">
<view class="icon iconfont iconcanhuiren1">
<view class="icon iconfont iconcanhuiren">
</view>
<view class="text">
<view a:if="{{participatorList.length}}">
......@@ -77,7 +77,7 @@
<text a:if="{{conflictPeople.includes(item.userId)}}" class="conflictTip"></text>
</text>
</view>
<view class="addPeople iconfont icontianjia" onTap="addParticipants">
<view class="addPeople iconfont icontianjia1" onTap="addParticipants">
</view>
<view class="rightPeople" catchTap="nextPage" data-nextPage="participantsDetail">
<text>{{participatorList.length}}人</text>
......@@ -101,7 +101,7 @@
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view>
<view class="remind" a:if="{{aheadTimes.length}}">
<view class="icon iconfont iconfont iconhuiqiantixing">
<view class="icon iconfont iconfont icontixing">
</view>
<view class="text" data-nextPage="remind" onTap="nextPage">
<text class="blank">
......@@ -115,7 +115,7 @@
<text a:if="{{aheadTimes.includes(10080)}}">1周前</text>
提醒
</text>
<text class="close iconshanchu iconfont" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}" data-icon="iconhuiqiantixing" catchTap="closeEditList"></text>
<text class="close iconshanchu-1 iconfont" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}" data-icon="iconhuiqiantixing" catchTap="closeEditList"></text>
</view>
</view>
</view>
......@@ -124,7 +124,7 @@
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view>
<view class="repeat" a:if="{{!!scheduleItem&&!!repeatable}}">
<view class="iconfont iconchongfu">
<view class="iconfont iconchongfu2">
</view>
<view class="repeatContaint">
<view class="repeatTime" data-nextPage="repeatMechanism" onTap="nextPage">
......@@ -144,47 +144,47 @@
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view>
<view class="describe" a:if="{{!!remark}}">
<view class="iconfont icondidianmiaoshu">
<view class="iconfont iconmiaoshu">
</view>
<view class="describeText" data-nextPage="addRemark" onTap="nextPage">
{{remark}}
</view>
<view class="iconfont iconshanchu" data-icon="icondidianmiaoshu" catchTap="closeEditList" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}">
<view class="iconfont iconshanchu-1" data-icon="icondidianmiaoshu" catchTap="closeEditList" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}">
</view>
</view>
</view>
<!-- 编辑列表 -->
<view class="editList">
<view a:if="{{!!scheduleItem?organizer==permissions&&!locationName:false}}" class="listGroup" onTap="editSchedule" data-icon="icondingwei">
<view class="listIcon iconfont icondingwei">
<view class="listIcon iconfont icondingwei1">
</view>
<view class="listText">
地点
</view>
</view>
<view a:if="{{!!scheduleItem?!aheadTimes.length&&organizer==permissions:!aheadTimes.length}}" class="listGroup" onTap="editSchedule" data-icon="iconhuiqiantixing">
<view class="listIcon iconfont iconhuiqiantixing">
<view class="listIcon iconfont icontixing">
</view>
<view class="listText">
提醒
</view>
</view>
<view a:if="{{!repeatable&&!!scheduleItem&&organizer==permissions}}" class="listGroup" onTap="editSchedule" data-icon="iconchongfu">
<view class="listIcon iconfont iconchongfu">
<view class="listIcon iconfont iconchongfu2">
</view>
<view class="listText">
重复
</view>
</view>
<view a:if="{{!remark&&!!scheduleItem&&organizer==permissions}}" class="listGroup" onTap="editSchedule" data-icon="icondidianmiaoshu">
<view class="listIcon iconfont icondidianmiaoshu">
<view class="listIcon iconfont iconmiaoshu">
</view>
<view class="listText">
描述
</view>
</view>
<view a:if="{{isRepeat==0&&!!scheduleItem}}" class="listGroup" onTap="editSchedule" data-icon="iconshanchu">
<view class="listIcon iconfont iconshanchu">
<view class="listIcon iconfont iconshanchu3">
</view>
<view class="listText">
删除
......@@ -193,7 +193,7 @@
<view a:if="{{!!scheduleItem&&isRepeat==1}}">
<picker range="{{['仅删除此次会议', '删除以后会议', '删除所有会议']}}" onChange="deleteRepeatSchedule">
<view class="listGroup" data-icon="iconshanchu">
<view class="listIcon iconfont iconshanchu">
<view class="listIcon iconfont iconshanchu3">
</view>
<view class="listText">
删除
......
pages/index/index.acss
......@@ -95,7 +95,7 @@ page {
.createSchedule {
vertical-align: top;
font-size: 80rpx;
font-size: 40rpx;
width: 98rpx;
height: 98rpx;
border-radius: 50%;
......
pages/index/index.axml
<!-- <mw-select></mw-select> -->
版本号：108版
版本号：109版
<scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" onScroll="onScroll" style="height: 100vh;" scroll-into-view="{{todayStr}}">
<block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
<block a:for="{{scheduleYearList}}">
......@@ -46,6 +46,6 @@
</block>
</block>
</scroll-view>
<view class="createSchedule " onTap="nextPage">
+
<view class="createSchedule iconfont iconjiahao " onTap="nextPage">
</view>
pages/participantsDetail/participantsDetail.js
......@@ -64,11 +64,11 @@ create.Page({
requiredUsers: require, //必选用户（不可取消选中状态）
responseUserOnly: true, //返回人，或者返回人和部门
success: function (res) {
_that.store.data.participatorList.push({ userId: getApp().globalData.userid, username: getApp().globalData.name, headUrl: getApp().globalData.avatar })
_that.store.data.participatorUserId.push(getApp().globalData.userid)
if (!_that.data.scheduleItem || _that.data.organizer === getApp().globalData.userid) {
_that.store.data.participatorList = []
_that.store.data.participatorUserId = []
_that.store.data.participatorList.push({ userId: getApp().globalData.userid, username: getApp().globalData.name, headUrl: getApp().globalData.avatar })
_that.store.data.participatorUserId.push(getApp().globalData.userid)
res.users.forEach((item, index) => {
_that.store.data.participatorList.push({ userId: item.userId, username: item.name, headUrl: item.avatar })
_that.store.data.participatorUserId.push(item.userId)
......
pages/repeatMechanism/repeatMechanism.acss
......@@ -5,7 +5,9 @@ page {
font-size: 32rpx;
color: #191F25;
}
.iconfont {
font-size: 32rpx;
}
.repeatList {
line-height: 112rpx;
height: 112rpx;
......@@ -23,7 +25,6 @@ page {
.icon {
float: right;
font-size: 40rpx;
color: white;
}
......
pages/repeatMechanism/repeatMechanism.axml
......@@ -2,7 +2,7 @@
<view class="repeatList" a:for="{{repeatList}}" data-item="{{item}}" onTap="selectRepeat">
<view class="repeatRight ">
<text>{{item.text}}</text>
<text class="iconfont iconxuanzhong icon {{recurrenceModel.model=='day_in_week'?(recurrenceModel.weekDayList.length==item.weekDayList.length?'select':''):recurrenceModel.model==item.model?'select': ''}}
<text class="iconfont iconxuanzhong1 icon {{recurrenceModel.model=='day_in_week'?(recurrenceModel.weekDayList.length==item.weekDayList.length?'select':''):recurrenceModel.model==item.model?'select': ''}}
"></text>
</view>
</view>
......
pages/repeatMechanism/repeatMechanism.js
......@@ -4,8 +4,8 @@ create.Page({
store: exampleStore,
useAll: true,
data: {
week1: ['MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SU'],
week2: ['每周一重复', '每周二重复', '每周三重复', '每周四重复', '每周五重复', '每周六重复', '每周日重复'],
weekEn: ['MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SU'],
weekCh: ['每周一重复', '每周二重复', '每周三重复', '每周四重复', '每周五重复', '每周六重复', '每周日重复'],
repeatList: [
{ model: 'no_repeat', text: '不重复', weekDayList: [] },
{ model: 'every_day', text: '每天重复', weekDayList: [] },
......@@ -17,10 +17,12 @@ create.Page({
dd.setNavigationBar({
title: '选择重复'
})
let week1 = this.data.weekEn
let repeatList = this.data.repeatList
let week = new Date().getDay()
this.data.repeatList[2].weekDayList = [this.data.week1[week -1]]
repeatList[2].weekDayList = [ week1[week - 1] ]
this.setData({
repeatList: this.data.repeatList
repeatList: repeatList
})
},
// 选择重复机制
......@@ -45,6 +47,5 @@ create.Page({
dd.navigateBack({
delta: 1
})
}
});
pages/scheduleDetail/scheduleDetail.acss
......@@ -6,7 +6,9 @@ page {
color: #191F25;
padding-bottom: 180rpx;
}
.iconfont {
font-size: 32rpx;
}
::-webkit-scrollbar {
display: none
}
......@@ -26,7 +28,6 @@ page {
.icon {
line-height: 112rpx;
text-align: left;
font-size: 40rpx;
color: #191F25;
vertical-align: center;
margin-right: 25rpx;
......@@ -99,7 +100,6 @@ page {
.iconyoujinru, .icontianjia {
line-height: 112rpx;
font-size: 40rpx;
color: rgba(25, 31, 37, 0.40);
}
......@@ -245,8 +245,7 @@ page {
}
.bottom .iconfont {
font-size: 40rpx;
margin-right: 8rpx;
margin-right: 12rpx;
}
.buttonGroup text {
......@@ -389,3 +388,7 @@ page {
width: 100%;
background: rgba(25, 31, 37, 0.12)
}
.line {
color: rgba(25, 31, 37, 0.12)!important;
margin-right: 32rpx;
}
\ No newline at end of file
pages/scheduleDetail/scheduleDetail.axml
......@@ -3,7 +3,7 @@
<view class="scheduleInfo">
<!-- 标题 -->
<view class="title">
<view class="icon icondidianmiaoshu iconfont">
<view class="icon iconhuiyizhuti2 iconfont">
</view>
<view class="text">
{{title}}
......@@ -19,7 +19,7 @@
</view>
<!-- 时间 -->
<view class="time">
<view class="icon iconshijian iconfont">
<view class="icon iconshijian1 iconfont">
</view>
<view class="text" a:if="{{isAcrossDay}}">
<view>
......@@ -45,19 +45,19 @@
</view>
<!-- 参会人 -->
<view class="participants" onTap="nextPage" data-nextPage="participants">
<view class="icon iconcanhuiren1 iconfont"></view>
<view class="icon iconcanhuiren iconfont"></view>
<view class="scroll" v-if="{{!!userList.length}}">
<text class="imageGroup" a:for="{{userList}}" a:for-item="item">
<text>
<image a:if="{{!!item.participator.headUrl}}" mode="scaleToFill" src="{{item.participator.headUrl}}"/>
<text a:else class="name">{{item.participator.username.substring(item.participator.username.length - 2, item.participator.username.length)}}</text>
<text a:if="{{!!item.participator.confirmAttendance}}" class="participatorStaus {{item.participator.confirmAttendance==1?'accept':'cancel'}} "></text></text></text></view>
<text a:if="{{item.confirmAttendance!=null}}"class="participatorStaus {{item.confirmAttendance==0 || item.participator.userId == organizer?'accept':'cancel'}} "></text></text></text></view>
<view class="right">
<text class="number">{{userList.length}}人参与</text>
<text class="iconyoujinru iconfont"></text></view></view>
<!-- 重复 -->
<view class="remind" a:if="{{aheadTimes.length}}">
<view class="icon iconshijian iconfont"></view>
<view class="icon icontixing iconfont"></view>
<view class="text blank">
<text a:if="{{aheadTimes.includes(0)}}">立即提醒</text>
<text a:if="{{aheadTimes.includes(5)}}">5分钟前</text>
......@@ -77,13 +77,13 @@
</view></view>
<!-- 会议动态 -->
<view class="dynamic">
<view class="icon iconhuiyimiaoshu iconfont"></view>
<view class="icon icondongtai1 iconfont"></view>
<view class="text">
会议动态
</view>
<view class="upload" onTap="upload">
<text>文件上传</text>
<text class="icontianjia iconfont"></text></view></view>
<text class="line">|</text>
<text class="iconshangchuanwenjian1 iconfont"></text></view></view>
<!-- 动态详情展示 -->
<view class="dynamicContent">
<view class="dynamicDetail" a:for="{{allFileInfo}}" onTouchStart="touchStart" onTouchEnd="touchEnd" onLongTap="longPress" data-id="{{item.meetingLogId}}">
......@@ -125,18 +125,34 @@
</view>
<!-- 底部按钮 -->
<view class="bottom">
<view class="buttonGroup" data-nextPage="edit" onTap="nextPage">
<text class="icondidianmiaoshu iconfont"></text>
<text>编辑</text>
<view class="buttonGroup" data-value=0 onTap="confirmAtten" a:if="{{!(organizer == pemissions)&&isRepeatable == 0}}">
<text class="iconcanjia3 iconfont"></text>
<text>参加</text>
</view>
<view class="buttonGroup" data-nextPage="edit" onTap="nextPage" a:if="{{!(organizer == pemissions)}}">
<text class="icondidianmiaoshu iconfont"></text>
<picker range="{{['仅参加本次', '参加所有']}}" a:if="{{!(organizer == pemissions)&&isRepeatable == 1}}" data-value=0 onTap="confirmRepeatAtten">
<view>
<view class="buttonGroup">
<text class="iconcanjia3 iconfont"></text>
<text>参加</text>
</view>
<view class="buttonGroup" data-nextPage="edit" onTap="nextPage" a:if="{{!(organizer == pemissions)}}">
<text class="icondidianmiaoshu iconfont"></text>
</view>
</picker>
<view class="buttonGroup" data-value=1 onTap="confirmAtten" a:if="{{!(organizer == pemissions)&&isRepeatable == 0}}">
<text class="iconbucanjia3 iconfont"></text>
<text>不参加</text>
</view>
<picker range="{{['仅不参加本次', '不参加所有']}}" data-value=1 onTap="confirmRepeatAtten" a:if="{{!(organizer == pemissions)&&isRepeatable == 1}}">
<view>
<view class="buttonGroup">
<text class="iconbutanjia3 iconfont"></text>
<text>不参加</text>
</view>
</view>
</picker>
<view class="buttonGroup" data-nextPage="edit" onTap="nextPage">
<text class="iconbianji iconfont"></text>
<text>编辑</text>
</view>
</view>
</view>
</block>
\ No newline at end of file
pages/scheduleDetail/scheduleDetail.js
import create from 'dd-store'
import exampleStore from '/stores/exampleStore'
import { getDynamicTip, addSchedule, delFile, getDynamic, deleteSchedule, getScheduleDetail, uploadPermissions, previewPermissions } from '../../api/request.js'
import { isParticipate, getDynamicTip, addSchedule, delFile, getDynamic, deleteSchedule, getScheduleDetail, uploadPermissions, previewPermissions } from '../../api/request.js'
create.Page({
store: exampleStore,
useAll: true,
......@@ -111,9 +111,6 @@ create.Page({
space: { spaceId: _that.data.uploadSpaceId, compress: true, isCopy: 1, max: 9 },
types: ["photo", "camera", "space"],
success: (res) => {
console.log(111111)
console.log(JSON.stringify(res))
console.log(2222)
dd.navigateTo({ url: `./../uploadFile/uploadFile?scheduleItem=${JSON.stringify(_that.data.scheduleItem)}&upLoadInfo=${JSON.stringify(res)}` })
},
fail: (err) => {
......@@ -217,7 +214,7 @@ create.Page({
nextPage(event) {
switch (event.target.dataset.nextPage) {
case 'participants':
dd.navigateTo({ url: `./../attendingSituation/attendingSituation?userList=${JSON.stringify(this.store.data.userList)}` })
dd.navigateTo({ url: `./../attendingSituation/attendingSituation?userList=${JSON.stringify(this.store.data.userList)}&organizer=${this.data.organizer}` })
break;
case 'edit':
dd.navigateTo({ url: `./../createOrEditSchedule/createOrEditSchedule?scheduleItem=${JSON.stringify(this.data.scheduleItem)}` })
......@@ -246,5 +243,51 @@ create.Page({
}
return timeResule
},
// 确认参加不参加 单次的会议
confirmAtten(event) {
let value = event.target.dataset.value
let data = {
value: value,
scheduleId: this.data.scheduleItem.id,
planDate: this.data.scheduleItem.planDate,
templateId: this.data.scheduleItem.scheduleTemplateId,
type: 'only'
}
let data1 = {
id: this.data.scheduleItem.id,
planDate: this.data.scheduleItem.planDate,
templateId: this.data.scheduleItem.scheduleTemplateId
}
isParticipate(data).then(res => {
getScheduleDetail(data1).then(success => {
this.store.data.userList = res.data.data.userList
this.update()
})
})
},
// 重复会议的参加
confirmRepeatAtten(event) {
let type = ''
let data = {
value: 0,
scheduleId: this.data.scheduleItem.id,
planDate: this.data.scheduleItem.planDate,
templateId: this.data.scheduleItem.scheduleTemplateId,
type: 'only'
}
},
// 重复会议取消参加
cancelRepeatAtten(event) {
let data = {
value: 1,
scheduleId: this.data.scheduleItem.id,
planDate: this.data.scheduleItem.planDate,
templateId: this.data.scheduleItem.scheduleTemplateId,
type: 'only'
}
}
});
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