From 81c96d42d7997f0dc20cbbb294e2c3aad1c453d0 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 31 Jul 2023 14:05:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5,=E6=88=91?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/oaHome/oaHome.vue | 20 +++++++++++++-------
 pages/oaMy/oaMy.vue     |  7 +++----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 672d6f7..f28f2df 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -9,7 +9,7 @@
       <!-- #endif -->
       <view class="my_info flex_a_c">
         <view class="">
-          <u--image :showLoading="true" :src="myOaInfo.avatar||'../../static/img/public/avatar.png'" width="112.28rpx" height="112.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">
@@ -25,20 +25,25 @@
             
           </view>
           <view class="duty">
-            <!-- 所属公司:<text class="" v-if="myOaInfo.admin.company">{{ myOaInfo.admin.company.company_name }}</text> -->
             <!-- ({{ myOaInfo.did_name }}){{myOaInfo.label_name}} -->
-			电话:{{myOaInfo.account}}
+            电话:{{myOaInfo.account}}<br/>
+            公司:<text v-if="myOaInfo.admin.company">{{ myOaInfo.admin.company.company_name }}</text>
           </view>
         </view>
       </view>
-      <view class="task_panel">
+      
+      <!-- 占位 -->
+      <view style="height: 130rpx;"></view>
+      <!-- 任务状态 -->
+      <!-- <view class="task_panel">
         <block v-for="(item,index) in assessData" :key="index">
           <view class="task_item">
             <view class="plan">{{ item.num }}</view>
             <view class="">{{ item.name }}</view>
           </view>
         </block>
-      </view>
+      </view> -->
+      
       <view class="backlog" :class="!ApproveList.length>0?'backlog_no_data':''">
         <view class="head_title flex_a_c_j_sb">
           <view class="title">公告列表</view>
@@ -205,8 +210,9 @@
           let arr = oaHomeData.filter(item=>!item.admin);//过滤掉管理员专属页面
           this.oaHomeData = arr;
         }else {
-          let arr = oaHomeData.filter(item=>!item.personnel);//过滤掉普通用户专属页面
-          this.oaHomeData = arr;
+          this.oaHomeData = oaHomeData;
+          // let arr = oaHomeData.filter(item=>!item.personnel);//过滤掉普通用户专属页面
+          // this.oaHomeData = arr;
         }
       },
       async getApproveList() {
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index a8081bc..ff4ae0d 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -16,7 +16,7 @@
         <view class="my_msg flex_a_c_j_sb">
           <view class="flex_a_c">
             <u--image :showLoading="true" :src="oaUserInfo.avatar||'../../static/img/public/avatar.png'"
-              width="112.28rpx" height="112.28rpx" shape="circle">
+              width="130.28rpx" height="130.28rpx" shape="circle">
             </u--image>
             <view v-if="!$store.state.app.token" @click="login" class="name_work">
               <view class="name">
@@ -32,9 +32,8 @@
                 <!-- <text class="omit" v-if="oaUserInfo.admin.company">所属公司:{{ oaUserInfo.admin.company.company_name }}</text> -->
               </view>
               <view class="work">
-                电话:{{oaUserInfo.account}}
-
-                <!-- 所属公司:<text class="omit" v-if="oaUserInfo.admin.company">{{ oaUserInfo.admin.company.company_name }}</text> -->
+                电话:{{oaUserInfo.account}}<br/>
+                公司:<text v-if="oaUserInfo.admin.company">{{ oaUserInfo.admin.company.company_name }}</text>
                 <!-- {{ oaUserInfo.did_name }}({{ oaUserInfo.label_name }}) -->
               </view>
             </view>