完成片区经理功能,优化头像

api/company.js

@@ -14,3 +14,8 @@ export const companyIndex = (data) => oahttp.get('/company/index', data)
  * 公司详情
  */
 export const companyView = (data) => oahttp.get('/company/view', data)
+
+/**
+ * 公司详情
+ */
+export const companyAreaManager = (data) => oahttp.get('/company/areaManager', data)

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||''" width="112.28rpx" height="112.28rpx" shape="circle"></u--image>
+          <u--image :showLoading="true" :src="myOaInfo.avatar||'../../static/img/public/man.png'" width="112.28rpx" height="112.28rpx" shape="circle"></u--image>
         </view>
         <view class="mesg_box">
           <view class="name">{{ myOaInfo.nickname }} {{ myOaInfo.mobile }}</view>

pages/oaManager/oaManager.vue

@@ -28,21 +28,23 @@
       </view>
     </view>
     <view class="list">
-      <view class="item" v-for="item in 10" :key="item">
+      <view class="item" v-for="item in areaManagerList" :key="item.id">
         <view class="left">
           <view class="top">
-            <image class="avatar" src="../../static/logo.png"></image>
+            <!-- <image class="avatar" :src="item.avatar||'../../static/img/public/man.png'"></image> -->
+            <u--image class="u_avatar" :showLoading="true" :src="item.avatar||'../../static/img/public/man.png'" width="112.28rpx" height="112.28rpx" shape="circle">
+            </u--image>
             <view class="text">
-              <view class="name">经理名称</view>
+              <view class="name">{{item.name}}</view>
               <view class="mobile">
-                联系人-<text @click="copyPhone('17685151643')">13565632345</text>
+                <uni-icons type="phone" color="#999999FF"></uni-icons>联系人-<text @click="copyPhone('17685151643')">{{item.account}}</text>
               </view>
             </view>
           </view>
           <view class="bottom">
             <view class="circle"></view>
             <view class="green">所属片区</view>
-            <view>片区详情XXXX</view>
+            <view>{{item.area}}</view>
           </view>
         </view>
         <view class="right">
@@ -55,21 +57,24 @@
         </view>
       </view>
     </view>
-    <u-loadmore :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText" :nomore-text="nomoreText" />
+    <u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText" :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
   </view>
 </template>
 
 <script>
   import { Toast } from '@/libs/uniApi.js'
+  import {companyAreaManager} from "@/api/company.js"
   export default {
     data() {
       return {
         show: false,
-        lastpage: '',
+        loadConfig:{
-        loadingText: '努力加载中',
+          loadingText: '努力加载中',
-        loadmoreText: '轻轻上拉',
+          loadmoreText: '轻轻上拉',
-        nomoreText: '我也是有底线的~~',
+          nomoreText: '我也是有底线的~~',
-        status: 'loadmore'
+          status: 'nomore'
+        },
+        areaManagerList:[]
       }
     },
     onReady() {
@@ -79,8 +84,14 @@
       })
     },
     onLoad() {},
-    onShow() {},
+    onShow() {
+      this.loadAreaManager();
+    },
     methods: {
+      async loadAreaManager(){
+        let res = await companyAreaManager();
+        this.areaManagerList = res.data;
+      },
       //拨打电话
       callUp(phone) {
         uni.makePhoneCall({
@@ -207,7 +218,7 @@
 
     .item {
       width: 694rpx;
-      height: 231rpx;
+      height: 201rpx;
       background: #FFFFFF;
       border-radius: 14rpx 14rpx 14rpx 14rpx;
       opacity: 1;
@@ -233,10 +244,13 @@
             border-radius: 50%;
             margin-right: 18rpx;
           }
+          .u_avatar{
+            margin-right: 18rpx;
+          }
 
           .text {
             display: flex;
-            justify-content: space-between;
+            justify-content: space-around;
             flex-direction: column;
             height: 100%;
 

pages/oaMy/oaMy.vue

@@ -15,7 +15,7 @@
       <view v-else class="personage">
         <view class="my_msg flex_a_c_j_sb">
           <view class="flex_a_c">
-            <u--image :showLoading="true" :src="oaUserInfo.avatar" width="112.28rpx" height="112.28rpx" shape="circle">
+            <u--image :showLoading="true" :src="oaUserInfo.avatar||'../../static/img/public/man.png'" width="112.28rpx" height="112.28rpx" shape="circle">
             </u--image>
             <view class="name_work">
               <view class="name">

subpkg/finance/finance.vue

@@ -3,7 +3,7 @@
     <view class="finance_head">
       <view class="top">
         <view class="left">
-          <u--image :showLoading="true" :src="userInfo.avatar||''" width="44px" height="44px" shape="circle"></u--image>
+          <u--image :showLoading="true" :src="userInfo.avatar||'../../static/img/public/man.png'" width="44px" height="44px" shape="circle"></u--image>
           <view class="name">{{userInfo.nickname}}</view>
           <image src="../../static/img/contract/setting.png"></image>
         </view>

subpkg/personnel/personnel.vue

@@ -1,14 +1,16 @@
 <template>
   <view class="personnel">
-    <button class="new_btn">创建</button>
+    <!-- <button class="new_btn">创建</button> -->
-    <view class="personnel_item">
+    <view class="personnel_list">
-      <view class="type">
+      <view class="personnel_item">
-        <image src="../../static/icons/err.png"></image>
+        <view class="type">
-        <text>未签约</text>
+          <image src="../../static/icons/err.png"></image>
-      </view>
+          <text>未签约</text>
-      <view class="top">
+        </view>
-        <view class="left"></view>
+        <view class="top">
-        <view class="right"></view>
+          <view class="left"></view>
+          <view class="right"></view>
+        </view>
       </view>
     </view>
   </view>
@@ -52,39 +54,46 @@ export default {
     line-height: 80rpx;
     text-align: center;
   }
-  .personnel_item{
+  .personnel_list{
-    width: 694rpx;
+    display: flex;
-    height: 407rpx;
+    flex-direction: column;
-    background: #FFFFFF;
+    align-items: center;
-    border-radius: 14rpx 14rpx 14rpx 14rpx;
+    padding-top: 32rpx;
-    margin-bottom: 32rpx;
+    .personnel_item{
-    overflow: hidden;
+      width: 694rpx;
-    position: relative;
+      height: 407rpx;
-    .type{
+      background: #FFFFFF;
-      width: 137rpx;
+      border-radius: 14rpx 14rpx 14rpx 14rpx;
-      height: 53rpx;
+      margin-bottom: 32rpx;
-      background-color: #F02828;
+      overflow: hidden;
-      border-radius: 0rpx 14rpx 0rpx 14rpx;
+      position: relative;
-      font-size: 25rpx;
+      .type{
-      font-weight: 400;
+        width: 137rpx;
-      color: #FFFFFF;
+        height: 53rpx;
-      line-height: 35rpx;
+        background-color: #F02828;
-      display: flex;
+        border-radius: 0rpx 14rpx 0rpx 14rpx;
-      justify-content: center;
+        font-size: 25rpx;
-      align-items: center;
+        font-weight: 400;
-      position: absolute;
+        color: #FFFFFF;
-      top: 0;
+        line-height: 35rpx;
-      right: 0;
+        display: flex;
-      image{
+        justify-content: center;
-        width: 18rpx;
+        align-items: center;
-        height: 18rpx;
+        position: absolute;
-        margin-right: 9rpx;
+        top: 0;
+        right: 0;
+        image{
+          width: 18rpx;
+          height: 18rpx;
+          margin-right: 9rpx;
+        }
+      }
+      .top{
+        // background-color: #3274F9;
+        
       }
     }
-    .top{
-      // background-color: #3274F9;
-      
-    }
   }
+  
 }
 </style>