Skip to content

S
schedule
Commit dad0b226 by fengzhaoyu
Options

fix:换小图标

parent 46c41cc5
Showing with 127 additions and 37 deletions
app.acss
......@@ -65,8 +65,12 @@ view {
view.list-item {
border: none;
border-radius: 0;
border-bottom: 2rpx solid rgba(25, 31, 37, 0.12);
border-bottom: 2rpx solid rgba(227, 228, 228);
margin-top: 0;
padding-top: 24rpx;
padding-bottom: 24rpx;
}
.color4 {
color: rgba(10, 10, 10, 0.4)
}
\ No newline at end of file
components/fileList/fileList.axml
......@@ -10,7 +10,7 @@
<text>{{item.name.slice(-5)}}</text>
</view>
<view class="file-size">{{item.sizeShow}}</view>
<view a:if="{{showName}}" class="file-showName">{{item.userDetail.name}}</view>
<view a:if="{{showName}}" class=" color4 file-showName">{{item.userDetail.name}}</view>
<view a:if="{{isCanDelete}}" class="iconfont iconicon_noAgreed1" catchTap="removeFile" data-id="{{item.fileId}}"></view>
</view>
</view>
......
components/fileList/fileList.js
......@@ -25,9 +25,17 @@ create.Component({
this.setData({
fileList: fileList
})
},
didUpdate() {
const fileList = []
for (let i = 0; i < this.props.fileInfos.length; i++) {
this.props.fileInfos[i].sizeShow = renderSize(this.props.fileInfos[i].size)
fileList.push(this.props.fileInfos[i])
}
this.setData({
fileList: fileList
})
},
didUnmount() {
......
components/taskPanel/taskPanel.acss
......@@ -34,7 +34,7 @@
font-size: 34rpx;
}
.iconicon_attender {
.iconpeople1 {
position: relative;
top: 6rpx;
}
......
components/taskPanel/taskPanel.axml
......@@ -8,7 +8,7 @@
</view>
<view class="margin-bottom">
<view class="task-column participator-top" data-acceptorId="{{currentTask.acceptorId}}" onTap="handleExcutorChange">
<text class="iconicon_attender iconfont icon"></text>
<text class="iconpeople1 iconfont icon"></text>
<text class="participator-title">{{currentTask.acceptorInfo ? '执行人' : '设置执行人'}}</text>
<text class="iconright iconfont icon"></text>
</view>
......
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,48 @@
"description": "",
"glyphs": [
{
"icon_id": "17627318",
"name": "message",
"font_class": "message",
"unicode": "e808",
"unicode_decimal": 59400
},
{
"icon_id": "17627280",
"name": "people1",
"font_class": "people1",
"unicode": "e807",
"unicode_decimal": 59399
},
{
"icon_id": "17617868",
"name": "delete",
"font_class": "delete",
"unicode": "e806",
"unicode_decimal": 59398
},
{
"icon_id": "17617860",
"name": "comments",
"font_class": "comments",
"unicode": "e804",
"unicode_decimal": 59396
},
{
"icon_id": "17617862",
"name": "describe",
"font_class": "describe",
"unicode": "e805",
"unicode_decimal": 59397
},
{
"icon_id": "17595806",
"name": "notes",
"font_class": "notes",
"unicode": "e803",
"unicode_decimal": 59395
},
{
"icon_id": "14283585",
"name": "icon_icon",
"font_class": "icon_icon",
......@@ -377,13 +419,6 @@
"unicode_decimal": 59120
},
{
"icon_id": "13650773",
"name": "icon_attender",
"font_class": "icon_attender",
"unicode": "e6ef",
"unicode_decimal": 59119
},
{
"icon_id": "13532142",
"name": "icon_add2",
"font_class": "icon_add1",
......
fonts/iconfont.svg
......@@ -20,6 +20,24 @@ Created by iconfont
/>
<missing-glyph />
<glyph glyph-name="message" unicode="&#59400;" d="M716.8 726.016H307.2c-113.152-0.512-204.288-91.648-204.8-204.8v-136.704c0.512-113.152 91.648-204.288 204.8-204.8h22.528c6.144 0 11.776-5.12 11.776-11.776V15.36c0-15.872 18.944-24.576 30.72-13.824L572.416 176.64c2.048 2.048 4.608 3.072 7.68 3.072H716.8c113.152 0.512 204.288 91.648 204.8 204.8V521.216c-0.512 113.152-91.648 204.8-204.8 204.8" horiz-adv-x="1024" />
<glyph glyph-name="people1" unicode="&#59399;" d="M233.984 367.616h274.944c108.544 0 198.144-86.016 201.216-194.048v-61.44c0-62.464-50.688-113.152-113.664-113.152H145.92c-62.976 0-113.664 50.688-113.664 113.152V166.4c0 111.104 90.112 201.216 201.728 201.216z m137.216 30.72c-101.888 0-184.832 82.944-184.832 184.32 0 101.888 82.944 184.832 184.832 184.832s184.832-82.944 184.832-184.32c0-101.888-82.432-184.832-184.832-184.832z m354.304-30.72c-59.392 0-108.032 48.128-108.032 107.52s48.128 107.52 108.032 107.52c59.392 0 108.032-48.128 108.032-107.52s-48.64-107.52-108.032-107.52z m-18.432-30.72H819.2c90.624 0 164.352-71.168 167.936-160.768v-59.904c0-47.616-38.912-86.528-86.528-86.528H771.584V174.08c-2.048 68.608-27.136 128.512-64.512 162.816z" horiz-adv-x="1024" />
<glyph glyph-name="delete" unicode="&#59398;" d="M766.976 551.936H260.608c-4.096 0-14.336-0.512-28.672-0.512-16.896 0-29.696-13.312-29.696-29.696v-545.28c0-21.504 17.92-39.424 39.424-39.424H757.76c21.504 0 39.424 17.92 39.424 39.424V522.24c0 16.896-13.312 29.696-30.208 29.696z m-303.616-379.392c0-16.384-15.872-29.696-35.84-29.696s-35.84 13.312-35.84 29.696V389.632c0 16.384 16.896 29.696 35.84 29.696 19.968 0 35.84-13.312 35.84-29.696v-217.088z m178.176 0c0-16.384-15.872-29.696-35.84-29.696s-35.84 13.312-35.84 29.696V389.632c0 16.384 15.872 29.696 35.84 29.696s35.84-13.312 35.84-29.696v-217.088zM902.144 691.712c17.408 0 37.376-18.432 37.376-40.96s-19.456-40.96-37.376-40.96H121.856c-17.408 0-37.376 18.432-37.376 40.96s19.456 40.96 37.376 40.96h780.288zM649.216 830.976c17.408 0 37.376-18.432 37.376-40.96s-19.456-40.96-37.376-40.96H375.296c-17.408 0-37.376 18.432-37.376 40.96s19.456 40.96 37.376 40.96h273.92z" horiz-adv-x="1024" />
<glyph glyph-name="comments" unicode="&#59396;" d="M807.424 830.976H205.824c-80.384 0-147.968-62.464-147.968-147.968v-487.936c0-80.384 67.072-147.968 147.968-147.968h71.68l31.232-76.288c8.704-17.92 26.624-31.232 49.152-35.84h9.216c22.528 0 40.448 8.704 49.152 23.04l67.584 89.6h323.584c80.384 0 147.968 67.072 147.968 147.968V683.008c0 84.992-67.072 147.968-147.968 147.968zM273.92 379.392c-29.184 0-52.736 23.552-52.736 52.736 0 29.184 23.552 52.736 52.736 52.736 29.184 0 52.736-23.552 52.736-52.736 0-29.184-23.552-52.736-52.736-52.736z m232.448 0c-29.184 0-52.736 23.552-52.736 52.736 0 18.432 10.24 35.84 26.624 45.568 16.384 9.216 36.352 9.216 52.736 0 15.872-9.216 26.112-26.624 26.112-45.568 0-29.184-23.552-52.736-52.736-52.736z m232.448 0c-29.184 0-52.736 23.552-52.736 52.736 0 29.184 23.552 52.736 52.736 52.736s52.736-23.552 52.736-52.736c0-29.184-23.552-52.736-52.736-52.736z" horiz-adv-x="1024" />
<glyph glyph-name="describe" unicode="&#59397;" d="M795.136 829.44H228.864C153.6 829.44 92.16 768.512 92.16 692.736v-616.96c0-75.264 61.952-137.216 137.216-136.704h565.76c75.264 0 136.704 60.928 136.704 136.704V692.736C931.84 768 870.912 829.44 795.136 829.44zM284.672 161.28c-19.968 0-35.84 15.872-35.84 35.84s15.872 35.84 35.84 35.84 35.84-15.872 35.84-35.84-16.384-35.84-35.84-35.84z m0 194.56c-19.968 0-35.84 15.872-35.84 35.84s15.872 35.84 35.84 35.84 35.84-15.872 35.84-35.84-16.384-35.84-35.84-35.84z m0 179.2c-19.968 0-35.84 15.872-35.84 35.84s15.872 35.84 35.84 35.84 35.84-15.872 35.84-35.84-16.384-35.84-35.84-35.84z m459.776-374.272H378.368c-16.896 0-30.72 16.384-30.72 35.84 0 19.968 13.824 35.84 30.72 35.84h366.08c16.896 0 30.72-15.872 30.72-35.84 0-19.456-13.312-35.84-30.72-35.84z m0 193.536H378.368c-16.896 0-30.72 15.872-30.72 35.84s13.824 35.84 30.72 35.84h366.08c16.896 0 30.72-15.872 30.72-35.84s-13.312-35.84-30.72-35.84z m-2.56 181.248H380.928c-18.432 0-33.28 15.872-33.28 35.84s14.848 35.84 33.28 35.84h360.96c18.432 0 33.28-15.872 33.28-35.84s-14.336-35.84-33.28-35.84z" horiz-adv-x="1024" />
<glyph glyph-name="notes" unicode="&#59395;" d="M677.888 98.816v-76.8c0-27.648 32.768-38.4 49.152-22.016l109.568 109.568c16.384 16.384 5.632 49.152-22.016 49.152h-76.8c-32.256 0.512-59.904-26.624-59.904-59.904z m54.784 548.352c0-16.384-10.752-27.648-27.648-27.648H337.92c-16.384 0-27.648 10.752-27.648 27.648V652.8c0 16.384 10.752 27.648 27.648 27.648h367.104c16.896-0.512 27.648-11.264 27.648-33.28z m0-147.968c0-16.384-10.752-27.648-27.648-27.648H337.92c-16.384 5.632-32.768 16.384-32.768 27.648v5.632c0 16.384 10.752 27.648 27.648 27.648h367.104c22.016-0.512 32.768-11.264 32.768-33.28z m-120.32-147.968c0-16.384-10.752-27.648-27.648-27.648H337.92c-16.384 0-27.648 10.752-27.648 27.648v5.632c0 16.384 10.752 27.648 27.648 27.648h246.784c16.384-0.512 27.648-11.264 27.648-33.28zM793.088 800.768H233.984c-32.768 0-54.784-22.016-54.784-54.784v-723.456c0-27.648 27.648-54.784 54.784-54.784h350.72c32.768 0 54.784 22.016 54.784 54.784v115.2c0 27.648 27.648 54.784 54.784 54.784h93.184c32.768 0 54.784 22.016 54.784 54.784V751.104c11.264 27.648-16.384 49.664-49.152 49.664z" horiz-adv-x="1024" />
<glyph glyph-name="icon_icon" unicode="&#59208;" d="M784.384 688.64h-64c0 35.328-28.672 64-64 64H207.36C172.032 752.64 143.36 723.968 143.36 688.64v-448.512c0-35.328 28.672-64 64-64v-64c-70.656 0-128 57.344-128 128V688.64c0 70.656 57.344 128 128 128h448.512c71.168 0 128.512-57.344 128.512-128z m-544.768-609.28V528.384c0 70.656 57.344 128 128 128h448.512c70.656 0 128-57.344 128-128v-448.512c0-70.656-57.344-128-128-128H367.616c-70.656-0.512-128 56.832-128 127.488z" horiz-adv-x="1024" />
......@@ -179,9 +197,6 @@ Created by iconfont
<glyph glyph-name="icon_app1" unicode="&#59120;" d="M509.952 422.912L277.504 558.08c-15.36 8.704-34.816 3.584-43.52-11.776-8.704-15.36-3.584-34.816 11.776-44.032l232.448-134.656V97.28c0-17.92 14.336-32.256 31.744-32.256 17.408 0 31.744 14.336 31.744 32.256v270.336L778.24 504.832c15.36 8.704 20.48 28.672 11.776 44.032-8.704 15.36-28.16 20.48-43.52 11.776L509.952 422.912z m47.616 416.768l318.976-184.832c29.696-17.408 48.128-49.152 48.128-83.456v-369.664c0-34.304-18.432-66.048-48.128-83.456L557.568-66.56c-29.696-17.408-66.048-17.408-95.744 0l-318.976 184.832c-29.696 17.408-48.128 49.152-48.128 83.456V571.392c0 34.304 18.432 66.048 48.128 83.456L461.312 839.68c29.696 16.896 66.56 16.896 96.256 0z" horiz-adv-x="1024" />
<glyph glyph-name="icon_attender" unicode="&#59119;" d="M225.28 368.128h285.696c113.152 0 205.824-89.6 209.408-201.728V102.4c0-65.024-52.736-117.76-118.272-117.76H133.632C68.096-15.36 15.36 37.376 15.36 102.4v56.32c0 115.712 93.696 209.408 209.92 209.408z m142.336 31.744c-105.984 0-192 86.016-192 191.488C175.616 697.344 261.632 783.36 367.616 783.36s192-86.016 192-191.488c0.512-105.984-85.504-192-192-192z m368.64-31.744c-61.952 0-112.128 50.176-112.128 111.616s50.176 111.616 112.128 111.616c61.952 0 112.128-50.176 112.128-111.616s-50.176-111.616-112.128-111.616z m-18.944-32.256h116.736c94.208 0 171.008-74.24 174.592-167.424V105.984c0-49.664-40.448-90.112-90.112-90.112h-134.144v150.016c-2.56 72.192-28.16 134.656-67.072 169.984z" horiz-adv-x="1024" />
<glyph glyph-name="icon_add1" unicode="&#59118;" d="M560.128 335.872v-336.384c0-26.624-21.504-48.128-48.128-48.128s-48.128 21.504-48.128 48.128v336.384H127.488c-26.624 0-48.128 21.504-48.128 48.128s21.504 48.128 48.128 48.128h336.384V768.512c0 26.624 21.504 48.128 48.128 48.128s48.128-21.504 48.128-48.128v-336.384h336.384c26.624 0 48.128-21.504 48.128-48.128s-21.504-48.128-48.128-48.128h-336.384z" horiz-adv-x="1024" />
......
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.axml
......@@ -46,7 +46,7 @@
</view>
<!-- participatorList participatorUserId 参会人 -->
<view class="participator">
<view class="iconicon_attender iconfont icon {{$data.showParticipatorList.length>1 ? '' : 'noValueIcon'}}">
<view class="iconpeople1 iconfont icon {{$data.showParticipatorList.length>1 ? '' : 'noValueIcon'}}">
</view>
<view class="participatorContaint">
<view class="participatorText" a:if="{{$data.showParticipatorList.length < 2}}" catchTap="handleAddParticipator">
......
pages/createTask/createTask.acss
......@@ -93,4 +93,9 @@ page {
.btn-disabled {
opacity: 0.4;
}
.iconright {
font-size: 30rpx;
color: rgba(10, 10, 10, 0.3)
}
\ No newline at end of file
pages/createTask/createTask.axml
......@@ -4,7 +4,7 @@
</view>
<view>
<view class="task-column participator-top" data-excutorId="{{currentTask.excutorId}}" onTap="handleExcutorChange">
<text class="iconicon_attender iconfont icon"></text>
<text class="iconpeople1 iconfont icon"></text>
<text class="participator-title">{{currentTask.excutorId ? '执行人' : '设置执行人'}}</text>
<text class="iconright iconfont icon"></text>
</view>
......
pages/index/index.acss
......@@ -39,19 +39,25 @@
position: relative;
}
.unread-message {
.unread-message, .unread-messageIcon {
position: absolute;
top: 0;
right: 0;
color: #fff;
background: #ea4e6b;
font-size: 24rpx;
height: 40rpx;
display: flex;
justify-content: center;
line-height: 40rpx;
padding: 0 16rpx;
color: #fff;
background: #ea4e6b;
border-radius: 20rpx;
display: flex;
justify-content: center;
}
.unread-message-icon {
color: #fff;
margin-left: 8rpx;
font-size: 32rpx;
}
.userDynamic {
......
pages/index/index.axml
......@@ -15,7 +15,11 @@
<view>
{{item.title}}
<view a:if="{{item.unReadMessageCommentIdList.length}}" class="unread-message">
<view class="unread-message-num">
{{item.unReadMessageCommentIdList.length}}
</view>
<view class=" iconfont icon unread-message-icon iconmessage">
</view>
</view>
</view>
</view>
......
pages/index/index.js
......@@ -86,9 +86,9 @@ create.Page({
this.update();
}
//开启一个定时器
// this.timer = setInterval(() => {
// this.getData();
// }, 30000);
this.timer = setInterval(() => {
this.getData();
}, 30000);
// 设置标题
dd.setNavigationBar({
......@@ -286,8 +286,8 @@ create.Page({
onHide() {
dd.closeSocket();
// clearInterval(this.timer);
// this.timer = null;
clearInterval(this.timer);
this.timer = null;
},
onUload() {
},
......
pages/meetingDetail/meetingDetail.axml
......@@ -73,7 +73,7 @@
</view>
<!-- participatorList participatorUserId 参会人 -->
<view class="participator">
<view class="iconicon_attender iconfont icon {{$data.showParticipatorList.length>1 ? '' : 'noValueIcon'}}">
<view class="iconpeople1 iconfont icon {{$data.showParticipatorList.length>1 ? '' : 'noValueIcon'}}">
</view>
<view class="participatorContaint">
<view class="participatorText" a:if="{{$data.showParticipatorList.length < 2}}" catchTap="handleAddParticipator">
......@@ -104,7 +104,7 @@
</view>
<!-- 几个任务 -->
<view onTap="goTasksPage" class="taskNumber" a:if="{{tasks.length}}">
<view class="iconicon_attender iconfont icon {{$data.showParticipatorList.length>1 ? '' : 'noValueIcon'}}"></view>
<view class="iconicon_task1 iconfont icon {{$data.showParticipatorList.length>1 ? '' : 'noValueIcon'}}"></view>
<view class="fileText">
{{tasks.length}} 个任务
</view>
......@@ -112,7 +112,7 @@
</view>
<!-- 几个文件 -->
<view onTap="goFilesPage" class="taskNumber" a:if="{{files.length}}">
<view class="iconicon_attender iconfont icon {{$data.showParticipatorList.length>1 ? '' : 'noValueIcon'}}"></view>
<view class="iconicon_data iconfont icon {{$data.showParticipatorList.length>1 ? '' : 'noValueIcon'}}"></view>
<view class="fileText">
{{files.length}} 个附件
</view>
......@@ -171,7 +171,7 @@
文件
</view>
<view onTap="openNoteModal">
<view class="iconfont iconicon_task1"></view>
<view class="iconfont iconnotes"></view>
笔记
</view>
<!--<text class="devider"></text><view onTap="onShareAppMessage"><text class="iconfont iconicon_share1"></text></view> -->
......@@ -214,10 +214,10 @@
<view class="meeting-title" a:if="{{item.commentType === 'meeting'}}">创建了会议</view>
</view>
<view class="compose-column-operation">
<text a:if="{{item.fileDetailList&&item.creator.ddUserId === currentPeople}}" onTap="openRemarkModal" data-commentId="{{item.commentId}}" data-remark="{{item.remark}}">描述</text>
<text a:if="{{item.notes&&item.creator.ddUserId === currentPeople }}" onTap="editNotes" data-meetingNotes="{{item.notes}}" data-commentId="{{item.commentId}}">编辑</text>
<text data-commentId="{{item.commentId}}" onTap="openComentModal">评论</text>
<text a:if="{{item.creator.ddUserId === currentPeople}}" onTap="handleDeleteMoment" data-commentId="{{item.commentId}}">删除</text>
<text class="icondescribe iconfont color4" a:if="{{item.fileDetailList&&item.creator.ddUserId === currentPeople}}" onTap="openRemarkModal" data-commentId="{{item.commentId}}" data-remark="{{item.remark}}"></text>
<text class="icondescribe iconfont color4" a:if="{{item.notes&&item.creator.ddUserId === currentPeople }}" onTap="editNotes" data-meetingNotes="{{item.notes}}" data-commentId="{{item.commentId}}"></text>
<text class="iconcomments iconfont color4" data-commentId="{{item.commentId}}" onTap="openComentModal"></text>
<text class="icondelete iconfont color4" a:if="{{item.creator.ddUserId === currentPeople}}" onTap="handleDeleteMoment" data-commentId="{{item.commentId}}"></text>
</view>
<view class="compose-column">
<comment currentPeople="{{currentPeople}}" a:if="{{item.replyCommentList}}" replyCommentList="{{item.replyCommentList}}" onDeleteComment="deleteComment" parentCommentId="{{item.commentId}}"/>
......
pages/meetingDetail/meetingDetail.js
......@@ -983,9 +983,11 @@ create.Page({
},
// 上传文件
async handleAddFile() {
this.store.data.description = '';
this.store.data.fileInfos = null;
const res = await getFileInfo();
dd.hideLoading()
if (res.code === -1) {
dd.alert({
content: res.msg,
......
pages/meetingDetail/uploadFile.js
......@@ -2,6 +2,7 @@ import { uploadPermissions } from '../../api/request';
// 获取权限
async function getPermission() {
dd.showLoading()
let data = {
ddUserId: getApp().globalData.userid,
type: 'add',
......@@ -9,9 +10,12 @@ async function getPermission() {
}
return new Promise((resolve) => {
uploadPermissions(data).then(res => {
dd.hideLoading()
if (res.data.code === 0) {
resolve(res)
}
}).catch(err => {
dd.hideLoading()
})
})
}
......
pages/place/place.js
......@@ -51,7 +51,11 @@ create.Page({
queryAvailableMeetingRoomByTime(data).then(res => {
if (res.data && res.data.data) {
for (let value of res.data.data) {
value.meetingRoomFullName = `${value.meetingRoomFullName}-${value.name}`
if (value.meetingRoomFullName) {
value.meetingRoomFullName = `${value.meetingRoomFullName}-${value.name}`
} else {
value.meetingRoomFullName = `${value.name}`
}
}
that.setData({
availableMeetingRoom: res.data.data
......
pages/uploadFile/uploadFile.js
......@@ -36,6 +36,7 @@ create.Page({
//添加会议文件
async add() {
const res = await getFileInfo();
console.log(res.data)
if (res.code === -1) {
dd.alert({
content: res.msg
......@@ -55,7 +56,7 @@ create.Page({
})
console.log(this.store.data.fileInfos)
// console.log(this.store.data.fileInfos)
this.update();
},
......
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