Skip to content

S
schedule
Commit 7d18ce9c by fengzhaoyu
Options

fix:换小图标 加三个点 修改展开收起样式

parent b3420bd6
Showing with 140 additions and 30 deletions
components/comment/comment.acss
...@@ -24,6 +24,10 @@ ...@@ -24,6 +24,10 @@
line-height: 40rpx; line-height: 40rpx;
} }
.comment-name {
font-family: PingFangSC-Medium;
}
.comment-text>view:first-child { .comment-text>view:first-child {
color: #0A0A0A; color: #0A0A0A;
} }
......
components/comment/comment.axml
...@@ -9,11 +9,12 @@ ...@@ -9,11 +9,12 @@
<import src="../../template/avater/index.axml"/> <import src="../../template/avater/index.axml"/>
<template is="avater" data="{{item: item.creator }}"/> <template is="avater" data="{{item: item.creator }}"/>
<view class="comment-text"> <view class="comment-text">
<view>{{item.creator.name}}: {{item.remark}}</view> <view>
<text class="comment-name">{{item.creator.name}}</text>:{{item.remark}}
</view>
<view>{{item.updateTime}}</view> <view>{{item.updateTime}}</view>
</view> </view>
<view a:if="{{currentPeople === item.creator.ddUserId}}" class="delete-btn" onTap="deleteComment" data-commentId="{{item.commentId}}" data-parentCommentId="{{parentCommentId}}"> <view a:if="{{currentPeople === item.creator.ddUserId}}" class="delete-btn color4 icondelete2 iconfont" onTap="deleteComment" data-commentId="{{item.commentId}}" data-parentCommentId="{{parentCommentId}}">
删除
</view> </view>
</view> </view>
</view> </view>
\ No newline at end of file
components/notes/notes.acss
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
} }
.state { .state {
font-family: PingFangSC-Medium;
margin-top: 16rpx; margin-top: 16rpx;
color: rgba(10, 10, 10) color: rgba(10, 10, 10)
} }
......
components/taskList/taskList.acss
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
@import "../../template/checkbox/index.acss"; @import "../../template/checkbox/index.acss";
.task-list { .task-list {
border: 1rpx solid rgba(10, 10, 10, 0.14); border: 1rpx solid rgba(10, 10, 10, 0.14);
border-radius: 16rpx; border-radius: 8rpx;
padding: 16rpx; padding: 16rpx;
margin-top: 16rpx; margin-top: 16rpx;
} }
......
fonts/iconfont.eot
No preview for this file type
fonts/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
fonts/iconfont.json
...@@ -6,6 +6,55 @@ ...@@ -6,6 +6,55 @@
"description": "", "description": "",
"glyphs": [ "glyphs": [
{ {
"icon_id": "17677479",
"name": "editor-2",
"font_class": "editor-2",
"unicode": "e813",
"unicode_decimal": 59411
},
{
"icon_id": "17649868",
"name": "more",
"font_class": "more",
"unicode": "e812",
"unicode_decimal": 59410
},
{
"icon_id": "17649721",
"name": "describe1",
"font_class": "describe11",
"unicode": "e811",
"unicode_decimal": 59409
},
{
"icon_id": "17630350",
"name": "comments1",
"font_class": "comments1",
"unicode": "e80a",
"unicode_decimal": 59402
},
{
"icon_id": "17630466",
"name": "editor1",
"font_class": "editor1",
"unicode": "e80b",
"unicode_decimal": 59403
},
{
"icon_id": "17630503",
"name": "delete2",
"font_class": "delete2",
"unicode": "e80c",
"unicode_decimal": 59404
},
{
"icon_id": "17630300",
"name": "notes",
"font_class": "notes1",
"unicode": "e809",
"unicode_decimal": 59401
},
{
"icon_id": "17627318", "icon_id": "17627318",
"name": "message", "name": "message",
"font_class": "message", "font_class": "message",
...@@ -20,13 +69,6 @@ ...@@ -20,13 +69,6 @@
"unicode_decimal": 59399 "unicode_decimal": 59399
}, },
{ {
"icon_id": "17617868",
"name": "delete",
"font_class": "delete",
"unicode": "e806",
"unicode_decimal": 59398
},
{
"icon_id": "17617860", "icon_id": "17617860",
"name": "comments", "name": "comments",
"font_class": "comments", "font_class": "comments",
...@@ -41,13 +83,6 @@ ...@@ -41,13 +83,6 @@
"unicode_decimal": 59397 "unicode_decimal": 59397
}, },
{ {
"icon_id": "17595806",
"name": "notes",
"font_class": "notes",
"unicode": "e803",
"unicode_decimal": 59395
},
{
"icon_id": "14283585", "icon_id": "14283585",
"name": "icon_icon", "name": "icon_icon",
"font_class": "icon_icon", "font_class": "icon_icon",
......
fonts/iconfont.ttf
No preview for this file type
fonts/iconfont.woff
No preview for this file type
fonts/iconfont.woff2
No preview for this file type
pages/createMeeting/createMeeting.js
...@@ -10,7 +10,7 @@ create.Page({ ...@@ -10,7 +10,7 @@ create.Page({
$data: null, $data: null,
relatedAppPlatform: null, relatedAppPlatform: null,
title: ``, title: ``,
remark: '', meetingRemark: '',
isShowRemark: false, isShowRemark: false,
showTime: '', showTime: '',
repeat: { repeat: {
...@@ -70,7 +70,7 @@ create.Page({ ...@@ -70,7 +70,7 @@ create.Page({
// 添加描述 // 添加描述
handleChangeRemark(event) { handleChangeRemark(event) {
this.setData({ this.setData({
remark: event.detail.value meetingRemark: event.detail.value
}) })
}, },
...@@ -204,7 +204,7 @@ create.Page({ ...@@ -204,7 +204,7 @@ create.Page({
scheduleType: this.$store.data.roomId ? 'meeting' : 'common', scheduleType: this.$store.data.roomId ? 'meeting' : 'common',
participatorList: !!this.$store.data.showParticipatorList.length ? this.$store.data.showParticipatorList : [{ userId: getApp().globalData.userid, username: getApp().globalData.name, headUrl: getApp().globalData.avatar, platform: 'dingtalk' }], participatorList: !!this.$store.data.showParticipatorList.length ? this.$store.data.showParticipatorList : [{ userId: getApp().globalData.userid, username: getApp().globalData.name, headUrl: getApp().globalData.avatar, platform: 'dingtalk' }],
repeatable: this.data.repeat.repeatable, repeatable: this.data.repeat.repeatable,
remark: this.data.remark, remark: this.data.meetingRemark,
recurrenceModel: this.data.repeat.recurrenceModel, recurrenceModel: this.data.repeat.recurrenceModel,
meetingWayModel: { model: null } meetingWayModel: { model: null }
} }
......
pages/meetingDetail/meetingDetail.acss
...@@ -679,5 +679,44 @@ input { ...@@ -679,5 +679,44 @@ input {
} }
.iconpeople1 { .iconpeople1 {
line-height: 40rpx; line-height: 36rpx;
}
.operation-more {
position: relative;
padding: 0 8rpx;
background: #F9FAFB;
border-radius: 4rpx;
font-size: 28rpx;
}
.operation-containt {
border-radius: 8rpx;
padding: 16rpx;
position: absolute;
right: 40rpx;
top: 50%;
background: rgba(10, 10, 10, 0.71);
display: flex;
justify-content: space-between;
margin-top: -28rpx;
}
.operation-containt>text {
padding-right: 16rpx;
margin-right: 16rpx;
font-size: 24rpx;
color: #fff;
border-right: 1px solid #fff;
}
.operation-containt>text:last-child {
padding-right: 0rpx;
margin-right: 0rpx;
border-right: none;
}
.text {
white-space: nowrap;
padding-left: 8rpx;
} }
\ No newline at end of file
pages/meetingDetail/meetingDetail.axml
<!--<block a:if="{{getData}}"> --> <!--<block a:if="{{getData}}"> -->
<import src="../../template/loading/loading.axml"/> <import src="../../template/loading/loading.axml"/>
<block> <block>
<view class=" {{(popup.show || selectPopup.show || centerPopup.show )? 'metingDetail' : ''}}"> <view catchTap="handleCloseOperation" class=" {{(popup.show || selectPopup.show || centerPopup.show )? 'metingDetail' : ''}}">
<import src="../../template/deleteBtn/index.axml"/> <import src="../../template/deleteBtn/index.axml"/>
<view class="hideDetail" a:if="{{isExpand}}"> <view class="hideDetail" a:if="{{isExpand}}">
<view class="hideTitle"> <view class="hideTitle">
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
文件 文件
</view> </view>
<view onTap="openNoteModal"> <view onTap="openNoteModal">
<view class="iconfont iconnotes"></view> <view class="iconfont iconnotes1"></view>
笔记 笔记
</view> </view>
<!--<text class="devider"></text><view onTap="onShareAppMessage"><text class="iconfont iconicon_share1"></text></view> --> <!--<text class="devider"></text><view onTap="onShareAppMessage"><text class="iconfont iconicon_share1"></text></view> -->
...@@ -207,10 +207,22 @@ ...@@ -207,10 +207,22 @@
<view class="meeting-title" a:if="{{item.commentType === 'meeting'}}">创建了会议</view> <view class="meeting-title" a:if="{{item.commentType === 'meeting'}}">创建了会议</view>
</view> </view>
<view class="compose-column-operation"> <view class="compose-column-operation">
<text class="icondescribe iconfont color4" a:if="{{item.fileDetailList&&item.creator.ddUserId === currentPeople}}" onTap="openRemarkModal" data-commentId="{{item.commentId}}" data-remark="{{item.remark}}"></text> <view class="operation-more iconmore iconfont color4" catchTap="handleOpenOperation" data-commentId="{{item.commentId}}">
<text class="icondescribe iconfont color4" a:if="{{item.notes&&item.creator.ddUserId === currentPeople }}" onTap="editNotes" data-meetingNotes="{{item.notes}}" data-commentId="{{item.commentId}}"></text> <view class="operation-containt" a:if="{{modifyDynamicId === item.commentId}}">
<text class="iconcomments iconfont color4" data-commentId="{{item.commentId}}" onTap="openComentModal"></text> <text class="icondescribe11 iconfont color4" a:if="{{item.fileDetailList&&item.creator.ddUserId === currentPeople}}" catchTap="openRemarkModal" data-commentId="{{item.commentId}}" data-remark="{{item.remark}}">
<text class="icondelete iconfont color4" a:if="{{item.creator.ddUserId === currentPeople}}" onTap="handleDeleteMoment" data-commentId="{{item.commentId}}"></text> <text class="text">编辑</text>
</text>
<text class="icondescribe11 iconfont color4" a:if="{{item.notes&&item.creator.ddUserId === currentPeople }}" catchTap="editNotes" data-meetingNotes="{{item.notes}}" data-commentId="{{item.commentId}}">
<text class="text">编辑</text>
</text>
<text class="iconcomments1 iconfont color4" data-commentId="{{item.commentId}}" catchTap="openComentModal">
<text class="text">评论</text>
</text>
<text class="icondelete2 iconfont color4" a:if="{{item.creator.ddUserId === currentPeople}}" catchTap="handleDeleteMoment" data-commentId="{{item.commentId}}">
<text class="text">删除</text>
</text>
</view>
</view>
</view> </view>
<view class="compose-column"> <view class="compose-column">
<comment currentPeople="{{currentPeople}}" a:if="{{item.replyCommentList}}" replyCommentList="{{item.replyCommentList}}" onDeleteComment="deleteComment" parentCommentId="{{item.commentId}}"/> <comment currentPeople="{{currentPeople}}" a:if="{{item.replyCommentList}}" replyCommentList="{{item.replyCommentList}}" onDeleteComment="deleteComment" parentCommentId="{{item.commentId}}"/>
......
pages/meetingDetail/meetingDetail.js
...@@ -917,6 +917,7 @@ create.Page({ ...@@ -917,6 +917,7 @@ create.Page({
reset() { reset() {
this.$store.resetEditData() this.$store.resetEditData()
this.store.data.affairList = []; this.store.data.affairList = [];
this.handleCloseOperation()
}, },
// 页面卸载 // 页面卸载
...@@ -1202,6 +1203,7 @@ create.Page({ ...@@ -1202,6 +1203,7 @@ create.Page({
}, },
// 删除动态 // 删除动态
handleDeleteMoment(e) { handleDeleteMoment(e) {
this.handleCloseOperation()
this.deleteComment('', e.currentTarget.dataset.commentId) this.deleteComment('', e.currentTarget.dataset.commentId)
}, },
// 有commentId删除评论，无则删除动态 // 有commentId删除评论，无则删除动态
...@@ -1332,6 +1334,19 @@ create.Page({ ...@@ -1332,6 +1334,19 @@ create.Page({
goFilesPage() { goFilesPage() {
dd.navigateTo({ url: '/pages/files/files?meetingId=' + this.store.data.scheduleId }) dd.navigateTo({ url: '/pages/files/files?meetingId=' + this.store.data.scheduleId })
}, },
// 打开修改弹窗
handleOpenOperation(event) {
this.store.data.modifyDynamicId = event.currentTarget.dataset.commentId
this.update()
},
// 关闭修改弹窗
handleCloseOperation() {
if (!this.store.data.modifyDynamicId) {
return
}
this.store.data.modifyDynamicId = ''
this.update()
}
}); });
......
pages/meetingDetail/store.js
...@@ -20,7 +20,8 @@ class Store { ...@@ -20,7 +20,8 @@ class Store {
isNeedReloadList: false, isNeedReloadList: false,
isNeedReloadIndexList: false, isNeedReloadIndexList: false,
logId: '', logId: '',
relatedAppPlatform: null relatedAppPlatform: null,
modifyDynamicId: ''
} }
changeStatus(meetingId, taskModifyModel, callBack) { changeStatus(meetingId, taskModifyModel, callBack) {
......
pages/meetingRoomList/meetingRoomList.axml
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<view> <view>
<image style="width: 280rpx; height: 156rpx;" mode="{{item.mode}}" src="./../../assests/noRoom.png" /> <image style="width: 280rpx; height: 156rpx;" mode="{{item.mode}}" src="./../../assests/noRoom.png" />
</view> </view>
<view class="noRoomTip">当前暂无会议室</view> <view class="noRoomTip">当前暂无会议室,请联系管理员到Pc端添加会议室</view>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
......
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