Commit 48c35895 by liang ce

修改首页图标和侧边栏图标

parent dcb5ea4b
......@@ -49,7 +49,7 @@ Component({
}
let itemData = item.meetingLogDataList[i].meetingLogResource;
if (itemData) {
if (itemData.taskInfos || itemData.taskInfos) {
if (itemData.taskInfos || itemData.fileInfos) {
if (itemData.creatorInfo) {
itemData.creatorInfo = JSON.parse(itemData.creatorInfo);
}
......
......@@ -36,6 +36,26 @@
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 {
transform: translateX(750rpx);
transition: all 400ms linear 0s;
......@@ -65,8 +85,15 @@
margin-right: 34rpx;
width: 64rpx;
height: 64rpx;
background: yellow;
border-radius: 50%;
background: #3070F2;
color: white;
overflow: hidden;
}
.sidebarLogo view:nth-of-type(1) image {
width: 64rpx;
height: 64rpx;
}
.hasAssociated, .unAssociated {
......@@ -122,6 +149,11 @@
height: 32rpx;
}
.operateIcon .iconright {
font-size: 22rpx;
color: rgba(27, 38, 61, .5)
}
.scheduleList {
margin-bottom: 48rpx;
}
......
<view class="scheduleHeader">
<view>2020年3月</view>
<view onTap="changesidebar">icon</view>
<view onTap="changesidebar" class="headerIcon">
<text class="iconfont iconicon_app1">
</text>
<view>
</view>
</view>
</view>
<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">
......@@ -93,10 +98,11 @@
<view class="sidebarContent" catchTap="preventSort">
<view class="sidebarLogo">
<view>
logo
<image a:if="{{userMsg.headUrl}}" mode="scaleToFill" src="{{userMsg.headUrl}}" />
<text a:else>{{ userMsg.username.slice(-1) }}</text>
</view>
<view>
出的鹏
{{ userMsg.username }}
</view>
</view>
<view class="hasAssociated">
......@@ -116,7 +122,7 @@
</view>
</view>
<view class="operateIcon">
ic
<text class="iconfont iconright"></text>
</view>
</view>
</view>
......@@ -138,7 +144,7 @@
</view>
</view>
<view class="operateIcon">
ic
<text class="iconfont iconright"></text>
</view>
</view>
</view>
......@@ -155,7 +161,7 @@
</view>
</view>
<view class="operateIcon">
ic
<text class="iconfont iconright"></text>
</view>
</view>
</view>
......@@ -172,27 +178,10 @@
</view>
</view>
<view class="operateIcon">
ic
<text class="iconfont iconright"></text>
</view>
</view>
</view>
</view>
</view>
</popup>
\ No newline at end of file
<!--<view class="sidebar {{isShowSidebar === '' ? '' : isShowSidebar === false ? 'siderbarHidden' : 'siderbarShow'}}" catchTap="changesidebar"><view class="sidebarContent" catchTap="preventSort"><view class="sidebarLogo"><view>
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
......@@ -10,6 +10,7 @@ import create from "dd-store";
create.Component({
mixins: [],
data: {
userMsg: "",
$data: null,
response: "",
scheduleList: [],
......@@ -25,11 +26,19 @@ create.Component({
pageEndTime: "",
show: false,
scrollHeight: "",
timeStamp: ""
timeStamp: "",
userMsg: {}
},
props: {},
didMount() {
console.log(getApp().globalData);
this.getDate();
this.setData({
userMsg: {
headUrl: getApp().globalData.avatar || "",
userName: getApp().globalData.name
}
});
},
didUpdate() {
if (this.props.update) {
......@@ -139,8 +148,6 @@ create.Component({
parseInt(initialTime[1]) - 1,
parseInt(initialTime[2])
);
initialTimeDate.setDate(initialTimeDate.getDate() - 1);
console.log(initialTimeDate.toLocaleDateString());
let initialTimeDateyear = initialTimeDate.getFullYear();
let initialTimeDatemonth =
initialTimeDate.getMonth() + 1 < 10
......
......@@ -8,13 +8,6 @@ export function getMeetingRoom(data) {
url: '/meet/meeting-room/page',
})
}
export function getMeetingGlobalSetting(data) {
return $http({
method: 'get',
data: data,
url: '/meet/meeting-global-setting/get',
})
}
// 获取会议室分类
// 办公区域
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment