Skip to content

S
schedule
Commit 5bd00ca2 by xiexiaoqin
Options

merge

parents 1273711b 381c50f9
Showing with 684 additions and 10 deletions
components/fileList/fileList.axml
......@@ -12,7 +12,8 @@
<view a:if="{{isCanDelete}}" class="iconfont iconicon_noAgreed1" catchTap="removeFile" data-id="{{item.fileId}}"></view>
</view>
</view>
<view class="btns-pop" a:if="{{fileView.id == logId && (organizer === currentPeople ? true : currentPeople === fileView.creatorId)}}">
<!-- && (organizer === currentPeople ? true : currentPeople === fileView.creatorId) -->
<view class="btns-pop" a:if="{{fileView.id == logId}}">
<view class="edit" catchTap="updateFile" data-fileView="{{fileView}}">
编辑
</view>
......
components/relatedApp/relatedApp.js
......@@ -26,7 +26,11 @@ create.Component({
didUnmount() {},
methods: {
getData() {
getThirdUserPlatForm().then(res => {
let data = {
platForm: "",
ddUserId: getApp().globalData.userid
};
getThirdUserPlatForm(data).then(res => {
let relatedAppPlatformList = [];
res.data.data.forEach(item => {
relatedAppPlatformList.push(item.platform);
......
pages/appDetails/appDetails.js
......@@ -47,12 +47,28 @@ create.Page({
clearInterval(interval);
}
requestNum++;
getThirdUserPlatForm().then(res => {
let relatedAppPlatformList = [];
res.data.data.forEach(item => {
if (item.platform === this.data.platform) {
let data = {
platForm: this.data.platform,
ddUserId: getApp().globalData.userid
};
getThirdUserPlatForm(data).then(res => {
console.log(JSON.stringify(res));
console.log(res.data.msg === "当前账号已被其他账号绑定！");
if (res.data.msg === "当前账号已被其他账号绑定！") {
this.setData({
isBind: false,
bindStatus: "binded"
});
setTimeout(() => {
that.setData({
isLoading: false
});
}, 10000);
clearInterval(interval);
} else if (res.data.data) {
if (res.data.data.platform === this.data.platform) {
this.setData({
name: item.userName,
name: res.data.data.userName,
isBind: true,
bindStatus: "success"
});
......@@ -65,7 +81,7 @@ create.Page({
this.$store.data.relatedAppNeedUpdate = true;
this.update();
}
});
}
});
}, 1000);
},
......
pages/meetingDetail/meetingDetail.acss
/* required by usingComponents */
\ No newline at end of file
@import "../../template/affairBlank/index.acss";
.affair-list {
background: #fff;
padding: 48rpx 32rpx 220rpx 32rpx;
/* height: calc(100vh - 200rpx); */
}
.affair-list-margin-top {
margin-top: 16rpx;
}
.simple-column {
color: rgba(25, 31, 37, 0.4);
font-size: 26rpx;
line-height: 1.5;
text-align: center;
margin-bottom: 48rpx;
}
.compose-column {
position: relative;
padding-left: 104rpx;
margin-bottom: 48rpx;
padding-top: 16rpx;
}
.compose-column>.avater {
width: 80rpx;
height: 80rpx;
line-height: 80rpx;
border-radius: 50%;
position: absolute;
left: 0;
top: 16rpx;
}
.compose-column>.task-avater {
background: rgba(21, 188, 131, 1);
}
.compose-column>.task-avater>.iconfont {
color: #fff;
font-size: 40rpx;
}
.compose-column .title {
color: rgba(27, 38, 61, 1);
font-size: 32rpx;
font-family: PingFangSC-Medium;
}
.compose-column .title>text {
color: rgba(25, 31, 37, 0.4);
font-size: 28rpx;
margin-left: 16rpx;
font-family: PingFangSC-Regular;
}
.checkbox {
border: 3rpx solid rgba(77, 217, 100, 1);
border-radius: 4rpx;
width: 28rpx;
height: 28rpx;
margin-right: 18rpx;
}
.footer {
background: #fff;
border-top: 2rpx solid rgba(25, 31, 37, 0.12);
height: 94rpx;
position: fixed;
bottom: 0;
left: 0;
display: flex;
align-items: center;
justify-content: flex-end;
width: 100%;
}
.footer>view {
width: 35rpx;
margin: 0 38rpx;
font-size: 16rpx;
color: rgba(10, 10, 10, 0.56);
text-align: center;
}
.footer>view>.iconfont {
font-size: 36rpx;
}
.footer>view:last-child {
margin: 0 24rpx 0 0;
}
.devider {
background: rgba(227, 228, 228, 1);
height: 48rpx;
width: 1rpx;
margin: 0 28rpx;
}
/* das */
@import "../../template/deleteBtn/index.acss";
page {
font-size: 28rpx;
color: #0a0a0a;
}
.hideDetail {
padding: 28rpx 32rpx 24rpx;
box-shadow: 0 0px 4px 1px rgba(0, 0, 0, 0.08);
background: #fff;
z-index: 1;
position: relative;
width: 100%;
padding-bottom: 0;
}
.hideTitle {
font-family: PingFangSC-Regular;
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: #9599A2;
font-size: 64rpx;
text-align: center;
}
.icon {
width: 36rpx;
height: 100%;
vertical-align: middle;
color: #0a0a0a;
font-size: 36rpx;
line-height: 50rpx;
line-height: 50rpx;
}
input {
caret-color: #3070F2;
padding-left: 0;
height: 52rpx;
/* line-height: 52rpx; */
}
.createTitle {
padding: 14rpx 32rpx 16rpx;
position: relative;
min-height: 90rpx;
overflow: hidden;
}
.createTitle>.title {
display: flex;
line-height: 1.5;
justify-content: space-between;
text-align: left;
}
.createTitle>.title>input {
padding-left: 0;
font-size: 40rpx;
font-family: PingFangSC-Medium;
width: 100%;
}
.createTitle>.title>.icon {
color: #0a0a0a;
line-height: 58rpx;
}
.remark>input {
padding-left: 0;
width: 100%;
font-size: 28rpx;
color: rgba(10, 10, 10, 0.4)
}
.placeholder {
opacity: 0.4;
font-family: PingFangSC-Medium;
font-size: 40rpx;
color: #1B263D;
}
.remark .placeholder {
font-size: 28rpx;
font-family: PingFangSC-Regular;
}
.meetingWay {
position: relative;
}
.place, .time, .participator, .meetingWay, .meetingWayShowTop {
display: flex;
padding: 0 32rpx;
font-family: PingFangSC-Regular;
color: #191F25;
overflow: hidden;
margin-top: 48rpx;
}
.place>.icon, .time>.icon, .participator>.icon, .meetingWay>.icon, .meetingWayShowTop>.icon {
margin-right: 24rpx;
}
.noPlace, .hasplace, .timeText, .participatorText, .noWay, .hasWay, .meetingWayText {
font-size: 34rpx;
width: 100%;
line-height: 1.5;
}
.hasplace, .timeText {
word-break: break-all;
max-width: 540rpx;
overflow: hidden;
}
.placeContaint, .timeContaint, .participatorContaint, .meetingWayContent {
width: 622rpx;
display: flex;
justify-content: space-between;
}
.meetingWay .close, .place .close, .participator .iconright {
color: #9599A2;
}
.close {
font-size: 32rpx;
color: rgba(10, 10, 10, 0.3)!important;
}
.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;
}
.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: 15px;
vertical-align: top;
width: 15px;
height: 15px;
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: 78rpx;
border: 1rpx solid rgba(10, 10, 10, 0.14);
border-radius: 50%;
color: #BBBEC5;
}
.editeMeeting {
background: #fff;
}
.editeMeeting .delete-task-wrap {
padding: 74rpx 0 32rpx 0;
}
.delete-task {
color: #EA0C28!important;
}
.footNav {
position: fixed;
bottom: 0;
left: 0;
right: 0;
background: rgb(255, 255, 255);
z-index: 100
}
.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: rgba(10, 10, 10, 0.4);
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 {
height: 100%;
display: inline-block;
max-width: 400rpx;
min-width: 0;
white-space: nowrap;
margin: 0 20rpx;
text-align: center;
overflow: scroll;
}
.remindTimeContaint>text {
margin: 0 8rpx;
}
.noRemind {
margin: 0 20rpx;
}
.remindTime {
margin-right: 4rpx;
}
.participate>text {
margin-right: 10rpx;
color: #15BC83;
vertical-align: middle;
}
.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(239, 242, 245, 1);
height: 94rpx;
display: flex;
align-items: center;
justify-content: flex-end;
width: 100%;
color: rgba(10, 10, 10, 0.4);
}
.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 {
box-shadow: 0px 0px 4px 1px rgba(0, 0, 0, 0.08);
}
.permissions {
background: rgba(0, 0, 0, 0);
position: fixed;
top: 0;
z-index: 10;
height: 100%;
width: 100%;
background: red;
}
.affair-list-title {
font-size: 40rpx;
color: rgba(25, 31, 37, 1);
margin-bottom: 64rpx;
}
.permissionContant {
height: auto;
position: relative;
}
.permission {
width: 100%;
height: 100%;
position: absolute;
top: 0;
z-index: 999；
}
.affair-placeholder {
padding-top: 168rpx;
text-align: center;
width: 600rpx;
margin: 0 auto;
}
.affair-placeholder image {
margin-top: 50rpx;
}
.affair-placeholder .affair-blank-tip {
white-space: nowrap;
}
.metingDetail {
overflow: hidden;
height: 100vh;
}
.meetingWayImageUrl {
flex-grow: 0;
width: 40rpx;
height: 40rpx;
margin-right: 24rpx;
}
.meetingWayImageUrl>image {
margin-top: 5rpx;
vertical-align: top;
width: 100%;
height: 100%;
}
.loading {
width: 100vw;
height: 100%;
background: #fff;
position: fixed;
top: 0;
left: 0;
right: 0;
}
.loading .image {
width: 56rpx;
height: 56rpx;
position: absolute;
left: 50%;
top: 50%;
margin-left: -28rpx;
margin-top: -28rpx;
text-align: center;
background: url(../../assests/loading.gif) center / 100% 100%;
vertical-align: middle;
}
.iconicon_repeat1 {
color: rgba(10, 10, 10, 0.4)
}
.participateText {
vertical-align: middle
}
.tabBarBottom {
height: 68rpx;
width: 100%;
background: #fff;
}
.iconicon_description1 {
color: rgba(10, 10, 10, 0.4)!important;
}
.iconright {
font-size: 30rpx;
color: rgba(10, 10, 10, 0.3)!important;
}
.addPadding {
padding-bottom: 270rpx;
}
.lineThrough {
text-decoration: line-through;
}
.loading-more {
color: rgba(234, 12, 40, 1);
font-size: 24rpx;
text-align: center;
width: 400rpx;
border-top: 1px solid rgba(239, 242, 245, 1);
padding-top: 32rpx;
margin: 0 auto 50rpx;
}
.meetingWayText {
color: rgba(48, 112, 242, 1);
}
.mettingWayText {
margin-top: 22rpx;
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(25, 31, 37, 0.55);
}
.mettingWayText .icon {
color: rgba(10, 10, 10, 0.14);
margin-left: 26rpx;
}
.passWord {
margin-top: 0rpx;
}
.meetingWayShowTop>.icon {
color: rgb(216, 216, 216) !important
}
>>>>>>>dev
\ 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