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
6ecd8093
Commit
6ecd8093
authored
5 years ago
by
xiexiaoqin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule
into dev
parents
6c3cc310
195f7bbc
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
47 additions
and
21 deletions
+47
-21
request.js
api/request.js
+8
-0
app.json
app.json
+1
-2
bindingOutlook.js
pages/bindingOutlook/bindingOutlook.js
+20
-9
meetingRoomList.acss
pages/meetingRoomList/meetingRoomList.acss
+15
-6
meetingRoomList.axml
pages/meetingRoomList/meetingRoomList.axml
+1
-1
meetingRoomList.js
pages/meetingRoomList/meetingRoomList.js
+0
-0
place.axml
pages/place/place.axml
+2
-3
No files found.
api/request.js
View file @
6ecd8093
...
...
@@ -302,3 +302,11 @@ export function getOutlookUrl(data) {
url
:
`https://third-authentication-beta.mingwork.com/microsoft/getThirdLoginUrl?state=
${
data
}
`
});
}
// 发送给后端outlook code
export
function
authorizationCodeReplacementToken
(
data
)
{
return
$binding
({
method
:
"get"
,
data
:
data
,
url
:
`https://third-authentication-beta.mingwork.com/microsoft/authorizationCodeReplacementToken`
});
}
This diff is collapsed.
Click to expand it.
app.json
View file @
6ecd8093
...
...
@@ -16,4 +16,4 @@
"window"
:
{
"allowsBounceVertical"
:
"YES"
}
}
\ No newline at end of file
}
This diff is collapsed.
Click to expand it.
pages/bindingOutlook/bindingOutlook.js
View file @
6ecd8093
import
{
getOutlookUrl
}
from
"../../api/request"
;
import
{
getOutlookUrl
,
authorizationCodeReplacementToken
}
from
"../../api/request"
;
Page
({
data
:
{
url
:
''
url
:
""
},
onLoad
()
{
setTimeout
(()
=>
{
let
data
=
`0968162722860917,
${
dd
.
corpId
}
`
;
getOutlookUrl
(
data
).
then
(
res
=>
{
this
.
setData
({
url
:
res
.
data
.
data
})
},
2000
);
this
.
webViewContext
=
dd
.
createWebViewContext
(
"web-view-1"
);
let
data
=
`
${
getApp
().
globalData
.
userid
}
,
${
dd
.
corpId
}
`
;
getOutlookUrl
(
data
).
then
(
res
=>
{
this
.
setData
({
url
:
res
.
data
.
data
});
});
},
test
(
e
)
{
const
data
=
{
code
:
code
,
state
:
`
${
getApp
().
globalData
.
userid
}
,
${
dd
.
corpId
}
`
};
authorizationCodeReplacementToken
(
data
).
then
(
res
=>
{
console
.
log
(
res
);
});
}
});
This diff is collapsed.
Click to expand it.
pages/meetingRoomList/meetingRoomList.acss
View file @
6ecd8093
...
...
@@ -128,25 +128,34 @@
}
.reservation {
background: #F3F6FA
!important;
border: 1px solid rgba(27, 38, 61, 0.1
0
) !important;
background: #F3F6FA!important;
border: 1px solid rgba(27, 38, 61, 0.1) !important;
}
.occupied {
background: rgba(48, 112, 242, 0.28) !important;
border: 1rpx solid rgba(27, 38, 61, 0.10) !important;
background: rgba(10, 10, 10, 0.2) !important;
border: 1rpx solid rgba(27, 38, 61, 0.1) !important;
}
.myReservation {
background: rgba(234, 12, 40, 1);
border: 1rpx solid rgba(27, 38, 61, 0.1);
}
.reserveRoomTimeBarNum {
display: flex;
margin-top: 12rpx;
font-size: 20rpx;
color: #A3A5A8;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
color: rgba(25, 31, 37, 0.56);
}
.reserveRoomTimeBarNum>view {
text-align: center;
margin-right: 6rpx;
flex: 1;
width: 24rpx;
}
/* 弹框的样式 */
...
...
@@ -349,7 +358,7 @@
}
.checked .iconicon_Agreed1 {
color:
#3296FA
;
color:
rgba(234, 12, 40, 1)
;
font-size: 40rpx;
}
...
...
This diff is collapsed.
Click to expand it.
pages/meetingRoomList/meetingRoomList.axml
View file @
6ecd8093
...
...
@@ -13,7 +13,7 @@
{{item.name}}
</view>
<view class="reserveRoomEquipFacility" a:if="{{item.equipFacilityNames.length>0}}">
<text class="locationIcon iconfont iconicon_
app
1"></text>
<text class="locationIcon iconfont iconicon_
facility
1"></text>
<text a:for="{{item.equipFacilityNames}}" a:if="{{item2 !== null}}" a:for-item="item2" a:for-index="index2">{{item2}}{{index2 === item.equipFacilityNames.length-1 ? '' : '/'}}</text>
</view>
<view class="reserveRoomNumAndLocation">
...
...
This diff is collapsed.
Click to expand it.
pages/meetingRoomList/meetingRoomList.js
View file @
6ecd8093
This diff is collapsed.
Click to expand it.
pages/place/place.axml
View file @
6ecd8093
...
...
@@ -13,8 +13,7 @@
</view>
<block a:for="{{availableMeetingRoom}}">
<view class="mettingRoom" data-locationName="{{item.meetingRoomFullName ? item.meetingRoomFullName : item.name}}" data-locationid="{{item.meetingRoomId}}" onTap="selectMeetingRoom">
<view class="icon iconfont iconicon_room iconhuiyishi2">
</view>
<!--<view class="icon iconfont iconicon_room iconhuiyishi2"></view> -->
<view class="mettingRoomRight">
<view class="name">
{{item.meetingRoomFullName ? item.meetingRoomFullName : item.name}}
...
...
@@ -25,7 +24,7 @@
<text>{{item.capacityNum}}</text>
</view>
<view class="equipment" a:if="{{item.equipFacilityLabelList}}">
<text class="iconfont iconshebei icon
icon_attender
" style="margin-right: 9rpx;"></text>
<text class="iconfont iconshebei icon
_facility1
" style="margin-right: 9rpx;"></text>
<text a:for="{{item.equipFacilityLabelList}}" a:for-item="equipmentList">{{equipmentList.name}}</text>
</view>
</view>
...
...
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