Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
schedule
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fengzhaoyu
schedule
Commits
b2dfa931
Commit
b2dfa931
authored
Apr 23, 2020
by
xiexiaoqin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 重复会议动态修改
parent
64670f4c
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
197 additions
and
54 deletions
+197
-54
request.js
api/request.js
+7
-1
xFetch.js
api/xFetch.js
+1
-0
app.js
app.js
+1
-0
taskPanel.acss
components/taskPanel/taskPanel.acss
+5
-0
meetingDetail.acss
pages/meetingDetail/meetingDetail.acss
+14
-0
meetingDetail.axml
pages/meetingDetail/meetingDetail.axml
+4
-3
meetingDetail.js
pages/meetingDetail/meetingDetail.js
+165
-50
No files found.
api/request.js
View file @
b2dfa931
...
@@ -138,7 +138,13 @@ export function isParticipate(data) {
...
@@ -138,7 +138,13 @@ export function isParticipate(data) {
url
:
`/meet/schedule/confirm`
url
:
`/meet/schedule/confirm`
});
});
}
}
//会议室详情的获取重复会议动态列表
export
function
getMeetingRoomRepeatAffairs
(
groupId
,
page
)
{
return
$http
({
method
:
"get"
,
url
:
`/meet/meeting-log/scheduleTemplateMeetingLogPage?category=2,3&groupId=
${
groupId
}
&size=10¤t=
${
page
}
`
});
}
//会议室详情的获取动态列表
//会议室详情的获取动态列表
export
function
getMeetingRoomAffairs
(
id
)
{
export
function
getMeetingRoomAffairs
(
id
)
{
return
$http
({
return
$http
({
...
...
api/xFetch.js
View file @
b2dfa931
...
@@ -28,6 +28,7 @@ export default function xFetch({ url, method, data, type }) {
...
@@ -28,6 +28,7 @@ export default function xFetch({ url, method, data, type }) {
}
}
},
},
fail
:
function
(
err
)
{
fail
:
function
(
err
)
{
console
.
log
(
err
)
alertOnce
(
'网络异常,请重试'
,
rejects
);
alertOnce
(
'网络异常,请重试'
,
rejects
);
}
}
});
});
...
...
app.js
View file @
b2dfa931
...
@@ -20,6 +20,7 @@ App({
...
@@ -20,6 +20,7 @@ App({
userid
:
""
,
userid
:
""
,
name
:
""
,
name
:
""
,
userInfo
:
""
,
userInfo
:
""
,
// globalUrl: "http://192.168.1.101:9999", //beta地址
globalUrl
:
"https://gateway-beta.mingwork.com"
,
//beta地址
globalUrl
:
"https://gateway-beta.mingwork.com"
,
//beta地址
globalUrl2
:
"https://third-authentication-beta.mingwork.com"
globalUrl2
:
"https://third-authentication-beta.mingwork.com"
// globalUrl: "https://gateway2.mingwork.com", // 线上地址
// globalUrl: "https://gateway2.mingwork.com", // 线上地址
...
...
components/taskPanel/taskPanel.acss
View file @
b2dfa931
...
@@ -34,6 +34,11 @@
...
@@ -34,6 +34,11 @@
font-size: 34rpx;
font-size: 34rpx;
}
}
.iconicon_attender {
position: relative;
top: 4rpx;
}
.participator-title {
.participator-title {
color: rgba(25, 31, 37, 1);
color: rgba(25, 31, 37, 1);
font-size: 34rpx;
font-size: 34rpx;
...
...
pages/meetingDetail/meetingDetail.acss
View file @
b2dfa931
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
.affair-list {
.affair-list {
background: #fff;
background: #fff;
padding: 48rpx 32rpx 220rpx 32rpx;
padding: 48rpx 32rpx 220rpx 32rpx;
/* height: calc(100vh - 200rpx); */
}
}
.affair-list-margin-top {
.affair-list-margin-top {
...
@@ -113,7 +114,9 @@ page {
...
@@ -113,7 +114,9 @@ page {
background: #fff;
background: #fff;
z-index: 1;
z-index: 1;
position: relative;
position: relative;
width: 100%;
padding-bottom: 0;
padding-bottom: 0;
height: 200rpx;
}
}
.hideTitle {
.hideTitle {
...
@@ -613,4 +616,14 @@ input {
...
@@ -613,4 +616,14 @@ input {
.lineThrough {
.lineThrough {
text-decoration: line-through;
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;
}
}
\ No newline at end of file
pages/meetingDetail/meetingDetail.axml
View file @
b2dfa931
...
@@ -202,10 +202,10 @@
...
@@ -202,10 +202,10 @@
<!-- 动态列表 -->
<!-- 动态列表 -->
<import src="../../template/avater/index.axml"/>
<import src="../../template/avater/index.axml"/>
<import src="../../template/affairBlank/index.axml"/>
<import src="../../template/affairBlank/index.axml"/>
<
view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}} {{!isExpand&&$data.participatorList.length>1 ? 'addPadding' : ''}}" onTap="hideFileOperate
">
<
scroll-view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}} {{!isExpand&&$data.participatorList.length>1 ? 'addPadding' : ''}}" onTap="hideFileOperate" scroll-y="{{true}}" lower-threshold="{{400}}" onScrollToLower="onScrollToLower
">
<view a:if="{{!isExpand}}" class="affair-list-title">会议动态</view>
<view a:if="{{!isExpand}}" class="affair-list-title">会议动态</view>
<block a:if="{{!affairLoading}}">
<block a:if="{{!affairLoading}}">
<block a:for="{{affairList}}">
<block a:for="{{affairList}}"
key="{{item.id}}"
>
<view a:if="{{item.category == '3' && item.taskViewList && item.taskViewList.length > 0}}" class='compose-column'>
<view a:if="{{item.category == '3' && item.taskViewList && item.taskViewList.length > 0}}" class='compose-column'>
<view class="avater task-avater">
<view class="avater task-avater">
<text class="iconfont iconicon_task1"></text>
<text class="iconfont iconicon_task1"></text>
...
@@ -226,6 +226,7 @@
...
@@ -226,6 +226,7 @@
</view>
</view>
<view a:if="{{item.content && ((item.category == 1 || item.taskViewList && item.taskViewList.length > 0) || ( item.fileView && item.fileView.fileInfos && item.fileView.fileInfos.length > 0 ))}}" class='simple-column'>{{item.content}} {{item.createTime}}</view>
<view a:if="{{item.content && ((item.category == 1 || item.taskViewList && item.taskViewList.length > 0) || ( item.fileView && item.fileView.fileInfos && item.fileView.fileInfos.length > 0 ))}}" class='simple-column'>{{item.content}} {{item.createTime}}</view>
</block>
</block>
<view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">加载更多动态...</view>
<view class="affair-placeholder" a:if="{{affairList.length == 1 && affairList[0].logType == 'create_schedule'}}">
<view class="affair-placeholder" a:if="{{affairList.length == 1 && affairList[0].logType == 'create_schedule'}}">
<template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会,快来上传会议文件吧。'}}"/>
<template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会,快来上传会议文件吧。'}}"/>
</view>
</view>
...
@@ -243,7 +244,7 @@
...
@@ -243,7 +244,7 @@
<!-- 任务修改弹出框 -->
<!-- 任务修改弹出框 -->
<task-panel a:if="{{pop.type === 'updateTask'}}" action='update' onDeleteTask="deleteTask"/>
<task-panel a:if="{{pop.type === 'updateTask'}}" action='update' onDeleteTask="deleteTask"/>
</popup>
</popup>
</view>
</
scroll-
view>
</view>
</view>
</block>
</block>
<view class="loading" a:if="{{loading || !getData}}">
<view class="loading" a:if="{{loading || !getData}}">
...
...
pages/meetingDetail/meetingDetail.js
View file @
b2dfa931
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment