mkm/OfficeApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.excellentkk.cn/mkm/OfficeApp

Browse Source 
# Conflicts:
#	pages/oaHome/oaHome.vue
#	pages/oaMy/oaMy.vue
This commit is contained in:
weipengfei 2023-08-01 16:44:41 +08:00
commit c6fdebf1af
2 changed files with 76 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pages/oaHome/oaHome.vue
View File

@ -9,7 +9,8 @@
<!-- #endif -->
<view class="my_info flex_a_c">
<view class="">
<u--image :showLoading="true" :src="myOaInfo.avatar||'../../static/img/public/avatar.png'" width="130.28rpx" height="130.28rpx" shape="circle"></u--image>
<u--image :showLoading="true" :src="myOaInfo.avatar||'../../static/img/public/avatar.png'" width="130.28rpx"
height="130.28rpx" shape="circle"></u--image>
</view>
<view v-if="!$store.state.app.token" @click="login" class="mesg_box">
<view class="name">
@ -53,7 +54,8 @@
</view>
</view>
<block v-if="ApproveList.length>0">
<view class="backlog_item flex_a_c_j_sb" v-for="(item,index) in ApproveList.slice(0,2)" :key="index" @click="clickNotice(item.id)">
<view class="backlog_item flex_a_c_j_sb" v-for="(item,index) in ApproveList.slice(0,2)" :key="index"
@click="clickNotice(item.id)">
<view class="text">{{ item.title }}</view>
<i class="iconfont icon-you"><uni-icons type="forward"></uni-icons></i>
</view>
@ -337,6 +339,7 @@
.mesg_box {
color: #fff;
margin-left: 31.58rpx;
.nickname {
font-size: 32rpx;
font-weight: 500;
@ -395,10 +398,14 @@
.text {
font-size: 28.04rpx;
white-space: nowrap; /* 禁止换行 */
overflow: hidden; /* 溢出隐藏 */
text-overflow: ellipsis; /* 使用省略号代表被截断的文本 */
width: 580rpx; /* 设置元素宽度，根据需要进行调整 */
white-space: nowrap;
/* 禁止换行 */
overflow: hidden;
/* 溢出隐藏 */
text-overflow: ellipsis;
/* 使用省略号代表被截断的文本 */
width: 580rpx;
/* 设置元素宽度，根据需要进行调整 */
&::before {
content: '公告';
@ -418,10 +425,14 @@
.text {
font-size: 28.04rpx;
white-space: nowrap; /* 禁止换行 */
overflow: hidden; /* 溢出隐藏 */
text-overflow: ellipsis; /* 使用省略号代表被截断的文本 */
width: 580rpx; /* 设置元素宽度，根据需要进行调整 */
white-space: nowrap;
/* 禁止换行 */
overflow: hidden;
/* 溢出隐藏 */
text-overflow: ellipsis;
/* 使用省略号代表被截断的文本 */
width: 580rpx;
/* 设置元素宽度，根据需要进行调整 */
&::before {
content: none;
@ -429,10 +440,12 @@
}
}
}
.backlog_no_data {
bottom: -70rpx;
}
}
.home_header_no_data {
margin-bottom: 93.33rpx;
}
@ -480,12 +493,14 @@
display: flex;
flex-direction: column;
justify-content: space-evenly;
.title {
font-size: 28rpx;
font-weight: 500;
color: #000000CC;
line-height: 35rpx;
}
.tips {
font-size: 25rpx;
font-weight: 400;
@ -499,6 +514,7 @@
font-size: 25rpx;
font-weight: 400;
padding: 28rpx;
.title {
font-size: 32rpx;
font-weight: 500;
@ -590,16 +606,19 @@
background: rgba(#333333, 0.4);
border-radius: 14rpx 14rpx 0rpx 0rpx;
padding: 28rpx 28rpx;
.view {
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
.text {
font-size: 28rpx;
font-weight: 500;
color: #FFFFFF;
}
.btn {
width: 158rpx;
height: 60rpx;

3
pages/oaMy/oaMy.vue
View File

@ -33,7 +33,8 @@
</view>
<view class="work">
电话:{{oaUserInfo.account}}<br />
公司:<text v-if="oaUserInfo.admin&&oaUserInfo.admin.company">{{ oaUserInfo.admin.company.company_name }}</text>
公司:<text
v-if="oaUserInfo.admin&&oaUserInfo.admin.company">{{ oaUserInfo.admin.company.company_name }}</text>
<!-- {{ oaUserInfo.did_name }}({{ oaUserInfo.label_name }}) -->
</view>
</view>