diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index 2417577..1f2f40d 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -40,7 +40,9 @@
     props: {
       datas: {
         type: Object,
-        default: {}
+        default: function(){
+			return {}
+		}
       }
     },
     data() {
diff --git a/package-lock.json b/package-lock.json
index 5ee8b9d..51a135c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,6 @@
 {
+  "name": "OfficeApp",
+  "lockfileVersion": 3,
   "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    }
-  }
+  "packages": {}
 }
diff --git a/pages.json b/pages.json
index c6f8a3a..430f7be 100644
--- a/pages.json
+++ b/pages.json
@@ -152,7 +152,7 @@
       "path": "personnel/personnel",
       "style": {
         "navigationBarTitleText": "人员管理",
-        "enablePullDownRefresh": false,
+        "enablePullDownRefresh": true,
         "navigationBarBackgroundColor": "#3175f9",
         "navigationBarTextStyle": "white"
       }
@@ -216,7 +216,7 @@
       "path": "companyInfo/companyInfo",
       "style": {
         "navigationBarTitleText": "公司信息",
-        "enablePullDownRefresh": false,
+        "enablePullDownRefresh": true,
         "navigationBarBackgroundColor": "#3175f9",
         "navigationBarTextStyle": "white"
       }
@@ -315,7 +315,7 @@
       "path": "archives/archives",
       "style": {
         "navigationBarTitleText": "档案管理",
-        "enablePullDownRefresh": false,
+        "enablePullDownRefresh": true,
         "navigationBarBackgroundColor": "#3175f9",
         "navigationBarTextStyle": "white"
       }
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 4f77b35..021e59b 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -23,12 +23,13 @@
         <view v-else class="mesg_box">
           <view class="name">
             <text class="nickname">姓名:{{ myOaInfo.nickname }}</text>
-
+			<text>（{{ myOaInfo.admin_id?'超级管理员':'普通用户'}}）</text>
           </view>
           <view class="duty">
             <!-- ({{ myOaInfo.did_name }}){{myOaInfo.label_name}} -->
             电话:{{myOaInfo.account}}<br />
-            公司:<text v-if="myOaInfo.company">{{ myOaInfo.company.company_name }}</text>
+            公司:<text v-if="myOaInfo.company">{{ myOaInfo.company.company_name }}</text><br/>
+			公司类型:<text v-if="myOaInfo.company">{{ myOaInfo.company.company_type_name }}</text><br/>
           </view>
         </view>
       </view>
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index 4c7e049..34175e5 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -23,11 +23,13 @@
             <view v-else class="name_work">
               <view class="name">
                 <text class="nickname">姓名:{{ oaUserInfo.nickname }}</text>
+                （{{ oaUserInfo.admin_id?'超级管理员':'普通用户'}}）
                 <!-- <text class="omit" v-if="oaUserInfo.admin.company">所属公司:{{ oaUserInfo.admin.company.company_name }}</text> -->
               </view>
               <view class="work">
                 电话:{{oaUserInfo.account}}<br />
-                公司:<text v-if="oaUserInfo.company">{{ oaUserInfo.company.company_name }}</text>
+                公司:<text v-if="oaUserInfo.company">{{ oaUserInfo.company.company_name }}</text><br/>
+				公司类型:<text v-if="oaUserInfo.company">{{ oaUserInfo.company.company_type_name }}</text><br/>
                 <!-- {{ oaUserInfo.did_name }}({{ oaUserInfo.label_name }}) -->
               </view>
             </view>
diff --git a/static/server/server.js b/static/server/server.js
index ace0a5d..c27b7cd 100644
--- a/static/server/server.js
+++ b/static/server/server.js
@@ -204,12 +204,12 @@ export const oaHomeData = [
     url: '/subpkg/personnel/personnel',
     admin: true
   },
-  {
-    text: '固定资产',
-    icon: prefix + 'oa/wcsq@2x.png',
-    // url: '/subpkg/fixedAssets/fixedAssets',
-    admin: true
-  },
+  // {
+  //   text: '固定资产',
+  //   icon: prefix + 'oa/wcsq@2x.png',
+  //   url: '/subpkg/fixedAssets/fixedAssets',
+  //   admin: true
+  // },
   {
     text: '合同管理',
     icon: prefix + 'oa/cgsq@2x.png',
diff --git a/subpkg/archives/archives.vue b/subpkg/archives/archives.vue
index 59c1772..df159ce 100644
--- a/subpkg/archives/archives.vue
+++ b/subpkg/archives/archives.vue
@@ -1,217 +1,230 @@
 <template>
-  <view class="">
-    <view class="personnel_list">
-      <view class="item" v-for="(item, index) in list" :key="item.id">
-        <view class="top">
-          <image class="avatar" src="../../static/img/public/record.png"></image>
-          <view class="body">
-            <view class="t_top">
-              <view>姓名:<text class="name">{{item.name}}</text></view>
-              <view>电话:<text class="mobile">{{item.phone}}</text></view>
-            </view>
-            <view class="t_bottom">片区:<text class="address">{{item.address}}</text></view>
-          </view>
-        </view>
-        <u-line color="#cccccc"></u-line>
-        <view class="bottom">
-          <view>更新时间: {{item.create_time}}</view>
-          <view class="right" v-if="showView">
-            <view class="update" @click="navTo('/subpkg/updateArchives/updateArchives?id='+item.id)">
-              更新
-            </view>
-            <view class="look" @click="navTo('/subpkg/archivesDetail/archivesDetail?id='+item.id)">
-              查看
-            </view>
-          </view>
-        </view>
-      </view>
-      <u-empty v-if="loadConfig.status=='nomore'&& list.length==0" text="没有档案" icon="/static/img/empty/list.png"></u-empty>
-      <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
-        :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-    </view>
-    <mybtn text="信息登记" v-if="showView" @click="navTo('/subpkg/newArchives/newArchives')"></mybtn>
-  </view>
+	<view class="">
+		<view class="personnel_list">
+			<view class="item" v-for="(item, index) in list" :key="item.id">
+				<view class="top">
+					<image class="avatar" src="../../static/img/public/record.png"></image>
+					<view class="body">
+						<view class="t_top">
+							<view>姓名:<text class="name">{{item.name}}</text></view>
+							<view>电话:<text class="mobile">{{item.phone}}</text></view>
+						</view>
+						<view class="t_bottom">片区:<text class="address">{{item.address}}</text></view>
+					</view>
+				</view>
+				<u-line color="#cccccc"></u-line>
+				<view class="bottom">
+					<view>更新时间: {{item.create_time}}</view>
+					<view class="right" v-if="showView">
+						<view class="update" @click="navTo('/subpkg/updateArchives/updateArchives?id='+item.id)">
+							更新
+						</view>
+						<view class="look" @click="navTo('/subpkg/archivesDetail/archivesDetail?id='+item.id)">
+							查看
+						</view>
+					</view>
+				</view>
+			</view>
+			<u-empty v-if="loadConfig.status=='nomore'&& list.length==0" text="没有档案" icon="/static/img/empty/list.png">
+			</u-empty>
+			<u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
+				:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
+		</view>
+		<mybtn text="信息登记" v-if="showView" @click="navTo('/subpkg/newArchives/newArchives')"></mybtn>
+	</view>
 </template>
 
 <script>
-  import { informationList } from "@/api/information.js"
-  import { Toast } from "../../libs/uniApi";
-  export default {
-    data() {
-      return {
-        user_id: -1,
-        list: [],
-        loadConfig: {
-          page: 1,
-          limit: 15,
-          loadingText: '努力加载中',
-          loadmoreText: '轻轻上拉',
-          nomoreText: '我也是有底线的~~',
-          status: 'loadmore'
-        },
-      }
-    },
-    onLoad(options) {
-      if (options.id) this.user_id = options.id;
-      else if (this.$store.state.app.userInfo.admin_id == 0) { //如果用户是小队长,将带上自己的id
-        this.user_id = this.$store.state.app.userInfo.id;
-      }
-    },
-    onShow() {
-      this.initLoadconfig();
-      this.loadInformationList();
-    },
-    computed: {
-      // 是否显示查看和更新按钮
-      showView() {
-        return !this.$store.state.app.userInfo.admin_id && this.$store.state.app.userInfo.is_captain;
-      }
-    },
-    onReachBottom() {
-      this.loadInformationList();
-    },
-    methods: {
-      navTo(url) {
-        if(url){
-          uni.showLoading({
-            title: '加载中',
-            mask: true
-          })
-          uni.navigateTo({
-            url: url,
-            success() {
-              uni.hideLoading()
-            }
-          })
-        }
-        else Toast('暂未开放');
-      },
-      initLoadconfig() {
-        this.loadConfig.page = 1;
-        this.loadConfig.status = "loadmore";
-        this.list = [];
-      },
-      async loadInformationList() {
-        let that = this;
-        if (this.loadConfig.status == "nomore") return;
-        this.loadConfig.status = "loading"
-        let res = await informationList({
-          page: this.loadConfig.page,
-          limit: this.loadConfig.limit,
-          user_id: that.user_id
-        })
-        this.loadConfig.status = "loadmore"
-        if (res.data.length < this.loadConfig.limit) {
-          this.loadConfig.status = "nomore"
-        } else {
-          this.loadConfig.page++;
-        }
-        this.list = [...this.list, ...res.data];
-      }
-    },
-    onPullDownRefresh() {
-      uni.stopPullDownRefresh()
-    }
-  }
+	import {
+		informationList
+	} from "@/api/information.js"
+	import {
+		Toast
+	} from "../../libs/uniApi";
+	export default {
+		data() {
+			return {
+				user_id: -1,
+				list: [],
+				loadConfig: {
+					page: 1,
+					limit: 15,
+					loadingText: '努力加载中',
+					loadmoreText: '轻轻上拉',
+					nomoreText: '我也是有底线的~~',
+					status: 'loadmore'
+				},
+			}
+		},
+		onLoad(options) {
+			if (options.id) this.user_id = options.id;
+			else if (this.$store.state.app.userInfo.admin_id == 0) { //如果用户是小队长,将带上自己的id
+				this.user_id = this.$store.state.app.userInfo.id;
+			}
+			this.loadInformationList();
+		},
+		onShow() {
+			
+		},
+		computed: {
+			// 是否显示查看和更新按钮
+			showView() {
+				return !this.$store.state.app.userInfo.admin_id && this.$store.state.app.userInfo.is_captain;
+			}
+		},
+		onReachBottom() {
+			this.loadInformationList();
+		},
+		methods: {
+			navTo(url) {
+				if (url) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					uni.navigateTo({
+						url: url,
+						success() {
+							uni.hideLoading()
+						}
+					})
+				} else Toast('暂未开放');
+			},
+			async initLoad() {
+				this.loadConfig.page = 1;
+				this.loadConfig.status = "loadmore";
+				this.list = [];
+				await this.loadInformationList();
+				uni.stopPullDownRefresh();
+			},
+			async loadInformationList() {
+				let that = this;
+				if (this.loadConfig.status == "nomore") return;
+				this.loadConfig.status = "loading"
+				let res = await informationList({
+					page: this.loadConfig.page,
+					limit: this.loadConfig.limit,
+					user_id: that.user_id
+				})
+				this.loadConfig.status = "loadmore"
+				if (res.data.length < this.loadConfig.limit) {
+					this.loadConfig.status = "nomore"
+				} else {
+					this.loadConfig.page++;
+				}
+				this.list = [...this.list, ...res.data];
+			}
+		},
+		onPullDownRefresh() {
+			this.initLoad();
+		}
+	}
 </script>
 
 <style lang="scss">
-  .new_btn {
-    position: fixed;
-    bottom: 28rpx;
-    left: 50%;
-    transform: translate(-50%);
-    margin-top: 32rpx;
-    // margin-bottom: 40rpx;
-    width: 694rpx;
-    height: 84rpx;
-    background: $theme-oa-color;
-    border-radius: 42rpx 42rpx 42rpx 42rpx;
-    color: #fff;
-    line-height: 80rpx;
-    text-align: center;
-  }
+	.new_btn {
+		position: fixed;
+		bottom: 28rpx;
+		left: 50%;
+		transform: translate(-50%);
+		margin-top: 32rpx;
+		// margin-bottom: 40rpx;
+		width: 694rpx;
+		height: 84rpx;
+		background: $theme-oa-color;
+		border-radius: 42rpx 42rpx 42rpx 42rpx;
+		color: #fff;
+		line-height: 80rpx;
+		text-align: center;
+	}
 
-  .personnel_list {
-    padding: 28rpx 0;
-    margin-bottom: 130rpx;
+	.personnel_list {
+		padding: 28rpx 0;
+		margin-bottom: 130rpx;
 
-    .item {
-      margin: 0 auto;
-      width: 694rpx;
-      // height: 201rpx;
-      background: #FFFFFF;
-      border-radius: 14rpx 14rpx 14rpx 14rpx;
-      opacity: 1;
-      margin-bottom: 21rpx;
-      box-sizing: border-box;
-      padding: 28rpx;
-      font-size: 24.53rpx;
-      color: #999999FF;
+		.item {
+			margin: 0 auto;
+			width: 694rpx;
+			// height: 201rpx;
+			background: #FFFFFF;
+			border-radius: 14rpx 14rpx 14rpx 14rpx;
+			opacity: 1;
+			margin-bottom: 21rpx;
+			box-sizing: border-box;
+			padding: 28rpx;
+			font-size: 24.53rpx;
+			color: #999999FF;
 
-      .top {
-        display: flex;
-        align-items: center;
-        width: 100%;
+			.top {
+				display: flex;
+				align-items: center;
+				width: 100%;
 
-        .avatar {
-          width: 120rpx;
-          height: 120rpx;
-          margin-right: 18rpx;
-          margin-bottom: 12rpx;
-        }
+				.avatar {
+					width: 120rpx;
+					height: 120rpx;
+					margin-right: 18rpx;
+					margin-bottom: 12rpx;
+				}
 
-        .body{
-          flex: 1;
-          .t_top{
-            display: flex;
-            justify-content: space-between;
-            margin-bottom: 18rpx;
-            .name{
-              font-size: 32rpx;
-              color: #333;
-            }
-            .mobile{
-              font-size: 28rpx;
-              color: #333;
-            }
-          }
-          .t_bottom{
-            width: 500rpx;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-            .address{
-              font-size: 28rpx;
-              color: #333;
-            }
-          }
-        }
-      }
+				.body {
+					flex: 1;
 
-      .bottom {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-top: 20rpx;
-        font-size: 25rpx;
-        
-        .right{
-          font-size: 28rpx;
-          display: flex;
-          .look{
-            color: $theme-oa-color;
-          }
-          .update{
-            color: #34A853;
-            margin-right: 38rpx;
-          }
-        }
+					.t_top {
+						display: flex;
+						justify-content: space-between;
+						margin-bottom: 18rpx;
 
-      }
+						.name {
+							font-size: 32rpx;
+							color: #333;
+						}
+
+						.mobile {
+							font-size: 28rpx;
+							color: #333;
+						}
+					}
+
+					.t_bottom {
+						width: 500rpx;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+
+						.address {
+							font-size: 28rpx;
+							color: #333;
+						}
+					}
+				}
+			}
+
+			.bottom {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-top: 20rpx;
+				font-size: 25rpx;
+
+				.right {
+					font-size: 28rpx;
+					display: flex;
+
+					.look {
+						color: $theme-oa-color;
+					}
+
+					.update {
+						color: #34A853;
+						margin-right: 38rpx;
+					}
+				}
+
+			}
 
 
-    }
+		}
 
-  }
-</style>
\ No newline at end of file
+	}
+</style>
diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue
index 6fb0cb1..dd3e01e 100644
--- a/subpkg/archivesDetail/archivesDetail.vue
+++ b/subpkg/archivesDetail/archivesDetail.vue
@@ -14,7 +14,7 @@
         <view class="card">
           <view class="item">
             <view class="title">基本信息</view>
-            <u-form-item labelWidth="auto" label="户主姓名" required prop="name" borderBottom>
+            <u-form-item labelWidth="auto" label="姓名" required prop="name" borderBottom>
               <u--input v-model="formData.name" :readonly="readonly" placeholder="请输入姓名"></u--input>
             </u-form-item>
             <u-form-item label="性别" required prop="sex" borderBottom>
diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue
index 70c70d9..96f725a 100644
--- a/subpkg/companyInfo/companyInfo.vue
+++ b/subpkg/companyInfo/companyInfo.vue
@@ -91,11 +91,12 @@
       this.loadCompanyList();
     },
     methods: {
-      initLoad() {
+      async initLoad() {
         this.loadConfig.page = 1;
         this.loadConfig.status = "loadmore";
         this.companyList = [];
-        this.loadCompanyList();
+        await this.loadCompanyList();
+		uni.stopPullDownRefresh()
       },
       // 加载公司列表
       async loadCompanyList() {
@@ -138,7 +139,7 @@
       }
     },
     onPullDownRefresh() {
-      uni.stopPullDownRefresh()
+      this.initLoad()
     }
   }
 </script>
diff --git a/subpkg/companySign/companySign.vue b/subpkg/companySign/companySign.vue
index b9af296..5abfe82 100644
--- a/subpkg/companySign/companySign.vue
+++ b/subpkg/companySign/companySign.vue
@@ -3,12 +3,12 @@
     <company :id="id" type="company"></company>
     <view class="need_contract" v-if="!company.contract||!company.contract.status">
       <picker v-if="!company.contract" :range="contractTypeList" range-key="name" @change="changeType">
-        <button class="btn">发起合同</button>
-        <!-- <mybtn text="发起合同" position="false"></mybtn> -->
+        <button class="btn">生成合同</button>
+        <!-- <mybtn text="生成合同" position="false"></mybtn> -->
       </picker>
       <view v-if="company.contract&&company.contract.check_status==1">
-        <button class="btn tips_center">合同已发起,请等待审核</button>
-        <!-- <mybtn text="发起合同" position="false" disabled></mybtn> -->
+        <button class="btn tips_center">合同已生成,请等待审核</button>
+        <!-- <mybtn text="生成合同" position="false" disabled></mybtn> -->
       </view>
       <view v-if="company.contract&&company.contract.check_status==2" class="card">
         <view class="contract_box send">
@@ -101,22 +101,22 @@
         })
         this.contractTypeList = res.data;
       },
-      // 发起合同
+      // 生成合同
       async createContract(data) {
         let res = await initiateContract({
           party_b: data.party_b,
           contract_type: data.contract_type,
           type: data.type
         })
-        Toast(res.msg || '合同已发起')
+        Toast(res.msg || '合同已生成')
         this.initCompany();
       },
-      // 生成合同
+      // 发送合同
       async addContract(data) {
         let res = await Draftingcontracts({
           id: this.id
         });
-        Toast('合同已生成');
+        Toast('合同已发送');
         this.initCompany();
         if (this.userInfo.contract.check_status == 3) {
           this.timerCount = 60;
diff --git a/subpkg/companyUnsign/companyUnsign.vue b/subpkg/companyUnsign/companyUnsign.vue
index c2531e6..9a8f90f 100644
--- a/subpkg/companyUnsign/companyUnsign.vue
+++ b/subpkg/companyUnsign/companyUnsign.vue
@@ -83,6 +83,17 @@ export default {
           url: url
         }) : Toast('暂未开放')
     },
+	copyPhone(str = "", type = "号码") {
+	  if (str) uni.setClipboardData({
+	    data: str + "",
+	    success: (e) => {
+	      Toast(type + '已复制')
+	    },
+	    fail: (e) => {
+	      Toast('复制失败')
+	    }
+	  })
+	},
   },
   onPullDownRefresh() {
       uni.stopPullDownRefresh()
diff --git a/subpkg/newArchives/newArchives.vue b/subpkg/newArchives/newArchives.vue
index 0d997d8..b71144e 100644
--- a/subpkg/newArchives/newArchives.vue
+++ b/subpkg/newArchives/newArchives.vue
@@ -4,7 +4,7 @@
       <u--form labelPosition="left" :model="formData" :rules="rules" ref="archives">
         <view class="item">
           <view class="title">基本信息</view>
-          <u-form-item labelWidth="auto" label="户主姓名" required prop="name" borderBottom>
+          <u-form-item labelWidth="auto" label="姓名" required prop="name" borderBottom>
             <u--input v-model="formData.name" placeholder="请输入姓名"></u--input>
           </u-form-item>
           <u-form-item label="性别" required prop="sex" borderBottom>
@@ -28,6 +28,9 @@
         <view class="item">
           <view class="title">地区信息</view>
           <!-- <districtSelector ref="districtSelectorRef"></districtSelector> -->
+		  <u-form-item labelWidth="auto" label="地址" borderBottom>
+		    <u--textarea :value="nowAddress" autoHeight readonly></u--textarea>
+		  </u-form-item>
           <u-form-item labelWidth="auto" label="详细地址" required prop="address" borderBottom>
             <u--input v-model="formData.address" placeholder="请输入详细地址"></u--input>
           </u-form-item>
@@ -56,8 +59,8 @@
           </block>
         </view>
         <residents ref="residentsRef"></residents>
-        <breeding ref="breedingRef"></breeding>
-        <plant ref="plantRef"></plant>
+        <!-- <breeding ref="breedingRef"></breeding>
+        <plant ref="plantRef"></plant> -->
 
         <!-- 更多内容 -->
         <!-- <block v-for="(item, index) in showDemandList" :key="'demand'+index">
@@ -223,6 +226,12 @@
       this.initCategoryBusinessList();
     },
     onShow() {},
+	computed:{
+		nowAddress(){
+			let address = this.$store.state.app.userInfo;
+			return address.province_name+address.city_name+address.area_name+address.street_name+address.village_name+address.brigade_name;
+		}
+	},
     methods: {
       // 新增档案
       async addArchives() {
@@ -231,11 +240,11 @@
           // let refsDatas = this.loadRefsDatas();
           // let flag1 = await this.$refs.districtSelectorRef.validate();
           let flag2 = await this.$refs.residentsRef.validate();
-          let flag3 = await this.$refs.breedingRef.validate();
-          let flag4 = await this.$refs.plantRef.validate();
+          // let flag3 = await this.$refs.breedingRef.validate();
+          // let flag4 = await this.$refs.plantRef.validate();
           // return console.log(flag1);
           this.$refs.archives.validate().then(async (e) => {
-            if (e == true && flag4 == true && flag2 == true && flag3 == true) {
+            if (e == true && flag2 == true) {
               uni.showLoading({
                 title: '登记中',
                 mask: true
diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue
index 3d8e51f..eca2eb6 100644
--- a/subpkg/personnel/personnel.vue
+++ b/subpkg/personnel/personnel.vue
@@ -74,10 +74,9 @@
         userList: []
       }
     },
-    onLoad() {},
-    onShow() {
-      this.loadUserList()
-    },
+    onLoad() {
+		this.loadUserList()
+	},
     methods: {
       navTo(url) {
         url ?
@@ -85,6 +84,13 @@
             url: url,
           }) : Toast('暂未开放')
       },
+	  async initLoad() {
+	    this.loadConfig.page = 1;
+	    this.loadConfig.status = "loadmore";
+	    this.userList = [];
+	    await this.loadUserList();
+		uni.stopPullDownRefresh();
+	  },
       async loadUserList() {
         let that = this;
         if (this.loadConfig.status == "nomore") return;
@@ -104,7 +110,7 @@
       }
     },
     onPullDownRefresh() {
-      uni.stopPullDownRefresh()
+		this.initLoad();
     }
   }
 </script>
diff --git a/subpkg/personnelDetails/personnelDetails.vue b/subpkg/personnelDetails/personnelDetails.vue
index 6675e67..bc8250a 100644
--- a/subpkg/personnelDetails/personnelDetails.vue
+++ b/subpkg/personnelDetails/personnelDetails.vue
@@ -1,573 +1,621 @@
 <template>
-  <view class="page">
-    <view class="basic">
-      <u-skeleton :loading="skeleton" :animate="true" title rows="1" rows-width="100%" rowsHeight="56"></u-skeleton>
-      <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="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" v-if="userInfo.roles">{{userInfo.roles[0]}}</view> -->
-              </view>
-              <view class="id_card">
-                身份证号:{{userInfo.id_card}}
-              </view>
-              <view class="phone">
-                联系电话:{{userInfo.phone}}
-              </view>
-            </view>
-          </view>
-          <view class="bottom" style="margin-bottom: 10rpx;display: flex;align-items: center;">
-            是否为小队长:
-            <u-radio-group v-model="userInfo.is_captain" style="margin-left: 16rpx;" disabled>
-              <u-radio :customStyle="{marginRight: '16px'}"
-                v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index" :label="item.label"
-                :name="item.value">
-              </u-radio>
-            </u-radio-group>
-            <view class="update" @click="updateShow(userInfo.is_captain)"><uni-icons type="compose"
-                color="#F9AA32"></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>
-          <u-popup :show="show" :round="10" mode="center">
-            <view class="popup">
-              <view class="p_title">修改信息</view>
-              <view class="p_body">
-                是否为小队长:
-                <u-radio-group v-model="updateForm.is_captain" style="margin: 16rpx;">
-                  <u-radio :customStyle="{marginRight: '16px'}"
-                    v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index" :label="item.label"
-                    :name="item.value">
-                  </u-radio>
-                </u-radio-group>
-              </view>
-              <view class="p_button">
-                <view @click="show=false">取消</view>
-                <view @click="updateInfo">确认</view>
-              </view>
-            </view>
-          </u-popup>
-        </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&&userInfo.qualification.id_card"
-              @click="previewImg([userInfo.qualification&&userInfo.qualification.id_card,userInfo.qualification&&userInfo.qualification.id_card_b], 0)">
-            </image>
-            <image :src="userInfo.qualification&&userInfo.qualification.id_card_b"
-              @click="previewImg([userInfo.qualification&&userInfo.qualification.id_card,userInfo.qualification&&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&&userInfo.qualification.car_card"
-              @click="previewImg([userInfo.qualification&&userInfo.qualification.car_card,userInfo.qualification&&userInfo.qualification.car_card_b], 0)">
-            </image>
-            <image :src="userInfo.qualification&&userInfo.qualification.car_card_b"
-              @click="previewImg([userInfo.qualification&&userInfo.qualification.car_card,userInfo.qualification&&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&&userInfo.qualification.bank_account"
-              @click="previewImg([userInfo.qualification&&userInfo.qualification.bank_account,userInfo.qualification&&userInfo.qualification.bank_account_b], 0)">
-            </image>
-            <image :src="userInfo.qualification&&userInfo.qualification.bank_account_b"
-              @click="previewImg([userInfo.qualification&&userInfo.qualification.bank_account,userInfo.qualification&&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 v-if="userInfo.contract&&userInfo.contract.status" 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&&userInfo.contract.contract_type_name}}</view>
-          <view class="c_text">合同编号：{{userInfo.contract&&userInfo.contract.contract_no}}</view>
-          <u-line v-if="userInfo.contract&&userInfo.contract.file" color="#999999FF" style="margin: 31rpx 0;"></u-line>
-          <view v-if="userInfo.contract&&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&&userInfo.contract.create_time}}</text>
-                </view>
-              </view>
-            </view>
-          </view>
-        </view>
-        <picker v-if="!userInfo.is_contract&&!userInfo.contract" :range="contractTypeList" range-key="name" @change="changeType">
-          <button class="btn">发起合同</button>
-        </picker>
-        <view v-if="userInfo.contract&&userInfo.contract.check_status==1">
-          <button class="btn tips_center">合同已发起,请等待审核</button></view>
-        <view v-if="userInfo.contract&&userInfo.contract.check_status==2" class="card">
-          <view  class="contract_box send">
-            <view class="left">
-              <image class="contract_img" src="../../static/img/contract/pdf.png"></image>
-              <view class="text">
-                <view class="name">{{userInfo.contract.contract_type_name}}</view>
-                <view>
-                  <text>{{userInfo.contract&&userInfo.contract.create_time}}</text>
-                </view>
-              </view>
-            </view>
-          </view>
-          <u-line  color="#999999FF" style="margin: 31rpx 0;"></u-line>
-          <view class="bottom">
-            <button class="send_btn" @click="addContract" v-if="timerCount==0">发送合同</button>
-            <button class="send_btn tips_center" v-else>{{cTimerCount+'秒后可继续发送合同'}}</button>
-          </view>
-        </view>
-        <view v-if="userInfo.contract&&userInfo.contract.check_status==3" class="card">
-          <view  class="contract_box send">
-            <view class="left">
-              <image class="contract_img" src="../../static/img/contract/pdf.png"></image>
-              <view class="text">
-                <view class="name">{{userInfo.contract.contract_type_name}}</view>
-                <view>
-                  <text>{{userInfo.contract&&userInfo.contract.create_time}}</text>
-                </view>
-              </view>
-            </view>
-          </view>
-          <u-line  color="#999999FF" style="margin: 31rpx 0;"></u-line>
-          <view class="bottom">
-            <button class="send_btn" @click="getPostsms" v-if="timerCount==0">再次发送短信</button>
-            <button class="send_btn tips_center" v-else>{{cTimerCount+'秒后可继续再次发送短信'}}</button>
-          </view>
-        </view>
-      </block>
-      
-    </view>
-  </view>
+	<view class="page">
+		<view class="basic">
+			<u-skeleton :loading="skeleton" :animate="true" title rows="1" rows-width="100%" rowsHeight="56">
+			</u-skeleton>
+			<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="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" v-if="userInfo.roles">{{userInfo.roles[0]}}</view> -->
+							</view>
+							<view class="id_card">
+								身份证号:{{userInfo.id_card}}
+							</view>
+							<view class="phone">
+								联系电话:{{userInfo.phone}}
+							</view>
+						</view>
+					</view>
+					<view class="bottom" style="margin-bottom: 10rpx;display: flex;align-items: center;">
+						是否为小队长:
+						<u-radio-group v-model="userInfo.is_captain" style="margin-left: 16rpx;" disabled>
+							<u-radio :customStyle="{marginRight: '16px'}"
+								v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index"
+								:label="item.label" :name="item.value">
+							</u-radio>
+						</u-radio-group>
+						<view class="update" @click="updateShow(userInfo.is_captain)">
+							<uni-icons type="compose" color="#F9AA32"></uni-icons>
+						</view>
+					</view>
+					<view class="bottom">
+						负责区域:{{userInfo.street_name+(userInfo.village_name||'')+(userInfo.brigade_name||'')}}
+					</view>
+					<u-popup :show="show" :round="10" mode="center">
+						<view class="popup">
+							<view class="p_title">修改信息</view>
+							<view class="p_body">
+								是否为小队长:
+								<u-radio-group v-model="updateForm.is_captain" style="margin: 16rpx;">
+									<u-radio :customStyle="{marginRight: '16px'}"
+										v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index"
+										:label="item.label" :name="item.value">
+									</u-radio>
+								</u-radio-group>
+							</view>
+							<view class="p_button">
+								<view @click="show=false">取消</view>
+								<view @click="updateInfo">确认</view>
+							</view>
+						</view>
+					</u-popup>
+				</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&&userInfo.qualification.id_card"
+							@click="previewImg([userInfo.qualification&&userInfo.qualification.id_card,userInfo.qualification&&userInfo.qualification.id_card_b], 0)">
+						</image>
+						<image :src="userInfo.qualification&&userInfo.qualification.id_card_b"
+							@click="previewImg([userInfo.qualification&&userInfo.qualification.id_card,userInfo.qualification&&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&&userInfo.qualification.car_card"
+							@click="previewImg([userInfo.qualification&&userInfo.qualification.car_card,userInfo.qualification&&userInfo.qualification.car_card_b], 0)">
+						</image>
+						<image :src="userInfo.qualification&&userInfo.qualification.car_card_b"
+							@click="previewImg([userInfo.qualification&&userInfo.qualification.car_card,userInfo.qualification&&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&&userInfo.qualification.bank_account"
+							@click="previewImg([userInfo.qualification&&userInfo.qualification.bank_account,userInfo.qualification&&userInfo.qualification.bank_account_b], 0)">
+						</image>
+						<image :src="userInfo.qualification&&userInfo.qualification.bank_account_b"
+							@click="previewImg([userInfo.qualification&&userInfo.qualification.bank_account,userInfo.qualification&&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 v-if="userInfo.contract&&userInfo.is_contract&&userInfo.contract.status" 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&&userInfo.contract.contract_type_name}}</view>
+					<view class="c_text">合同编号：{{userInfo.contract&&userInfo.contract.contract_no}}</view>
+					<u-line v-if="userInfo.contract&&userInfo.contract.file" color="#999999FF" style="margin: 31rpx 0;">
+					</u-line>
+					<view v-if="userInfo.contract&&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">{{userInfo.contract.contract_type_name||'合同'}}</view>
+								<view>
+									<text>{{userInfo.contract&&userInfo.contract.create_time}}</text>
+								</view>
+							</view>
+						</view>
+						<view class="right" @click="naviToContract(userInfo.contract.contract_no)">
+							<!-- <image class="icon"></image> -->
+							<uni-icons type="paperclip" color="#3274F9"></uni-icons>
+							<view>查看</view>
+						</view>
+					</view>
+				</view>
+				<picker v-if="!userInfo.is_contract&&!userInfo.contract" :range="contractTypeList" range-key="name"
+					@change="changeType">
+					<button class="btn">生成合同</button>
+				</picker>
+				<view v-if="userInfo.contract&&userInfo.contract.check_status==1">
+					<button class="btn tips_center">合同已生成,请等待审核</button>
+				</view>
+				<view v-if="!userInfo.is_contract&&userInfo.contract&&userInfo.contract.check_status==2" class="card">
+					<view class="contract_box send">
+						<view class="left">
+							<image class="contract_img" src="../../static/img/contract/pdf.png"></image>
+							<view class="text">
+								<view class="name">{{userInfo.contract.contract_type_name}}</view>
+								<view>
+									<text>{{userInfo.contract&&userInfo.contract.create_time}}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<u-line color="#999999FF" style="margin: 31rpx 0;"></u-line>
+					<view class="bottom">
+						<button class="send_btn" @click="addContract" v-if="timerCount==0">发送合同</button>
+						<button class="send_btn tips_center" v-else>{{cTimerCount+'秒后可继续发送合同'}}</button>
+					</view>
+				</view>
+				<view v-if="!userInfo.is_contract&&userInfo.contract&&userInfo.contract.check_status==3" class="card">
+					<view class="contract_box send">
+						<view class="left">
+							<image class="contract_img" src="../../static/img/contract/pdf.png"></image>
+							<view class="text">
+								<view class="name">{{userInfo.contract.contract_type_name}}</view>
+								<view>
+									<text>{{userInfo.contract&&userInfo.contract.create_time}}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<u-line color="#999999FF" style="margin: 31rpx 0;"></u-line>
+					<view class="bottom">
+						<button class="send_btn" @click="getPostsms" v-if="timerCount==0">再次发送短信</button>
+						<button class="send_btn tips_center" v-else>{{cTimerCount+'秒后可继续再次发送短信'}}</button>
+					</view>
+				</view>
+			</block>
+
+		</view>
+	</view>
 </template>
 
 <script>
-  import { Toast } from '@/libs/uniApi.js'
-  import { companyUserDetail } from "@/api/company.js"
-  import { loginSetInfo, userDraftingcontracts, userInitiateContract, userPostsms } from "@/api/oaUser.js"
-  import { dictDataLists } from "@/api/oaPbulic.js"
-  export default {
-    onReady() {
-      uni.setNavigationBarColor({
-        frontColor: '#ffffff',
-        backgroundColor: '#3175f9'
-      })
-    },
-    data() {
-      return {
-        id: '',
-        skeleton: true,
-        show: false,
-        typeShow: false,
-        timer: null, // 计时器
-        timerCount: 0, //倒计时
-        updateForm:{
-          is_captain: 0,
-        },
-        userInfo: {
-          qualification: {},
-          contract: {},
-          roles: {}
-        },
-        contractTypeList: []
-      }
-    },
-    onLoad(options) {
-      if (options.id) this.id = options.id;
-      this.initContractTypeList();
-      this.loadUserDetail();
-    },
-    onShow() { },
-    computed:{
-      cTimerCount(){
-        return this.timerCount;
-      }
-    },
-    methods: {
-      naviTo(url) {
-        url ?
-          uni.navigateTo({
-            url: url,
-          }) : Toast('暂未开放')
-      },
-      updateShow(value) {
-        this.updateForm.is_captain = value;
-        this.show = true;
-      },
-      // 更新信息
-      async updateInfo(){
-        let res = await loginSetInfo({
-          user_id: this.userInfo.id,
-          is_captain: this.updateForm.is_captain
-        });
-        this.userInfo.is_captain = this.updateForm.is_captain;
-        Toast('更新成功');
-        this.show = false;
-      },
-      changeType(e){
-        // console.log(this.contractTypeList[e.detail.value]);
-        this.createContract({
-          party_b:this.userInfo.id,
-          contract_type:this.contractTypeList[e.detail.value].id,
-          type:2 //1-公司,2-个人
-        })
-      },
-      // 初始化合同类型
-      async initContractTypeList(){
-        let res = await dictDataLists({
-          type_id: 7
-        })
-        this.contractTypeList = res.data;
-      },
-      // 发起合同
-      async createContract(data){
-        let res = await userInitiateContract({
-          party_b:data.party_b,
-          contract_type:data.contract_type,
-          type:data.type
-        })
-        Toast('合同已发起')
-        this.loadUserDetail();
-      },
-      // 生成合同
-      async addContract(data){
-        let res = await userDraftingcontracts({
-          id: this.userInfo.id
-        });
-        Toast('合同已生成');
-        this.loadUserDetail();
-        if(this.userInfo.contract.check_status==3){
-          this.timerCount = 60;
-          this.timer = setInterval(()=>{
-           this.timerCount--;
-           if(this.timerCount==0){
-             clearInterval(this.timer);
-             this.loadUserDetail();
-           }
-          }, 1000);
-        }
-        this.naviTo('/subpkg/submit/submit');
-      },
-      // 发送短信
-      async getPostsms(){
-        if(this.timerCount==0){
-          this.timerCount = 60;
-          this.timer = setInterval(()=>{
-           this.timerCount--;
-           if(this.timerCount==0){
-             clearInterval(this.timer);
-             this.loadUserDetail();
-           }
-          }, 1000);
-          let res = await userPostsms({
-            id: this.userInfo.id
-          })
-          Toast('短信已发送');
-          this.naviTo('/subpkg/submit/submit');
-        }
-      },
-      loadUserDetail() {
-        if (!this.id) return;
-        companyUserDetail({
-          id: this.id
-        }).then(res => {
-          this.userInfo = res.data;
-          this.skeleton = false;
-        })
-      },
-      previewImg(urls, index = 0) {
-        uni.previewImage({
-          urls: urls,
-          current: index
-        })
-      }
-    },
-    onPullDownRefresh() {
-      uni.stopPullDownRefresh()
-    }
-  }
+	import {
+		Toast
+	} from '@/libs/uniApi.js'
+	import {
+		companyUserDetail
+	} from "@/api/company.js"
+	import {
+		loginSetInfo,
+		userDraftingcontracts,
+		userInitiateContract,
+		userPostsms
+	} from "@/api/oaUser.js"
+	import {
+		dictDataLists
+	} from "@/api/oaPbulic.js"
+	import {
+		download_file
+	} from "@/api/junziqian.js"
+	export default {
+		onReady() {
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: '#3175f9'
+			})
+		},
+		data() {
+			return {
+				id: '',
+				skeleton: true,
+				show: false,
+				typeShow: false,
+				timer: null, // 计时器
+				timerCount: 0, //倒计时
+				updateForm: {
+					is_captain: 0,
+				},
+				userInfo: {
+					qualification: {},
+					contract: {},
+					roles: {}
+				},
+				contractTypeList: []
+			}
+		},
+		onLoad(options) {
+			if (options.id) this.id = options.id;
+			this.initContractTypeList();
+			this.loadUserDetail();
+		},
+		onShow() {},
+		computed: {
+			cTimerCount() {
+				return this.timerCount;
+			}
+		},
+		methods: {
+			naviToContract(contract_no) {
+				download_file({
+					applyNo: contract_no
+				}).then(res => {
+					if (res.code != 1) {
+						Toast(res.msg)
+					}
+					uni.navigateTo({
+						url: `/subpkg/pdfView/pdfView?url=${res.data.url}`
+					})
+				})
+			},
+			naviTo(url) {
+				url ?
+					uni.navigateTo({
+						url: url,
+					}) : Toast('暂未开放')
+			},
+			updateShow(value) {
+				this.updateForm.is_captain = value;
+				this.show = true;
+			},
+			// 更新信息
+			async updateInfo() {
+				let res = await loginSetInfo({
+					user_id: this.userInfo.id,
+					is_captain: this.updateForm.is_captain
+				});
+				this.userInfo.is_captain = this.updateForm.is_captain;
+				Toast('更新成功');
+				this.show = false;
+			},
+			changeType(e) {
+				// console.log(this.contractTypeList[e.detail.value]);
+				this.createContract({
+					party_b: this.userInfo.id,
+					contract_type: this.contractTypeList[e.detail.value].id,
+					type: 2 //1-公司,2-个人
+				})
+			},
+			// 初始化合同类型
+			async initContractTypeList() {
+				let res = await dictDataLists({
+					type_id: 7
+				})
+				this.contractTypeList = res.data;
+			},
+			// 生成合同
+			async createContract(data) {
+				let res = await userInitiateContract({
+					party_b: data.party_b,
+					contract_type: data.contract_type,
+					type: data.type
+				})
+				Toast('合同已生成')
+				this.loadUserDetail();
+			},
+			// 发送合同
+			async addContract(data) {
+				let res = await userDraftingcontracts({
+					id: this.userInfo.id
+				});
+				Toast('合同已发送');
+				this.loadUserDetail();
+				if (this.userInfo.contract.check_status == 3) {
+					this.timerCount = 60;
+					this.timer = setInterval(() => {
+						this.timerCount--;
+						if (this.timerCount == 0) {
+							clearInterval(this.timer);
+							this.loadUserDetail();
+						}
+					}, 1000);
+				}
+				this.naviTo('/subpkg/submit/submit');
+			},
+			// 发送短信
+			async getPostsms() {
+				if (this.timerCount == 0) {
+					this.timerCount = 60;
+					this.timer = setInterval(() => {
+						this.timerCount--;
+						if (this.timerCount == 0) {
+							clearInterval(this.timer);
+							this.loadUserDetail();
+						}
+					}, 1000);
+					let res = await userPostsms({
+						id: this.userInfo.id
+					})
+					Toast('短信已发送');
+					this.naviTo('/subpkg/submit/submit');
+				}
+			},
+			loadUserDetail() {
+				if (!this.id) return;
+				companyUserDetail({
+					id: this.id
+				}).then(res => {
+					this.userInfo = res.data;
+					this.skeleton = false;
+				})
+			},
+			previewImg(urls, index = 0) {
+				uni.previewImage({
+					urls: urls,
+					current: index
+				})
+			}
+		},
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		}
+	}
 </script>
 
 <style lang="scss">
-  .page {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
+	.page {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
 
-  .title {
-    font-size: 35rpx;
-    font-weight: 500;
-    color: #333333;
-    margin-bottom: 21rpx;
-  }
+	.title {
+		font-size: 35rpx;
+		font-weight: 500;
+		color: #333333;
+		margin-bottom: 21rpx;
+	}
 
-  .card {
-    width: 694rpx;
-    background: #FFFFFF;
-    border-radius: 14rpx 14rpx 14rpx 14rpx;
-    padding: 28rpx;
-  }
+	.card {
+		width: 694rpx;
+		background: #FFFFFF;
+		border-radius: 14rpx 14rpx 14rpx 14rpx;
+		padding: 28rpx;
+	}
 
-  .basic {
-    margin: 28rpx 0;
+	.basic {
+		margin: 28rpx 0;
 
-    .card {
-      font-size: 28rpx;
-      color: #666666;
+		.card {
+			font-size: 28rpx;
+			color: #666666;
 
-      .basic_top {
-        display: flex;
-        margin-bottom: 28rpx;
+			.basic_top {
+				display: flex;
+				margin-bottom: 28rpx;
 
-        .avatar {
-          width: 154rpx;
-          height: 154rpx;
-          background: #CCCCCC;
-          border-radius: 7rpx 7rpx 7rpx 7rpx;
-          margin-right: 28rpx;
-        }
+				.avatar {
+					width: 154rpx;
+					height: 154rpx;
+					background: #CCCCCC;
+					border-radius: 7rpx 7rpx 7rpx 7rpx;
+					margin-right: 28rpx;
+				}
 
-        .text {
-          display: flex;
-          flex-direction: column;
-          justify-content: space-between;
+				.text {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
 
-          .basic_name {
-            display: flex;
-            align-items: center;
+					.basic_name {
+						display: flex;
+						align-items: center;
 
-            .icon {
-              width: 21rpx;
-              height: 21rpx;
-              margin-left: 18rpx;
-              margin-right: 36rpx;
-            }
+						.icon {
+							width: 21rpx;
+							height: 21rpx;
+							margin-left: 18rpx;
+							margin-right: 36rpx;
+						}
 
-            .name {
-              font-size: 32rpx;
-              font-weight: 500;
-              color: #000000CC;
-            }
+						.name {
+							font-size: 32rpx;
+							font-weight: 500;
+							color: #000000CC;
+						}
 
-            .role {
-              width: 284rpx;
-              font-size: 28rpx;
-              font-weight: 500;
-              color: $theme-oa-color;
-              // white-space: nowrap; /* 不换行 */
-              // overflow: hidden; /* 将超出文本隐藏 */
-              // text-overflow: ellipsis; /* 使用省略号表示被隐藏的文本 */
-            }
-          }
+						.role {
+							width: 284rpx;
+							font-size: 28rpx;
+							font-weight: 500;
+							color: $theme-oa-color;
+							// white-space: nowrap; /* 不换行 */
+							// overflow: hidden; /* 将超出文本隐藏 */
+							// text-overflow: ellipsis; /* 使用省略号表示被隐藏的文本 */
+						}
+					}
 
-        }
-      }
+				}
+			}
 
-      .bottom {
-        .update {
-          display: flex;
-          align-items: center;
-          color: #F9AA32;
-        }
-      }
-      .popup{
-        width: 500rpx;
-        height: 300rpx;
-        // padding: 28rpx;
-        overflow: hidden;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        .p_title{
-          margin-top: 20rpx;
-          text-align: center;
-          font-weight: bold;
-          font-size: 33rpx;
-        }
-        .p_body{
-          margin: 28rpx;
-        }
-        .p_button{
-          display: flex;
-          border-top: 1rpx solid #ccc;
-          view{
-            flex: 1;
-            height: 80rpx;
-            line-height: 80rpx;
-            text-align: center;
-            border-left: 1rpx solid #ccc;
-            color: $theme-oa-color;
-            &:nth-child(1){
-              border-left: none;
-              color: #333;
-            }
-          }
-        }
-      }
-    }
-  }
+			.bottom {
+				.update {
+					display: flex;
+					align-items: center;
+					color: #F9AA32;
+				}
+			}
 
-  .certification {
-    margin-bottom: 28rpx;
+			.popup {
+				width: 500rpx;
+				height: 300rpx;
+				// padding: 28rpx;
+				overflow: hidden;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
 
-    .title {
-      margin-bottom: 0;
-    }
+				.p_title {
+					margin-top: 20rpx;
+					text-align: center;
+					font-weight: bold;
+					font-size: 33rpx;
+				}
 
-    .c_item {
-      width: 694rpx;
+				.p_body {
+					margin: 28rpx;
+				}
 
-      .card_box {
-        display: flex;
-        justify-content: space-between;
+				.p_button {
+					display: flex;
+					border-top: 1rpx solid #ccc;
 
-        image {
-          width: 336rpx;
-          height: 238rpx;
-          background: #FFFFFF;
-          border-radius: 14rpx 14rpx 14rpx 14rpx;
-          border: 2rpx solid #CCCCCC;
-        }
-      }
-    }
-  }
+					view {
+						flex: 1;
+						height: 80rpx;
+						line-height: 80rpx;
+						text-align: center;
+						border-left: 1rpx solid #ccc;
+						color: $theme-oa-color;
 
-  .contract {
-    margin-bottom: 28rpx;
-    .title{
-      width: 694rpx;
-    }
-    
+						&:nth-child(1) {
+							border-left: none;
+							color: #333;
+						}
+					}
+				}
+			}
+		}
+	}
 
-    .card {
-      padding-top: 0;
+	.certification {
+		margin-bottom: 28rpx;
 
-      .contract_box {
-        display: flex;
-        justify-content: space-between;
+		.title {
+			margin-bottom: 0;
+		}
 
-        .left {
-          display: flex;
+		.c_item {
+			width: 694rpx;
 
-          .contract_img {
-            width: 102rpx;
-            height: 102rpx;
-            background: #F5F5F5;
-            border-radius: 14rpx 14rpx 14rpx 14rpx;
-            margin-right: 21rpx;
-          }
+			.card_box {
+				display: flex;
+				justify-content: space-between;
 
-          .text {
-            display: flex;
-            flex-direction: column;
-            justify-content: space-between;
+				image {
+					width: 336rpx;
+					height: 238rpx;
+					background: #FFFFFF;
+					border-radius: 14rpx 14rpx 14rpx 14rpx;
+					border: 2rpx solid #CCCCCC;
+				}
+			}
+		}
+	}
 
-            .name {
-              font-size: 32rpx;
-              ;
-              font-weight: 500;
-              color: rgba(0, 0, 0, 0.8);
-              line-height: 35rpx;
-            }
+	.contract {
+		margin-bottom: 28rpx;
 
-            .nickname {
-              margin-right: 35rpx;
-            }
+		.title {
+			width: 694rpx;
+		}
 
-            text {
-              height: 39rpx;
-              font-size: 28rpx;
-              font-weight: 400;
-              color: #666666;
-              line-height: 35rpx;
-            }
-          }
-        }
 
-        .right {
-          font-size: 28rpx;
-          font-weight: 500;
-          color: #3274F9;
-          line-height: 35rpx;
-          display: flex;
-          justify-content: center;
-          align-items: center;
+		.card {
+			padding-top: 0;
 
-          .icon {
-            width: 35rpx;
-            height: 39rpx;
-            background-color: #3274F9;
-            opacity: 1;
-            margin-right: 10rpx
-          }
-        }
+			.contract_box {
+				display: flex;
+				justify-content: space-between;
 
-      }
-      .send{
-        padding-top: 28rpx;
-      }
-      .send_btn{
-        width: 100%;
-        height: 84rpx;
-        background: $theme-oa-color;
-        border-radius: 42rpx 42rpx 42rpx 42rpx;
-        color: #fff;
-        line-height: 80rpx;
-        text-align: center;
-      }
-      .tips_center{
-        background-color: #666;
-        color: #eee;
-      }
-    }
+				.left {
+					display: flex;
 
-    .btn {
-      margin-top: 32rpx;
-      // margin-bottom: 40rpx;
-      width: 694rpx;
-      height: 84rpx;
-      background: $theme-oa-color;
-      border-radius: 42rpx 42rpx 42rpx 42rpx;
-      color: #fff;
-      line-height: 80rpx;
-      text-align: center;
-    }
-    
-    .tips_center{
-      background-color: #666;
-      color: #eee;
-    }
-  }
-</style>
\ No newline at end of file
+					.contract_img {
+						width: 102rpx;
+						height: 102rpx;
+						background: #F5F5F5;
+						border-radius: 14rpx 14rpx 14rpx 14rpx;
+						margin-right: 21rpx;
+					}
+
+					.text {
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+
+						.name {
+							font-size: 32rpx;
+							;
+							font-weight: 500;
+							color: rgba(0, 0, 0, 0.8);
+							line-height: 35rpx;
+						}
+
+						.nickname {
+							margin-right: 35rpx;
+						}
+
+						text {
+							height: 39rpx;
+							font-size: 28rpx;
+							font-weight: 400;
+							color: #666666;
+							line-height: 35rpx;
+						}
+					}
+				}
+
+				.right {
+					font-size: 28rpx;
+					font-weight: 500;
+					color: #3274F9;
+					line-height: 35rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+
+					.icon {
+						width: 35rpx;
+						height: 39rpx;
+						background-color: #3274F9;
+						opacity: 1;
+						margin-right: 10rpx
+					}
+				}
+
+			}
+
+			.send {
+				padding-top: 28rpx;
+			}
+
+			.send_btn {
+				width: 100%;
+				height: 84rpx;
+				background: $theme-oa-color;
+				border-radius: 42rpx 42rpx 42rpx 42rpx;
+				color: #fff;
+				line-height: 80rpx;
+				text-align: center;
+			}
+
+			.tips_center {
+				background-color: #666;
+				color: #eee;
+			}
+		}
+
+		.btn {
+			margin-top: 32rpx;
+			// margin-bottom: 40rpx;
+			width: 694rpx;
+			height: 84rpx;
+			background: $theme-oa-color;
+			border-radius: 42rpx 42rpx 42rpx 42rpx;
+			color: #fff;
+			line-height: 80rpx;
+			text-align: center;
+		}
+
+		.tips_center {
+			background-color: #666;
+			color: #eee;
+		}
+	}
+</style>
diff --git a/subpkg/updateArchives/updateArchives.vue b/subpkg/updateArchives/updateArchives.vue
index 0758abb..cddc99f 100644
--- a/subpkg/updateArchives/updateArchives.vue
+++ b/subpkg/updateArchives/updateArchives.vue
@@ -4,7 +4,7 @@
       <u--form labelPosition="left" :model="formData" ref="archives">
        <!-- <view class="item" style="margin-top: 30rpx;">
           <view class="title">基本信息</view>
-          <u-form-item labelWidth="auto" label="户主姓名" required prop="name" borderBottom>
+          <u-form-item labelWidth="auto" label="姓名" required prop="name" borderBottom>
             <u--input readonly v-model="formData.name" placeholder="请输入姓名"></u--input>
           </u-form-item>
           <u-form-item label="性别" required prop="sex" borderBottom>