Skip to content

S
schedule
Commit da9f6976 by fengzhaoyu
Options

11

parent 6d9e46fd
Showing with 29 additions and 914 deletions
app.json
...@@ -3,10 +3,8 @@ ...@@ -3,10 +3,8 @@
"pages/index/index", "pages/index/index",
"pages/meetingDetail/meetingDetail", "pages/meetingDetail/meetingDetail",
"pages/excutorList/excutorList", "pages/excutorList/excutorList",
"pages/editMeeting/editMeeting",
"pages/createMeeting/createMeeting", "pages/createMeeting/createMeeting",
"pages/outLookContact/outLookContact", "pages/outLookContact/outLookContact",
"pages/editFile/editFile",
"pages/place/place", "pages/place/place",
"pages/meetingRoomList/meetingRoomList", "pages/meetingRoomList/meetingRoomList",
"pages/addRemark/addRemark", "pages/addRemark/addRemark",
...@@ -17,7 +15,6 @@ ...@@ -17,7 +15,6 @@
"pages/remind/remind", "pages/remind/remind",
"pages/scheduleDetail/scheduleDetail", "pages/scheduleDetail/scheduleDetail",
"pages/participantsDetail/participantsDetail", "pages/participantsDetail/participantsDetail",
"pages/createOrEditSchedule/createOrEditSchedule",
"pages/applicationDetails/applicationDetails", "pages/applicationDetails/applicationDetails",
"pages/attendeeList/attendeeList" "pages/attendeeList/attendeeList"
] ]
......
package.json
{ {
"dependencies": { "dependencies": {
"dd-store": "^1.8.3", "dd-store": "^1.8.4",
"rrule": "^2.6.4" "rrule": "^2.6.4"
} }
} }
pages/createOrEditSchedule/createOrEditSchedule.acss deleted 100644 → 0
@import "../../assests/font/iconfont.acss";
page {
background: #f6f6f6;
font-family: PingFangSC-Regular;
font-size: 34rpx;
color: #191F25;
padding-bottom: 180rpx;
box-sizing: border-box;
}
.iconfont {
font-size: 32rpx;
}
::-webkit-scrollbar {
display: none
}
.parent {
display: flex
}
.theme {
border-top: 1rpx solid rgba(25, 31, 37, 0.12);
/* overflow: hidden; */
background: #fff;
color: #191F25;
padding: 30rpx 32rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
position: relative;
}
.theme input {
width: 100%;
padding-left: 0;
height: 52rpx;
font-size: 40rpx;
line-height: 52rpx;
}
.place, .participants, .remind, .time {
background: #fff;
display: flex;
margin-top: 16rpx;
height: 112rpx;
padding: 0 32rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
}
.time {
height: 132rpx;
display: flex;
padding: 0;
/* overflow-y: hidden; */
}
.AllTimeUnAction {
background: url('../../assests/AllTimeUnAction.png');
background-size: cover;
}
.startTimeAction {
background: url('../../assests/startTimeAction.png');
background-size: cover;
}
.endTimeAction {
background: url('../../assests/endTimeAction.png');
background-size: cover;
}
.timeContainer {
font-family: DINAlternate-Bold;
display: flex;
height: 34rpx;
margin-top: 22rpx;
}
.yearTime {
margin-right: 24rpx;
}
.dayTime {
text-indent: 0;
}
.weekTime {
font-size: 26rpx;
margin-top: 15rpx;
/* color: rgba(152, 165, 179, 0.56); */
}
.startTime, .endTime {
width: 50%;
height: 132rpx;
}
.startTime {
width: 355rpx;
text-indent: 32rpx;
}
.line {
position: absolute;
background: white;
top: 230.5rpx;
right: -6rpx;
width: 32rpx;
height: 32rpx;
transform: scaleY(3) translate(30%, -30px) rotate(45deg);
border-top: 1rpx solid #E3E4E4;
border-right: 1rpx solid #E3E4E4;
}
.selectLine {
background: #3296FA;
border: none;
}
.endTime {
text-indent: 75rpx;
}
.endTime::before {}
.endTime::after {}
.icon, .text {
width: 100%;
height: 100%;
line-height: 112rpx;
vertical-align: center;
}
.icon {
/* font-size: 38rpx; */
width: 30rpx;
margin-right: 27rpx;
text-align: center;
}
.remind .text {
width: 100%;
display: flex;
justify-content: space-between;
}
.close {
color: rgba(25, 31, 37, 0.28);
}
.save {
padding: 24rpx 34rpx;
background: #fff;
position: fixed;
bottom: 0;
left: 0;
right: 0;
}
.save>view {
font-size: 36rpx;
text-align: center;
line-height: 96rpx;
width: 686rpx;
height: 90rpx;
color: #fff;
background: #3296FA;
border: 1px solid rgba(25, 31, 37, 0.12);
border-radius: 48px;
}
.people {
height: 100%;
display: flex;
position: relative;
}
.peopleTop {}
.scrollPeople {
white-space: nowrap;
height: 100%;
overflow-x: scroll;
max-width: 400rpx;
}
.scrollPeople image, .name {
text-align: center;
line-height: 58rpx;
font-size: 24rpx;
display: inline-block;
color: white;
margin: 27rpx 16rpx 27rpx 0;
width: 58rpx;
height: 58rpx;
border-radius: 50%;
vertical-align: top;
background: #3296FA;
}
.addPeople {
line-height: 58rpx;
margin-top: 27rpx;
color: rgba(25, 31, 37, 0.12);
margin-left: 8rpx;
width: 58rpx;
height: 58rpx;
text-align: center;
vertical-align: middle;
font-size: 61rpx;
border-radius: 50%;
}
.rightPeople {
position: absolute;
opacity: 0.56;
font-size: 28rpx;
color: #191F25;
right: 32rpx;
}
.rightPeople .iconyoujinru {
margin-left: 15rpx;
opacity: 1;
color: rgba(25, 31, 37, 0.40);
}
.imageGroup {
position: relative;
}
.conflictTip {
font-size: 12rpx;
text-align: center;
border: 1rpx solid #fff;
width: 11px;
line-height: 11px;
height: 11px;
display: inline-block;
border-radius: 50%;
position: absolute;
background: #f25643;
color: rgb(211, 190, 192);
bottom: -2rpx;
right: 12rpx;
color: rgb(204, 201, 201);
background: url(../../assests/chongtu.png) center / 100% 100%
}
.participants {
height: auto;
}
.tip {
width: 661rpx;
border-top: 1rpx solid rgba(25, 31, 37, 0.12);
height: 86rpx;
font-size: 28rpx;
white-space: nowrap;
line-height: 86rpx;
overflow-x: scroll;
}
.noConflict {
color: #3296FA;
}
.conflict {
color: #E60012;
}
.addParticipants {
width: 100%;
display: inline-block;
height: 100%;
}
.selectPlace {
display: flex;
justify-content: space-between;
}
.iconshanchu-1 {
color: rgba(25, 31, 37, 0.28);
}
.conflict {
margin-right: 10rpx;
}
.editList {
width: 670rpx;
padding: 0 16rpx;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.13);
background: #fff;
display: flex;
width: 670rpx;
border-radius: 6rpx;
margin: 24rpx 24rpx 0 24rpx;
justify-content: space-around;
}
.editList>view {
margin: 24rpx 0;
}
.listIcon {
line-height: 30rpx;
text-align: center;
margin-bottom: 9rpx;
vertical-align: top;
}
.listText {
text-align: center;
font-size: 20rpx;
line-height: 26rpx;
}
.repeat {
background: #fff;
display: flex;
padding-left: 32rpx;
margin-top: 16rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
}
.repeat .iconchongfu2 {
vertical-align: top;
margin-right: 27rpx;
text-align: center;
line-height: 112rpx;
}
.repeatTime {
height: 112rpx;
line-height: 112rpx;
/* position: relative; */
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
}
.repeatContaint {
width: 100%;
height: auto;
}
.repeat .iconshanchu-1 {
float: right;
margin-right: 24rpx;
}
.terminationTime {
height: 112rpx;
line-height: 112rpx;
}
.describe {
background: #fff;
margin-top: 16rpx;
padding: 32rpx;
display: flex;
}
.describe .iconmiaoshu {
margin-right: 27rpx;
}
.describeText {
width: 574rpx;
}
.describe .iconshanchu-1 {
position: absolute;
right: 32rpx;
}
.blank {
width: 600rpx;
overflow-x: scroll;
white-space: nowrap;
}
.blank>text {
margin-right: 10rpx;
}
.container {
position: relative;
}
.permissions {
width: 100%;
background: rgba(0, 0, 0, 0);
position: absolute;
height: 100%;
top: 0;
z-index: 10；
}
.noPermissions {
opacity: 0.6;
}
.iconshanchu3 {
color: #f25643;
}
.iconshanchu3+.listText {
color: #f25643;
}
.popupWindow {
height: 100%;
width: 100%;
position: fixed;
top: 0;
background: rgba(0, 0, 0, 0.12)
}
.popupWindowCenter {
width: 587rpx;
left: 50%;
margin-left: -293rpx;
height: auto;
position: absolute;
border-radius: 10rpx;
top: 400rpx;
background: #fff;
}
.list {
height: 96rpx;
text-align: center;
line-height: 96rpx;
text-align: center;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
}
.list:nth-child(2) {
color: #3296FA;
}
.listBg {
position: fixed;
top: 0;
height: 100%;
width: 100%;
background: rgba(0, 0, 0, 0.12);
font-family: 'PingFangSC-Regular';
font-size: 40rpx;
color: #191F25;
text-align: center;
z-index: 9999;
}
.listContent {
padding: 0 20rpx;
position: fixed;
bottom: 18rpx;
width: 710rpx;
}
.listItemCont {
background: #FFFFFF;
border-radius: 26rpx;
width: 100%;
}
.listItem {
height: 112rpx;
line-height: 112rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
}
.listItem:last-child {
border: none;
}
.cancelList {
background: #fff;
height: 112rpx;
line-height: 112rpx;
margin-top: 16rpx;
border-radius: 26rpx;
}
.placeName {
height: 100%;
width: 600rpx;
overflow-x: scroll;
white-space: nowrap;
}
\ No newline at end of file
pages/createOrEditSchedule/createOrEditSchedule.json deleted 100644 → 0
{
"usingComponents": {
"mw-modal": "../../components/mwSelectTimeModal/mwSelectTimeModal"
}
}
\ No newline at end of file
pages/editMeeting/editMeeting.acss deleted 100644 → 0
@import "../../assests/font/iconfont.acss";
@import "../../template/deleteBtn/index.acss";
page {
background: #fff;
font-family: PingFangSC-Regular;
font-size: 28rpx;
color: #0a0a0a;
}
.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: #0a0a0a;
font-size: 34rpx;
}
input {
caret-color: #3070F2;
padding-left: 0;
height: 52rpx;
line-height: 52rpx;
}
.createTitle {
padding: 14rpx 36rpx 16rpx;
position: relative;
min-height: 90rpx;
overflow: hidden;
}
.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: #0a0a0a;
line-height: 58rpx;
}
.remark>input {
padding-left: 0;
width: 100%;
opacity: 0.72;
font-size: 28rpx;
color: rgba(3, 3, 3, 1)
}
.placeholder {
opacity: 0.4;
font-family: PingFangSC-Medium;
font-size: 40rpx;
color: #1B263D;
position: relative;
}
.remark .placeholder {
font-size: 28rpx
}
.meetingWay {
position: relative;
}
.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;
}
.editeMeeting .delete-task-wrap {
margin: 74rpx auto 32rpx;
}
.delete-task {
color: #EA0C28!important;
}
.footNav {
position: fixed;
bottom: 0;
left: 0;
right: 0;
border-top: 1rpx solid rgba(25, 31, 37, 0.12);
box-shadow: 1rpx 1rpx 4rpx 0 rgba(0, 0, 0, 0.08);
}
.originStaus, .participateStatus, .noParticipateStatus {
display: flex;
line-height: 96rpx;
font-family: PingFangSC-Medium;
font-size: 28rpx;
align-items: center;
}
.originStaus>view, .participateStatus>view {
height: 96rpx;
line-height: 96rpx;
width: 49%;
text-align: center;
}
.originStaus>view>.iconfont {
margin-right: 12rpx;
color: #A9ACB4;
vertical-align: middle;
}
.participateStatus .remind {
width: 580rpx;
}
.participateStatus .participate {
width: 168rpx;
}
.remind {
font-family: PingFangSC-Regular;
font-size: 28rpx;
color: #1B263D;
}
.remind>text {
display: inline-block;
vertical-align: top;
}
.remindTimeContaint {
display: inline-block;
max-width: 400rpx;
overflow: scroll;
white-space: nowrap;
margin: 0 20rpx;
text-align: center;
}
.remindTimeContaint>text {
margin: 0 8rpx;
}
.noRemind {
margin: 0 20rpx;
}
.remindTime {
margin-right: 4rpx;
}
.participate>text {
margin-right: 10rpx;
color: #15BC83;
}
.noParticipateStatus {
font-family: PingFangSC-Medium;
font-size: 14px;
color: #F25643;
}
.noParticipateStatus {
justify-content: center;
}
.noParticipateStatus>text {
margin-right: 10rpx;
}
.footerBottom {
background: #fff;
border-top: 2rpx solid rgba(25, 31, 37, 0.12);
height: 94rpx;
display: flex;
align-items: center;
justify-content: flex-end;
width: 100%;
}
.footerBottom>view {
width: 35rpx;
margin: 0 38rpx;
font-size: 16rpx;
text-align: center;
}
.footerBottom>view>.iconfont {
font-size: 36rpx;
}
.footerBottom>view:last-child {
margin: 0 24rpx 0 0;
}
.devider {
background: rgba(227, 228, 228, 1);
height: 48rpx;
width: 1rpx;
margin: 0 28rpx;
}
.noValueIcon {
color: rgba(216, 216, 216, 1)!important;
}
.footNavTop .devider {
margin: 0;
}
.permissions {
background: rgba(0, 0, 0, 0);
position: fixed;
top: 0;
z-index: 10;
height: 100%;
width: 100%;
background: red;
}
\ No newline at end of file
pages/editMeeting/editMeeting.json deleted 100644 → 0
{
"usingComponents": {
"popup": "../../components/popup/index",
"list": "../../components/list/list",
"hlist": "../../components/hList/hList",
"toast": "../../components/toast/toast",
"selectpopup": "../../components/selectPopup/selectPopup",
"centerpopup": "../../components/centerPopup/centerPopup",
"meeting-time-picker": "../../components/meetingTimePicker/meetingTimePicker"
}
}
\ No newline at end of file
pages/meetingDetail/meetingDetail.acss
...@@ -186,7 +186,6 @@ input { ...@@ -186,7 +186,6 @@ input {
font-family: PingFangSC-Medium; font-family: PingFangSC-Medium;
font-size: 40rpx; font-size: 40rpx;
color: #1B263D; color: #1B263D;
position: relative;
} }
.remark .placeholder { .remark .placeholder {
......
pages/meetingDetail/meetingDetail.js
...@@ -214,7 +214,6 @@ create.Page({ ...@@ -214,7 +214,6 @@ create.Page({
}, },
// 输入框输入事件 // 输入框输入事件
onInput(event) { onInput(event) {
debugger
switch (event.target.dataset.type) { switch (event.target.dataset.type) {
case 'title': case 'title':
this.setData({ this.setData({
...@@ -416,7 +415,6 @@ create.Page({ ...@@ -416,7 +415,6 @@ create.Page({
// 选择完水平 HList 的回调 // 选择完水平 HList 的回调
selectComHList(event) { selectComHList(event) {
console.log(event) console.log(event)
debugger;
switch (event.currentTarget.dataset.item.id) { switch (event.currentTarget.dataset.item.id) {
case 0: case 0:
this.addParticipator() this.addParticipator()
...@@ -1048,6 +1046,7 @@ create.Page({ ...@@ -1048,6 +1046,7 @@ create.Page({
}, },
// 删除 日程 // 删除 日程
delSheudle() { delSheudle() {
const _that = this
if (this.data.repeatable) { if (this.data.repeatable) {
this.setData({ this.setData({
'conSelectPopupData.selectType': 'delSheudle', 'conSelectPopupData.selectType': 'delSheudle',
...@@ -1067,6 +1066,10 @@ create.Page({ ...@@ -1067,6 +1066,10 @@ create.Page({
deleteModel: 'only' deleteModel: 'only'
} }
deleteSchedule(data).then(res => { deleteSchedule(data).then(res => {
console.log(this)
debugger
_that.$store.data.indexNeedUpdate = true
_that.update()
dd.navigateBack({ dd.navigateBack({
delta: 1 delta: 1
}) })
......
yarn.lock
...@@ -2,7 +2,26 @@ ...@@ -2,7 +2,26 @@
# yarn lockfile v1 # yarn lockfile v1
dd-store@^1.8.3: dd-store@^1.8.4:
version "1.8.3" version "1.8.4"
resolved "https://registry.yarnpkg.com/dd-store/-/dd-store-1.8.3.tgz#b47f8b4d8f0c9a8c4429716788dd47b01dd15265" resolved "https://registry.yarnpkg.com/dd-store/-/dd-store-1.8.4.tgz#6a8e58d4f8acf60259f7357caf0d5c6e74e5f8ef"
integrity sha512-++BcwtpK0m57fAvv4bl9lc5Fc23TQCmLVQYgaBG2fKh2eY6WXURr6gg7crhAWiwEfFKa2waRE+ei4HHSSerYSw== integrity sha512-UKA9nrW5biJ1Pt7c4fKtFZ+4cgLyWuBMHao7PDigbUkVBug6aXDB5VvCZHqwDwf2ofiOa7e9wp5C1OVNaUEDzA==
luxon@^1.21.3:
version "1.22.2"
resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.22.2.tgz#799d65cc1ed0ba85b4cb3f7dd38fc08a8d1a6750"
integrity sha512-vq6eSaOOw1fKob+JXwfu0e3/UFUT4G4HTFRJab7dch8J1OdOGW/vXqCiJsY7rm2In+5gKNYx0EtnYT0Tc5V4Qw==
rrule@^2.6.4:
version "2.6.4"
resolved "https://registry.yarnpkg.com/rrule/-/rrule-2.6.4.tgz#7f4f31fda12bc7249bb176c891109a9bc448e035"
integrity sha512-sLdnh4lmjUqq8liFiOUXD5kWp/FcnbDLPwq5YAc/RrN6120XOPb86Ae5zxF7ttBVq8O3LxjjORMEit1baluahA==
dependencies:
tslib "^1.10.0"
optionalDependencies:
luxon "^1.21.3"
tslib@^1.10.0:
version "1.11.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
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