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
This commit is contained in:
THK3121 2023-08-21 13:47:39 +08:00
commit 26db68558d
4 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/oaMy/oaMy.vue
View File

@ -326,7 +326,7 @@
line-height: 84.21rpx; line-height: 84.21rpx;
margin: 0 auto; margin: 0 auto;
margin-top: 84.21rpx; margin-top: 84.21rpx;
width: 614.04rpx; width: 694rpx;
height: 84.21rpx; height: 84.21rpx;
background: $theme-oa-color; background: $theme-oa-color;
box-shadow: 0px 9px 26px 1px #E9EFF5; box-shadow: 0px 9px 26px 1px #E9EFF5;

2
pages/updatePasswprd/updatePasswprd.vue
View File

@ -28,7 +28,7 @@
<!-- #endif --> <!-- #endif -->
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-button style="margin-top: 28rpx;background-color: #3175f9;color: #fff;" @click="submit">提交</u-button> <u-button style="margin-top: 28rpx;background-color: #0122c7;color: #fff;" @click="submit">提交</u-button>
</u--form> </u--form>
</view> </view>
</template> </template>

10
subpkg/noticeList/noticeList.vue
View File

@ -107,10 +107,10 @@
height: 63rpx; height: 63rpx;
line-height: 63rpx; line-height: 63rpx;
text-align: center; text-align: center;
background: #FFFFFF; background: #0122c7;
border-radius: 35rpx; border-radius: 35rpx;
border: 2rpx solid #E6E5E5; border: 2rpx solid #0122c7;
color: #666; color: #fff;
font-size: 28rpx; font-size: 28rpx;
} }
@ -154,10 +154,10 @@
&::before { &::before {
content: '公告'; content: '公告';
display: inline-block; display: inline-block;
color: #FF8C1A; color: #ff7c32;
padding: 2px 8px; padding: 2px 8px;
border-radius: 4px; border-radius: 4px;
border: 1px solid #FF8C1A; border: 1px solid #ff7c32;
margin-right: 14.04rpx; margin-right: 14.04rpx;
} }
} }

23
subpkg/personnelDetails/personnelDetails.vue
View File

@ -152,7 +152,7 @@
</view> </view>
<view class="c_item" v-if=" <view class="c_item" v-if="
(userInfo.qualification && userInfo.qualification.car_card) || (userInfo.qualification && userInfo.qualification.car_card) ||
(userInfo.qualification && userInfo.qualification.car_card) (userInfo.qualification && userInfo.qualification.car_card_b)
"> ">
<uni-section style="background-color: transparent" title="驾驶证" titleFontSize="32rpx" type="line"> <uni-section style="background-color: transparent" title="驾驶证" titleFontSize="32rpx" type="line">
</uni-section> </uni-section>
@ -187,11 +187,13 @@
<u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"> <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56">
</u-skeleton> </u-skeleton>
<block v-if="!skeleton"> <block v-if="!skeleton">
<view class="tit">电子合同</view> <view class="tit" v-if=" userInfo.contract &&
<view v-if="
userInfo.contract &&
userInfo.is_contract && userInfo.is_contract &&
userInfo.contract.status userInfo.contract.status">电子合同</view>
<view v-if="
userInfo.contract &&
userInfo.is_contract &&
userInfo.contract.status
" class="card" style="font-size: 17px;"> " class="card" style="font-size: 17px;">
<uni-section style="background-color: transparent" :title="userInfo.name" titleFontSize="32rpx" <uni-section style="background-color: transparent" :title="userInfo.name" titleFontSize="32rpx"
type="line"></uni-section> type="line"></uni-section>
@ -686,6 +688,7 @@
.certification { .certification {
margin-bottom: 28rpx; margin-bottom: 28rpx;
overflow: hidden;
.title { .title {
margin-bottom: 0; margin-bottom: 0;
@ -693,14 +696,20 @@
.c_item { .c_item {
width: 694rpx; width: 694rpx;
padding: 0 28rpx;
background-color: #fff;
&:last-child{
padding-bottom: 28rpx;
border-radius: 0 0 14rpx 14rpx;
}
.card_box { .card_box {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
image { image {
width: 336rpx; width: 306rpx;
height: 238rpx; height: 208rpx;
background: #ffffff; background: #ffffff;
border-radius: 14rpx 14rpx 14rpx 14rpx; border-radius: 14rpx 14rpx 14rpx 14rpx;
border: 2rpx solid #cccccc; border: 2rpx solid #cccccc;