diff --git a/components/company/company.vue b/components/company/company.vue
index 8863b95..195e6f3 100644
--- a/components/company/company.vue
+++ b/components/company/company.vue
@@ -2,89 +2,98 @@
   <view>
     <view class="item">
       <u-skeleton :loading="skeleton" :animate="true" title rows="1" rows-width="100%" rowsHeight="56"></u-skeleton>
-      <view class="title">公司基本信息</view>
-      <view class="card">
-        <view class="top">
-          <view class="left">
-            <image src="../../static/img/contract/company.png"></image>
-            <view class="text">
-              <view class="name">{{company.company_name}}</view>
-              <view class="right">{{company.company_type_name||company.company_type}}</view>
-              <view class="code">社会代码{{company.organization_code}}</view>
-            </view>
-          </view>
-        </view>
-        <view class="bottom"><uni-icons type="location"></uni-icons><text class="location">负责区域:</text></view>
-      </view>
-    </view>
-    <view class="item">
-      <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
-      <view class="title">
-        <text>联系人管理</text>
-        <!-- <view>新增</view> -->
-      </view>
-      <view class="card">
-        <view class="one">
-          <view class="linkman">主要联系人</view>
-          <view class="info">
-            <view class="info_item">姓名：{{company.master_name}}</view>
-            <view class="info_item">职位：{{company.master_position}}</view>
-            <view class="info_item">联系电话：{{company.master_phone}}</view>
-            <view class="info_item">邮箱：{{company.master_email}}</view>
-          </view>
-        </view>
-        <view style="height: 32rpx;"></view>
-        <view class="one" v-for="(other, index) in company.other_contacts" :key="index">
-          <view class="linkman">其他联系人</view>
-          <view class="info">
-            <view class="info_item">姓名：{{other.name}}</view>
-            <view class="info_item">职位：{{company.position}}</view>
-            <view class="info_item">联系电话：{{other.phone}}</view>
-            <view class="info_item">邮箱：{{other.email}}</view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="item">
-      <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
-      <view class="title">资质信息</view>
-      <view class="image_box">
-        <image class="top" @click="priview(company.qualification.bank_account)" :src="company.qualification.bank_account"></image>
-        <image class="bottom" @click="priview(company.qualification.business_license)" :src="company.qualification.business_license"></image>
-      </view>
-    </view>
-    <view class="item">
-      <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
-      <view class="title">电子合同</view>
-      <view class="card">
-        <view class="one">
-          <view class="linkman">{{contract.party_a_name}}</view>
-          <view class="info">
-            <view class="info_item">签约对象：{{contract.party_b_name}}</view>
-            <view class="info_item">合同类型：{{contract.contract_type_name}}</view>
-            <view class="info_item">合同编号：{{contract.contract_no}}</view>
-          </view>
-        </view>
-        <u-line color="#999999FF" style="margin: 31rpx 0;"></u-line>
-        <view class="contract">
-          <view class="left">
-            <image class="contract_img" src="../../static/img/contract/pdf.png"></image>
-            <view class="text">
-              <view class="name">合同</view>
-              <view>
-                <!-- <text class="nickname">张郭郭</text> -->
-                <text>{{contract.create_time}}</text>
+      <block v-if="!skeleton">
+        <view class="title">公司基本信息</view>
+        <view class="card">
+          <view class="top">
+            <view class="left">
+              <image src="../../static/img/contract/company.png"></image>
+              <view class="text">
+                <view class="name">{{company.company_name}}</view>
+                <view class="right">{{company.company_type_name||company.company_type}}</view>
+                <view class="code">社会代码{{company.organization_code}}</view>
               </view>
             </view>
           </view>
-          <view class="right"
-            @click="naviTo('/subpkg/pdfView/pdfView?url=' + contract.file)">
-            <!-- <image class="icon"></image> -->
-            <uni-icons type="paperclip" color="#3274F9"></uni-icons>
-            <view>查看</view>
+          <view class="bottom"><uni-icons type="location"></uni-icons><text class="location">负责区域:</text></view>
+        </view>
+      </block>
+    </view>
+    <view class="item">
+      <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
+      <block v-if="!skeleton">
+        <view class="title">
+          <text>联系人管理</text>
+          <!-- <view>新增</view> -->
+        </view>
+        <view class="card">
+          <view class="one">
+            <view class="linkman">主要联系人</view>
+            <view class="info">
+              <view class="info_item">姓名：{{company.master_name}}</view>
+              <view class="info_item">职位：{{company.master_position}}</view>
+              <view class="info_item">联系电话：{{company.master_phone}}</view>
+              <view class="info_item">邮箱：{{company.master_email}}</view>
+            </view>
+          </view>
+          <view style="height: 32rpx;"></view>
+          <view class="one" v-for="(other, index) in company.other_contacts" :key="index">
+            <view class="linkman">其他联系人</view>
+            <view class="info">
+              <view class="info_item">姓名：{{other.name}}</view>
+              <view class="info_item">职位：{{company.position}}</view>
+              <view class="info_item">联系电话：{{other.phone}}</view>
+              <view class="info_item">邮箱：{{other.email}}</view>
+            </view>
           </view>
         </view>
-      </view>
+      </block>
+      
+    </view>
+    <view class="item">
+      <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
+      <block v-if="!skeleton">
+        <view class="title">资质信息</view>
+        <view class="image_box">
+          <image class="top" @click="priview(company.qualification.bank_account)" :src="company.qualification.bank_account"></image>
+          <image class="bottom" @click="priview(company.qualification.business_license)" :src="company.qualification.business_license"></image>
+        </view>
+      </block>
+    </view>
+    <view class="item">
+      <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
+      <block v-if="!skeleton">
+        <view class="title">电子合同</view>
+        <view class="card">
+          <view class="one">
+            <view class="linkman">{{contract.party_a_name}}</view>
+            <view class="info">
+              <view class="info_item">签约对象：{{contract.party_b_name}}</view>
+              <view class="info_item">合同类型：{{contract.contract_type_name}}</view>
+              <view class="info_item">合同编号：{{contract.contract_no}}</view>
+            </view>
+          </view>
+          <u-line color="#999999FF" style="margin: 31rpx 0;"></u-line>
+          <view class="contract">
+            <view class="left">
+              <image class="contract_img" src="../../static/img/contract/pdf.png"></image>
+              <view class="text">
+                <view class="name">合同</view>
+                <view>
+                  <!-- <text class="nickname">张郭郭</text> -->
+                  <text>{{contract.create_time}}</text>
+                </view>
+              </view>
+            </view>
+            <view class="right"
+              @click="naviTo('/subpkg/pdfView/pdfView?url=' + contract.file)">
+              <!-- <image class="icon"></image> -->
+              <uni-icons type="paperclip" color="#3274F9"></uni-icons>
+              <view>查看</view>
+            </view>
+          </view>
+        </view>
+      </block>
     </view>
   </view>
 </template>
@@ -332,6 +341,7 @@
         image{
           padding-bottom: 20rpx;
           border-radius: 20rpx;
+          overflow: hidden;
           width: 650rpx;
           height: 455rpx;
         }
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index af5b6ae..f8e159d 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -194,7 +194,6 @@
       },
       async getApproveList() {
         const res = await noticeList({
-          cid: 1,
           sort: 'new',
           keyword: '',
         })
diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue
index ced8ee4..e632f17 100644
--- a/pages/oaLogin/oaLogin.vue
+++ b/pages/oaLogin/oaLogin.vue
@@ -41,8 +41,8 @@ import { Toast } from "../../libs/uniApi";
       return {
         current: 0,
         formData: {
-          account: '13333333333',
-          password: 'm13333333333',
+          account: '',
+          password: '',
           code: '',
           terminal: 6, //6是APP端
           scene: 1
diff --git a/subpkg/personnelDetails/personnelDetails.vue b/subpkg/personnelDetails/personnelDetails.vue
index 4cc4666..1b0e632 100644
--- a/subpkg/personnelDetails/personnelDetails.vue
+++ b/subpkg/personnelDetails/personnelDetails.vue
@@ -2,90 +2,96 @@
   <view class="page">
     <view class="basic">
       <u-skeleton :loading="skeleton" :animate="true" title rows="1" rows-width="100%" rowsHeight="56"></u-skeleton>
-      <view class="title">人员基本信息</view>
-      <view class="card">
-        <view class="basic_top">
-          <image class="avatar" :src="userInfo.avatar"></image>
-          <view class="text">
-            <view class="basic_name">
-              <view class="name">{{userInfo.name}}</view>
-              <image class="icon" :src="userInfo.sex==1?'../../static/icons/man.png':'../../static/icons/woman.png'"></image>
-              <view class="role">{{userInfo.roles[0]}}</view>
-            </view>
-            <view class="id_card">
-              身份证号:{{userInfo.id_card}}
-            </view>
-            <view class="phone">
-              联系电话:{{userInfo.phone}}
-            </view>
-          </view>
-        </view>
-        <view class="bottom">
-          负责区域: {{userInfo.city_name+userInfo.area_name+userInfo.street_name}}{{userInfo.city_name+userInfo.area_name+userInfo.street_name}}
-        </view>
-      </view>
-    </view>
-    <view class="certification">
-      <u-skeleton :loading="skeleton" :animate="true" title rows="3" rows-width="100%" rowsHeight="56"></u-skeleton>
-      <view class="title">资质信息</view>
-      <view class="c_item">
-        <uni-section style="background-color: transparent;" title="身份证" titleFontSize="32rpx" type="line"></uni-section>
-        <view class="card_box">
-          <image :src="userInfo.qualification.id_card" 
-            @click="previewImg([userInfo.qualification.id_card,userInfo.qualification.id_card_b], 0)">
-          </image>
-          <image :src="userInfo.qualification.id_card_b"
-            @click="previewImg([userInfo.qualification.id_card,userInfo.qualification.id_card_b], 1)"></image>
-        </view>
-      </view>
-      <view class="c_item">
-        <uni-section style="background-color: transparent;" title="驾驶证" titleFontSize="32rpx" type="line"></uni-section>
-        <view class="card_box">
-          <image :src="userInfo.qualification.car_card"
-            @click="previewImg([userInfo.qualification.car_card,userInfo.qualification.car_card_b], 0)"></image>
-          <image :src="userInfo.qualification.car_card_b"
-            @click="previewImg([userInfo.qualification.car_card,userInfo.qualification.car_card_b], 1)"></image>
-        </view>
-      </view>
-      <view class="c_item">
-        <uni-section style="background-color: transparent;" title="银行卡照片" titleFontSize="32rpx" type="line"></uni-section>
-        <view class="card_box">
-          <image :src="userInfo.qualification.bank_account"
-            @click="previewImg([userInfo.qualification.bank_account,userInfo.qualification.bank_account_b], 0)"></image>
-          <image :src="userInfo.qualification.bank_account_b"
-            @click="previewImg([userInfo.qualification.bank_account,userInfo.qualification.bank_account_b], 1)"></image>
-        </view>
-      </view>
-    </view>
-    <view class="contract">
-      <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
-      <view class="title">电子合同</view>
-      <view class="card">
-        <uni-section style="background-color: transparent;" :title="userInfo.name" titleFontSize="32rpx" type="line"></uni-section>
-        <view class="c_text">性别：{{userInfo.sex==1?'男':'女'}}</view>
-        <view class="c_text">身份证号码：{{userInfo.id_card}}</view>
-        <view class="c_text">联系电话：{{userInfo.phone}}</view>
-        <view class="c_text">合同类型：{{userInfo.contract.contract_type_name}}</view>
-        <view class="c_text">合同编号：{{userInfo.contract.contract_no}}</view>
-        <u-line v-if="userInfo.contract.file" color="#999999FF" style="margin: 31rpx 0;"></u-line>
-        <view v-if="userInfo.contract.file" class="contract_box">
-          <view class="left">
-            <image class="contract_img" src="../../static/img/contract/pdf.png"></image>
+      <block v-if="!skeleton">
+        <view class="title">人员基本信息</view>
+        <view class="card">
+          <view class="basic_top">
+            <image class="avatar" :src="userInfo.avatar"></image>
             <view class="text">
-              <view class="name">合同</view>
-              <view>
-                <text>{{userInfo.contract.create_time}}</text>
+              <view class="basic_name">
+                <view class="name">{{userInfo.name}}</view>
+                <image class="icon" :src="userInfo.sex==1?'../../static/icons/man.png':'../../static/icons/woman.png'"></image>
+                <view class="role">{{userInfo.roles[0]}}</view>
+              </view>
+              <view class="id_card">
+                身份证号:{{userInfo.id_card}}
+              </view>
+              <view class="phone">
+                联系电话:{{userInfo.phone}}
               </view>
             </view>
           </view>
-          <view class="right"
-            @click="naviTo('/subpkg/pdfView/pdfView?url=' + userInfo.contract.file)">
-            <!-- <image class="icon"></image> -->
-            <uni-icons type="paperclip" color="#3274F9"></uni-icons>
-            <view>查看</view>
+          <view class="bottom">
+            负责区域: {{userInfo.city_name+userInfo.area_name+userInfo.street_name}}{{userInfo.city_name+userInfo.area_name+userInfo.street_name}}
           </view>
         </view>
-      </view>
+      </block>
+    </view>
+    <view class="certification">
+      <u-skeleton :loading="skeleton" :animate="true" title rows="3" rows-width="100%" rowsHeight="56"></u-skeleton>
+      <block v-if="!skeleton">
+        <view class="title">资质信息</view>
+        <view class="c_item">
+          <uni-section style="background-color: transparent;" title="身份证" titleFontSize="32rpx" type="line"></uni-section>
+          <view class="card_box">
+            <image :src="userInfo.qualification.id_card" 
+              @click="previewImg([userInfo.qualification.id_card,userInfo.qualification.id_card_b], 0)">
+            </image>
+            <image :src="userInfo.qualification.id_card_b"
+              @click="previewImg([userInfo.qualification.id_card,userInfo.qualification.id_card_b], 1)"></image>
+          </view>
+        </view>
+        <view class="c_item">
+          <uni-section style="background-color: transparent;" title="驾驶证" titleFontSize="32rpx" type="line"></uni-section>
+          <view class="card_box">
+            <image :src="userInfo.qualification.car_card"
+              @click="previewImg([userInfo.qualification.car_card,userInfo.qualification.car_card_b], 0)"></image>
+            <image :src="userInfo.qualification.car_card_b"
+              @click="previewImg([userInfo.qualification.car_card,userInfo.qualification.car_card_b], 1)"></image>
+          </view>
+        </view>
+        <view class="c_item">
+          <uni-section style="background-color: transparent;" title="银行卡照片" titleFontSize="32rpx" type="line"></uni-section>
+          <view class="card_box">
+            <image :src="userInfo.qualification.bank_account"
+              @click="previewImg([userInfo.qualification.bank_account,userInfo.qualification.bank_account_b], 0)"></image>
+            <image :src="userInfo.qualification.bank_account_b"
+              @click="previewImg([userInfo.qualification.bank_account,userInfo.qualification.bank_account_b], 1)"></image>
+          </view>
+        </view>
+      </block>
+    </view>
+    <view class="contract">
+      <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
+      <block v-if="!skeleton">
+        <view class="title">电子合同</view>
+        <view class="card">
+          <uni-section style="background-color: transparent;" :title="userInfo.name" titleFontSize="32rpx" type="line"></uni-section>
+          <view class="c_text">性别：{{userInfo.sex==1?'男':'女'}}</view>
+          <view class="c_text">身份证号码：{{userInfo.id_card}}</view>
+          <view class="c_text">联系电话：{{userInfo.phone}}</view>
+          <view class="c_text">合同类型：{{userInfo.contract.contract_type_name}}</view>
+          <view class="c_text">合同编号：{{userInfo.contract.contract_no}}</view>
+          <u-line v-if="userInfo.contract.file" color="#999999FF" style="margin: 31rpx 0;"></u-line>
+          <view v-if="userInfo.contract.file" class="contract_box">
+            <view class="left">
+              <image class="contract_img" src="../../static/img/contract/pdf.png"></image>
+              <view class="text">
+                <view class="name">合同</view>
+                <view>
+                  <text>{{userInfo.contract.create_time}}</text>
+                </view>
+              </view>
+            </view>
+            <view class="right"
+              @click="naviTo('/subpkg/pdfView/pdfView?url=' + userInfo.contract.file)">
+              <!-- <image class="icon"></image> -->
+              <uni-icons type="paperclip" color="#3274F9"></uni-icons>
+              <view>查看</view>
+            </view>
+          </view>
+        </view>
+      </block>
     </view>
   </view>
 </template>