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
8f6ee05e
Commit
8f6ee05e
authored
5 years ago
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into release_beta/1.0.0
parents
fe43f313
b842b42d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
22 deletions
+9
-22
index.js
pages/index/index.js
+7
-3
meetingDetail.axml
pages/meetingDetail/meetingDetail.axml
+2
-19
meetingRoomList.js
pages/meetingRoomList/meetingRoomList.js
+0
-0
No files found.
pages/index/index.js
View file @
8f6ee05e
...
...
@@ -34,7 +34,7 @@ create.Page({
$data
:
null
,
iconDay
:
currentDate
.
getDate
(),
scheduleList
:
[],
todayStr
:
toLocaleDateString
(
currentDate
)
,
todayStr
:
''
,
currentData
:
toLocaleDateString
(
currentDate
),
currentDataIndex
:
0
,
offset
:
"stop"
,
...
...
@@ -170,7 +170,9 @@ create.Page({
loading
:
false
});
this
.
isLoaded
=
true
;
this
.
backToToday
(
'first'
)
setTimeout
(()
=>
{
this
.
backToToday
(
'first'
)
},
300
)
return
;
}
...
...
@@ -181,7 +183,9 @@ create.Page({
sign
:
res
.
data
.
data
.
sign
})
if
(
this
.
isFirstLoad
)
{
this
.
backToToday
(
'first'
)
setTimeout
(()
=>
{
this
.
backToToday
(
'first'
)
},
300
)
this
.
isFirstLoad
=
false
;
}
return
...
...
This diff is collapsed.
Click to expand it.
pages/meetingDetail/meetingDetail.axml
View file @
8f6ee05e
...
...
@@ -139,25 +139,8 @@
<view class="permission" a:if="{{currentPeople != organizer}}">
</view>
</view>
<view class="meetingWayShow" a:if="{{comListData.meetingWayModelId == 0}}">
<view class="meetingWayShowTop">
<view class=" icon iconfont iconicon_camera1">
</view>
<view class="meetingWayText">
<view onTap="setCopy" data-item="https://zoom.com.cn/j/93255954558?pwd=YmNZQkY1SGxtUFNPYjZlcUpJT0xtQT09" data-type="url">
Zoom
</view>
<view class="mettingWayText" onTap="setCopy" data-item="513410069">
<text>ID:513410069</text>
<text class="icon iconfont iconicon_icon"></text>
</view>
<view class="mettingWayText passWord" onTap="setCopy" data-item="4ez3am">
<text >密码:4ez3am</text>
<text class="icon iconfont iconicon_icon"></text>
</view>
</view>
</view>
</view>
<!--<view class="meetingWayShow" a:if="{{comListData.meetingWayModelId == 0}}"><view class="meetingWayShowTop"><view class=" icon iconfont iconicon_camera1"></view><view class="meetingWayText"><view onTap="setCopy" data-item="https://zoom.com.cn/j/93255954558?pwd=YmNZQkY1SGxtUFNPYjZlcUpJT0xtQT09" data-type="url">
Zoom</view><view class="mettingWayText" onTap="setCopy" data-item="513410069"><text>ID:513410069</text><text class="icon iconfont iconicon_icon"></text></view><view class="mettingWayText passWord" onTap="setCopy" data-item="4ez3am"><text >密码:4ez3am</text><text class="icon iconfont iconicon_icon"></text></view></view></view></view> -->
<!-- 删除该会议 -->
<template is="deleteBtn" onhandleDelete="" data="{{title: '删除该会议' }}"/>
</view>
...
...
This diff is collapsed.
Click to expand it.
pages/meetingRoomList/meetingRoomList.js
View file @
8f6ee05e
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