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
3dc43fb1
Commit
3dc43fb1
authored
Apr 21, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:解决部分机型页面下拉回刷新 会议室名字全拼问题 时间组件点击范围
parent
70c47b22
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
app.json
app.json
+4
-1
meetingRoomList.axml
pages/meetingRoomList/meetingRoomList.axml
+1
-1
meetingRoomList.js
pages/meetingRoomList/meetingRoomList.js
+6
-2
No files found.
app.json
View file @
3dc43fb1
{
{
"pages"
:
[
"pages"
:
[
"pages/index/index"
,
"pages/index/index"
,
"pages/aa/aa"
,
"pages/meetingRoomList/meetingRoomList"
,
"pages/meetingRoomList/meetingRoomList"
,
"pages/bindingApp/bindingApp"
,
"pages/bindingApp/bindingApp"
,
"pages/meetingDetail/meetingDetail"
,
"pages/meetingDetail/meetingDetail"
,
...
@@ -16,5 +17,6 @@
...
@@ -16,5 +17,6 @@
],
],
"window"
:
{
"window"
:
{
"allowsBounceVertical"
:
"YES"
"allowsBounceVertical"
:
"YES"
}
},
"pullRefresh"
:
false
}
}
\ No newline at end of file
pages/meetingRoomList/meetingRoomList.axml
View file @
3dc43fb1
<view class="searchHeader">
<view class="searchHeader">
<view class="searchTime">
<view class="searchTime">
<view onTap="selectSearchTime">{{search.time.split('-')[0]}}年{{search.time.split('-')[1]}}月{{search.time.split('-')[2]}}日</view>
<view onTap="selectSearchTime">{{search.time.split('-')[0]}}年{{search.time.split('-')[1]}}月{{search.time.split('-')[2]}}日</view>
<view class="iconfont iconicon_open"></view>
<view class="iconfont iconicon_open"
onTap="selectSearchTime"
></view>
</view>
</view>
</view>
</view>
<view class="roomScrollView" style="{{canScroll ? '': 'overflow:hidden'}}"">
<view class="roomScrollView" style="{{canScroll ? '': 'overflow:hidden'}}"">
...
...
pages/meetingRoomList/meetingRoomList.js
View file @
3dc43fb1
...
@@ -1266,6 +1266,10 @@ create.Page({
...
@@ -1266,6 +1266,10 @@ create.Page({
};
};
getReserveRoomList
(
data
).
then
(
res
=>
{
getReserveRoomList
(
data
).
then
(
res
=>
{
if
(
res
.
data
.
data
)
{
if
(
res
.
data
.
data
)
{
for
(
let
value
of
res
.
data
.
data
)
{
value
.
name
=
`
${
this
.
getParentStr
(
value
.
locationId
)}${
value
.
name
}
`
;
this
.
parentStr
=
""
;
}
let
reserveRoomList
=
res
.
data
.
data
.
map
(
item
=>
{
let
reserveRoomList
=
res
.
data
.
data
.
map
(
item
=>
{
let
startTime
=
parseInt
(
let
startTime
=
parseInt
(
item
.
timeSlotWithMeetingVOS
[
0
].
reserveStartTime
.
substring
(
0
,
2
)
item
.
timeSlotWithMeetingVOS
[
0
].
reserveStartTime
.
substring
(
0
,
2
)
...
@@ -1321,8 +1325,8 @@ create.Page({
...
@@ -1321,8 +1325,8 @@ create.Page({
}
}
);
);
},
},
onMonthChange
()
{},
onMonthChange
()
{
},
onYearChange
()
{},
onYearChange
()
{
},
onSelectHasDisableDate
()
{
onSelectHasDisableDate
()
{
my
.
alert
({
my
.
alert
({
content
:
"SelectHasDisableDate"
content
:
"SelectHasDisableDate"
...
...
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