From fa2f172812de8344fa22c4ef088ea2a67257a0d3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 05 九月 2023 10:21:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev
---
minipro_standard/pages/personal/personal.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/minipro_standard/pages/personal/personal.vue b/minipro_standard/pages/personal/personal.vue
index 22f5c25..3677e11 100644
--- a/minipro_standard/pages/personal/personal.vue
+++ b/minipro_standard/pages/personal/personal.vue
@@ -1,41 +1,45 @@
<template>
<view class="info">
<view class="info_portrait">
- <image src="@/static/2@2x.png" mode="widthFix" />
+ <image :src="userInfo.avatar ? userInfo.avatar : avatar" mode="widthFix" />
<text>鐢ㄦ埛鍚�</text>
</view>
<view class="info_list">
<view class="info_list_item">
<text>鏄电О</text>
- <text>鏆傛棤鏄电О</text>
+ <text>{{userInfo.realname ? userInfo.realname : '鏆傛棤鏄电О'}}</text>
</view>
<view class="info_list_item">
<text>鎵嬫満鍙�</text>
- <text>鏆傛棤鎵嬫満鍙�</text>
+ <text>{{userInfo.companyUser.phone ? userInfo.companyUser.phone : '鏆傛棤鎵嬫満鍙�'}}</text>
</view>
<view class="info_list_item">
<text>鎵�灞為儴闂�</text>
- <text>鏆傛棤鎵�灞為儴闂�</text>
+ <text>{{userInfo.department.name ? userInfo.department.name : '鏆傛棤鎵�灞為儴闂�'}}</text>
</view>
<view class="info_list_item">
<text>宀椾綅</text>
- <text>鏆傛棤宀椾綅</text>
+ <text>{{userInfo.companyUser.positionName ? userInfo.companyUser.positionName : '鏆傛棤宀椾綅'}}</text>
</view>
<view class="info_list_item">
<text>褰撳墠缁勭粐</text>
- <text>鏆傛棤缁勭粐</text>
+ <text>{{userInfo.rootDepartment.name ? userInfo.rootDepartment.name : '鏆傛棤缁勭粐'}}</text>
</view>
</view>
</view>
</template>
<script>
+ import { mapState } from 'vuex'
export default {
data() {
return {
-
+ avatar: require('@/static/2@2x.png'),
};
- }
+ },
+ computed: mapState([
+ 'userInfo'
+ ])
}
</script>
--
Gitblit v1.9.3