Skip to content

S
schedule
Commit 21f7e539 by fengzhaoyu
Options

暂存

parent 8f5835d5
Showing with 89 additions and 56 deletions
pages/attendingSituation/attendingSituation.acss
......@@ -95,13 +95,13 @@ page {
background: #E60012 ;
}
.participatorStaus {
width: 9px;
width: 11px;
text-align: center;
line-height: 9px;
line-height:11px;
color: #fff;
font-size: 14rpx;
font-size: 12rpx;
border: 1rpx solid #fff;
height: 9px;
height: 11px;
border-radius: 50%;
position: absolute;
bottom: 2rpx;
......
pages/createOrEditSchedule/createOrEditSchedule.acss
......@@ -228,12 +228,12 @@ page {
}
.conflictTip {
font-size: 14rpx;
font-size: 12rpx;
text-align: center;
border: 1rpx solid #fff;
width: 9px;
line-height: 9px;
height: 9px;
width: 11px;
line-height: 11px;
height: 11px;
display: inline-block;
border-radius: 50%;
position: absolute;
......@@ -242,7 +242,7 @@ page {
bottom: -2rpx;
right: 12rpx;
color: rgb(204, 201, 201);
/* border: 1rpx solid #fff; */
background: url(../../assests/chongtu.png) center / 100% 100%
}
.participants {
......
pages/createOrEditSchedule/createOrEditSchedule.axml
......@@ -3,7 +3,7 @@
<!-- 主题 -->
<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<view class="theme">
<input placeholder="添加主题" type="text" onInput="getTitle" value="{{title}}" focus="{{true}}"/>
<input placeholder="添加主题" type="text" onInput="getTitle" value="{{title}}" focus="{{true&&scheduleItem}}"/>
</view>
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view>
......@@ -73,7 +73,7 @@
<image a:if="{{!!item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}"/>
<text a:else class="name">{{item.username.substring(item.username.length - 2, item.username.length)}}</text>
</text>
<view a:if="{{conflictPeople.includes(item.userId)}}" class="conflictTip iconfont iconduigou "></view>
<view a:if="{{conflictPeople.includes(item.userId)}}" class="conflictTip "></view>
</text>
</view>
<view class="addPeople iconfont icontianjia1" onTap="addParticipants">
......
pages/createOrEditSchedule/createOrEditSchedule.js
......@@ -418,7 +418,8 @@ create.Page({
},
// 会议冲突
conflict() {
this.store.data.conflictPeople = []
// this.store.data.conflictPeople = []
let conflictPeople = []
let data = {
startTime: `${this.data.time1.replace(/\//g, "-")}`,
endTime: `${this.data.time2.replace(/\//g, "-")}`,
......@@ -428,15 +429,15 @@ create.Page({
for (let value in res.data.data) {
if (!!this.data.scheduleItem) {
if (res.data.data[value].length > 1) {
this.store.data.conflictPeople.push(value)
conflictPeople.push(value)
}
} else {
if (res.data.data[value].length > 0) {
this.store.data.conflictPeople.push(value)
conflictPeople.push(value)
}
}
}
this.store.data.conflictPeople = conflictPeople
this.update()
})
},
......@@ -520,7 +521,7 @@ create.Page({
}
dd.confirm({
title: '删除会议',
content: '确认删除删除会议吗？',
content: '确认删除会议吗？',
confirmButtonText: '确定',
cancelButtonText: '取消',
success: (success) => {
......@@ -665,7 +666,7 @@ create.Page({
},
// 展示弹窗
showModel: throttle(function (e) {
if (!!this.data.scheduleItem&&this.store.data.userList.length>1) {
if (!!this.data.scheduleItem && this.store.data.userList.length > 1) {
this.setData({
isShowPopupWindowList: true
})
......
pages/index/index.acss
......@@ -170,7 +170,7 @@ page {
height: 100%;
top: 0;
width: 100%;
background: #fff;
background:#fff;
}
.startPage>image {
width: 603rpx;
......@@ -178,5 +178,5 @@ page {
vertical-align: top;
margin-top: 365rpx;
margin-left: 82rpx;
z-index: 999;
z-index: 9999999;
}
\ No newline at end of file
pages/index/index.js
......@@ -8,10 +8,15 @@ Page({
thisYear: '',
maxYear: '',
minYear: '',
isClicked:false
isClicked:false,
startPageOnLoad: false,
startPageOnShow: false
},
onLoad(query) {
// 页面加载
this.setData({
startPageOnLoad: true
})
},
onReady() {
},
......@@ -46,7 +51,8 @@ Page({
todayStr: finalDate.toLocaleDateString(),
thisYear: year,
maxYear: year,
canClick: true
canClick: true,
startPageOnShow: true
})
})
})
......
pages/participantsDetail/participantsDetail.acss
......@@ -27,12 +27,12 @@ page {
text-align: center;
position: relative;
}
.conflict {
font-size: 14rpx;
position: absolute;
width: 9px;
height: 9px;
line-height: 9px;
width: 11px;
height: 11px;
line-height: 11px;
text-align: center;
color: #fff;
border: 1rpx solid #fff;
......@@ -40,13 +40,14 @@ page {
bottom: 3rpx;
right: -2rpx;
border-radius: 50%;
background: url(../../assests/chongtu.png) center / 100% 100%
}
.headImg image {
vertical-align: top;
width: 64rpx;
height: 64rpx;
border-radius: 50%;
}
.info {
......@@ -85,7 +86,7 @@ page {
margin-right: 16rpx;
}
.button .save {
.button .save {
color: white;
background: #3296FA;
border: 1px solid rgba(25, 31, 37, 0.12);
......
pages/participantsDetail/participantsDetail.axml
......@@ -3,7 +3,7 @@
<view class="headImg">
<image a:if="{{!!item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}"/>
<text a:else>{{item.username.substring(0, 1)}}</text>
<text a:if="{{conflictPeople.includes(item.userId)}}" class="conflict iconfont iconduigou"></text>
<text a:if="{{conflictPeople.includes(item.userId)}}" class="conflict"></text>
</view>
<view class="info">
<text class="name">{{item.username}}</text>
......
pages/place/place.acss
......@@ -10,24 +10,28 @@ page {
text-align: left;
font-size: 32rpx;
color: rgba(25, 31, 37, 0.40);
vertical-align: top;
margin-right: 24rpx;
line-height: 1.5;
line-height: 52rpx;
vertical-align: top;
}
.iconsousuo1 {
vertical-align: top;
line-height: 52rpx;
}
.search {
background: white;
display: flex;
padding: 40rpx 32rpx;
padding: 34rpx 32rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
}
.search input {
height: 52rpx;
font-size: 40rpx !important;
width: 100%;
vertical-align: top;
padding-left: 0;
display: block;
}
.availableList {
......@@ -44,6 +48,7 @@ page {
opacity: 0.75;
font-size: 28rpx;
color: #191F25;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
}
.iconhuiyishi2 {
......
pages/place/place.axml
......@@ -25,7 +25,7 @@
<text>{{item.capacityNum}}</text>
</view>
<view class="equipment" a:if="{{item.equipFacilityLabelList}}">
<text class="numIcon iconfont icondingwei1"></text>
<text class="numIcon iconfont iconshebei"></text>
<text a:for="{{item.equipFacilityLabelList}}" a:for-item="equipmentList">{{equipmentList.name}}</text>
</view>
</view>
......
pages/scheduleDetail/scheduleDetail.acss
......@@ -6,10 +6,12 @@ page {
color: #191F25;
padding-bottom: 180rpx;
}
.iconfont {
font-size: 32rpx;
vertical-align: top;
}
::-webkit-scrollbar {
display: none
}
......@@ -245,16 +247,17 @@ page {
bottom: 0;
color: rgba(25, 31, 37, 0.56);
font-size: 28rpx;
box-shadow: 0 -2px 16px 0 rgba(25,31,37,0.10);
box-shadow: 0 -2px 16px 0 rgba(25, 31, 37, 0.10);
}
.bottom .iconfont {
margin-right: 12rpx;
}
.buttonGroup {
flex: 1;
text-align: center;}
text-align: center;
}
.buttonGroup text {
vertical-align: top;
......@@ -270,7 +273,6 @@ page {
.describe .text {
padding: 27rpx 0;
margin-top: 10rpx;
}
.modFile {
......@@ -284,6 +286,7 @@ page {
z-index: 9;
top: -73rpx;
left: 50%;
background: red;
}
.modFile>view {
......@@ -312,11 +315,11 @@ page {
.participatorStaus {
border: 1rpx solid #fff;
width: 9px;
height: 9px;
width: 11px;
height: 11px;
color: #fff;
font-size: 14rpx;
line-height: 20rpx;
font-size: 12rpx;
line-height: 11px;
text-align: center;
border-radius: 50%;
position: absolute;
......@@ -399,6 +402,7 @@ page {
.dynamicright {
position: relative;
}
.selectDynamicright {
position: absolute;
top: 0;
......@@ -406,26 +410,34 @@ page {
width: 100%;
background: rgba(25, 31, 37, 0.12)
}
.line {
color: rgba(25, 31, 37, 0.12)!important;
margin-right: 32rpx;
}
.iconcanjia2 {
color: #15BC83;
}
.iconbucanjia2 {
color:#F25643;
color: #F25643;
}
.red {
color: #F25643;
color: #F25643;
}
.green {
color: #15BC83;
color: #15BC83;
}
.model {
position: fixed;
width: 100%;
height: 100%;
position: fixed;
top: 0;
background: rgb(0, 0, 0, 0);
z-index: 9999;
background: red;
}
\ No newline at end of file
pages/scheduleDetail/scheduleDetail.axml
<block a:if="{{showPage}}">
<view class="scheduleDetail">
<view class="scheduleDetail" onTap="hideModel">
<view class="scheduleInfo">
<!-- 标题 -->
<view class="title">
......@@ -90,7 +90,7 @@
<text class="iconshangchuanwenjian1 iconfont"></text></view></view>
<!-- 动态详情展示 -->
<view class="dynamicContent" a:if="{{allFileInfo.length}}">
<view class="dynamicDetail" a:for="{{allFileInfo}}" onTouchStart="touchStart" onTouchEnd="touchEnd" onLongTap="longPress" data-id="{{item.meetingLogId}}">
<view class="dynamicDetail" a:for="{{allFileInfo}}" catchTouchStart="touchStart" catchTouchEnd="touchEnd" catchLongTap="longPress" data-id="{{item.meetingLogId}}">
<view class="dynamicList" a:if="{{!!item.scheduleAccessory}}">
<view class="dynamicleft">
<image a:if="{{!!item.scheduleAccessory.uploaderInfo.headUrl}}" mode="scaleToFill" src="{{item.scheduleAccessory.uploaderInfo.headUrl}}"/>
......@@ -163,7 +163,4 @@
</view>
</view>
</view>
<!-- 编辑 删除的时候的弹窗 -->
<view class="model" onTap="hideModel" a:if="{{!!meetingLogId}}">
</view>
</block>
\ No newline at end of file
pages/scheduleDetail/scheduleDetail.js
......@@ -36,9 +36,9 @@ create.Page({
})
},
onShow() {
this.setData({
meetingLogId: ''
})
// this.setData({
// meetingLogId: ''
// })
let data = {
id: this.data.scheduleItem.id,
planDate: this.data.scheduleItem.planDate,
......@@ -367,6 +367,13 @@ create.Page({
},
// 隐藏删除编辑弹窗
hideModel() {
console.log(22238888)
this.setData({
meetingLogId: ''
})
},
// 空方法 阻止冒泡
blank() {
this.setData({
meetingLogId: ''
})
......
pages/uploadFile/uploadFile.js
......@@ -75,7 +75,7 @@ create.Page({
createModel: 'auto'
}
addSchedule(getId).then(success => {
this.data.saveUpload(success.data.id)
this.saveUpload(success.data.id)
})
}
},
......@@ -94,6 +94,9 @@ create.Page({
descript: this.data.descript
}
saveFileInfo(data).then(res => {
console.log(1111)
console.log(JSON.stringify(res))
console.log(1111)
dd.navigateBack({
delta: 1
})
......
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