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
9e7aa95a
Commit
9e7aa95a
authored
Apr 01, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
获取数据之后加载
parent
d7dc9316
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
21 deletions
+25
-21
meetingDetail.axml
pages/meetingDetail/meetingDetail.axml
+20
-18
meetingDetail.js
pages/meetingDetail/meetingDetail.js
+4
-2
place.axml
pages/place/place.axml
+1
-1
No files found.
pages/meetingDetail/meetingDetail.axml
View file @
9e7aa95a
<import src="../../template/deleteBtn/index.axml"/>
<block a:if="{{getData}}">
<view class="hideDetail" a:if="{{confirmAttendance === 1&&onload || organizer === currentPeople&&onload}}">
<import src="../../template/deleteBtn/index.axml"/>
<view class="hideDetail" a:if="{{confirmAttendance === 1&&onload || organizer === currentPeople&&onload}}">
<view class="hideTitle">
<view class="hideTitle">
{{title}}
{{title}}
</view>
</view>
...
@@ -13,8 +14,8 @@
...
@@ -13,8 +14,8 @@
</view>
</view>
<view class="hideIcon iconfont iconicon_expand" onTap="expand">
<view class="hideIcon iconfont iconicon_expand" onTap="expand">
</view>
</view>
</view>
</view>
<view class="editeMeeting" a:else>
<view class="editeMeeting" a:else>
<!-- title remark 标题 描述 -->
<!-- title remark 标题 描述 -->
<view class="permissionContant">
<view class="permissionContant">
<view class="createTitle">
<view class="createTitle">
...
@@ -145,9 +146,9 @@
...
@@ -145,9 +146,9 @@
<list multiple="{{comListData.multiple}}" onCompelete="selectAheadtimes" comSelectList={{aheadTimes}} complete="{{comType=='aheadTime' ? true : false}}"a:if="{{comType=='repeat' || comType=='meetingWayModel' || comType=='aheadTime'}}" dataComList="{{comType=='repeat' ? comListData.repeatList : (comType=='aheadTime' ? comListData.aheadTimesList : comListData.meetingWayList)}}" onComSelectList="selectComList" comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : (comType=='aheadTime'?comListData.aheadTimesListId : comListData.meetingWayModelId)}}" iconType="{{comListData.iconType}}">
<list multiple="{{comListData.multiple}}" onCompelete="selectAheadtimes" comSelectList={{aheadTimes}} complete="{{comType=='aheadTime' ? true : false}}"a:if="{{comType=='repeat' || comType=='meetingWayModel' || comType=='aheadTime'}}" dataComList="{{comType=='repeat' ? comListData.repeatList : (comType=='aheadTime' ? comListData.aheadTimesList : comListData.meetingWayList)}}" onComSelectList="selectComList" comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : (comType=='aheadTime'?comListData.aheadTimesListId : comListData.meetingWayModelId)}}" iconType="{{comListData.iconType}}">
</list>
</list>
</popup>
</popup>
</view>
</view>
<!-- 底部导航栏 -->
<!-- 底部导航栏 -->
<view class="footNav">
<view class="footNav">
<view class="footNavTop" a:if="{{currentPeople != organizer}}">
<view class="footNavTop" a:if="{{currentPeople != organizer}}">
<view class="originStaus" a:if="{{confirmAttendance === null}}">
<view class="originStaus" a:if="{{confirmAttendance === null}}">
<view catchTap="participate">
<view catchTap="participate">
...
@@ -192,13 +193,13 @@
...
@@ -192,13 +193,13 @@
<text class="iconfont iconicon_share1"></text>
<text class="iconfont iconicon_share1"></text>
</view>
</view>
</view>
</view>
</view>
</view>
<centerpopup centerPopup="{{centerPopup.showCenterPopup}}" centerPopupList="{{centerPopup.centerPopupList}}" onSelectSend="onSelectSend"></centerpopup>
<centerpopup centerPopup="{{centerPopup.showCenterPopup}}" centerPopupList="{{centerPopup.centerPopupList}}" onSelectSend="onSelectSend"></centerpopup>
<toast showToast="{{conToastData.showToast}}" title="{{conToastData.title}}" onToastHidden="onToastHidden"></toast>
<toast showToast="{{conToastData.showToast}}" title="{{conToastData.title}}" onToastHidden="onToastHidden"></toast>
<selectpopup showSelectPopup="{{conSelectPopupData.showSelectPopup}}" selectPopupList="{{conSelectPopupData.selectType==='noParticipateStatus' ? conSelectPopupData.noParticipateStatusList : conSelectPopupData.selectType==='delSheudle' ? conSelectPopupData.delSheudleList : (conSelectPopupData.selectType === 'participateStatus' ? conSelectPopupData.participateStatusList : conSelectPopupData.editSaveList)}}" onSelectPopup="onSelectPopup" onSelectPopupCancel="onSelectPopupCancel"></selectpopup>
<selectpopup showSelectPopup="{{conSelectPopupData.showSelectPopup}}" selectPopupList="{{conSelectPopupData.selectType==='noParticipateStatus' ? conSelectPopupData.noParticipateStatusList : conSelectPopupData.selectType==='delSheudle' ? conSelectPopupData.delSheudleList : (conSelectPopupData.selectType === 'participateStatus' ? conSelectPopupData.participateStatusList : conSelectPopupData.editSaveList)}}" onSelectPopup="onSelectPopup" onSelectPopupCancel="onSelectPopupCancel"></selectpopup>
<!-- 动态列表 -->
<!-- 动态列表 -->
<import src="../../template/avater/index.axml"/>
<import src="../../template/avater/index.axml"/>
<view class="affair-list" onTap="hideFileOperate">
<view class="affair-list" onTap="hideFileOperate">
<view class="affair-list-title">会议动态</view>
<view class="affair-list-title">会议动态</view>
<block a:for="{{affairList}}">
<block a:for="{{affairList}}">
<view a:if="{{item.category == '3' && item.taskViewList}}" class='compose-column'>
<view a:if="{{item.category == '3' && item.taskViewList}}" class='compose-column'>
...
@@ -221,10 +222,11 @@
...
@@ -221,10 +222,11 @@
</view>
</view>
<view a:if="{{item.content}}" class='simple-column'>{{item.content}}{{item.createTime}}</view>
<view a:if="{{item.content}}" class='simple-column'>{{item.content}}{{item.createTime}}</view>
</block>
</block>
</view>
</view>
<popup show="{{show}}" onClose="closePop" title="{{pop.title}}">
<popup show="{{show}}" onClose="closePop" title="{{pop.title}}">
<!-- 任务创建弹出框 -->
<!-- 任务创建弹出框 -->
<task-panel a:if="{{pop.type === 'createTask'}}" onComplete="complete" action='create'/>
<task-panel a:if="{{pop.type === 'createTask'}}" onComplete="complete" action='create'/>
<!-- 任务修改弹出框 -->
<!-- 任务修改弹出框 -->
<task-panel a:if="{{pop.type === 'updateTask'}}" action='update' onDeleteTask="deleteTask"/>
<task-panel a:if="{{pop.type === 'updateTask'}}" action='update' onDeleteTask="deleteTask"/>
</popup>
</popup>
\ No newline at end of file
</block>
\ No newline at end of file
pages/meetingDetail/meetingDetail.js
View file @
9e7aa95a
...
@@ -104,7 +104,8 @@ create.Page({
...
@@ -104,7 +104,8 @@ create.Page({
currentPeople
:
''
,
currentPeople
:
''
,
editType
:
''
,
editType
:
''
,
confirmAttendance
:
null
,
confirmAttendance
:
null
,
onload
:
false
onload
:
false
,
c
:
false
},
},
onShow
()
{
onShow
()
{
console
.
log
(
this
)
console
.
log
(
this
)
...
@@ -178,7 +179,8 @@ create.Page({
...
@@ -178,7 +179,8 @@ create.Page({
title
:
res
.
data
.
data
.
title
,
title
:
res
.
data
.
data
.
title
,
remark
:
res
.
data
.
data
.
remark
,
remark
:
res
.
data
.
data
.
remark
,
isShowRemark
:
res
.
data
.
data
.
remark
?
true
:
false
,
isShowRemark
:
res
.
data
.
data
.
remark
?
true
:
false
,
week
:
this
.
data
.
weekList
[
new
Date
(
res
.
data
.
data
.
startTime
.
replace
(
/'-'/g
,
"
\
/"
)).
getDay
()]
week
:
this
.
data
.
weekList
[
new
Date
(
res
.
data
.
data
.
startTime
.
replace
(
/'-'/g
,
"
\
/"
)).
getDay
()],
getData
:
true
})
})
if
(
res
.
data
.
data
.
repeatable
)
{
if
(
res
.
data
.
data
.
repeatable
)
{
this
.
setData
({
this
.
setData
({
...
...
pages/place/place.axml
View file @
9e7aa95a
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
</view>
</view>
<view class="mettingRoomRight">
<view class="mettingRoomRight">
<view class="name">
<view class="name">
{{item.meetingRoomFullName ? item.meetingRoomFullName : item.name}}
"
{{item.meetingRoomFullName ? item.meetingRoomFullName : item.name}}
</view>
</view>
<view class="mettingRoomDetail">
<view class="mettingRoomDetail">
<view class="num">
<view class="num">
...
...
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