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
48c35895
Commit
48c35895
authored
5 years ago
by
liang ce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改首页图标和侧边栏图标
parent
dcb5ea4b
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
59 additions
and
38 deletions
+59
-38
myDynamic.js
PageComponents/myDynamic/myDynamic.js
+1
-1
scheduleList.acss
PageComponents/scheduleList/scheduleList.acss
+33
-1
scheduleList.axml
PageComponents/scheduleList/scheduleList.axml
+15
-26
scheduleList.js
PageComponents/scheduleList/scheduleList.js
+10
-3
request.js
api/request.js
+0
-7
No files found.
PageComponents/myDynamic/myDynamic.js
View file @
48c35895
...
@@ -49,7 +49,7 @@ Component({
...
@@ -49,7 +49,7 @@ Component({
}
}
let
itemData
=
item
.
meetingLogDataList
[
i
].
meetingLogResource
;
let
itemData
=
item
.
meetingLogDataList
[
i
].
meetingLogResource
;
if
(
itemData
)
{
if
(
itemData
)
{
if
(
itemData
.
taskInfos
||
itemData
.
task
Infos
)
{
if
(
itemData
.
taskInfos
||
itemData
.
file
Infos
)
{
if
(
itemData
.
creatorInfo
)
{
if
(
itemData
.
creatorInfo
)
{
itemData
.
creatorInfo
=
JSON
.
parse
(
itemData
.
creatorInfo
);
itemData
.
creatorInfo
=
JSON
.
parse
(
itemData
.
creatorInfo
);
}
}
...
...
This diff is collapsed.
Click to expand it.
PageComponents/scheduleList/scheduleList.acss
View file @
48c35895
...
@@ -36,6 +36,26 @@
...
@@ -36,6 +36,26 @@
z-index: 99;
z-index: 99;
}
}
.headerIcon {
position: relative;
}
.headerIcon>view {
position: absolute;
left: 28rpx;
top: 52rpx;
width: 12rpx;
height: 12rpx;
border: 2rpx solid #FFFFFF;
border-radius: 50%;
background: #EA0C28;
}
.headerIcon .iconicon_app1 {
font-size: 44rpx;
color: rgba(27, 38, 61, 0.4);
}
.siderbarShow {
.siderbarShow {
transform: translateX(750rpx);
transform: translateX(750rpx);
transition: all 400ms linear 0s;
transition: all 400ms linear 0s;
...
@@ -65,8 +85,15 @@
...
@@ -65,8 +85,15 @@
margin-right: 34rpx;
margin-right: 34rpx;
width: 64rpx;
width: 64rpx;
height: 64rpx;
height: 64rpx;
background: yellow;
border-radius: 50%;
border-radius: 50%;
background: #3070F2;
color: white;
overflow: hidden;
}
.sidebarLogo view:nth-of-type(1) image {
width: 64rpx;
height: 64rpx;
}
}
.hasAssociated, .unAssociated {
.hasAssociated, .unAssociated {
...
@@ -122,6 +149,11 @@
...
@@ -122,6 +149,11 @@
height: 32rpx;
height: 32rpx;
}
}
.operateIcon .iconright {
font-size: 22rpx;
color: rgba(27, 38, 61, .5)
}
.scheduleList {
.scheduleList {
margin-bottom: 48rpx;
margin-bottom: 48rpx;
}
}
...
...
This diff is collapsed.
Click to expand it.
PageComponents/scheduleList/scheduleList.axml
View file @
48c35895
<view class="scheduleHeader">
<view class="scheduleHeader">
<view>2020年3月</view>
<view>2020年3月</view>
<view onTap="changesidebar">icon</view>
<view onTap="changesidebar" class="headerIcon">
<text class="iconfont iconicon_app1">
</text>
<view>
</view>
</view>
</view>
</view>
<scroll-view class="indexScrollView" scroll-y="{{true}}" style="background: #FFFFFF" lower-threshold="1000" onScrollToLower="lower" scroll-into-view="{{todayStr}}">
<scroll-view class="indexScrollView" scroll-y="{{true}}" style="background: #FFFFFF" lower-threshold="1000" onScrollToLower="lower" scroll-into-view="{{todayStr}}">
<block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
<block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
...
@@ -93,10 +98,11 @@
...
@@ -93,10 +98,11 @@
<view class="sidebarContent" catchTap="preventSort">
<view class="sidebarContent" catchTap="preventSort">
<view class="sidebarLogo">
<view class="sidebarLogo">
<view>
<view>
logo
<image a:if="{{userMsg.headUrl}}" mode="scaleToFill" src="{{userMsg.headUrl}}" />
<text a:else>{{ userMsg.username.slice(-1) }}</text>
</view>
</view>
<view>
<view>
出的鹏
{{ userMsg.username }}
</view>
</view>
</view>
</view>
<view class="hasAssociated">
<view class="hasAssociated">
...
@@ -116,7 +122,7 @@
...
@@ -116,7 +122,7 @@
</view>
</view>
</view>
</view>
<view class="operateIcon">
<view class="operateIcon">
ic
<text class="iconfont iconright"></text>
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -138,7 +144,7 @@
...
@@ -138,7 +144,7 @@
</view>
</view>
</view>
</view>
<view class="operateIcon">
<view class="operateIcon">
ic
<text class="iconfont iconright"></text>
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -155,7 +161,7 @@
...
@@ -155,7 +161,7 @@
</view>
</view>
</view>
</view>
<view class="operateIcon">
<view class="operateIcon">
ic
<text class="iconfont iconright"></text>
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -172,27 +178,10 @@
...
@@ -172,27 +178,10 @@
</view>
</view>
</view>
</view>
<view class="operateIcon">
<view class="operateIcon">
ic
<text class="iconfont iconright"></text>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</popup>
</popup>
<!--<view class="sidebar {{isShowSidebar === '' ? '' : isShowSidebar === false ? 'siderbarHidden' : 'siderbarShow'}}" catchTap="changesidebar"><view class="sidebarContent" catchTap="preventSort"><view class="sidebarLogo"><view>
\ No newline at end of file
logo</view><view>
出的鹏</view></view><view class="hasAssociated"><view class="associated">
已关联应用</view><view class="applicationList"><view class="applicationLogo"></view><view class="applicationMsg"><view><view>
Outlook日历</view><view>
支持会议日程双向同步,实时同步日程信息等</view></view><view class="operateIcon">
ic</view></view></view></view><view class="unAssociated"><view class="associated">
可关联应用</view><view class="applicationList"><view class="applicationLogo"></view><view class="applicationMsg"><view><view>
Outlook日历</view><view>
支持会议日程双向同步,实时同步日程信息等</view></view><view class="operateIcon">
ic</view></view></view><view class="applicationList"><view class="applicationLogo"></view><view class="applicationMsg"><view><view>
Outlook日历</view><view>
支持会议日程双向同步,实时同步日程信息等</view></view><view class="operateIcon">
ic</view></view></view><view class="applicationList"><view class="applicationLogo"></view><view class="applicationMsg"><view><view>
Outlook日历</view><view>
支持会议日程双向同步,实时同步日程信息等</view></view><view class="operateIcon">
ic</view></view></view></view></view></view> -->
\ No newline at end of file
This diff is collapsed.
Click to expand it.
PageComponents/scheduleList/scheduleList.js
View file @
48c35895
...
@@ -10,6 +10,7 @@ import create from "dd-store";
...
@@ -10,6 +10,7 @@ import create from "dd-store";
create
.
Component
({
create
.
Component
({
mixins
:
[],
mixins
:
[],
data
:
{
data
:
{
userMsg
:
""
,
$data
:
null
,
$data
:
null
,
response
:
""
,
response
:
""
,
scheduleList
:
[],
scheduleList
:
[],
...
@@ -25,11 +26,19 @@ create.Component({
...
@@ -25,11 +26,19 @@ create.Component({
pageEndTime
:
""
,
pageEndTime
:
""
,
show
:
false
,
show
:
false
,
scrollHeight
:
""
,
scrollHeight
:
""
,
timeStamp
:
""
timeStamp
:
""
,
userMsg
:
{}
},
},
props
:
{},
props
:
{},
didMount
()
{
didMount
()
{
console
.
log
(
getApp
().
globalData
);
this
.
getDate
();
this
.
getDate
();
this
.
setData
({
userMsg
:
{
headUrl
:
getApp
().
globalData
.
avatar
||
""
,
userName
:
getApp
().
globalData
.
name
}
});
},
},
didUpdate
()
{
didUpdate
()
{
if
(
this
.
props
.
update
)
{
if
(
this
.
props
.
update
)
{
...
@@ -139,8 +148,6 @@ create.Component({
...
@@ -139,8 +148,6 @@ create.Component({
parseInt
(
initialTime
[
1
])
-
1
,
parseInt
(
initialTime
[
1
])
-
1
,
parseInt
(
initialTime
[
2
])
parseInt
(
initialTime
[
2
])
);
);
initialTimeDate
.
setDate
(
initialTimeDate
.
getDate
()
-
1
);
console
.
log
(
initialTimeDate
.
toLocaleDateString
());
let
initialTimeDateyear
=
initialTimeDate
.
getFullYear
();
let
initialTimeDateyear
=
initialTimeDate
.
getFullYear
();
let
initialTimeDatemonth
=
let
initialTimeDatemonth
=
initialTimeDate
.
getMonth
()
+
1
<
10
initialTimeDate
.
getMonth
()
+
1
<
10
...
...
This diff is collapsed.
Click to expand it.
api/request.js
View file @
48c35895
...
@@ -8,13 +8,6 @@ export function getMeetingRoom(data) {
...
@@ -8,13 +8,6 @@ export function getMeetingRoom(data) {
url
:
'/meet/meeting-room/page'
,
url
:
'/meet/meeting-room/page'
,
})
})
}
}
export
function
getMeetingGlobalSetting
(
data
)
{
return
$http
({
method
:
'get'
,
data
:
data
,
url
:
'/meet/meeting-global-setting/get'
,
})
}
// 获取会议室分类
// 获取会议室分类
// 办公区域
// 办公区域
...
...
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