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:
#	subpkg/personnelDetails/personnelDetails.vue
This commit is contained in:
weipengfei 2023-08-02 10:04:26 +08:00
commit 583450a39a
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/company/company.vue
View File

@ -20,7 +20,7 @@
<uni-icons type="location"></uni-icons> <uni-icons type="location"></uni-icons>
<view class="location">区域:</view> <view class="location">区域:</view>
</view> </view>
<view style="flex: 1;">{{company.province_name+company.city_name+company.area_name+company.street_name+company.address}}</view> <view style="flex: 1;">{{company.address}}</view>
</view> </view>
</view> </view>
</block> </block>

29
subpkg/archives/archives.vue
View File

@ -47,6 +47,7 @@
export default { export default {
data() { data() {
return { return {
user_id: 0,
list: [], list: [],
loadConfig: { loadConfig: {
page: 1, page: 1,
@ -59,6 +60,7 @@
} }
}, },
onLoad(options) { onLoad(options) {
this.user_id = options.id
console.log(options); console.log(options);
}, },
onShow() { onShow() {
@ -92,7 +94,8 @@
this.loadConfig.status = "loading" this.loadConfig.status = "loading"
let res = await informationList({ let res = await informationList({
page: this.loadConfig.page, page: this.loadConfig.page,
limit: this.loadConfig.limit limit: this.loadConfig.limit,
user_id: that.user_id
}) })
this.loadConfig.status = "loadmore" this.loadConfig.status = "loadmore"
if (res.data.length < this.loadConfig.limit) { if (res.data.length < this.loadConfig.limit) {
@ -146,42 +149,42 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
width: 100%; width: 100%;
.avatar { .avatar {
width: 88rpx; width: 88rpx;
height: 88rpx; height: 88rpx;
border-radius: 50%; border-radius: 50%;
margin-right: 18rpx; margin-right: 18rpx;
} }
.u_avatar { .u_avatar {
margin-right: 18rpx; margin-right: 18rpx;
} }
.text { .text {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
.name { .name {
font-size: 32rpx; font-size: 32rpx;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
} }
.mobile { .mobile {
color: #999999; color: #999999;
font-size: 28rpx; font-size: 28rpx;
} }
} }
.right { .right {
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
.top, .top,
.bottom { .bottom {
width: 158rpx; width: 158rpx;
@ -195,7 +198,7 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.bottom { .bottom {
border: 2rpx solid #F9AA32; border: 2rpx solid #F9AA32;
color: #F9AA32; color: #F9AA32;
@ -203,13 +206,13 @@
} }
} }
} }
.bottom { .bottom {
display: flex; display: flex;
justify-content: left; justify-content: left;
align-items: center; align-items: center;
margin-top: 20rpx; margin-top: 20rpx;
.circle { .circle {
width: 11rpx; width: 11rpx;
height: 11rpx; height: 11rpx;
@ -218,7 +221,7 @@
margin-right: 10rpx; margin-right: 10rpx;
border-radius: 50%; border-radius: 50%;
} }
.green { .green {
font-weight: 400; font-weight: 400;
color: #34A853; color: #34A853;
@ -228,7 +231,7 @@
} }
} }
} }
} }

2
subpkg/personnelDetails/personnelDetails.vue
View File

@ -11,7 +11,7 @@
<view class="basic_name"> <view class="basic_name">
<view class="name">{{userInfo.name}}</view> <view class="name">{{userInfo.name}}</view>
<image class="icon" :src="userInfo.sex==1?'../../static/icons/man.png':'../../static/icons/woman.png'"></image> <image class="icon" :src="userInfo.sex==1?'../../static/icons/man.png':'../../static/icons/woman.png'"></image>
<view class="role" v-if="userInfo.roles">{{userInfo.roles[0]}}</view> <!-- <view class="role" v-if="userInfo.roles">{{userInfo.roles[0]}}</view> -->
</view> </view>
<view class="id_card"> <view class="id_card">
身份证号:{{userInfo.id_card}} 身份证号:{{userInfo.id_card}}