diff --git a/App.vue b/App.vue
index ced6a94..e7c61ab 100644
--- a/App.vue
+++ b/App.vue
@@ -1,60 +1,80 @@
 <script>
-//#ifdef APP-PLUS
-const jpushModule = uni.requireNativePlugin("JG-JPush");
-// #endif
-export default {
-  onLaunch: async function () {
+	//#ifdef APP-PLUS
+	const jpushModule = uni.requireNativePlugin("JG-JPush");
+	// #endif
+	export default {
+		onLaunch: async function() {
+			const audioContext = uni.createInnerAudioContext()
+			// 设置音频文件地址
+			audioContext.src = './static/mp3/order.mp3'
+			let noticeArr = []
+			// 播放音频
+			//#ifdef APP-PLUS
+			jpushModule.addNotificationListener(res => {
+				if (!noticeArr.includes(res.messageID)) {
+					console.log(res.messageID)
+					audioContext.play()
+					noticeArr.push(res.messageID)
+					uni.vibrateLong({
+						success: function() {
+							console.log('success');
+						}
+					});
+				}
 
-    console.log('App Launch')
-    try {
-      if (!this.$store.state.app.token) uni.redirectTo({
-        url: '/pages/oaLogin/oaLogin'
-      })
-    } catch (e) {
-      uni.redirectTo({
-        url: '/pages/oaLogin/oaLogin'
-      })
-    }
 
-    // jpushModule.initJPushService()
-    // const audioContext = uni.createInnerAudioContext()
-    // audioContext.src = './static/mp3/order.mp3'
-    // let ida = [0]
-    // jpushModule.addNotificationListener(function (result) {
-    //   if (!ida.includes(result.messageID)) {
-    //     audioContext.play()
-    //   }
-    //   ida.push(result.messageID)
-    // })
-  },
-  onShow: function () {
-    console.log('App Show')
-    // 创建内部音频对象
-    const audioContext = uni.createInnerAudioContext()
+			})
+			// #endif
+			console.log('App Launch')
+			try {
+				if (!this.$store.state.app.token) uni.redirectTo({
+					url: '/pages/oaLogin/oaLogin'
+				})
+			} catch (e) {
+				uni.redirectTo({
+					url: '/pages/oaLogin/oaLogin'
+				})
+			}
 
-    // 设置音频文件地址
-    audioContext.src = './static/mp3/order.mp3'
+			// jpushModule.initJPushService()
+			// const audioContext = uni.createInnerAudioContext()
+			// audioContext.src = './static/mp3/order.mp3'
+			// let ida = [0]
+			// jpushModule.addNotificationListener(function (result) {
+			//   if (!ida.includes(result.messageID)) {
+			//     audioContext.play()
+			//   }
+			//   ida.push(result.messageID)
+			// })
+		},
+		onShow: function() {
+			console.log('App Show')
+			// 创建内部音频对象
+			// const audioContext = uni.createInnerAudioContext()
 
-    // 播放音频
-    //#ifdef APP-PLUS
-    jpushModule.addNotificationListener(res => {
-      console.log("监听成功")
-      audioContext.play()
-    })
-    // #endif
-  },
-  onHide: function () {
-    console.log('App Hide')
-  }
-}
+			// // 设置音频文件地址
+			// audioContext.src = './static/mp3/order.mp3'
+
+			// // 播放音频
+			// //#ifdef APP-PLUS
+			// jpushModule.addNotificationListener(res => {
+			//   console.log("监听成功")
+			//   audioContext.play()
+			// })
+			// // #endif
+		},
+		onHide: function() {
+			console.log('App Hide')
+		}
+	}
 </script>
 
 <style>
-/*每个页面公共css */
-@import "static/css/base.css";
-@import "static/css/style.scss";
+	/*每个页面公共css */
+	@import "static/css/base.css";
+	@import "static/css/style.scss";
 
-view {
-  box-sizing: border-box;
-}
+	view {
+		box-sizing: border-box;
+	}
 </style>
\ No newline at end of file
diff --git a/components/company/company.vue b/components/company/company.vue
index dfed292..898a06a 100644
--- a/components/company/company.vue
+++ b/components/company/company.vue
@@ -1,15 +1,9 @@
 <template>
-  <view>
-    <view class="item">
-      <u-skeleton
-        :loading="skeleton"
-        :animate="true"
-        title
-        rows="1"
-        rows-width="100%"
-        rowsHeight="56"
-      ></u-skeleton>
-      <!-- <block v-if="!skeleton">
+	<view>
+		<view class="item">
+			<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="top">
@@ -75,7 +69,7 @@
 							</view>
 							<view class="" @click="copyPhone(company.master_email, '社会代码')">
 								<text>担任职务 :</text>
-								<text>{{company.organization_code}}</text>
+								<text>{{company.master_position}}</text>
 							</view>
 							<view class="" @click="copyPhone(company.master_email, '电话')">
 								<text>联系电话 :</text>
@@ -321,193 +315,193 @@
 </template>
 
 <script>
-import {
-  contractView
-} from "@/api/contract.js"
-import {
-  companyView
-} from "@/api/company.js"
-import {
-  download_file
-} from "@/api/junziqian.js"
-import {
-  Toast
-} from '@/libs/uniApi.js'
+	import {
+		contractView
+	} from "@/api/contract.js"
+	import {
+		companyView
+	} from "@/api/company.js"
+	import {
+		download_file
+	} from "@/api/junziqian.js"
+	import {
+		Toast
+	} from '@/libs/uniApi.js'
 
-export default {
-  name: "company",
-  data () {
-    return {
-      skeleton: true,
-      company: {
-        qualification: {
-          bank_account: "",
-          bank_accountB: "",
-          business_license: "",
-          business_licenseB: "",
-        },
-      },
-      contract: {},
-      users: [],
-      current: 1
-    }
-  },
-  props: ['id', 'type'],
-  mounted () {
-    this.initContract(this.$props.id, this.$props.type || null);
-  },
-  computed: {
-    c_address () {
-      let str = '';
-      if (this.company.company_type == 16) {
-        this.company?.province_name ? str += this.company?.province_name : null;
-        this.company?.city_name ? str += this.company?.city_name : null;
-        this.company?.area_name ? str += this.company?.area_name : null;
-        this.company?.street_name ? str += this.company?.street_name : null;
-      } else {
-        this.company?.street_name ? str += this.company?.street_name : null;
-        this.company?.village_name ? str += this.company?.village_name : null;
-        this.company?.brigade_name ? str += this.company?.brigade_name : null;
+	export default {
+		name: "company",
+		data() {
+			return {
+				skeleton: true,
+				company: {
+					qualification: {
+						bank_account: "",
+						bank_accountB: "",
+						business_license: "",
+						business_licenseB: "",
+					},
+				},
+				contract: {},
+				users: [],
+				current: 1
+			}
+		},
+		props: ['id', 'type'],
+		mounted() {
+			this.initContract(this.$props.id, this.$props.type || null);
+		},
+		computed: {
+			c_address() {
+				let str = '';
+				if (this.company.company_type == 16) {
+					this.company?.province_name ? str += this.company?.province_name : null;
+					this.company?.city_name ? str += this.company?.city_name : null;
+					this.company?.area_name ? str += this.company?.area_name : null;
+					this.company?.street_name ? str += this.company?.street_name : null;
+				} else {
+					this.company?.street_name ? str += this.company?.street_name : null;
+					this.company?.village_name ? str += this.company?.village_name : null;
+					this.company?.brigade_name ? str += this.company?.brigade_name : null;
 
-      }
-      return str;
-    }
-  },
-  methods: {
-    navTo (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}`
-        })
-      })
-    },
-    naviBack () {
-      uni.navigateBack()
-    },
-    async initContract (id, type = "contract") {
-      let res;
-      //判断是合同还是公司
-      if (id && (type == "contract" || type == null)) {
-        res = await contractView({
-          id
-        });
-      } else {
-        if (id > 0) {
-          res = await companyView({
-            id
-          });
-        } else {
-          res = await companyView();
-        }
+				}
+				return str;
+			}
+		},
+		methods: {
+			navTo(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}`
+					})
+				})
+			},
+			naviBack() {
+				uni.navigateBack()
+			},
+			async initContract(id, type = "contract") {
+				let res;
+				//判断是合同还是公司
+				if (id && (type == "contract" || type == null)) {
+					res = await contractView({
+						id
+					});
+				} else {
+					if (id > 0) {
+						res = await companyView({
+							id
+						});
+					} else {
+						res = await companyView();
+					}
 
-      }
-      this.company = res.data.company;
-      uni.$emit('companyInfo', this.company); //发送全局事件
-      this.user = res.data.user;
-      this.contract = res.data.contract;
-      this.skeleton = false;
-      // console.log(res.data);
-    },
-    //查看图片
-    priview (url) {
-      uni.previewImage({
-        urls: [url],
-        longPressActions: {
-          itemList: ['保存图片'],
-          success: function (data) {
-            if (data.tapIndex === 0) {
-              uni.saveImageToPhotosAlbum({
-                filePath: url,
-                success: function () {
-                  uni.showToast({
-                    title: '保存成功',
-                    icon: 'success'
-                  })
-                },
-                fail: function () {
-                  uni.showToast({
-                    title: '保存失败',
-                    icon: 'none'
-                  })
-                }
-              })
-            }
-          }
-        }
-      })
-    },
-    copyPhone (str = "", type = "号码") {
-      if (str) uni.setClipboardData({
-        data: str + "",
-        success: (e) => {
-          Toast(type + '已复制')
-        },
-        fail: (e) => {
-          Toast('复制失败')
-        }
-      })
-    }
-  },
-}
+				}
+				this.company = res.data.company;
+				uni.$emit('companyInfo', this.company); //发送全局事件
+				this.user = res.data.user;
+				this.contract = res.data.contract;
+				this.skeleton = false;
+				// console.log(res.data);
+			},
+			//查看图片
+			priview(url) {
+				uni.previewImage({
+					urls: [url],
+					longPressActions: {
+						itemList: ['保存图片'],
+						success: function(data) {
+							if (data.tapIndex === 0) {
+								uni.saveImageToPhotosAlbum({
+									filePath: url,
+									success: function() {
+										uni.showToast({
+											title: '保存成功',
+											icon: 'success'
+										})
+									},
+									fail: function() {
+										uni.showToast({
+											title: '保存失败',
+											icon: 'none'
+										})
+									}
+								})
+							}
+						}
+					}
+				})
+			},
+			copyPhone(str = "", type = "号码") {
+				if (str) uni.setClipboardData({
+					data: str + "",
+					success: (e) => {
+						Toast(type + '已复制')
+					},
+					fail: (e) => {
+						Toast('复制失败')
+					}
+				})
+			}
+		},
+	}
 </script>
 
 <style lang="scss" scoped>
 	.personnel_list {
 		padding: 28rpx 0;
 
-  .cards {
-    margin: 0 auto;
-    margin-bottom: 28rpx;
-    width: 694rpx;
-    background: #ffffff;
-    border-radius: 30rpx;
-    opacity: 1;
-    overflow: hidden;
-    box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
+		.cards {
+			margin: 0 auto;
+			margin-bottom: 28rpx;
+			width: 694rpx;
+			background: #ffffff;
+			border-radius: 30rpx;
+			opacity: 1;
+			overflow: hidden;
+			box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
 
-    .cards_head {
-      padding: 28rpx;
-      background-color: $theme-oa-color;
-      color: white;
-      height: 100rpx;
-      display: flex;
-      justify-content: space-between;
-    }
+			.cards_head {
+				padding: 28rpx;
+				background-color: $theme-oa-color;
+				color: white;
+				height: 100rpx;
+				display: flex;
+				justify-content: space-between;
+			}
 
-    .cards_content {
-      padding: 28rpx;
-      display: flex;
-      justify-content: space-between;
+			.cards_content {
+				padding: 28rpx;
+				display: flex;
+				justify-content: space-between;
 
-      .left {
-        text-align: center;
-        // padding: 15rpx 25rpx;
-        padding-top: 20rpx;
+				.left {
+					text-align: center;
+					// padding: 15rpx 25rpx;
+					padding-top: 20rpx;
 
-        width: 160rpx;
-        background-color: $theme-oa-color;
-        color: white;
-        border-radius: 40rpx;
+					width: 160rpx;
+					background-color: $theme-oa-color;
+					color: white;
+					border-radius: 40rpx;
 
-        .cir {
-          width: 120rpx;
-          height: 120rpx;
-          background-color: #ffffff;
-          margin-left: 25rpx;
-          border-radius: 120rpx;
-          position: relative;
-        }
-      }
+					.cir {
+						width: 120rpx;
+						height: 120rpx;
+						background-color: #ffffff;
+						margin-left: 25rpx;
+						border-radius: 120rpx;
+						position: relative;
+					}
+				}
 
-      .right {
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
+				.right {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
 
 					view {
 						margin-bottom: 10rpx;
@@ -520,10 +514,10 @@ export default {
 				}
 			}
 
-    .u_avatar {
-      position: absolute;
-      top: 50%;
-      left: 50%;
+			.u_avatar {
+				position: absolute;
+				top: 50%;
+				left: 50%;
 
 				transform: translate(-50%, -50%);
 			}
@@ -599,232 +593,233 @@ export default {
 
 		padding-top: 0;
 
-  &:nth-child(1) {
-    padding-top: 32rpx;
-  }
-
-  .title {
-    margin-bottom: 21rpx;
-    font-size: 35rpx;
-    font-weight: 500;
-    color: #333333;
-    display: flex;
-    justify-content: space-between;
-  }
-
-  .card {
-    width: 694rpx;
-    // height: 231rpx;
-    padding: 28rpx;
-    background: #ffffff;
-    border-radius: 14rpx 14rpx 14rpx 14rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-
-    .top {
-      display: flex;
-      justify-content: space-between;
-
-      .left {
-        display: flex;
-        align-items: center;
-
-        image {
-          flex-shrink: 0;
-          width: 142rpx;
-          height: 142rpx;
-          margin-right: 28rpx;
-          background: #cccccc;
-          border-radius: 14rpx 14rpx 14rpx 14rpx;
-          opacity: 1;
-        }
-
-        .text {
-          display: flex;
-          flex-direction: column;
-          justify-content: space-between;
-
-          .name {
-            font-size: 32rpx;
-            font-weight: 500;
-            color: rgba(0, 0, 0, 0.8);
-          }
-
-          .code {
-            font-size: 28rpx;
-            font-weight: 400;
-            color: #666666;
-          }
-        }
-      }
-
-      .right {
-        font-size: 28rpx;
-        font-weight: 500;
-        color: $theme-oa-color;
-      }
-    }
-
-    .bottom {
-      display: flex;
-      align-items: center;
-      color: #666666ff;
-      margin-top: 32rpx;
-
-      .left {
-        display: flex;
-        align-items: center;
-        flex-shrink: 0;
-
-        .location {
-          margin-left: 5rpx;
-          margin-right: 5rpx;
-        }
-      }
-    }
-
-    .one {
-      margin-top: 32rpx;
-
-      &:nth-child(1) {
-        margin-top: 0;
-      }
-
-      .linkman {
-        // height: 44rpx;
-        font-size: 32rpx;
-        font-weight: 500;
-        color: #333333;
-        margin-bottom: 28rpx;
-        display: flex;
-        align-items: center;
-      }
-
-      .info {
-        font-size: 28rpx;
-        font-weight: 400;
-        color: #666666;
-        line-height: 45rpx;
-      }
-    }
-
-    .contract {
-      display: flex;
-      justify-content: space-between;
-
-
-
+		&:nth-child(1) {
+			padding-top: 32rpx;
 		}
 
+		.title {
+			margin-bottom: 21rpx;
+			font-size: 35rpx;
+			font-weight: 500;
+			color: #333333;
+			display: flex;
+			justify-content: space-between;
+		}
+
+		.card {
+			width: 694rpx;
+			// height: 231rpx;
+			padding: 28rpx;
+			background: #ffffff;
+			border-radius: 14rpx 14rpx 14rpx 14rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+
+			.top {
+				display: flex;
+				justify-content: space-between;
+
+				.left {
+					display: flex;
+					align-items: center;
+
+					image {
+						flex-shrink: 0;
+						width: 142rpx;
+						height: 142rpx;
+						margin-right: 28rpx;
+						background: #cccccc;
+						border-radius: 14rpx 14rpx 14rpx 14rpx;
+						opacity: 1;
+					}
+
+					.text {
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+
+						.name {
+							font-size: 32rpx;
+							font-weight: 500;
+							color: rgba(0, 0, 0, 0.8);
+						}
+
+						.code {
+							font-size: 28rpx;
+							font-weight: 400;
+							color: #666666;
+						}
+					}
+				}
+
+				.right {
+					font-size: 28rpx;
+					font-weight: 500;
+					color: $theme-oa-color;
+				}
+			}
+
+			.bottom {
+				display: flex;
+				align-items: center;
+				color: #666666ff;
+				margin-top: 32rpx;
+
+				.left {
+					display: flex;
+					align-items: center;
+					flex-shrink: 0;
+
+					.location {
+						margin-left: 5rpx;
+						margin-right: 5rpx;
+					}
+				}
+			}
+
+			.one {
+				margin-top: 32rpx;
+
+				&:nth-child(1) {
+					margin-top: 0;
+				}
+
+				.linkman {
+					// height: 44rpx;
+					font-size: 32rpx;
+					font-weight: 500;
+					color: #333333;
+					margin-bottom: 28rpx;
+					display: flex;
+					align-items: center;
+				}
+
+				.info {
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #666666;
+					line-height: 45rpx;
+				}
+			}
+
+			.contract {
+				display: flex;
+				justify-content: space-between;
 
 
 
+			}
+
+
+
+
+			.image_box {
+				display: flex;
+				justify-content: space-between;
+				flex-direction: column;
+				align-items: center;
+				padding: 28rpx;
+
+				.left {
+					display: flex;
+
+					.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: $theme-oa-color;
+					line-height: 35rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+
+					.icon {
+						width: 35rpx;
+						height: 39rpx;
+						background-color: $theme-oa-color;
+						opacity: 1;
+						margin-right: 10rpx;
+					}
+				}
+			}
+		}
+
 		.image_box {
 			display: flex;
 			justify-content: space-between;
 			flex-direction: column;
 			align-items: center;
 			padding: 28rpx;
-      .left {
-        display: flex;
 
-        .contract_img {
-          width: 102rpx;
-          height: 102rpx;
-          background: #f5f5f5;
-          border-radius: 14rpx 14rpx 14rpx 14rpx;
-          margin-right: 21rpx;
-        }
+			.image {
+				border-radius: 20rpx;
+				overflow: hidden;
+				margin-bottom: 28rpx;
 
-        .text {
-          display: flex;
-          flex-direction: column;
-          justify-content: space-between;
+				image {
+					width: 650rpx;
+					height: 455rpx;
+					background-color: #7f7f7f;
+				}
+			}
+		}
+	}
 
-          .name {
-            font-size: 32rpx;
-            font-weight: 500;
-            color: rgba(0, 0, 0, 0.8);
-            line-height: 35rpx;
-          }
+	.back_btn {
+		width: 694rpx;
+		height: 84rpx;
+		background: $theme-oa-color;
+		border-radius: 42rpx 42rpx 42rpx 42rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #fff;
+		margin: 30rpx auto;
+	}
 
-          .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: $theme-oa-color;
-        line-height: 35rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-
-        .icon {
-          width: 35rpx;
-          height: 39rpx;
-          background-color: $theme-oa-color;
-          opacity: 1;
-          margin-right: 10rpx;
-        }
-      }
-    }
-  }
-
-  .image_box {
-    display: flex;
-    justify-content: space-between;
-    flex-direction: column;
-    align-items: center;
-    padding: 28rpx;
-
-    .image {
-      border-radius: 20rpx;
-      overflow: hidden;
-      margin-bottom: 28rpx;
-
-      image {
-        width: 650rpx;
-        height: 455rpx;
-        background-color: #7f7f7f;
-      }
-    }
-  }
-}
-
-.back_btn {
-  width: 694rpx;
-  height: 84rpx;
-  background: $theme-oa-color;
-  border-radius: 42rpx 42rpx 42rpx 42rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  color: #fff;
-  margin: 30rpx auto;
-}
-
-.stop_btn {
-  width: 694rpx;
-  height: 84rpx;
-  border-radius: 42rpx 42rpx 42rpx 42rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  color: $theme-oa-color;
-  background-color: transparent;
-  margin: 30rpx auto;
-}
+	.stop_btn {
+		width: 694rpx;
+		height: 84rpx;
+		border-radius: 42rpx 42rpx 42rpx 42rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: $theme-oa-color;
+		background-color: transparent;
+		margin: 30rpx auto;
+	}
 </style>
\ No newline at end of file
diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue
index e7a3f50..ce1d83c 100644
--- a/components/companyFinance/companyFinance.vue
+++ b/components/companyFinance/companyFinance.vue
@@ -1,271 +1,291 @@
 <template>
-  <view class="c_card">
-    <view class="f_card">
-      <view class="item" @click="navTo('/subpkg/topUp/topUp')">
-        <view>公司账户余额(元)</view>
-        <view class="price" v-if="company.deposit">{{cCount(+company.deposit)}}</view>
-        <view class="price" v-else>0.00</view>
-      </view>
-      <view class="item" @click="navTo('/subpkg/withdrawDeposit/withdrawDeposit')">
-        <view>公司收益金额(元)</view>
-        <view class="price" v-if="company.company_money">{{cCount(+company.company_money)}}</view>
-        <view class="price" v-else>0.00</view>
-      </view>
-    </view>
-    <view class="f_nav">
-      <view class="title">账单流水</view>
-      <view class="right">
-        <view class="btn" :class="current==0?'active':''" @click="current=0;initLoad()">今日账单</view>
-        <!-- <view class="btn" :class="current==1?'active':''" @click="current=1;initLoad()">月账单</view> -->
-        <view class="btn" @click="navTo('/subpkg/companyFinance/companyFinance')">更多</view>
-      </view>
-    </view>
-    <view class="f_list">
-      <view class="item" v-for="(item, index) in list" :key="index">
-        <view class="top">
-          账单日期: {{current?item.month:item.create_time}}
-        </view>
-        <view class="bottom">
-          <view class="text">
-            <view class="t_item" v-if="current==0">
-              <view class="t_title">任务名称：</view>
-              <view class="tips">{{item.remark}}</view>
-            </view>
-            <view class="t_item">
-              <view class="t_title">金额归属：</view>
-              <view class="tips"><text v-if="item.userInfo">{{item.userInfo.nickname}}</text></view>
-            </view>
-            <view class="t_item">
-              <view class="t_title">收益来源：</view>
-              <view class="tips">
-                <!-- {{current?item.remark:item.type_desc}} -->
-                <text v-if="item.change_type==202" style="color: #46be61;">{{item.type_desc}}</text>
-                <text v-else-if="item.change_type==203" style="color: #ff7c32;">{{item.type_desc}}</text>
-                <text v-else="item.change_type==203">{{item.type_desc}}</text>
-              </view>
-            </view>
-          </view>
-          <view class="price">{{current?(item.expenditure==0?'+'+item.income:'-'+item.income):item.change_amount_desc}}</view>
-        </view>
-      </view>
-      <u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText" :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-    </view>
-  </view>
+	<view class="c_card">
+		<view class="f_card">
+			<view class="item" @click="navTo('/subpkg/topUp/topUp')">
+				<view>公司账户余额(元)</view>
+				<view class="price" v-if="company.deposit">{{cCount(+company.deposit)}}</view>
+				<view class="price" v-else>0.00</view>
+			</view>
+			<view class="item" @click="navTo('/subpkg/withdrawDeposit/withdrawDeposit')">
+				<view>公司收益金额(元)</view>
+				<view class="price" v-if="company.company_money">{{cCount(+company.company_money)}}</view>
+				<view class="price" v-else>0.00</view>
+			</view>
+		</view>
+		<view class="f_nav">
+			<view class="title">账单流水</view>
+			<view class="right">
+				<!-- <u-tabs :list="[{
+					name: '日账单',
+				}, {
+					name: '月账单'
+				}]" @click="changeCurrent" lineColor='#0122C7' :scrollable="false" lineWidth='40' inactiveStyle='color:black'
+					activeStyle="color:#0122C7"></u-tabs> -->
+				<view class="btn" :class="current==0?'active':''" @click="current=0;initLoad()">今日账单</view>
+				<view class="btn" :class="current==0?'active':''" @click="current=0;initLoad()">月账单</view>
+				<!-- <view class="btn" :class="current==1?'active':''" @click="current=1;initLoad()">月账单</view> -->
+				<view class="btn" @click="navTo('/subpkg/companyFinance/companyFinance')">更多</view>
+			</view>
+		</view>
+		<view class="f_list">
+			<view class="item" v-for="(item, index) in list" :key="index">
+				<view class="top">
+					账单日期: {{current?item.month:item.create_time}}
+				</view>
+				<view class="bottom">
+					<view class="text">
+						<view class="t_item" v-if="current==0">
+							<view class="t_title">任务名称：</view>
+							<view class="tips">{{item.remark}}</view>
+						</view>
+						<view class="t_item">
+							<view class="t_title">金额归属：</view>
+							<view class="tips"><text v-if="item.userInfo">{{item.userInfo.nickname}}</text></view>
+						</view>
+						<view class="t_item">
+							<view class="t_title">收益来源：</view>
+							<view class="tips">
+								<!-- {{current?item.remark:item.type_desc}} -->
+								<text v-if="item.change_type==202" style="color: #46be61;">{{item.type_desc}}</text>
+								<text v-else-if="item.change_type==203"
+									style="color: #ff7c32;">{{item.type_desc}}</text>
+								<text v-else="item.change_type==203">{{item.type_desc}}</text>
+							</view>
+						</view>
+					</view>
+					<view class="price">
+						{{current?(item.expenditure==0?'+'+item.income:'-'+item.income):item.change_amount_desc}}
+					</view>
+				</view>
+			</view>
+			<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
+				:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
+		</view>
+	</view>
 </template>
 
 <script>
-  import { accountMonthList, accountDateList } from "@/api/company.js"
-  import { Toast } from "../../libs/uniApi";
-  export default {
-    name: "companyFinance",
-    data() {
-      return {
-        current: 0,
-        list: [],
-        company:{
-          company_money: "0",
-          deposit: "0"
-        },
-        loadConfig:{
-          page: 1,
-          limit: 15,
-          lastpage: '',
-          loadingText: '努力加载中',
-          loadmoreText: '轻轻上拉',
-          nomoreText: '没有更多账单了~~',
-          status: 'loadmore'
-        },
-      };
-    },
-    mounted() {
-      uni.$on('companyInfo', (e)=>{
-        this.company = e;
-        console.log(this.company);
-        this.initLoad();
-      })
-    },
-    methods:{
-      navTo(url) {
-        url ?
-          uni.navigateTo({
-            url: url,
-          }) : Toast('暂未开放')
-      },
-      initLoad(){
-        this.loadConfig.page = 1;
-        this.loadConfig.status = "loadmore";
-        this.list = [];
-        this.initList();
-      },
-      async initList(){
-        if(this.loadConfig.status=="nomore")return;
-        this.loadConfig.status="loading";
-        let res;
-        if(this.current==0) res = await accountDateList({
-          page: this.loadConfig.page,
-          limit: this.loadConfig.limit,
-          company_id: this.$store.state.app.userInfo.company_id
-        })
-        else res = await accountMonthList({
-          page: this.loadConfig.page,
-          limit: this.loadConfig.limit,
-          company_id: this.$store.state.app.userInfo.company_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]
-      },
-      // 格式化数据
-      cCount(value=0){
-        try{
-          return value.toFixed(2);
-        }catch(e){
-          return "0.00";
-        }
-      }
-    }
-  }
+	import {
+		accountMonthList,
+		accountDateList
+	} from "@/api/company.js"
+	import {
+		Toast
+	} from "../../libs/uniApi";
+	export default {
+		name: "companyFinance",
+		data() {
+			return {
+				current: 0,
+				list: [],
+				company: {
+					company_money: "0",
+					deposit: "0"
+				},
+				loadConfig: {
+					page: 1,
+					limit: 15,
+					lastpage: '',
+					loadingText: '努力加载中',
+					loadmoreText: '轻轻上拉',
+					nomoreText: '没有更多账单了~~',
+					status: 'loadmore'
+				},
+			};
+		},
+		mounted() {
+			uni.$on('companyInfo', (e) => {
+				this.company = e;
+				console.log(this.company);
+				this.initLoad();
+			})
+		},
+		methods: {
+			navTo(url) {
+				url ?
+					uni.navigateTo({
+						url: url,
+					}) : Toast('暂未开放')
+			},
+			initLoad() {
+				this.loadConfig.page = 1;
+				this.loadConfig.status = "loadmore";
+				this.list = [];
+				this.initList();
+			},
+			async initList() {
+				if (this.loadConfig.status == "nomore") return;
+				this.loadConfig.status = "loading";
+				let res;
+				if (this.current == 0) res = await accountDateList({
+					page: this.loadConfig.page,
+					limit: this.loadConfig.limit,
+					company_id: this.$store.state.app.userInfo.company_id
+				})
+				else res = await accountMonthList({
+					page: this.loadConfig.page,
+					limit: this.loadConfig.limit,
+					company_id: this.$store.state.app.userInfo.company_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]
+			},
+			// 格式化数据
+			cCount(value = 0) {
+				try {
+					return value.toFixed(2);
+				} catch (e) {
+					return "0.00";
+				}
+			}
+		}
+	}
 </script>
 
 <style lang="scss">
-  .c_card {
-    padding-top: 28rpx;
+	.c_card {
+		padding-top: 28rpx;
 
-    .f_card {
-      margin: 0 auto;
-      width: 694rpx;
-      height: 158rpx;
-      background: #3175F9;
-      border-radius: 18rpx 18rpx 18rpx 18rpx;
-      opacity: 1;
-      padding: 28rpx;
-      display: flex;
-      justify-content: space-around;
-      color: #fff;
-      text-align: center;
+		.f_card {
+			margin: 0 auto;
+			width: 694rpx;
+			height: 158rpx;
+			background: $theme-oa-color;
+			border-radius: 18rpx 18rpx 18rpx 18rpx;
+			opacity: 1;
+			padding: 28rpx;
+			display: flex;
+			justify-content: space-around;
+			color: #fff;
+			text-align: center;
 
-      .item {
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        font-size: 28rpx;
-        flex: 1;
+			.item {
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				font-size: 28rpx;
+				flex: 1;
 
-        &:nth-child(1) {
-          border-right: 1px solid #fff;
-        }
+				&:nth-child(1) {
+					border-right: 1px solid #fff;
+				}
 
-        .price {
-          font-size: 49rpx;
-          font-weight: 500;
-        }
-      }
-    }
+				.price {
+					font-size: 49rpx;
+					font-weight: 500;
+				}
+			}
+		}
 
-    .f_nav {
-      margin: 28rpx;
-      display: flex;
-      justify-content: space-between;
-      align-items: flex-end;
+		.f_nav {
+			margin: 28rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: flex-end;
 
-      .title {
-        font-size: 32rpx;
-        font-weight: 500;
-        color: #333333;
-        display: flex;
-        align-items: center;
+			.title {
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				align-items: center;
 
-        &:before {
-          content: "";
-          width: 6rpx;
-          height: 26rpx;
-          border-radius: 10rpx;
-          margin-right: 10rpx;
-          display: inline-block;
-          background-color: #3175F9;
-        }
-      }
+				&:before {
+					content: "";
+					width: 6rpx;
+					height: 26rpx;
+					border-radius: 10rpx;
+					margin-right: 10rpx;
+					display: inline-block;
+					background-color: #3175F9;
+				}
+			}
 
-      .right {
-        display: flex;
+			.right {
+				display: flex;
 
-        .btn {
-          margin-left: 28rpx;
-        }
+				.btn {
+					margin-left: 28rpx;
+				}
 
-        .active {
-          color: #3175F9;
-        }
-      }
-    }
+				.active {
+					color: #3175F9;
+				}
+			}
+		}
 
-    .f_list {
-      .item {
-        margin: 0 auto;
-        margin-bottom: 28rpx;
-        width: 694rpx;
-        // height: 238rpx;
-        background: #FFFFFF;
-        border-radius: 14rpx 14rpx 14rpx 14rpx;
-        opacity: 1;
-        padding: 28rpx;
+		.f_list {
+			.item {
+				margin: 0 auto;
+				margin-bottom: 28rpx;
+				width: 694rpx;
+				// height: 238rpx;
+				background: #FFFFFF;
+				border-radius: 14rpx 14rpx 14rpx 14rpx;
+				opacity: 1;
+				padding: 28rpx;
 
-        .top {
-          margin-bottom: 28rpx;
-          font-size: 25rpx;
-          font-family: PingFang SC-Regular, PingFang SC;
-          font-weight: 400;
-          color: #333333;
+				.top {
+					margin-bottom: 28rpx;
+					font-size: 25rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #333333;
 
-          &:before {
-            display: inline-block;
-            content: '账单详情';
-            width: 137rpx;
-            height: 49rpx;
-            line-height: 49rpx;
-            text-align: center;
-            background: #3274F9;
-            border-radius: 26rpx 26rpx 26rpx 26rpx;
-            color: #fff;
-            margin-right: 28rpx;
-          }
-        }
+					&:before {
+						display: inline-block;
+						content: '账单详情';
+						width: 137rpx;
+						height: 49rpx;
+						line-height: 49rpx;
+						text-align: center;
+						background: #3274F9;
+						border-radius: 26rpx 26rpx 26rpx 26rpx;
+						color: #fff;
+						margin-right: 28rpx;
+					}
+				}
 
-        .bottom {
-          display: flex;
-          justify-content: space-between;
+				.bottom {
+					display: flex;
+					justify-content: space-between;
 
-          .text {
-            font-size: 25rpx;
-            font-weight: 400;
-            color: #999999;
-            line-height: 39rpx;
-            .t_item{
-              display: flex;
-              .t_title{
-                margin-bottom: 16rpx;
-                flex-shrink: 0 !important;
-              }
-              .tips{
-                font-size: 28rpx;
-                font-weight: 400;
-                color: #333333;
-              }
-            }
-          }
-          .price{
-            display: flex;
-            align-items: center;
-            font-size: 32rpx;
-            font-weight: 500;
-            color: #F02828;
-          }
-        }
-      }
-    }
-  }
+					.text {
+						font-size: 25rpx;
+						font-weight: 400;
+						color: #999999;
+						line-height: 39rpx;
+
+						.t_item {
+							display: flex;
+
+							.t_title {
+								margin-bottom: 16rpx;
+								flex-shrink: 0 !important;
+							}
+
+							.tips {
+								font-size: 28rpx;
+								font-weight: 400;
+								color: #333333;
+							}
+						}
+					}
+
+					.price {
+						display: flex;
+						align-items: center;
+						font-size: 32rpx;
+						font-weight: 500;
+						color: #F02828;
+					}
+				}
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index a74893e..7fd0b50 100644
--- a/pages.json
+++ b/pages.json
@@ -238,7 +238,7 @@
 			"style": {
 				"navigationBarTitleText": "合同管理",
 				"enablePullDownRefresh": true,
-				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarBackgroundColor": "#0022C7",
 				"navigationBarTextStyle": "white"
 			}
 
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 214d80e..f7ac35a 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -1,37 +1,29 @@
 <template>
-  <view class="oa_home" style="oaColor">
-    <!-- <image class="header_bg" src="../../static/img/home/head-bg.png"></image> -->
+	<view class="oa_home" style="oaColor">
+		<!-- <image class="header_bg" src="../../static/img/home/head-bg.png"></image> -->
 
-    <view
-      class="home_header"
-      :class="!ApproveList.length > 0 ? 'home_header_no_data' : ''"
-    >
-      <!-- #ifdef APP-PLUS||H5 -->
-      <view style="height: var(--status-bar-height)"></view>
-      <view style="height: 100rpx"></view>
-      <!-- #endif -->
-      <view class="my_info">
-        <view class="head_img">
-          <view class="img_box">
-            <u--image
-              :showLoading="true"
-              width="131.43rpx"
-              height="131.43rpx"
-              :src="myOaInfo.avatar || '../../static/img/public/avatar.png'"
-              shape="circle"
-            ></u--image>
-          </view>
+		<view class="home_header" :class="!ApproveList.length > 0 ? 'home_header_no_data' : ''">
+			<!-- #ifdef APP-PLUS||H5 -->
+			<view style="height: var(--status-bar-height)"></view>
+			<view style="height: 100rpx"></view>
+			<!-- #endif -->
+			<view class="my_info">
+				<view class="head_img">
+					<view class="img_box">
+						<u--image :showLoading="true" width="131.43rpx" height="131.43rpx"
+							:src="myOaInfo.avatar || '../../static/img/public/avatar.png'" shape="circle"></u--image>
+					</view>
 
-          <text class="nickname">工作证: {{ myOaInfo.nickname }}</text>
-          <text>身份: {{ myOaInfo.admin_id ? "超级管理员" : "普通用户" }}</text>
-        </view>
-        <view v-if="!$store.state.app.token" @click="login" class="mesg_box">
-          <view class="name">
-            <text class="nickname">立即登录</text>
-          </view>
-          <view class="duty"> 登录后可查看更多 </view>
-        </view>
-        <!-- <view v-else class="mesg_box">
+					<text class="nickname">工作证: {{ myOaInfo.nickname }}</text>
+					<text>身份: {{ myOaInfo.admin_id ? "超级管理员" : "普通用户" }}</text>
+				</view>
+				<view v-if="!$store.state.app.token" @click="login" class="mesg_box">
+					<view class="name">
+						<text class="nickname">立即登录</text>
+					</view>
+					<view class="duty"> 登录后可查看更多 </view>
+				</view>
+				<!-- <view v-else class="mesg_box">
 					<view class="name">
 						<text class="nickname">姓名:{{ myOaInfo.nickname }}</text>
 						<text>（{{ myOaInfo.admin_id ? "超级管理员" : "普通用户" }}）</text>
@@ -47,12 +39,12 @@
             }}</text><br />
 					</view>
 				</view> -->
-      </view>
+			</view>
 
-      <!-- 占位 -->
-      <view style="height: 130rpx"></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>
@@ -61,103 +53,78 @@
         </block>
       </view> -->
 
-      <view
-        class="backlog"
-        :class="!ApproveList.length > 0 ? 'backlog_no_data' : ''"
-      >
-        <view class="head_title flex_a_c_j_sb">
-          <view class="title">公告列表</view>
-          <view class="flex_a_c" @click="navTo('/subpkg/noticeList/noticeList')"
-            >更多
-            <view class="iconfont icon-you">
-              <uni-icons type="forward"></uni-icons>
-            </view>
-          </view>
-        </view>
-        <block v-if="ApproveList.length > 0">
-          <view
-            class="backlog_item flex_a_c_j_sb"
-            v-for="(item, index) in ApproveList.slice(0, 2)"
-            :key="index"
-            @click="clickNotice(item.id)"
-          >
-            <view class="text">
-              <text class="text_time">{{
+			<view class="backlog" :class="!ApproveList.length > 0 ? 'backlog_no_data' : ''">
+				<view class="head_title flex_a_c_j_sb">
+					<view class="title">公告列表</view>
+					<view class="flex_a_c" @click="navTo('/subpkg/noticeList/noticeList')">更多
+						<view class="iconfont icon-you">
+							<uni-icons type="forward"></uni-icons>
+						</view>
+					</view>
+				</view>
+				<block v-if="ApproveList.length > 0">
+					<view class="backlog_item flex_a_c_j_sb" v-for="(item, index) in ApproveList.slice(0, 2)"
+						:key="index" @click="clickNotice(item.id)">
+						<view class="text">
+							<text class="text_time">{{
                 item.create_time.substring(0, 10)
               }}</text>
-              {{ item.title }}
-            </view>
+							{{ item.title }}
+						</view>
 
-            <i class="iconfont icon-you"
-              ><uni-icons type="forward"></uni-icons
-            ></i>
-          </view>
-        </block>
-        <view v-else class="backlog_no flex_a_c_j_sb">
-          <view class="text">暂无更多消息</view>
-          <i class="iconfont icon-you"
-            ><uni-icons type="forward"></uni-icons
-          ></i>
-        </view>
-      </view>
-    </view>
-    <view class="my_task">
-      <view class="task_title flex_a_c_j_sb">
-        <view class="title">工作管理</view>
-        <view class="flex_a_c"
-          >更多
-          <view class="iconfont icon-you">
-            <uni-icons type="forward"></uni-icons>
-          </view>
-        </view>
-      </view>
-    </view>
+						<i class="iconfont icon-you"><uni-icons type="forward"></uni-icons></i>
+					</view>
+				</block>
+				<view v-else class="backlog_no flex_a_c_j_sb">
+					<view class="text">暂无更多消息</view>
+					<i class="iconfont icon-you"><uni-icons type="forward"></uni-icons></i>
+				</view>
+			</view>
+		</view>
+		<view class="my_task">
+			<view class="task_title flex_a_c_j_sb">
+				<view class="title">工作管理</view>
+				<view class="flex_a_c">更多
+					<view class="iconfont icon-you">
+						<uni-icons type="forward"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</view>
 
-    <view class="fast_track">
-      <block v-for="(item, index) in oaHomeData" :key="index">
-        <view class="track_item" @click="navTwo(item.url, index)">
-          <u--image
-            :showLoading="true"
-            :src="item.icon"
-            width="77.19rpx"
-            height="77.19rpx"
-          ></u--image>
-          <view class="title">{{ item.text }}</view>
-        </view>
-      </block>
-    </view>
+		<view class="fast_track">
+			<block v-for="(item, index) in oaHomeData" :key="index">
+				<view class="track_item" @click="navTwo(item.url, index)">
+					<u--image :showLoading="true" :src="item.icon" width="77.19rpx" height="77.19rpx"></u--image>
+					<view class="title">{{ item.text }}</view>
+				</view>
+			</block>
+		</view>
 
-    <view class="my_task">
-      <view class="task_title flex_a_c_j_sb">
-        <view class="title">配送信息</view>
-        <view class="flex_a_c" @click="goOrderList"
-          >更多
-          <view class="iconfont icon-you">
-            <uni-icons type="forward"></uni-icons>
-          </view>
-        </view>
-      </view>
+		<view class="my_task">
+			<view class="task_title flex_a_c_j_sb">
+				<view class="title">配送信息</view>
+				<view class="flex_a_c" @click="goOrderList">更多
+					<view class="iconfont icon-you">
+						<uni-icons type="forward"></uni-icons>
+					</view>
+				</view>
+			</view>
 
-      <!-- <block v-if="myTaskList.length>0">
+			<!-- <block v-if="myTaskList.length>0">
    		<taskCard></taskCard>
    	</block> -->
-      <view v-if="orderList.length > 0">
-        <globalPopup ref="globalPopup"></globalPopup>
-        <logistiBriefCard
-          v-for="(item, index) in orderList"
-          :key="index"
-          :goodsInfo="item"
-        >
-        </logistiBriefCard>
-      </view>
+			<view v-if="orderList.length > 0">
+				<globalPopup ref="globalPopup"></globalPopup>
+				<logistiBriefCard v-for="(item, index) in orderList" :key="index" :goodsInfo="item">
+				</logistiBriefCard>
+			</view>
 
-      <view v-else class="no_task">
-        <view class="title">暂无配送信息</view>
-        <view class="tips" v-if="!$store.state.app.token"
-          >登录后查看配送信息详情</view
-        >
-      </view>
-      <!-- <view class="head_title flex_a_c_j_sb">
+			<view v-else class="no_task">
+				<view class="title">暂无配送信息</view>
+				<view class="tips" v-if="!$store.state.app.token">登录后查看配送信息详情</view>
+			</view>
+			<!-- <view class="head_title flex_a_c_j_sb">
         <view class="">我的任务</view>
         <view class="flex_a_c" @click="test">更多 <view class="iconfont icon-you"></view>
         </view>
@@ -181,616 +148,630 @@
           </view>
         </view>
       </block> -->
-    </view>
+		</view>
 
-    <view class="no_login" @click="login" v-if="!$store.state.app.token">
-      <view class="view">
-        <view class="text">登录里海OA,开启线上便捷办公</view>
-        <button class="btn">立即登录</button>
-      </view>
-    </view>
-    <!-- <tabbar></tabbar> -->
-  </view>
+		<view class="no_login" @click="login" v-if="!$store.state.app.token">
+			<view class="view">
+				<view class="text">登录里海OA,开启线上便捷办公</view>
+				<button class="btn">立即登录</button>
+			</view>
+		</view>
+		<!-- <tabbar></tabbar> -->
+	</view>
 </template>
 
 <script>
-import logistiBriefCard from "@/components/logistiComptent/logistiCard/logistiBriefCard.vue";
-import globalPopup from "@/components/GlobalPopup/GlobalPopup.vue";
-import { getList } from "@/api/logistics.js";
-import { Toast } from "@/libs/uniApi.js";
-import { oaHomeData } from "@/static/server/server.js";
-import { noticeList } from "@/api/notice.js";
-// import tabbar from '../components/tabbar'
-import {
-  getIndexListAPI,
-  getTaskListAPI,
-  getMyTaskListAPI,
-  getApproveListAPI,
-  getUserIndexAPI,
-} from "@/api/oaApi.js";
-//#ifdef APP-PLUS
-var jpushModule = uni.requireNativePlugin("JG-JPush");
-// #endif
-export default {
-  components: {
-    // tabbar
-    logistiBriefCard,
-    globalPopup,
-  },
-  data() {
-    return {
-      notArr: [],
-      orderList: [],
-      oaHomeData: [],
-      src: "https://cdn.uviewui.com/uview/album/1.jpg",
-      assessData: [
-        {
-          num: "0",
-          name: "任务",
-        },
-        {
-          num: "0",
-          name: "已完成",
-        },
-        {
-          num: "0",
-          name: "未完成",
-        },
-        {
-          num: "0%",
-          name: "完成率",
-        },
-      ],
-      project: {},
-      task: {},
-      page: 1,
-      myTaskList: [],
-      flowState: "#47B347", // 任务状态
-      priority: "", // 任务紧急度
-      myOaInfo: {
-        avatar: "",
-        nickname: "",
-        mobile: "",
-        did_name: "",
-        label_name: "",
-      },
-      ApproveList: [],
-    };
-  },
-  onReady() {
-    uni.setNavigationBarColor({
-      frontColor: "#ffffff",
-      backgroundColor: "#3175f9",
-    });
-  },
-  onLoad() {
-    //#ifdef APP-PLUS
-    const audioContext = uni.createInnerAudioContext();
-    audioContext.volume = 1;
-    audioContext.src = "../../static/mp3/order.mp3";
-    let that = this;
-    jpushModule.addNotificationListener(function (result) {
-      if (!that.notArr.includes(result.messageID)) {
-        that.$refs.globalPopup.showPopu();
-        that.getOrderList();
-        console.log("idnex的");
-        audioContext.play();
-      }
-      that.notArr.push(result.messageID);
-    });
-    // #endif
-  },
-  onShow() {
-    // this.getUserIndex()
-    // this.getIndexList()
-    this.getApproveList();
-    this.initUserInfo();
-    this.showToask();
-    this.initOaHomeDada();
-    this.getOrderList();
-  },
-  computed: {},
-  methods: {
-    test() {
-      this.$refs.globalPopup.showPopu();
-    },
-    // test() {
-    //   wx.chooseMessageFile({
-    //     count: 1, //限制选择的文件数量
-    //     type: 'all', //非图片和视频的文件,不选默认为all
-    //     //type:'video',//视频
-    //     //type:'image',//图片
-    //     success(res) {
-    //       const tempFilePaths = res.tempFiles
-    //       console.log(res);
-    //     }
-    //   })
-    // },
-    async getOrderList() {
-      let id = JSON.parse(uni.getStorageSync("USER_INFO")).id || "";
-      let res = await getList({
-        courier_id: id,
-        // courier_id: 167
-      });
-      this.orderList = res.data.data;
-    },
-    goOrderList() {
-      uni.navigateTo({
-        url: "/pages/logistics/index",
-      });
-    },
-    initUserInfo() {
-      this.$store.state.app.userInfo
-        ? (this.myOaInfo = this.$store.state.app.userInfo)
-        : (this.myOaInfo.avatar = "");
-    },
-    initOaHomeDada() {
-      if (this.$store.state.app.userInfo.admin_id == 0) {
-        // 如果用户不是管理员
-        let arr = oaHomeData.filter((item) => !item.admin); //过滤掉管理员专属页面
-        this.oaHomeData = arr;
-      } else {
-        // this.oaHomeData = oaHomeData;
-        let arr = oaHomeData.filter((item) => !item.captain); //过滤掉普通用户专属页面
-        this.oaHomeData = arr;
-      }
-      if (
-        this.$store.state.app.userInfo?.company?.company_type_name == "平台公司"
-      ) {
-        this.oaHomeData = this.oaHomeData.filter((item) => {
-          return item.text == "人员管理" ? false : true;
-        });
-      }
-      // 判断是否需要显示更多按钮
-      if (this.oaHomeData >= 8) {
-        this.oaHomeData[7] = this.oaHomeData[this.oaHomeData.length - 1];
-      } else {
-        this.oaHomeData.splice(this.oaHomeData.length - 1, 1);
-      }
-    },
-    async getApproveList() {
-      const res = await noticeList({
-        keyword: "",
-        page_no: 1,
-        page_size: 2,
-      });
-      this.ApproveList = res.data.lists;
-    },
-    async getIndexList() {
-      const { project, task } = await getIndexListAPI();
-      console.log(task, "222");
-      this.assessData[0].num = project.count;
-      this.assessData[1].num = project.count_ok;
-      this.assessData[2].num = project.count_no;
-      this.assessData[3].num = project.count_lv + "%";
-      this.assessData[4].num = task.count;
-      this.assessData[5].num = task.count_ok;
-      this.assessData[6].num = task.count_no;
-      this.assessData[7].num = task.count_lv + "%";
-      this.myTaskList = task.list;
-    },
-    async getMyTask() {
-      let data = {
-        page: this.page,
-        limit: 10,
-      };
-      const res = getMyTaskListAPI(data);
-    },
-    naviTaskDetails(id) {
-      uni.navigateTo({
-        url: `/pages/views/task_details?id=${id}`,
-      });
-    },
-    navTo(url) {
-      url
-        ? uni.navigateTo({
-            url: url,
-            fail() {
-              uni.switchTab({
-                url: url,
-              });
-            },
-          })
-        : Toast("暂未开放");
-    },
-    navTwo(url, key) {
-      let role_id = this.$store.state.app?.userInfo?.admin?.role_id || null;
-      var arr = [3, 6];
+	import logistiBriefCard from "@/components/logistiComptent/logistiCard/logistiBriefCard.vue";
+	import globalPopup from "@/components/GlobalPopup/GlobalPopup.vue";
+	import {
+		getList
+	} from "@/api/logistics.js";
+	import {
+		Toast
+	} from "@/libs/uniApi.js";
+	import {
+		oaHomeData
+	} from "@/static/server/server.js";
+	import {
+		noticeList
+	} from "@/api/notice.js";
+	// import tabbar from '../components/tabbar'
+	import {
+		getIndexListAPI,
+		getTaskListAPI,
+		getMyTaskListAPI,
+		getApproveListAPI,
+		getUserIndexAPI,
+	} from "@/api/oaApi.js";
+	//#ifdef APP-PLUS
+	var jpushModule = uni.requireNativePlugin("JG-JPush");
+	// #endif
+	export default {
+		components: {
+			// tabbar
+			logistiBriefCard,
+			globalPopup,
+		},
+		data() {
+			return {
+				notArr: [],
+				orderList: [],
+				oaHomeData: [],
+				src: "https://cdn.uviewui.com/uview/album/1.jpg",
+				assessData: [{
+						num: "0",
+						name: "任务",
+					},
+					{
+						num: "0",
+						name: "已完成",
+					},
+					{
+						num: "0",
+						name: "未完成",
+					},
+					{
+						num: "0%",
+						name: "完成率",
+					},
+				],
+				project: {},
+				task: {},
+				page: 1,
+				myTaskList: [],
+				flowState: "#47B347", // 任务状态
+				priority: "", // 任务紧急度
+				myOaInfo: {
+					avatar: "",
+					nickname: "",
+					mobile: "",
+					did_name: "",
+					label_name: "",
+				},
+				ApproveList: [],
+			};
+		},
+		onReady() {
+			uni.setNavigationBarColor({
+				frontColor: "#ffffff",
+				backgroundColor: "#3175f9",
+			});
+		},
+		onLoad() {
+			// //#ifdef APP-PLUS
+			// const audioContext = uni.createInnerAudioContext();
+			// audioContext.volume = 1;
+			// audioContext.src = "../../static/mp3/order.mp3";
+			// let that = this;
+			// jpushModule.addNotificationListener(function (result) {
+			//   if (!that.notArr.includes(result.messageID)) {
+			//     that.$refs.globalPopup.showPopu();
+			//     that.getOrderList();
+			//     console.log("idnex的");
+			//     audioContext.play();
+			//   }
+			//   that.notArr.push(result.messageID);
+			// });
+			// // #endif
+		},
+		onShow() {
+			// this.getUserIndex()
+			// this.getIndexList()
+			this.getApproveList();
+			this.initUserInfo();
+			this.showToask();
+			this.initOaHomeDada();
+			this.getOrderList();
+		},
+		computed: {},
+		methods: {
+			test() {
+				this.$refs.globalPopup.showPopu();
+			},
+			// test() {
+			//   wx.chooseMessageFile({
+			//     count: 1, //限制选择的文件数量
+			//     type: 'all', //非图片和视频的文件,不选默认为all
+			//     //type:'video',//视频
+			//     //type:'image',//图片
+			//     success(res) {
+			//       const tempFilePaths = res.tempFiles
+			//       console.log(res);
+			//     }
+			//   })
+			// },
+			async getOrderList() {
+				let id = JSON.parse(uni.getStorageSync("USER_INFO")).id || "";
+				let res = await getList({
+					courier_id: id,
+					// courier_id: 167
+				});
+				this.orderList = res.data.data;
+			},
+			goOrderList() {
+				uni.navigateTo({
+					url: "/pages/logistics/index",
+				});
+			},
+			initUserInfo() {
+				this.$store.state.app.userInfo ?
+					(this.myOaInfo = this.$store.state.app.userInfo) :
+					(this.myOaInfo.avatar = "");
+			},
+			initOaHomeDada() {
+				if (this.$store.state.app.userInfo.admin_id == 0) {
+					// 如果用户不是管理员
+					let arr = oaHomeData.filter((item) => !item.admin); //过滤掉管理员专属页面
+					this.oaHomeData = arr;
+				} else {
+					// this.oaHomeData = oaHomeData;
+					let arr = oaHomeData.filter((item) => !item.captain); //过滤掉普通用户专属页面
+					this.oaHomeData = arr;
+				}
+				if (
+					this.$store.state.app.userInfo?.company?.company_type_name == "平台公司"
+				) {
+					this.oaHomeData = this.oaHomeData.filter((item) => {
+						return item.text == "人员管理" ? false : true;
+					});
+				}
+				// 判断是否需要显示更多按钮
+				if (this.oaHomeData >= 8) {
+					this.oaHomeData[7] = this.oaHomeData[this.oaHomeData.length - 1];
+				} else {
+					this.oaHomeData.splice(this.oaHomeData.length - 1, 1);
+				}
+			},
+			async getApproveList() {
+				const res = await noticeList({
+					keyword: "",
+					page_no: 1,
+					page_size: 2,
+				});
+				this.ApproveList = res.data.lists;
+			},
+			async getIndexList() {
+				const {
+					project,
+					task
+				} = await getIndexListAPI();
+				console.log(task, "222");
+				this.assessData[0].num = project.count;
+				this.assessData[1].num = project.count_ok;
+				this.assessData[2].num = project.count_no;
+				this.assessData[3].num = project.count_lv + "%";
+				this.assessData[4].num = task.count;
+				this.assessData[5].num = task.count_ok;
+				this.assessData[6].num = task.count_no;
+				this.assessData[7].num = task.count_lv + "%";
+				this.myTaskList = task.list;
+			},
+			async getMyTask() {
+				let data = {
+					page: this.page,
+					limit: 10,
+				};
+				const res = getMyTaskListAPI(data);
+			},
+			naviTaskDetails(id) {
+				uni.navigateTo({
+					url: `/pages/views/task_details?id=${id}`,
+				});
+			},
+			navTo(url) {
+				url
+					?
+					uni.navigateTo({
+						url: url,
+						fail() {
+							uni.switchTab({
+								url: url,
+							});
+						},
+					}) :
+					Toast("暂未开放");
+			},
+			navTwo(url, key) {
+				let role_id = this.$store.state.app?.userInfo?.admin?.role_id || null;
+				var arr = [3, 6];
 
-      if (role_id && role_id[0] == 9) {
-        if (arr.indexOf(key) == -1) {
-          Toast("请先成立公司后开放");
-          return false;
-        }
-      }
-      this.navTo(url);
-    },
-    // 点击公告
-    clickNotice(e) {
-      uni.navigateTo({
-        url: `/pages/oaNews/oaNews?id=${e}`,
-      });
-    },
-    // 判断当前是否登录,显示任务及完成率
-    showToask() {
-      if (!this.$store.state.app.token) {
-        this.assessData = this.assessData.map((item) => {
-          item.num = "*";
-          return item;
-        });
-      } else {
-        // 新增接口后要替换为接口
-        this.assessData = this.assessData.map((item) => {
-          item.num = "0";
-          return item;
-        });
-      }
-    },
-    login() {
-      uni.navigateTo({
-        url: "/pages/oaLogin/oaLogin",
-      });
-    },
-    async getUserIndex() {
-      const res = await getUserIndexAPI();
-      this.myOaInfo = res;
-    },
-  },
-  onPullDownRefresh() {
-    // this.getIndexList()
-    uni.stopPullDownRefresh();
-  },
-};
+				if (role_id && role_id[0] == 9) {
+					if (arr.indexOf(key) == -1) {
+						Toast("请先成立公司后开放");
+						return false;
+					}
+				}
+				this.navTo(url);
+			},
+			// 点击公告
+			clickNotice(e) {
+				uni.navigateTo({
+					url: `/pages/oaNews/oaNews?id=${e}`,
+				});
+			},
+			// 判断当前是否登录,显示任务及完成率
+			showToask() {
+				if (!this.$store.state.app.token) {
+					this.assessData = this.assessData.map((item) => {
+						item.num = "*";
+						return item;
+					});
+				} else {
+					// 新增接口后要替换为接口
+					this.assessData = this.assessData.map((item) => {
+						item.num = "0";
+						return item;
+					});
+				}
+			},
+			login() {
+				uni.navigateTo({
+					url: "/pages/oaLogin/oaLogin",
+				});
+			},
+			async getUserIndex() {
+				const res = await getUserIndexAPI();
+				this.myOaInfo = res;
+			},
+		},
+		onPullDownRefresh() {
+			// this.getIndexList()
+			uni.stopPullDownRefresh();
+		},
+	};
 </script>
 
 <style lang="scss">
-.oa_home {
-  padding-bottom: 120rpx;
-}
+	.oa_home {
+		padding-bottom: 120rpx;
+	}
 
-.header_bg {
-  position: absolute;
-  width: 100%;
-  // z-index: -1;
-}
+	.header_bg {
+		position: absolute;
+		width: 100%;
+		// z-index: -1;
+	}
 
-.home_header {
-  position: relative;
-  padding: 28rpx;
-  // height: 607.02rpx;
-  // height: 480.02rpx;
-  width: 100%;
-  // background-color: $theme-oa-color;
-  margin-bottom: 133.33rpx;
-  background-color: $theme-oa-color;
-  border-radius: 0 0 30rpx 30rpx;
+	.home_header {
+		position: relative;
+		padding: 28rpx;
+		// height: 607.02rpx;
+		// height: 480.02rpx;
+		width: 100%;
+		// background-color: $theme-oa-color;
+		margin-bottom: 133.33rpx;
+		background-color: $theme-oa-color;
+		border-radius: 0 0 30rpx 30rpx;
 
-  .head_img {
-    position: relative;
-    background-color: #ff7c32;
-    width: 100%;
-    height: 105.14rpx;
-    line-height: 105.14rpx;
-    border-radius: 35.05rpx 35.05rpx 35.05rpx 35.05rpx;
-    display: flex;
-    justify-content: space-between;
-    padding-right: 50rpx;
+		.head_img {
+			position: relative;
+			background-color: #ff7c32;
+			width: 100%;
+			height: 105.14rpx;
+			line-height: 105.14rpx;
+			border-radius: 35.05rpx 35.05rpx 35.05rpx 35.05rpx;
+			display: flex;
+			justify-content: space-between;
+			padding-right: 50rpx;
+			color: white;
+			font-size: 34rpx;
+			padding-left: 150rpx;
+			box-sizing: border-box;
 
-    color: white;
-    font-size: 34rpx;
+			.img_box {
+				width: 131.43rpx;
+				height: 131.43rpx;
+				position: absolute;
 
-    .img_box {
-      width: 131.43rpx;
-      height: 131.43rpx;
-      position: absolute;
-      border: 1px dashed #707070;
-    }
+				left: -10rpx;
+				top: -15rpx;
+			}
 
-    // font-we
-  }
+			// font-we
+		}
 
-  .my_info {
-    .mesg_box {
-      color: #fff;
-      margin-left: 31.58rpx;
+		.my_info {
+			.mesg_box {
+				color: #fff;
+				margin-left: 31.58rpx;
 
-      .nickname {
-        font-size: 32rpx;
-        font-weight: 500;
-        margin-right: 30rpx;
-      }
+				.nickname {
+					font-size: 32rpx;
+					font-weight: 500;
+					margin-right: 30rpx;
+				}
 
-      .duty {
-        margin-top: 10.53rpx;
-      }
-    }
-  }
+				.duty {
+					margin-top: 10.53rpx;
+				}
+			}
+		}
 
-  .task_panel {
-    color: #fff;
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    align-content: space-between;
-    text-align: center;
-    padding-bottom: 110rpx;
+		.task_panel {
+			color: #fff;
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			align-content: space-between;
+			text-align: center;
+			padding-bottom: 110rpx;
 
-    .task_item {
-      margin-top: 42.11rpx;
+			.task_item {
+				margin-top: 42.11rpx;
 
-      .plan {
-        width: 173.68rpx;
-        font-size: 38.6rpx;
-        margin-bottom: 21.05rpx;
-      }
-    }
-  }
+				.plan {
+					width: 173.68rpx;
+					font-size: 38.6rpx;
+					margin-bottom: 21.05rpx;
+				}
+			}
+		}
 
-  .backlog {
-    position: absolute;
-    left: 50%;
-    bottom: -101.75rpx;
-    transform: translate(-50%);
-    width: 694.74rpx;
-    background: #ffffff;
-    border-radius: 12px;
-    padding: 28.07rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    font-size: 25rpx;
-    font-weight: 400;
+		.backlog {
+			position: absolute;
+			left: 50%;
+			bottom: -101.75rpx;
+			transform: translate(-50%);
+			width: 694.74rpx;
+			background: #ffffff;
+			border-radius: 12px;
+			padding: 28.07rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			font-size: 25rpx;
+			font-weight: 400;
 
-    .title {
-      font-size: 32rpx;
-      font-weight: 500;
-    }
+			.title {
+				font-size: 32rpx;
+				font-weight: 500;
+			}
 
-    &_item {
-      margin-top: 19.3rpx;
-      color: #666666;
+			&_item {
+				margin-top: 19.3rpx;
+				color: #666666;
 
-      .text {
-        font-size: 28.04rpx;
-        white-space: nowrap;
-        /* 禁止换行 */
-        overflow: hidden;
-        /* 溢出隐藏 */
-        text-overflow: ellipsis;
-        /* 使用省略号代表被截断的文本 */
-        width: 580rpx;
+				.text {
+					font-size: 28.04rpx;
+					white-space: nowrap;
+					/* 禁止换行 */
+					overflow: hidden;
+					/* 溢出隐藏 */
+					text-overflow: ellipsis;
+					/* 使用省略号代表被截断的文本 */
+					width: 580rpx;
 
-        /* 设置元素宽度，根据需要进行调整 */
-        .text_time {
-          display: inline-block;
-          background-color: #ff8c1a;
-          color: white;
-          padding: 5rpx 10rpx;
-          margin-right: 10rpx;
-          border-radius: 15rpx;
-        }
+					/* 设置元素宽度，根据需要进行调整 */
+					.text_time {
+						display: inline-block;
+						background-color: #ff8c1a;
+						color: white;
+						padding: 5rpx 10rpx;
+						margin-right: 10rpx;
+						border-radius: 15rpx;
+					}
 
-        // &::before {
-        // 	content: "公告";
-        // 	display: inline-block;
-        // 	color: #ff8c1a;
-        // 	padding: 2px 8px;
-        // 	border-radius: 4px;
-        // 	border: 1px solid #ff8c1a;
-        // 	margin-right: 14.04rpx;
-        // }
-      }
-    }
+					// &::before {
+					// 	content: "公告";
+					// 	display: inline-block;
+					// 	color: #ff8c1a;
+					// 	padding: 2px 8px;
+					// 	border-radius: 4px;
+					// 	border: 1px solid #ff8c1a;
+					// 	margin-right: 14.04rpx;
+					// }
+				}
+			}
 
-    &_no {
-      margin-top: 19.3rpx;
-      color: #666666;
+			&_no {
+				margin-top: 19.3rpx;
+				color: #666666;
 
-      .text {
-        font-size: 28.04rpx;
-        white-space: nowrap;
-        /* 禁止换行 */
-        overflow: hidden;
-        /* 溢出隐藏 */
-        text-overflow: ellipsis;
-        /* 使用省略号代表被截断的文本 */
-        width: 580rpx;
-        /* 设置元素宽度，根据需要进行调整 */
+				.text {
+					font-size: 28.04rpx;
+					white-space: nowrap;
+					/* 禁止换行 */
+					overflow: hidden;
+					/* 溢出隐藏 */
+					text-overflow: ellipsis;
+					/* 使用省略号代表被截断的文本 */
+					width: 580rpx;
+					/* 设置元素宽度，根据需要进行调整 */
 
-        &::before {
-          content: none;
-        }
-      }
-    }
-  }
+					&::before {
+						content: none;
+					}
+				}
+			}
+		}
 
-  .backlog_no_data {
-    bottom: -70rpx;
-  }
-}
+		.backlog_no_data {
+			bottom: -70rpx;
+		}
+	}
 
-.home_header_no_data {
-  margin-bottom: 93.33rpx;
-}
+	.home_header_no_data {
+		margin-bottom: 93.33rpx;
+	}
 
-.fast_track {
-  width: 694rpx;
-  // height: 331rpx;
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: left;
-  align-content: space-between;
-  margin: 0 auto;
-  padding: 15rpx 38.6rpx;
-  background-color: #fff;
-  border-radius: 12px;
+	.fast_track {
+		width: 694rpx;
+		// height: 331rpx;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: left;
+		align-content: space-between;
+		margin: 0 auto;
+		padding: 15rpx 38.6rpx;
+		background-color: #fff;
+		border-radius: 12px;
 
-  .track_item {
-    width: 154.39rpx;
-    font-size: 24.56rpx;
-    margin: 25rpx 0;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
+		.track_item {
+			width: 154.39rpx;
+			font-size: 24.56rpx;
+			margin: 25rpx 0;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
 
-    .title {
-      margin-top: 14.04rpx;
-    }
-  }
-}
+			.title {
+				margin-top: 14.04rpx;
+			}
+		}
+	}
 
-.my_task {
-  width: 694.74rpx;
-  margin: 0 auto;
-  // margin-top: 31.58rpx;
-  // background-color: #fff;
-  border-radius: 12px;
-  // padding: 28.07rpx;
+	.my_task {
+		width: 694.74rpx;
+		margin: 0 auto;
+		// margin-top: 31.58rpx;
+		// background-color: #fff;
+		border-radius: 12px;
+		// padding: 28.07rpx;
 
-  .no_task {
-    width: 694rpx;
-    height: 140rpx;
-    padding: 28rpx;
-    background: #ffffff;
-    border-radius: 21rpx 21rpx 21rpx 21rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-evenly;
+		.no_task {
+			width: 694rpx;
+			height: 140rpx;
+			padding: 28rpx;
+			background: #ffffff;
+			border-radius: 21rpx 21rpx 21rpx 21rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-evenly;
 
-    .title {
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #000000cc;
-      line-height: 35rpx;
-    }
+			.title {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #000000cc;
+				line-height: 35rpx;
+			}
 
-    .tips {
-      font-size: 25rpx;
-      font-weight: 400;
-      color: #333333ff;
-      line-height: 35rpx;
-    }
-  }
+			.tips {
+				font-size: 25rpx;
+				font-weight: 400;
+				color: #333333ff;
+				line-height: 35rpx;
+			}
+		}
 
-  .task_title {
-    font-size: 25rpx;
-    font-weight: 400;
-    padding: 28rpx;
+		.task_title {
+			font-size: 25rpx;
+			font-weight: 400;
+			padding: 28rpx;
 
-    .title {
-      font-size: 32rpx;
-      font-weight: 500;
-    }
-  }
+			.title {
+				font-size: 32rpx;
+				font-weight: 500;
+			}
+		}
 
-  .task_list {
-    height: 196.49rpx;
-    border-bottom: 1px solid #cccccc;
-    padding: 21.05rpx 0;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
+		.task_list {
+			height: 196.49rpx;
+			border-bottom: 1px solid #cccccc;
+			padding: 21.05rpx 0;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
 
-    .title {
-      .tag {
-        color: #f24848;
-        font-size: 24.56rpx;
-        padding: 0 7.02rpx;
-        margin-right: 14.04rpx;
-        background: #ffe4e4;
-        border-radius: 4px;
-      }
+			.title {
+				.tag {
+					color: #f24848;
+					font-size: 24.56rpx;
+					padding: 0 7.02rpx;
+					margin-right: 14.04rpx;
+					background: #ffe4e4;
+					border-radius: 4px;
+				}
 
-      .tag1 {
-        color: #3274f9;
-        font-size: 24.56rpx;
-        padding: 0 7.02rpx;
-        margin-right: 14.04rpx;
-        background: #e4edff;
-        border-radius: 4px;
-      }
+				.tag1 {
+					color: #3274f9;
+					font-size: 24.56rpx;
+					padding: 0 7.02rpx;
+					margin-right: 14.04rpx;
+					background: #e4edff;
+					border-radius: 4px;
+				}
 
-      .text {
-        font-size: 28.07rpx;
-        width: 403.51rpx;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
+				.text {
+					font-size: 28.07rpx;
+					width: 403.51rpx;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
 
-      .if_take {
-        font-size: 28.07rpx;
-        text-align: center;
-        line-height: 49.12rpx;
-        width: 115.79rpx;
-        height: 49.12rpx;
-        border-radius: 100px;
-      }
+				.if_take {
+					font-size: 28.07rpx;
+					text-align: center;
+					line-height: 49.12rpx;
+					width: 115.79rpx;
+					height: 49.12rpx;
+					border-radius: 100px;
+				}
 
-      .take1 {
-        color: #47b347;
-        background: #dffcdf;
-      }
+				.take1 {
+					color: #47b347;
+					background: #dffcdf;
+				}
 
-      .take2 {
-        color: #3274f9;
-        background: #e4edff;
-      }
+				.take2 {
+					color: #3274f9;
+					background: #e4edff;
+				}
 
-      .take3 {
-        color: #999999;
-        background: #f5f5f5;
-      }
-    }
+				.take3 {
+					color: #999999;
+					background: #f5f5f5;
+				}
+			}
 
-    .describe {
-      font-size: 24.56rpx;
-    }
+			.describe {
+				font-size: 24.56rpx;
+			}
 
-    .task_deta {
-      color: #999;
-      font-size: 24.56rpx;
-    }
-  }
-}
+			.task_deta {
+				color: #999;
+				font-size: 24.56rpx;
+			}
+		}
+	}
 
-.no_login {
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  width: 100vw;
-  height: 112rpx;
-  /* #ifdef H5 */
-  height: 212rpx;
-  /* #endif */
-  background: rgba(#333333, 0.4);
-  border-radius: 14rpx 14rpx 0rpx 0rpx;
-  padding: 28rpx 28rpx;
+	.no_login {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100vw;
+		height: 112rpx;
+		/* #ifdef H5 */
+		height: 212rpx;
+		/* #endif */
+		background: rgba(#333333, 0.4);
+		border-radius: 14rpx 14rpx 0rpx 0rpx;
+		padding: 28rpx 28rpx;
 
-  .view {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+		.view {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
 
-    .text {
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #ffffff;
-    }
+			.text {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #ffffff;
+			}
 
-    .btn {
-      width: 158rpx;
-      height: 60rpx;
-      background: #3274f9;
-      border-radius: 30rpx 30rpx 30rpx 30rpx;
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #ffffff;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
-  }
-}
-</style>
+			.btn {
+				width: 158rpx;
+				height: 60rpx;
+				background: #3274f9;
+				border-radius: 30rpx 30rpx 30rpx 30rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #ffffff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index 7b6e51c..d9db23e 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -1,333 +1,332 @@
 <template>
-  <view class="my">
-    <view class="head_box">
-      <!-- <image class="head_img" src="../../static/img/home/head-bg.png"></image> -->
-      <!-- #ifdef APP-PLUS||H5 -->
-      <view style="height: var(--status-bar-height);"></view>
-      <view style="height: 100rpx"></view>
-      <!-- #endif -->
-      <view class="personage">
-        <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="130.28rpx" height="130.28rpx" shape="circle">
-            </u--image>
-            <view v-if="!$store.state.app.token" @click="login" class="name_work">
-              <view class="name">
-                <text class="nickname">立即登录</text>
-              </view>
-              <view class="work">
-                登录后可查看更多
-              </view>
-            </view>
-            <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><br/>
-				公司类型:<text v-if="oaUserInfo.company">{{ oaUserInfo.company.company_type_name }}</text><br/>
-                <!-- {{ oaUserInfo.did_name }}({{ oaUserInfo.label_name }}) -->
-              </view>
-            </view>
-          </view>
-          <!-- <view v-if="$store.state.app.token" class="compile" @click="navTo()">
+	<view class="my">
+		<view class="head_box">
+			<!-- <image class="head_img" src="../../static/img/home/head-bg.png"></image> -->
+			<!-- #ifdef APP-PLUS||H5 -->
+			<view style="height: var(--status-bar-height);"></view>
+			<view style="height: 100rpx"></view>
+			<!-- #endif -->
+			<view class="personage">
+				<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="130.28rpx" height="130.28rpx" shape="circle">
+						</u--image>
+						<view v-if="!$store.state.app.token" @click="login" class="name_work">
+							<view class="name">
+								<text class="nickname">立即登录</text>
+							</view>
+							<view class="work">
+								登录后可查看更多
+							</view>
+						</view>
+						<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><br />
+								公司类型:<text
+									v-if="oaUserInfo.company">{{ oaUserInfo.company.company_type_name }}</text><br />
+								<!-- {{ oaUserInfo.did_name }}({{ oaUserInfo.label_name }}) -->
+							</view>
+						</view>
+					</view>
+					<!-- <view v-if="$store.state.app.token" class="compile" @click="navTo()">
             <view class="iconfont icon-bianji"></view>
             <view class="">编辑</view>
           </view> -->
-        </view>
-        <view class="assess">
-          <view class="ass_cent flex_a_c_j_sb">
-            <view class="cent_item" @click="navTo('/subpkg/finance/finance')">
-              <!-- <view class="num">{{ oaUserInfo.achievements_money }}</view> -->
-              <view class="num" v-if="!$store.state.app.token">*</view>
-              <view class="num" v-else-if="eyeType">{{oaUserInfo.user_money||'0.00'}}</view>
-              <view class="num" v-if="!eyeType">****</view>
-              <view class="name">账户余额(元)</view>
-            </view>
-            <!-- <view class="cent_item" @click="navTo('/subpkg/finance/finance')">
-              <view class="num">0.00</view>
-              <view class="name">冻结金额</view>
-            </view> -->
-            <view class="cent_item" @click="navTo('/subpkg/finance/finance')">
-              <!-- <view class="num">{{ oaUserInfo.company_money }}</view> -->
-              <view class="num" v-if="!$store.state.app.token">*</view>
-              <view class="num" v-else-if="eyeType">{{oaUserInfo.income||'0.00'}}</view>
-              <view class="num" v-if="!eyeType">****</view>
-              <view class="name">收益金额(元)</view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="other_guide">
-      <block v-for="(item,i) in myOaData" :key="i">
-        <view class="other_item flex_a_c_j_sb" @click="navTo(item.url)">
-          <view class="flex_a_c left">
-            <!-- <view class="iconfont2" :class="item.icon"></view> -->
-            <image :src="item.icon"></image>
-            <view class="text">{{ item.name }}</view>
-          </view>
-          <uni-icons type="forward"></uni-icons>
-        </view>
-      </block>
-    </view>
-    <view class="log_out" v-if="$store.state.app.token" @click="modelShow=true">退出登录</view>
-    <view class="log_out" v-else @click="login">登录账号</view>
-    
-    <u-modal :show="modelShow" title="警告" content='确定要退出登录吗' closeOnClickOverlay showCancelButton @close="modelShow=false" @cancel="modelShow=false" @confirm="logout"></u-modal>
-    <!-- <tabbar></tabbar> -->
-  </view>
+				</view>
+
+			</view>
+		</view>
+		<view class="other_guide">
+			<block v-for="(item,i) in myOaData" :key="i">
+
+				<view class="other_item flex_a_c_j_sb" @click="navTo(item.url)">
+					<view class="flex_a_c left">
+						<!-- <view class="iconfont2" :class="item.icon"></view> -->
+						<image :src="item.icon"></image>
+						<view class="text">{{ item.name }}</view>
+					</view>
+					<uni-icons type="forward"></uni-icons>
+				</view>
+			</block>
+		</view>
+		<view class="log_out" v-if="$store.state.app.token" @click="modelShow=true">退出登录</view>
+		<view class="log_out" v-else @click="login">登录账号</view>
+
+		<u-modal :show="modelShow" title="警告" content='确定要退出登录吗' closeOnClickOverlay showCancelButton
+			@close="modelShow=false" @cancel="modelShow=false" @confirm="logout"></u-modal>
+		<!-- <tabbar></tabbar> -->
+	</view>
 </template>
 
 <script>
-  import { mapActions } from 'vuex'
-  import { getUserIndexAPI } from '@/api/oaApi.js'
-  import { userInfo } from '@/api/oaUser.js'
-  import { Toast } from '@/libs/uniApi.js'
-  import { myOaData } from '@/static/server/server.js'
-  // import tabbar from '../components/tabbar'
-  export default {
-    components: {
-      // tabbar
-    },
-    data() {
-      return {
-        myOaData: myOaData,
-        src: 'https://cdn.uviewui.com/uview/album/1.jpg',
-        modelShow: false
-      }
-    },
-    onReady() {
-      uni.setNavigationBarColor({
-        frontColor: '#ffffff',
-        backgroundColor: '#3175f9'
-      })
-    },
-    onShow() {
-      this.getOaUserInfo();
-    },
-    onHide() {
-      this.modelShow = false;
-    },
-    computed: {
-      eyeType() {
-        return this.$store.state.config.eyeType;
-      },
-      oaUserInfo() {
-        return this.$store.state.app.userInfo || { avatar: '', admin: { company: { company_name: '' } } };
-      }
-    },
-    methods: {
-      ...mapActions(['getWxLogin']),
-      login() {
-        uni.navigateTo({
-          url: '/pages/oaLogin/oaLogin'
-        })
-      },
-      logout() {
-        let that = this;
-        // uni.showModal({
-        //   content: '确定要退出登录吗',
-        //   success: (e) => {
-        //     if (e.confirm) {
-              uni.navigateTo({
-                url: '/pages/oaLogin/oaLogin?clear='+true,
-                success() {
-                  that.$store.commit('CLEAR');
-                }
-              })
-        //     }
-        //   }
-        // })
-      },
-      async getOaUserInfo() {
-        const res = await userInfo();
-        this.$store.commit('setUserInfo', res.data);
-      },
-      navTo(url) {
-        url ?
-          uni.navigateTo({
-            url: url,
-            fail(e) {
-              uni.switchTab({
-                url: url
-              })
-            }
-          }) : Toast('暂未开放')
-      },
-      alterMyInfo() {
-        uni.navigateTo({
-          url: '/pages/views/personal_center'
-        })
-      }
-    },
-    onPullDownRefresh() {
-      this.getOaUserInfo()
-      uni.stopPullDownRefresh()
-    }
-  }
+	import {
+		mapActions
+	} from 'vuex'
+	import {
+		getUserIndexAPI
+	} from '@/api/oaApi.js'
+	import {
+		userInfo
+	} from '@/api/oaUser.js'
+	import {
+		Toast
+	} from '@/libs/uniApi.js'
+	import {
+		myOaData
+	} from '@/static/server/server.js'
+	// import tabbar from '../components/tabbar'
+	export default {
+		components: {
+			// tabbar
+		},
+		data() {
+			return {
+				myOaData: myOaData,
+				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
+				modelShow: false
+			}
+		},
+		onReady() {
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: '#3175f9'
+			})
+		},
+		onShow() {
+			this.getOaUserInfo();
+		},
+		onHide() {
+			this.modelShow = false;
+		},
+		computed: {
+			eyeType() {
+				return this.$store.state.config.eyeType;
+			},
+			oaUserInfo() {
+				return this.$store.state.app.userInfo || {
+					avatar: '',
+					admin: {
+						company: {
+							company_name: ''
+						}
+					}
+				};
+			}
+		},
+		methods: {
+			...mapActions(['getWxLogin']),
+			login() {
+				uni.navigateTo({
+					url: '/pages/oaLogin/oaLogin'
+				})
+			},
+			logout() {
+				let that = this;
+				// uni.showModal({
+				//   content: '确定要退出登录吗',
+				//   success: (e) => {
+				//     if (e.confirm) {
+				uni.navigateTo({
+					url: '/pages/oaLogin/oaLogin?clear=' + true,
+					success() {
+						that.$store.commit('CLEAR');
+					}
+				})
+				//     }
+				//   }
+				// })
+			},
+			async getOaUserInfo() {
+				const res = await userInfo();
+				this.$store.commit('setUserInfo', res.data);
+			},
+			navTo(url) {
+				url ?
+					uni.navigateTo({
+						url: url,
+						fail(e) {
+							uni.switchTab({
+								url: url
+							})
+						}
+					}) : Toast('暂未开放')
+			},
+			alterMyInfo() {
+				uni.navigateTo({
+					url: '/pages/views/personal_center'
+				})
+			}
+		},
+		onPullDownRefresh() {
+			this.getOaUserInfo()
+			uni.stopPullDownRefresh()
+		}
+	}
 </script>
 
 <style lang="scss">
-  .my {
-    .head_box {
-      position: relative;
-      padding: 28rpx;
-      width: 100vw;
-      margin-bottom: 30rpx;
-      background-image: url('../../static/img/home/my_bg.png');
-      background-size: 100% 100%;
-      background-repeat: no-repeat;
+	.my {
+		.head_box {
+			position: relative;
+			padding: 28rpx;
+			width: 100vw;
+			margin-bottom: 30rpx;
+			background-image: url('../../static/img/home/my_bg.png');
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
 
-      // .head_img {
-      //   position: absolute;
-      //   // z-index: -1;
-      //   width: 100%;
-      //   height: 100%;
-      //   top: 0;
-      //   left: 0;
-      // }
-    }
+			// .head_img {
+			//   position: absolute;
+			//   // z-index: -1;
+			//   width: 100%;
+			//   height: 100%;
+			//   top: 0;
+			//   left: 0;
+			// }
+		}
 
-  }
+	}
 
-  .my_head {
-    height: 90.39rpx;
-    position: relative;
-    // z-index: 1;
-    // top: 20rpx;
-    // background-color: $theme-oa-color;
-    // background-image: url('../../static/img/home/head-bg.png');
+	.my_head {
+		height: 90.39rpx;
+		position: relative;
+		// z-index: 1;
+		// top: 20rpx;
+		// background-color: $theme-oa-color;
+		// background-image: url('../../static/img/home/head-bg.png');
 
-    .department {
-      // padding-top: 38.6rpx;
-      font-size: 31.58rpx;
-      color: #fff;
+		.department {
+			// padding-top: 38.6rpx;
+			font-size: 31.58rpx;
+			color: #fff;
 
-      .section {
-        margin-right: 57.89rpx;
-      }
-    }
-  }
+			.section {
+				margin-right: 57.89rpx;
+			}
+		}
+	}
 
-  .personage {
-    // position: relative;
-    padding-bottom: 28rpx;
-    border-radius: 12px;
-    // background-color: #fff;
-    color: #fff;
-    width: 694rpx;
-    margin-left: 50%;
-    transform: translate(-50%);
+	.personage {
+		// position: relative;
+		padding-bottom: 28rpx;
+		border-radius: 12px;
+		// background-color: #fff;
+		color: #fff;
+		width: 694rpx;
+		margin-left: 50%;
+		transform: translate(-50%);
 
-    .name_work {
-      margin-left: 31.58rpx;
-      font-size: 28.07rpx;
+		.name_work {
+			margin-left: 31.58rpx;
+			font-size: 28.07rpx;
 
-      .name {
-        .nickname {
-          font-size: 32rpx;
-          font-weight: 500;
-          margin-right: 30rpx;
-        }
-      }
+			.name {
+				.nickname {
+					font-size: 32rpx;
+					font-weight: 500;
+					margin-right: 30rpx;
+				}
+			}
 
-      .work {
-        margin-top: 14.04rpx;
-      }
+			.work {
+				margin-top: 14.04rpx;
+			}
 
-      .omit {
-        white-space: nowrap;
-        /* 禁止换行 */
-        overflow: hidden;
-        /* 溢出隐藏 */
-        text-overflow: ellipsis;
-        /* 使用省略号代表被截断的文本 */
-      }
-    }
+			.omit {
+				white-space: nowrap;
+				/* 禁止换行 */
+				overflow: hidden;
+				/* 溢出隐藏 */
+				text-overflow: ellipsis;
+				/* 使用省略号代表被截断的文本 */
+			}
+		}
 
-    .my_msg {
-      .compile {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-      }
-    }
+		.my_msg {
+			.compile {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+			}
+		}
 
-    .assess {
-      height: 170.18rpx;
-    }
+		.assess {
+			height: 170.18rpx;
+		}
 
-    .ass_cent {
-      width: 100%;
-      padding: 31.58rpx 66.67rpx;
-      position: absolute;
-      left: 0;
-      bottom: 0;
-      height: 170.18rpx;
-      border-radius: 12px;
-      background-color: rgba(#fff, 0.18);
-      justify-content: space-around;
+		.ass_cent {
+			width: 100%;
+			padding: 31.58rpx 66.67rpx;
+			position: absolute;
+			left: 0;
+			bottom: 0;
+			height: 170.18rpx;
+			border-radius: 12px;
+			background-color: rgba(#fff, 0.18);
+			justify-content: space-around;
 
-      .cent_item {
-        font-size: 24.56rpx;
-        color: #fff;
-        text-align: center;
+			.cent_item {
+				font-size: 24.56rpx;
+				color: #fff;
+				text-align: center;
 
-        .num {
-          font-size: 38.6rpx;
-          margin-bottom: 21.05rpx;
-        }
+				.num {
+					font-size: 38.6rpx;
+					margin-bottom: 21.05rpx;
+				}
 
-      }
-    }
-  }
+			}
+		}
+	}
 
-  .other_guide {
-    width: 694.74rpx;
-    margin: 0 auto;
-    padding: 28.07rpx;
-    background-color: #fff;
-    border-radius: 12px;
+	.other_guide {
+		width: 694.74rpx;
+		margin: 0 auto;
+		padding: 28.07rpx;
+		background-color: #fff;
+		border-radius: 12px;
 
-    .other_item {
-      height: 87.72rpx;
-      border-bottom: 1px solid #F0F5F7;
+		.other_item {
+			height: 87.72rpx;
+			border-bottom: 1px solid #F0F5F7;
 
-      .text {
-        font-size: 28.07rpx;
-        margin-left: 20.56rpx;
-      }
+			.text {
+				font-size: 28.07rpx;
+				margin-left: 20.56rpx;
+			}
 
-      .left {
-        align-items: center;
-      }
+			.left {
+				align-items: center;
+			}
 
-      image {
-        width: 42rpx;
-        height: 42rpx;
-      }
+			image {
+				width: 42rpx;
+				height: 42rpx;
+			}
 
-      .iconfont2 {
-        font-size: 42.11rpx;
-      }
-    }
-  }
+			.iconfont2 {
+				font-size: 42.11rpx;
+			}
+		}
+	}
 
-  .log_out {
-    color: #fff;
-    border-radius: 100px;
-    text-align: center;
-    line-height: 84.21rpx;
-    margin: 0 auto;
-    margin-top: 84.21rpx;
-    width: 614.04rpx;
-    height: 84.21rpx;
-    background: #3274F9;
-    box-shadow: 0px 9px 26px 1px #E9EFF5;
-  }
+	.log_out {
+		color: #fff;
+		border-radius: 100px;
+		text-align: center;
+		line-height: 84.21rpx;
+		margin: 0 auto;
+		margin-top: 84.21rpx;
+		width: 614.04rpx;
+		height: 84.21rpx;
+		background: #3274F9;
+		box-shadow: 0px 9px 26px 1px #E9EFF5;
+	}
 </style>
\ No newline at end of file
diff --git a/subpkg/captain/captain.vue b/subpkg/captain/captain.vue
index 412dd09..fcc0ecb 100644
--- a/subpkg/captain/captain.vue
+++ b/subpkg/captain/captain.vue
@@ -41,8 +41,8 @@
 						</view>
 
 						<view style="margin-top: 40rpx;">
-							<u-icon style="display: inline-block;margin-left: 10rpx;" color="white"
-								name="edit-pen-fill"></u-icon> {{item.is_contract?"已签约":"未签约"}}
+							<u-icon style="display: inline-block;" color="white" name="edit-pen-fill"></u-icon>
+							{{item.is_contract?"已签约":"未签约"}}
 						</view>
 					</view>
 					<view class="right">
@@ -216,9 +216,8 @@
 
 			.left {
 				text-align: center;
-				// padding: 15rpx 25rpx;
+				padding: 15rpx 25rpx;
 				padding-top: 20rpx;
-
 				margin-right: 50rpx;
 				width: 160rpx;
 				background-color: $theme-oa-color;
@@ -229,7 +228,8 @@
 					width: 120rpx;
 					height: 120rpx;
 					background-color: #FFFFFF;
-					margin-left: 25rpx;
+					// margin-left: 25rpx;
+					padding: 0 25rpx;
 					border-radius: 120rpx;
 					position: relative;
 
diff --git a/subpkg/contract/contract.vue b/subpkg/contract/contract.vue
index 0ea4faa..43c1879 100644
--- a/subpkg/contract/contract.vue
+++ b/subpkg/contract/contract.vue
@@ -1,6 +1,6 @@
 <template>
-  <view class="">
-    <!-- <view class="tabs">
+	<view class="">
+		<!-- <view class="tabs">
       <view class="left">
         <view class="item" :class="changeType==0?'active':''" @click="changeType=0">合同列表</view>
         <view class="item" :class="changeType==1?'active':''" @click="changeType=1">已签订合同</view>
@@ -9,259 +9,467 @@
         <text>新增</text>
       </view>
     </view> -->
-    <view class="contract_list">
-      <view class="item" v-for="(item,index) in list" :key="item.id">
-        <view class="top">
-          <image src="../../static/img/contract/pdf.png" style="height: 140rpx; width: 140rpx;"></image>
-          <view class="text">
-            <view class="name">
-              <view class="title">
-                <text v-if="item.company">{{item.company.company_name}}</text>
-              </view>
-            </view>
-            <view class="date">
-              <!-- <text class="time">2023-04-27 至 2024-04-28 </text> -->
-              <view class="number">
-                <view class="num_left">合同编号:</view>
-                <text>{{item.contract_no}}</text>
-              </view>
-              <view class="number">
-                <view class="num_left">合同类型:</view>
-                <view>{{item.company.contract_type_name}}</view>
-              </view>
-              <view class="time">
-                <view class="num_left">修改时间:</view>
-                <view>{{item.update_time}}</view>
-              </view>
-            </view>
-          </view>
-        </view>
-        <u-line color="#999999FF"></u-line>
-        <view class="bottom">
-          <view class="left" v-if="item.status">已签订</view>
-          <view class="left yellow" v-else-if="item.check_status>=2">签订中</view>
-          <view class="left red" v-else>未签订</view>
-          <button class="right" @click="navTo('/subpkg/contractDetail/contractDetail?id='+item.id)">详情</button>
-        </view>
-      </view>
-    </view>
-    <u-empty v-if="loadConfig.status=='nomore'&& list.length==0" text="暂无合同"
-      icon="/static/img/empty/data.png"></u-empty>
-    <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
-      :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-  </view>
+		<view class="contract_list">
+			<view class="item" v-for="(item,index) in list" :key="item.id">
+
+
+				<view class="personnel_list">
+					<view class="cards">
+						<view class="cards_head">
+							<text style="font-size: 32rpx">电子合同</text>
+						</view>
+						<view class="cards_content">
+							<view class="right">
+								<view class="">
+									<text>甲方 :</text>
+									<text> { item.name }</text>
+								</view>
+								<view class="">
+									<text>乙方 :</text>
+									<text>{ item.phone }</text>
+								</view>
+								<view class="">
+									<text>合同类型 :</text>
+									<text> {{item.company.contract_type_name}} </text>
+								</view>
+								<view class="">
+									<text>合同编号 :</text>
+									<text> {{item.contract_no}} </text>
+								</view>
+							</view>
+
+
+						</view>
+
+						<view class="hr">
+						</view>
+
+
+						<view class="contract_box">
+
+							<view class="left">
+								<image class="contract_img" src="../../static/img/contract/pdf.png"></image>
+								<view class="text">
+									<view class="name">{{item.company.contract_type_name}}</view>
+									<view>
+										<text>{{item.update_time}}</text>
+									</view>
+								</view>
+							</view>
+							<view class="right" @click="navTo('/subpkg/contractDetail/contractDetail?id='+item.id)">
+								<uni-icons type="paperclip" color="#0022C7"></uni-icons>
+								<view>查看</view>
+							</view>
+
+
+						</view>
+
+
+
+
+
+
+
+					</view>
+				</view>
+
+				<!-- 
+				<view class="top">
+					<image src="../../static/img/contract/pdf.png" style="height: 140rpx; width: 140rpx;"></image>
+					<view class="text">
+						<view class="name">
+							<view class="title">
+								<text v-if="item.company">{{item.company.company_name}}</text>
+							</view>
+						</view>
+						<view class="date">
+
+							<view class="number">
+								<view class="num_left">合同编号:</view>
+								<text>{{item.contract_no}}</text>
+							</view>
+							<view class="number">
+								<view class="num_left">合同类型:</view>
+								<view>{{item.company.contract_type_name}}</view>
+							</view>
+							<view class="time">
+								<view class="num_left">修改时间:</view>
+								<view>{{item.update_time}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<u-line color="#999999FF"></u-line>
+				<view class="bottom">
+					<view class="left" v-if="item.status">已签订</view>
+					<view class="left yellow" v-else-if="item.check_status>=2">签订中</view>
+					<view class="left red" v-else>未签订</view>
+					<button class="right"
+						@click="navTo('/subpkg/contractDetail/contractDetail?id='+item.id)">详情</button>
+				</view>
+
+ -->
+
+
+
+			</view>
+		</view>
+		<u-empty v-if="loadConfig.status=='nomore'&& list.length==0" text="暂无合同"
+			icon="/static/img/empty/data.png"></u-empty>
+		<u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
+			:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
+	</view>
 </template>
 
 <script>
-  import { contractList } from "@/api/contract.js"
-  export default {
-    data() {
-      return {
-        changeType: 0,
-        list: [],
-        loadConfig: {
-          page: 1,
-          limit: 15,
-          loadingText: '努力加载中',
-          loadmoreText: '轻轻上拉',
-          nomoreText: '我也是有底线的~~',
-          status: 'loadmore'
-        },
-      }
-    },
-    onLoad() {},
-    onShow() {
-      this.initLoadConfig();
-    },
-    onReady() {
-      uni.setNavigationBarColor({
-        frontColor: '#ffffff',
-        backgroundColor: '#3175f9'
-      })
-    },
-    methods: {
-      navTo(url) {
-        url ?
-          uni.navigateTo({
-            url: url
-          }) : Toast('暂未开放')
-      },
-      initLoadConfig() {
-        this.loadConfig.page = 1;
-        this.loadConfig.status = "loadmore";
-        this.list = [];
-        this.initContractList();
-        uni.stopPullDownRefresh();
-      },
-      async initContractList() {
-        try {
-          if (this.loadConfig.status == "nomore") return;
-          this.loadConfig.status = "loading"
-          let res = await contractList({
-            page: this.loadConfig.page,
-            limit: this.loadConfig.limit
-          })
-          this.loadConfig.status = "loadmore"
-          if (res.data.data.length < this.loadConfig.limit) {
-            this.loadConfig.status = "nomore"
-          } else {
-            this.loadConfig.page++;
-          }
-          this.list = [...this.list, ...res.data?.data]
-        } catch (e) {
-          this.initLoadConfig();
-          this.loadConfig.status = "nomore"
-        }
-      }
-    },
-    onPullDownRefresh() {
-      this.initLoadConfig();
-    }
-  }
+	import {
+		contractList
+	} from "@/api/contract.js"
+	export default {
+		data() {
+			return {
+				changeType: 0,
+				list: [],
+				loadConfig: {
+					page: 1,
+					limit: 15,
+					loadingText: '努力加载中',
+					loadmoreText: '轻轻上拉',
+					nomoreText: '我也是有底线的~~',
+					status: 'loadmore'
+				},
+			}
+		},
+		onLoad() {},
+		onShow() {
+			this.initLoadConfig();
+		},
+		onReady() {
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: '#3175f9'
+			})
+		},
+		methods: {
+			navTo(url) {
+				url ?
+					uni.navigateTo({
+						url: url
+					}) : Toast('暂未开放')
+			},
+			initLoadConfig() {
+				this.loadConfig.page = 1;
+				this.loadConfig.status = "loadmore";
+				this.list = [];
+				this.initContractList();
+				uni.stopPullDownRefresh();
+			},
+			async initContractList() {
+				try {
+					if (this.loadConfig.status == "nomore") return;
+					this.loadConfig.status = "loading"
+					let res = await contractList({
+						page: this.loadConfig.page,
+						limit: this.loadConfig.limit
+					})
+					this.loadConfig.status = "loadmore"
+					if (res.data.data.length < this.loadConfig.limit) {
+						this.loadConfig.status = "nomore"
+					} else {
+						this.loadConfig.page++;
+					}
+					this.list = [...this.list, ...res.data?.data]
+				} catch (e) {
+					this.initLoadConfig();
+					this.loadConfig.status = "nomore"
+				}
+			}
+		},
+		onPullDownRefresh() {
+			this.initLoadConfig();
+		}
+	}
 </script>
 
 <style lang="scss">
-  .tabs {
-    height: 112rpx;
-    background-color: #fff;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0 28rpx;
+	.tabs {
+		height: 112rpx;
+		background-color: #fff;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 28rpx;
 
-    .left {
-      display: flex;
+		.left {
+			display: flex;
 
-      .item {
-        margin-right: 52.5rpx;
-        width: 175rpx;
-        height: 53rpx;
-        line-height: 53rpx;
-        text-align: center;
-        background-color: #F3F4F8FF;
-        border-radius: 35rpx 35rpx 35rpx 35rpx;
-        font-size: 28rpx;
-        font-weight: 400;
-        color: #999999;
-      }
+			.item {
+				margin-right: 52.5rpx;
+				width: 175rpx;
+				height: 53rpx;
+				line-height: 53rpx;
+				text-align: center;
+				background-color: #F3F4F8FF;
+				border-radius: 35rpx 35rpx 35rpx 35rpx;
+				font-size: 28rpx;
+				font-weight: 400;
+				color: #999999;
+			}
 
-      .active {
-        background-color: #3274F9FF;
-        color: #FFFFFFFF;
-      }
-    }
+			.active {
+				background-color: #3274F9FF;
+				color: #FFFFFFFF;
+			}
+		}
 
-    .right {
-      font-size: 28rpx;
-      font-weight: 400;
-      color: #999999;
-      line-height: 0rpx;
-    }
-  }
+		.right {
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #999999;
+			line-height: 0rpx;
+		}
+	}
 
-  .contract_list {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    align-items: center;
-    padding: 28rpx;
+	.personnel_list {
+		padding: 28rpx 0;
+		margin-bottom: 130rpx;
 
-    .item {
-      width: 694rpx;
-      min-height: 263rpx;
-      padding: 28rpx;
-      margin-bottom: 28rpx;
-      background: #FFFFFF;
-      border-radius: 14rpx 14rpx 14rpx 14rpx;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
+		.cards {
+			margin: 0 auto;
+			margin-bottom: 28rpx;
+			width: 694rpx;
+			background: #ffffff;
+			border-radius: 30rpx;
+			opacity: 1;
+			overflow: hidden;
+			box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
 
-      .top {
-        display: flex;
-        margin-bottom: 28rpx;
+			.cards_head {
+				padding: 28rpx;
+				background-color: $theme-oa-color;
+				color: white;
+				height: 100rpx;
+				display: flex;
+				justify-content: space-between;
+			}
 
-        image {
-          width: 87.6rpx;
-          height: 87.6rpx;
-          margin-right: 28rpx;
-          flex-shrink: 0;
-        }
+			.cards_content {
+				padding: 28rpx;
+				display: flex;
+				justify-content: space-between;
 
-        .text {
-          display: flex;
-          flex-direction: column;
-          justify-content: space-between;
+				.left {
+					text-align: center;
+					// padding: 15rpx 25rpx;
+					padding-top: 20rpx;
 
-          .name {
-            .title {
-              font-size: 32rpx;
-              font-weight: 400;
-              color: #333333;
-              margin-right: 17.5rpx;
-            }
-          }
+					width: 160rpx;
+					background-color: $theme-oa-color;
+					color: white;
+					border-radius: 40rpx;
 
-          .date {
-            font-size: 25rpx;
-            font-weight: 400;
-            color: #F9AA32;
-            line-height: 36rpx;
-            
-            .number, .time{
-              display: flex;
-              justify-content: left;
-              flex-wrap: wrap;
-              .num_left{
-                margin-right: 18rpx;
-              }
-            }
+					.cir {
+						width: 120rpx;
+						height: 120rpx;
+						background-color: #ffffff;
+						margin-left: 25rpx;
+						border-radius: 120rpx;
+						position: relative;
+					}
+				}
 
-            .time {
-              color: #CCCCCCFF;
-              margin-right: 10rpx;
-            }
-          }
-        }
+				.right {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
 
-      }
+					view {
+						margin-bottom: 10rpx;
 
-      .bottom {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 28rpx;
+						text:nth-child(2) {
+							margin-left: 20rpx;
+						}
+					}
+				}
+			}
 
-        .left {
-          font-size: 28rpx;
-          font-weight: 400;
-          color: #34A853;
-        }
-        
-        .yellow {
-          color: #F9AA32;
-        }
+			.hr {
+				border-top: 1px dashed #0022C7;
+				margin-bottom: 30rpx;
+			}
 
-        .red {
-          color: #F02828FF;
-        }
+			.contract_box {
+				padding: 0 28rpx 20rpx;
+				display: flex;
+				justify-content: space-between;
 
-        .right {
-          width: 158rpx;
-          // height: 53rpx;
-          // border-radius: 26rpx 26rpx 26rpx 26rpx;
-          // border: 2rpx solid #3274F9;
-          // display: flex;
-          // justify-content: center;
-          // align-items: center;
-          text-align: right;
-          background: #FFFFFF;
-          opacity: 1;
-          font-size: 28rpx;
-          font-weight: 400;
-          color: #3274F9;
-        }
-      }
-    }
+				.left {
+					display: flex;
 
-  }
+					.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
+					}
+				}
+
+			}
+
+
+		}
+	}
+
+	// .contract_list {
+	// 	display: flex;
+	// 	flex-direction: column;
+	// 	justify-content: space-between;
+	// 	align-items: center;
+	// 	padding: 28rpx;
+
+	// 	.item {
+	// 		width: 694rpx;
+	// 		min-height: 263rpx;
+	// 		padding: 28rpx;
+	// 		margin-bottom: 28rpx;
+	// 		background: #FFFFFF;
+	// 		border-radius: 14rpx 14rpx 14rpx 14rpx;
+	// 		display: flex;
+	// 		flex-direction: column;
+	// 		justify-content: space-between;
+
+	// 		.top {
+	// 			display: flex;
+	// 			margin-bottom: 28rpx;
+
+	// 			image {
+	// 				width: 87.6rpx;
+	// 				height: 87.6rpx;
+	// 				margin-right: 28rpx;
+	// 				flex-shrink: 0;
+	// 			}
+
+	// 			.text {
+	// 				display: flex;
+	// 				flex-direction: column;
+	// 				justify-content: space-between;
+
+	// 				.name {
+	// 					.title {
+	// 						font-size: 32rpx;
+	// 						font-weight: 400;
+	// 						color: #333333;
+	// 						margin-right: 17.5rpx;
+	// 					}
+	// 				}
+
+	// 				.date {
+	// 					font-size: 25rpx;
+	// 					font-weight: 400;
+	// 					color: #F9AA32;
+	// 					line-height: 36rpx;
+
+	// 					.number,
+	// 					.time {
+	// 						display: flex;
+	// 						justify-content: left;
+	// 						flex-wrap: wrap;
+
+	// 						.num_left {
+	// 							margin-right: 18rpx;
+	// 						}
+	// 					}
+
+	// 					.time {
+	// 						color: #CCCCCCFF;
+	// 						margin-right: 10rpx;
+	// 					}
+	// 				}
+	// 			}
+
+	// 		}
+
+	// 		.bottom {
+	// 			display: flex;
+	// 			justify-content: space-between;
+	// 			margin-top: 28rpx;
+
+	// 			.left {
+	// 				font-size: 28rpx;
+	// 				font-weight: 400;
+	// 				color: #34A853;
+	// 			}
+
+	// 			.yellow {
+	// 				color: #F9AA32;
+	// 			}
+
+	// 			.red {
+	// 				color: #F02828FF;
+	// 			}
+
+	// 			.right {
+	// 				width: 158rpx;
+	// 				// height: 53rpx;
+	// 				// border-radius: 26rpx 26rpx 26rpx 26rpx;
+	// 				// border: 2rpx solid #3274F9;
+	// 				// display: flex;
+	// 				// justify-content: center;
+	// 				// align-items: center;
+	// 				text-align: right;
+	// 				background: #FFFFFF;
+	// 				opacity: 1;
+	// 				font-size: 28rpx;
+	// 				font-weight: 400;
+	// 				color: #3274F9;
+	// 			}
+	// 		}
+	// 	}
+
+	// }
 </style>
\ No newline at end of file
diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue
index 88f73a6..c34de46 100644
--- a/subpkg/finance/finance.vue
+++ b/subpkg/finance/finance.vue
@@ -1,60 +1,66 @@
 <template>
-  <view class="">
-    <view class="finance_head">
-      <view class="top">
-        <view class="left" @click="navTo()">
-			<view v-if="user_id==0">
-				<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>
-			</view>
-			<view v-else>
-				<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>
-			</view>
-        </view>
-        <!-- <view class="right" @click="navTo('/subpkg/topUp/topUp')">
+	<view class="">
+		<view class="finance_head">
+			<view class="top">
+				<view @click="navTo()">
+					<view v-if="user_id==0" class="accont">
+						<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>
+						<u-icon name="setting-fill" color="white" size="20"></u-icon>
+					</view>
+					<view v-else class="accont">
+						<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>
+						<u-icon name="setting-fill" color="white" size="20"></u-icon>
+					</view>
+				</view>
+				<!-- <view class="right" @click="navTo('/subpkg/topUp/topUp')">
           账户充值
         </view> -->
-      </view>
-      <view class="center">
-        <view class="title">
-          <text style="margin-right: 20rpx;">账户总金额(元)</text><uni-icons @click="updateEye()" :type="eyeType?'eye-filled':'eye-slash-filled'" color="#fff"></uni-icons>
-        </view>
-        <view class="price" v-show="eyeType">{{userInfo.user_money||0.00}}元</view>
-        <view class="price" v-show="!eyeType">****元</view>
-        <view class="bubble">
-          <!-- <image src="../../static/img/contract/bubble.png"></image> -->
-          <view class="text" v-show="eyeType">可提现金额{{userInfo.user_money||0.00}}元</view>
-          <view class="text" v-show="!eyeType">可提现金额****元</view>
-        </view>
-      </view>
-      <view class="bottom" @click="navTo('/subpkg/orderDetail/orderDetail')">
-        <view class="item">
-          <view>账户余额(元)</view>
-          <view class="num" v-show="eyeType">{{userInfo.user_money||0.00}}</view>
-          <view class="num" v-show="!eyeType">****</view>
-        </view>
-        <u-line direction="col" length="40%" color="#999999FF"></u-line>
-        <view class="item">
-          <view>收益金额(元)</view>
-          <view class="num" v-show="eyeType">{{userInfo.income||0.00}}</view>
-          <view class="num" v-show="!eyeType">****</view>
-        </view>
-      </view>
-    </view>
-    <view class="bill">
-      <view style="width: 100%;height: 90rpx;background-color: #fff;"></view>
-      <uni-section titleFontSize="32rpx" type="line" title="账单流水"></uni-section>
-      <!-- <u-subsection :list="billTypeList" :current="current" mode="subsection"></u-subsection> -->
-      <view class="type_box">
-        <view class="type">
-          <view :class="current==0?'active':''" @click="changeBillType(0)">日账单</view>
-          <view :class="current==1?'active':''" @click="changeBillType(1)">月账单</view>
-        </view>
-      </view>
-      <!-- 日账单 -->
-      <view class="bill_list" v-show="current==0">
-        <!-- <view class="card" v-for="(item, index) in billList" :key="index">
+			</view>
+			<view class="center">
+				<view class="title">
+					<text style="margin-right: 20rpx;">账户总金额(元)</text><uni-icons @click="updateEye()"
+						:type="eyeType?'eye-filled':'eye-slash-filled'" color="#fff"></uni-icons>
+				</view>
+				<view class="price" v-show="eyeType">{{userInfo.user_money||0.00}}元</view>
+				<view class="price" v-show="!eyeType">****元</view>
+				<view class="bubble">
+					<!-- <image src="../../static/img/contract/bubble.png"></image> -->
+					<view class="text" v-show="eyeType">可提现金额{{userInfo.user_money||0.00}}元</view>
+					<view class="text" v-show="!eyeType">可提现金额****元</view>
+				</view>
+			</view>
+			<view class="bottom" @click="navTo('/subpkg/orderDetail/orderDetail')">
+				<view class="item">
+					<view>账户余额(元)</view>
+					<view class="num" v-show="eyeType">{{userInfo.user_money||0.00}}</view>
+					<view class="num" v-show="!eyeType">****</view>
+				</view>
+				<u-line direction="col" length="40%" color="#999999FF"></u-line>
+				<view class="item">
+					<view>收益金额(元)</view>
+					<view class="num" v-show="eyeType">{{userInfo.income||0.00}}</view>
+					<view class="num" v-show="!eyeType">****</view>
+				</view>
+			</view>
+		</view>
+		<view class="bill">
+			<view style="width: 100%;height: 90rpx;background-color: #fff;"></view>
+			<uni-section titleFontSize="32rpx" type="line" title="账单流水"></uni-section>
+			<!-- <u-subsection :list="billTypeList" :current="current" mode="subsection"></u-subsection> -->
+			<view class="type_box">
+				<view class="type">
+					<view :class="current==0?'active':''" @click="changeBillType(0)">日账单</view>
+					<view :class="current==1?'active':''" @click="changeBillType(1)">月账单</view>
+				</view>
+			</view>
+			<!-- 日账单 -->
+			<view class="bill_list" v-show="current==0">
+				<!-- <view class="card" v-for="(item, index) in billList" :key="index">
           <view class="top">
             <view class="blue">账单详情</view>
             <view>账单日期：{{item.create_time}}</view>
@@ -70,433 +76,509 @@
             </view>
           </view>
         </view> -->
-        <view class="item" v-for="(item, index) in billList" :key="item.id">
-          <view class="top">
-            账单日期: {{current?item.month:item.create_time}}
-          </view>
-          <view class="bottom">
-            <view class="text">
-              <view class="t_item" v-if="current==0">
-                <view class="t_title">任务名称：</view>
-                <view class="tips">{{item.remark}}</view>
-              </view>
-              <view class="t_item">
-                <view class="t_title">金额归属：</view>
-                <view class="tips">{{$store.state.app.userInfo.nickname}}</view>
-              </view>
-              <view class="t_item">
-                <view class="t_title">收益来源：</view>
-                <view class="tips">
-                  <!-- {{current?item.remark:item.type_desc}} -->
-                  <text v-if="item.change_type==202" style="color: #46be61;">{{item.type_desc}}</text>
-                  <text v-else-if="item.change_type==203" style="color: #ff7c32;">{{item.type_desc}}</text>
-                  <text v-else="item.change_type==203">{{item.type_desc}}</text>
-                </view>
-              </view>
-            </view>
-            <view class="price">{{current?(item.expenditure==0?'+'+item.income:'-'+item.income):item.change_amount_desc}}</view>
-          </view>
-        </view>
-        
-        <u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText" :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />        
-      </view>
-      <!-- 月账单 -->
-      <view class="bill_list" v-show="current==1">
-        <view class="card" v-for="(item, index) in billListMonth" :key="index">
-          <view class="top">
-            <view class="blue">账单详情</view>
-            <view>账单日期：{{item.month}}</view>
-          </view>
-          <view class="bottom">
-            <view class="left">
-              <view>收益金额(元)</view>
-              <view class="num">{{item.income}}</view>
-            </view>
-            <view class="right">
-              <view>支出金额:{{item.expenditure>0?item.expenditure:'0.00'}}</view>
-              <view>入账金额:{{item.income>0?item.income:'0.00'}}</view>
-            </view>
-          </view>
-        </view>
-        <u-loadmore status="nomore" nomore-text="仅展示一年数据" />  
-      </view>
-      
-      <!-- <button class="btn" @click="navTo('/subpkg/withdrawDeposit/withdrawDeposit')">提现余额</button> -->
-    </view>
-  </view>
+				<!-- <view class="item" v-for="(item, index) in billList" :key="item.id">
+					<view class="top">
+						账单日期: {{current?item.month:item.create_time}}
+					</view>
+					<view class="bottom">
+						<view class="text">
+							<view class="t_item" v-if="current==0">
+								<view class="t_title">任务名称：</view>
+								<view class="tips">{{item.remark}}</view>
+							</view>
+							<view class="t_item">
+								<view class="t_title">金额归属：</view>
+								<view class="tips">{{$store.state.app.userInfo.nickname}}</view>
+							</view>
+							<view class="t_item">
+								<view class="t_title">收益来源：</view>
+								<view class="tips">
+
+									<text v-if="item.change_type==202" style="color: #46be61;">{{item.type_desc}}</text>
+									<text v-else-if="item.change_type==203"
+										style="color: #ff7c32;">{{item.type_desc}}</text>
+									<text v-else="item.change_type==203">{{item.type_desc}}</text>
+								</view>
+							</view>
+						</view>
+						<view class="price">
+							{{current?(item.expenditure==0?'+'+item.income:'-'+item.income):item.change_amount_desc}}
+						</view>
+					</view>
+
+
+				</view>
+ -->
+
+				<view class="card" v-for="(item, index) in billList" :key="index">
+					<view class="top">
+						<view class="blue">账单详情</view>
+						<view>账单日期：{{current?item.month:item.create_time}}</view>
+					</view>
+					<view class="bottom">
+						<view class="left">
+							<view>收益金额(元)</view>
+							<view class="num">
+								{{current?(item.expenditure==0?item.income:'-'+item.income):item.change_amount_desc}}
+							</view>
+						</view>
+						<view class="right">
+							<view>支出金额:{{item.expenditure>0?item.expenditure:'0.00'}}</view>
+							<view>入账金额:{{item.income>0?item.income:'0.00'}}</view>
+						</view>
+					</view>
+				</view>
+
+				<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
+					:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
+			</view>
+			<!-- 月账单 -->
+			<view class="bill_list" v-show="current==1">
+				<view class="card" v-for="(item, index) in billListMonth" :key="index">
+					<view class="top">
+						<view class="blue">账单详情</view>
+						<view>账单日期：{{item.month}}</view>
+					</view>
+					<view class="bottom">
+						<view class="left">
+							<view>收益金额(元)</view>
+							<view class="num">{{item.income}}</view>
+						</view>
+						<view class="right">
+							<view>支出金额:{{item.expenditure>0?item.expenditure:'0.00'}}</view>
+							<view>入账金额:{{item.income>0?item.income:'0.00'}}</view>
+						</view>
+					</view>
+				</view>
+				<u-loadmore status="nomore" nomore-text="仅展示一年数据" />
+			</view>
+
+			<!-- <button class="btn" @click="navTo('/subpkg/withdrawDeposit/withdrawDeposit')">提现余额</button> -->
+		</view>
+	</view>
 </template>
 
 <script>
-import { accountLogLists, accountLogListsMonth } from "@/api/pay.js"
-import { userInfo } from "@/api/oaUser.js"
+	import {
+		accountLogLists,
+		accountLogListsMonth
+	} from "@/api/pay.js"
+	import {
+		userInfo
+	} from "@/api/oaUser.js"
 
-import { Toast } from '@/libs/uniApi.js'
-export default {
-  data() {
-    return {
-	  user_id:0,
-      userInfo:{},
-	  otherUserInfo:{},
-      billTypeList:['日账单','月账单'],
-      current: 0,
-      billList: [],
-      billListMonth: [],
-      loadConfig:{
-        page: 1,
-        limit: 25,
-        loadingText: '努力加载中',
-        loadmoreText: '轻轻上拉',
-        nomoreText: '没有更多账单了~~',
-        status: 'loadmore'
-      },
-    }
-  },
-  onLoad(e) {
-	  if(e.id>0){
-		  this.user_id=e.id
-		  
-	  }
-    this.loadBill()
-  },
-  onShow() {
-    // console.log(this.userInfo);
-	if(this.user_id==0){
-		this.userInfo = this.$store.state.app.userInfo;
-	}else{
-		this.OtherUserInfo()
-		
+	import {
+		Toast
+	} from '@/libs/uniApi.js'
+	export default {
+		data() {
+			return {
+				user_id: 0,
+				userInfo: {},
+				otherUserInfo: {},
+				billTypeList: ['日账单', '月账单'],
+				current: 0,
+				billList: [],
+				billListMonth: [],
+				loadConfig: {
+					page: 1,
+					limit: 25,
+					loadingText: '努力加载中',
+					loadmoreText: '轻轻上拉',
+					nomoreText: '没有更多账单了~~',
+					status: 'loadmore'
+				},
+			}
+		},
+		onLoad(e) {
+			if (e.id > 0) {
+				this.user_id = e.id
+
+			}
+			this.loadBill()
+		},
+		onShow() {
+			// console.log(this.userInfo);
+			if (this.user_id == 0) {
+				this.userInfo = this.$store.state.app.userInfo;
+			} else {
+				this.OtherUserInfo()
+
+			}
+		},
+		computed: {
+			eyeType() {
+				return this.$store.state.config.eyeType;
+			}
+		},
+		onBackPress() {
+			this.loadBill()
+
+		},
+		methods: {
+			navTo(url) {
+				url ?
+					uni.navigateTo({
+						url: url
+					}) : Toast('暂未开放')
+			},
+			async OtherUserInfo() {
+				let res = await userInfo({
+					id: this.user_id
+				});
+				this.userInfo = res.data
+			},
+			updateEye() {
+				this.$store.commit('SET_EYE_TYPE')
+			},
+			// 选择日账单月账单
+			changeBillType(type) {
+				this.current = type;
+				if (type == 1) this.loadBillMonth();
+			},
+			async loadBill() {
+				if (this.loadConfig.status == "nomore") return;
+				this.loadConfig.status = "loading"
+				let res = await accountLogLists({
+					type: 'um', //账户余额
+					page_no: this.loadConfig.page,
+					page_size: this.loadConfig.limit,
+					user_id: this.user_id
+				});
+				this.loadConfig.status = "loadmore"
+				if (res.data.lists.length < this.loadConfig.limit) {
+					this.loadConfig.status = "nomore"
+				} else {
+					this.loadConfig.page++;
+				}
+				this.billList = [...this.billList, ...res.data.lists];
+			},
+			async loadBillMonth() {
+				let res = await accountLogListsMonth();
+				let list = [];
+				for (let key in res.data) {
+					list.push(res.data[key])
+				}
+				this.billListMonth = list;
+			}
+		},
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		}
 	}
-  },
-  computed:{
-    eyeType(){
-      return this.$store.state.config.eyeType;
-    }
-  },
-  onBackPress() {
-    this.loadBill()
-	
-  },
-  methods: {
-    navTo(url) {
-      url ?
-        uni.navigateTo({
-          url: url
-        }) : Toast('暂未开放')
-    },
-	 async OtherUserInfo(){
-	  let res = await userInfo({
-		id:this.user_id
-	  });
-	  this.userInfo=res.data
-	},
-    updateEye(){
-      this.$store.commit('SET_EYE_TYPE')
-    },
-    // 选择日账单月账单
-    changeBillType(type){
-      this.current = type;
-      if(type==1)this.loadBillMonth();
-    },
-    async loadBill(){
-      if(this.loadConfig.status=="nomore")return;
-      this.loadConfig.status="loading"
-      let res = await accountLogLists({
-        type: 'um', //账户余额
-        page_no: this.loadConfig.page,
-        page_size: this.loadConfig.limit,
-		user_id:this.user_id
-      });
-      this.loadConfig.status="loadmore"
-      if(res.data.lists.length<this.loadConfig.limit){
-        this.loadConfig.status="nomore"
-      }else {
-        this.loadConfig.page++;
-      }
-      this.billList = [...this.billList, ...res.data.lists];
-    },
-    async loadBillMonth(){
-      let res = await accountLogListsMonth();
-      let list = [];
-      for(let key in res.data){
-        list.push(res.data[key])
-      }
-      this.billListMonth = list;
-    }
-  },
-  onPullDownRefresh() {
-      uni.stopPullDownRefresh()
-    }
-  }
 </script>
 
 <style lang="scss">
-page{
-  // background-color: #fff;
-}
-.finance_head{
-  background-color: $theme-oa-color;
-  height: 400rpx;
-  position: relative;
-  // box-shadow: 0 -10px 20px rgba(#fff, 0.9) inset;
-  background-image: linear-gradient(to top, rgba(#fff, 1), transparent);
-  // box-shadow: -10px -10px 40px rgba(#fff, 0.9);
-  background-size: 100% 35%;
-  background-repeat: no-repeat;
-  background-position: center bottom;
-  .top{
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    color: #fff;
-    padding: 10rpx 28rpx;
-    .left{
-      display: flex;
-      align-items: center;
-      flex: 1;
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #FFFFFF;
-      .name{
-        margin: 0 17.5rpx;
-      }
-      image{
-        width: 40rpx;
-        height: 40rpx;
-      }
-    }
-    .right{
-      font-size: 24.53rpx;
-      font-weight: 400;
-      color: #FFFFFF;
-    }
-  }
-  .center{
-    color: #fff;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    .title{
-      font-size: 25rpx;
-      font-weight: 400;
-      line-height: 39rpx;
-    }
-    .price{
-      font-size: 60rpx;
-      font-weight: bold;
-      line-height: 39rpx;
-      margin-top: 28rpx;
-      margin-bottom: 14rpx;
-    }
-    .bubble{
-      padding: 20rpx 28rpx 10rpx 28rpx;
-      background-image: url('../../static/img/contract/bubble.png');
-      background-repeat: no-repeat;
-      background-size: 100% 100%;
-      .text{
-      }
-    }
-  }
-  .bottom{
-    position: absolute;
-    bottom: -78rpx;
-    left: 50%;
-    transform: translateX(-50%);
-    width: 694rpx;
-    height: 140rpx;
-    background: #FFFFFF;
-    box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50,116,249,0.1);
-    border-radius: 14rpx 14rpx 14rpx 14rpx;
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-    .item{
-      text-align: center;
-      font-size: 25rpx;
-      font-weight: 400;
-      color: #666666;
-      line-height: 39rpx;
-      .num{
-        font-size: 39rpx;
-        font-weight: 500;
-        color: #F02828;
-        line-height: 39rpx;
-      }
-    }
-  }
-}
-.bill{
-  // padding: 28rpx;
-  // padding-top: 90rpx;
-  padding-bottom: 32rpx;
-  background-color: #f5f5f5;
-  .type_box{
-    background-color: #fff;
-    padding: 32rpx 0;
-    .type{
-      height: 53rpx;
-      width: 333rpx;
-      display: flex;
-      align-items: center;
-      overflow: hidden;
-      margin: 0 auto;
-      view{
-        flex: 1;
-        color: $theme-oa-color;
-        height: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border: 1px solid $theme-oa-color;
-        &:nth-child(1){
-          border-radius: 30rpx 0 0 30rpx;
-        }
-        &:nth-child(2){
-          border-radius: 0 30rpx 30rpx 0;
-        }
-      }
-      .active{
-        background-color: $theme-oa-color;
-        color: #fff;
-      }
-    }
-  }
-  .bill_list{
-    // background-color: #f5f5f5;
-    padding-bottom: 100rpx;
-    padding-top: 28rpx;
-    .card{
-      padding: 28rpx;
-      background-color: #fff;
-      margin-bottom: 21rpx;
-      .top{
-        display: flex;
-        align-items: center;
-        font-size: 25rpx;
-        font-weight: 400;
-        color: #333333FF;
-        line-height: 39rpx;
-        .blue{
-          width: 137rpx;
-          height: 49rpx;
-          background: $theme-oa-color;
-          border-radius: 26rpx 26rpx 26rpx 26rpx;
-          font-size: 25rpx;
-          font-weight: 400;
-          color: #FFFFFF;
-          line-height: 39rpx;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          margin-right: 28rpx;
-        }
-      }
-      .bottom{
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        height: 160rpx;
-        .left{
-          flex: 1;
-          text-align: center;
-          font-size: 25rpx;
-          font-weight: 400;
-          color: #666666;
-          line-height: 39rpx;
-          .num{
-            font-size: 39rpx;
-            font-weight: 500;
-            color: #F02828;
-            line-height: 39rpx;
-          }
-        }
-        .right{
-          flex: 1;
-          font-size: 25rpx;
-          font-weight: 400;
-          color: #666666;
-          line-height: 39rpx;
-        }
-      }
-    }
-    .item {
-        margin: 0 auto;
-        margin-bottom: 28rpx;
-        width: 694rpx;
-        // height: 238rpx;
-        background: #FFFFFF;
-        border-radius: 14rpx 14rpx 14rpx 14rpx;
-        opacity: 1;
-        padding: 28rpx;
+	page {
+		// background-color: #fff;
+	}
 
-        .top {
-          margin-bottom: 28rpx;
-          font-size: 25rpx;
-          font-family: PingFang SC-Regular, PingFang SC;
-          font-weight: 400;
-          color: #333333;
+	.finance_head {
+		background-color: $theme-oa-color;
+		height: 400rpx;
+		position: relative;
+		// box-shadow: 0 -10px 20px rgba(#fff, 0.9) inset;
+		background-image: linear-gradient(to top, rgba(#fff, 1), transparent);
+		// box-shadow: -10px -10px 40px rgba(#fff, 0.9);
+		background-size: 100% 35%;
+		background-repeat: no-repeat;
+		background-position: center bottom;
 
-          &:before {
-            display: inline-block;
-            content: '账单详情';
-            width: 137rpx;
-            height: 49rpx;
-            line-height: 49rpx;
-            text-align: center;
-            background: #3274F9;
-            border-radius: 26rpx 26rpx 26rpx 26rpx;
-            color: #fff;
-            margin-right: 28rpx;
-          }
-        }
+		.top {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			color: #fff;
+			padding: 10rpx 28rpx;
 
-        .bottom {
-          display: flex;
-          justify-content: space-between;
+			.accont {
+				// background-color: red;
+				display: flex;
+				width: 32vw;
+				justify-content: space-between;
+				vertical-align: bottom;
+				line-height: 44px;
+			}
 
-          .text {
-            font-size: 25rpx;
-            font-weight: 400;
-            color: #999999;
-            line-height: 39rpx;
-            .t_item{
-              display: flex;
-              .t_title{
-                margin-bottom: 16rpx;
-                flex-shrink: 0 !important;
-              }
-              .tips{
-                font-size: 28rpx;
-                font-weight: 400;
-                color: #333333;
-              }
-            }
-          }
-          .price{
-            display: flex;
-            align-items: center;
-            font-size: 32rpx;
-            font-weight: 500;
-            color: #F02828;
-          }
-        }
-      }
-  }
-  
-  .btn{
-    color: #fff;
-    border-radius: 100px;
-    text-align: center;
-    line-height: 84.21rpx;
-    margin: 0 auto;
-    margin-top: 84.21rpx;
-    width: 693.93rpx;
-    height: 84.21rpx;
-    background: $theme-oa-color;
-    box-shadow: 0px 9px 26px 1px #E9EFF5;
-    position: fixed;
-    bottom: 0;
-    left: 50%;
-    transform: translate(-50%, -50%);
-  }
-}
-</style>
+
+			.left {
+				display: flex;
+				align-items: center;
+				flex: 1;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+
+				.name {
+					margin: 0 17.5rpx;
+				}
+
+				image {
+					width: 40rpx;
+					height: 40rpx;
+				}
+			}
+
+			.right {
+				font-size: 24.53rpx;
+				font-weight: 400;
+				color: #FFFFFF;
+			}
+		}
+
+		.center {
+			color: #fff;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.title {
+				font-size: 25rpx;
+				font-weight: 400;
+				line-height: 39rpx;
+			}
+
+			.price {
+				font-size: 60rpx;
+				font-weight: bold;
+				line-height: 39rpx;
+				margin-top: 28rpx;
+				margin-bottom: 14rpx;
+			}
+
+			.bubble {
+				padding: 20rpx 28rpx 10rpx 28rpx;
+				background-image: url('../../static/img/contract/bubble.png');
+				background-repeat: no-repeat;
+				background-size: 100% 100%;
+
+				.text {}
+			}
+		}
+
+		.bottom {
+			position: absolute;
+			bottom: -78rpx;
+			left: 50%;
+			transform: translateX(-50%);
+			width: 694rpx;
+			height: 140rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
+			border-radius: 14rpx 14rpx 14rpx 14rpx;
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
+
+			.item {
+				text-align: center;
+				font-size: 25rpx;
+				font-weight: 400;
+				color: #666666;
+				line-height: 39rpx;
+
+				.num {
+					font-size: 39rpx;
+					font-weight: 500;
+					color: #F02828;
+					line-height: 39rpx;
+				}
+			}
+		}
+	}
+
+	.bill {
+		// padding: 28rpx;
+		// padding-top: 90rpx;
+		padding-bottom: 32rpx;
+		background-color: #f5f5f5;
+
+		.type_box {
+			background-color: #fff;
+			padding: 32rpx 0;
+
+			.type {
+				height: 53rpx;
+				width: 333rpx;
+				display: flex;
+				align-items: center;
+				overflow: hidden;
+				margin: 0 auto;
+
+				view {
+					flex: 1;
+					color: $theme-oa-color;
+					height: 100%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					border: 1px solid #3274F9;
+
+					&:nth-child(1) {
+						border-radius: 30rpx 0 0 30rpx;
+					}
+
+					&:nth-child(2) {
+						border-radius: 0 30rpx 30rpx 0;
+					}
+				}
+
+				.active {
+					background-color: #3274F9;
+					color: #fff;
+				}
+			}
+		}
+
+		.bill_list {
+			// background-color: #f5f5f5;
+			padding-bottom: 100rpx;
+			padding-top: 28rpx;
+
+			.card {
+				padding: 28rpx;
+				background-color: #fff;
+				margin-bottom: 21rpx;
+
+				.top {
+					display: flex;
+					align-items: center;
+					font-size: 25rpx;
+					font-weight: 400;
+					color: #333333FF;
+					line-height: 39rpx;
+
+					.blue {
+						width: 137rpx;
+						height: 49rpx;
+						background: #3274F9;
+						border-radius: 26rpx 26rpx 26rpx 26rpx;
+						font-size: 25rpx;
+						font-weight: 400;
+						color: #FFFFFF;
+						line-height: 39rpx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						margin-right: 28rpx;
+					}
+				}
+
+				.bottom {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					height: 160rpx;
+
+					.left {
+						flex: 1;
+						text-align: center;
+						font-size: 25rpx;
+						font-weight: 400;
+						color: #666666;
+						line-height: 39rpx;
+
+						.num {
+							font-size: 39rpx;
+							font-weight: 500;
+							color: #F02828;
+							line-height: 39rpx;
+						}
+					}
+
+					.right {
+						flex: 1;
+						font-size: 25rpx;
+						font-weight: 400;
+						color: #666666;
+						line-height: 39rpx;
+					}
+				}
+			}
+
+			.item {
+				margin: 0 auto;
+				margin-bottom: 28rpx;
+				width: 694rpx;
+				// height: 238rpx;
+				background: #FFFFFF;
+				border-radius: 14rpx 14rpx 14rpx 14rpx;
+				opacity: 1;
+				padding: 28rpx;
+
+				.top {
+					margin-bottom: 28rpx;
+					font-size: 25rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+
+					&:before {
+						display: inline-block;
+						content: '账单详情';
+						width: 137rpx;
+						height: 49rpx;
+						line-height: 49rpx;
+						text-align: center;
+						background: #3274F9;
+						border-radius: 26rpx 26rpx 26rpx 26rpx;
+						color: #fff;
+						margin-right: 28rpx;
+					}
+				}
+
+				.bottom {
+					display: flex;
+					justify-content: space-between;
+
+					.text {
+						font-size: 25rpx;
+						font-weight: 400;
+						color: #999999;
+						line-height: 39rpx;
+
+						.t_item {
+							display: flex;
+
+							.t_title {
+								margin-bottom: 16rpx;
+								flex-shrink: 0 !important;
+							}
+
+							.tips {
+								font-size: 28rpx;
+								font-weight: 400;
+								color: #333333;
+							}
+						}
+					}
+
+					.price {
+						display: flex;
+						align-items: center;
+						font-size: 32rpx;
+						font-weight: 500;
+						color: #F02828;
+					}
+				}
+			}
+		}
+
+		.btn {
+			color: #fff;
+			border-radius: 100px;
+			text-align: center;
+			line-height: 84.21rpx;
+			margin: 0 auto;
+			margin-top: 84.21rpx;
+			width: 693.93rpx;
+			height: 84.21rpx;
+			background: $theme-oa-color;
+			box-shadow: 0px 9px 26px 1px #E9EFF5;
+			position: fixed;
+			bottom: 0;
+			left: 50%;
+			transform: translate(-50%, -50%);
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue
index 7305e4d..1adbbf3 100644
--- a/subpkg/personnel/personnel.vue
+++ b/subpkg/personnel/personnel.vue
@@ -58,7 +58,7 @@
 			<view class="personnel_list">
 				<view class="card" v-for="(item, index) in userList" :key="item.id">
 					<view class="card_head">
-						<text style="font-size: 32rpx">创建时间: 2020-25-2</text>
+						<text style="font-size: 32rpx">创建时间: {{item.create_time||"2020-10-10"}}</text>
 						<text @click="navTo('/subpkg/finance/finance?id='+item.id)">财务查看</text>
 						<text @click="navTo('/subpkg/personnelDetails/personnelDetails?id='+item.id)">信息查看</text>
 					</view>
@@ -71,8 +71,8 @@
 							</view>
 
 							<view style="margin-top: 40rpx;" @click="changeSign(item)">
-								<u-icon style="display: inline-block;margin-left: 10rpx;" color="white"
-									name="edit-pen-fill"></u-icon> {{item.is_contract?'已签约':'未签约'}}
+								<u-icon style="display: inline-block;" color="white" name="edit-pen-fill"></u-icon>
+								{{item.is_contract?'已签约':'未签约'}}
 							</view>
 						</view>
 						<view class="right">
@@ -234,7 +234,7 @@
 
 					.left {
 						text-align: center;
-						// padding: 15rpx 25rpx;
+						padding: 15rpx 25rpx;
 						padding-top: 20rpx;
 
 						margin-right: 50rpx;
@@ -247,7 +247,8 @@
 							width: 120rpx;
 							height: 120rpx;
 							background-color: #FFFFFF;
-							margin-left: 25rpx;
+							// margin-left: 25rpx;
+							padding: 0 25rpx;
 							border-radius: 120rpx;
 							position: relative;
 
diff --git a/subpkg/personnelDetails/personnelDetails.vue b/subpkg/personnelDetails/personnelDetails.vue
index 76b725c..20cc8e2 100644
--- a/subpkg/personnelDetails/personnelDetails.vue
+++ b/subpkg/personnelDetails/personnelDetails.vue
@@ -1,717 +1,719 @@
 <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">
-                <view>身份证号：{{userInfo.id_card}}</view>
-                <!-- <view class="update" @click="updateShow(userInfo.id_card, 'id_card')">
+	<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">
+								<view>身份证号：{{userInfo.id_card}}</view>
+								<!-- <view class="update" @click="updateShow(userInfo.id_card, 'id_card')">
                   <uni-icons type="compose" color="#F9AA32"></uni-icons>
                 </view> -->
-              </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, 'is_captain')">
-              <uni-icons type="compose" color="#F9AA32"></uni-icons>
-            </view>
-          </view>
-          <view class="bottom">
-            负责区域：<text>{{(userInfo.street_name||'')+(userInfo.village_name||'')+(userInfo.brigade_name||'')}}</text>
-          </view>
-          <u-popup :show="show.is_captain" :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.is_captain=false">取消</view>
-                <view @click="updateInfo('is_captain')">确认</view>
-              </view>
-            </view>
-          </u-popup>
-          <u-popup :show="show.id_card" :round="10" mode="center">
-            <view class="popup">
-              <view class="p_title">修改信息</view>
-              <u--form style="padding: 0 28rpx;">
-                <u-form-item label="身份证号:" labelWidth="auto" labelPosition="top">
-                  <u--input style="border:1px solid #3175f9;" v-model="updateForm.id_card"></u--input>
-                </u-form-item>
-              </u--form>
-              <view class="p_button">
-                <view @click="show.id_card=false">取消</view>
-                <view @click="updateInfo('id_card')">确认</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.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>
-        <view class="c_item"
-          v-if="userInfo.qualification&&userInfo.qualification.car_card||(userInfo.qualification&&userInfo.qualification.car_card)">
-          <uni-section style="background-color: transparent;" title="驾驶证" titleFontSize="32rpx" type="line">
-          </uni-section>
-          <view class="card_box">
-            <image v-if="userInfo.qualification&&userInfo.qualification.car_card"
-              :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 v-if="userInfo.qualification&&userInfo.qualification.car_card"
-              :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>
+							<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, 'is_captain')">
+							<uni-icons type="compose" color="#F9AA32"></uni-icons>
+						</view>
+					</view>
+					<view class="bottom">
+						负责区域：<text>{{(userInfo.street_name||'')+(userInfo.village_name||'')+(userInfo.brigade_name||'')}}</text>
+					</view>
+					<u-popup :show="show.is_captain" :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.is_captain=false">取消</view>
+								<view @click="updateInfo('is_captain')">确认</view>
+							</view>
+						</view>
+					</u-popup>
+					<u-popup :show="show.id_card" :round="10" mode="center">
+						<view class="popup">
+							<view class="p_title">修改信息</view>
+							<u--form style="padding: 0 28rpx;">
+								<u-form-item label="身份证号:" labelWidth="auto" labelPosition="top">
+									<u--input style="border:1px solid #3175f9;" v-model="updateForm.id_card"></u--input>
+								</u-form-item>
+							</u--form>
+							<view class="p_button">
+								<view @click="show.id_card=false">取消</view>
+								<view @click="updateInfo('id_card')">确认</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.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>
+				<view class="c_item"
+					v-if="userInfo.qualification&&userInfo.qualification.car_card||(userInfo.qualification&&userInfo.qualification.car_card)">
+					<uni-section style="background-color: transparent;" title="驾驶证" titleFontSize="32rpx" type="line">
+					</uni-section>
+					<view class="card_box">
+						<image v-if="userInfo.qualification&&userInfo.qualification.car_card"
+							: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 v-if="userInfo.qualification&&userInfo.qualification.car_card"
+							: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>
 
-      </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||(userInfo.contract&&userInfo.contract.check_status==0)"
-          :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 class="right" @click="naviToContract(userInfo.contract.contract_no)">
-              <!-- <image class="icon"></image> -->
-              <uni-icons type="paperclip" color="#3274F9"></uni-icons>
-              <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 class="right" @click="naviToContract(userInfo.contract.contract_no)">
-              <!-- <image class="icon"></image> -->
-              <uni-icons type="paperclip" color="#3274F9"></uni-icons>
-              <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>
+			</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||(userInfo.contract&&userInfo.contract.check_status==0)"
+					: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 class="right" @click="naviToContract(userInfo.contract.contract_no)">
+							<!-- <image class="icon"></image> -->
+							<uni-icons type="paperclip" color="#3274F9"></uni-icons>
+							<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 class="right" @click="naviToContract(userInfo.contract.contract_no)">
+							<!-- <image class="icon"></image> -->
+							<uni-icons type="paperclip" color="#3274F9"></uni-icons>
+							<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>
+	</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"
-  import {
-    download_file
-  } from "@/api/junziqian.js"
-  export default {
-    onReady() {
-      uni.setNavigationBarColor({
-        frontColor: '#ffffff',
-        backgroundColor: '#3175f9'
-      })
-    },
-    data() {
-      return {
-        id: '',
-        skeleton: true,
-        show: {
-          is_captain: false,
-          id_card: false,
-        },
-        typeShow: false,
-        timer: null, // 计时器
-        timerCount: 0, //倒计时
-        updateForm: {
-          is_captain: 0,
-          id_card: '',
-        },
-        userInfo: {
-          qualification: {},
-          contract: {},
-          roles: {}
-        },
-        contractTypeList: []
-      }
-    },
-    onLoad(options) {
-      if (options.id) this.id = options.id;
-      this.initContractTypeList();
-      this.loadUserDetail();
-      let time = uni.getStorageSync('time' + this.id);
-      if (time > 0 && (time - Date.now()) / 1000 > 0) {
-        this.startTimer((time - Date.now()) / 1000);
-      }
-    },
-    onUnload() {
-      if (this.timerCount > 0) uni.setStorageSync('time' + this.id, this.timerCount * 1000 + Date.now());
-    },
-    computed: {
-      cTimerCount() {
-        return this.timerCount;
-      }
-    },
-    methods: {
-      // 查看合同
-      naviToContract(contract_no) {
-        if (this.userInfo.is_contract) {
-          download_file({
-            applyNo: contract_no
-          }).then(res => {
-            if (res.code != 1) {
-              Toast(res.msg)
-            }
-            uni.navigateTo({
-              url: `/subpkg/pdfView/pdfView?url=${res.data.url}`
-            })
-          })
-        } else uni.navigateTo({
-          url: `/subpkg/pdfView/pdfView?url=${this.userInfo?.contract?.file}`
-        })
-      },
-      navTo(url) {
-        url ?
-          uni.navigateTo({
-            url: url,
-          }) : Toast('暂未开放')
-      },
-      updateShow(value, type) {
-        this.updateForm[type] = value;
-        this.show[type] = true;
-      },
-      // 更新信息
-      async updateInfo(type) {
-        try {
-          let form = {
-            user_id: this.userInfo.id,
-          };
-          form[type] = this.updateForm[type];
-          let res = await loginSetInfo(form);
-          this.userInfo[type] = this.updateForm[type];
-          Toast('更新成功');
-          this.show = false;
-        } catch (e) {
-          Toast(e.msg || '更新失败')
-        }
-      },
-      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;
-      },
-      // 生成合同
-      createContract(data) {
-        uni.showModal({
-          content: '请检查信息无误后再生成合同',
-          confirmText: '确认无误',
-          cancelText: '我再看看',
-          confirmColor: '#3175f9',
-          success: async (e) => {
-            if (e.confirm) {
-              uni.showLoading({
-                title: '合同生成中',
-                mask: true
-              })
-              let res = await userInitiateContract({
-                party_b: data.party_b,
-                contract_type: data.contract_type,
-                type: data.type
-              })
-              this.loadUserDetail();
-              uni.hideLoading();
-              Toast('合同已生成');
-              this.navTo('/subpkg/submit/submit?type=' + 1);
-            }
-          }
-        })
-      },
-      // 发送合同
-      async addContract(data) {
-        uni.showModal({
-          content: '请检查合同无误后再发送',
-          confirmText: '确认无误',
-          cancelText: '我再看看',
-          confirmColor: '#3175f9',
-          success: async (e) => {
-            if (e.confirm) {
-              try {
-                uni.showLoading({
-                  title: '合同发送中',
-                  mask: true
-                })
-                let res = await userDraftingcontracts({
-                  id: this.userInfo.id
-                });
-                this.loadUserDetail();
-                this.startTimer();
-                uni.hideLoading();
-                Toast('合同已发送');
-                // this.navTo('/subpkg/submit/submit?type='+2);
-              } catch (e) {
-                uni.hideLoading();
-                Toast(e.msg || '合同发送失败');
-              }
-            }
-          }
-        })
-      },
-      // 发送短信
-      async getPostsms() {
-        try {
-          uni.showLoading({
-            title: '发送中',
-            mask: true
-          })
-          if (this.timerCount == 0) {
-            this.startTimer();
-            let res = await userPostsms({
-              id: this.userInfo.id
-            })
-            uni.hideLoading();
-            Toast('短信已发送');
-            // this.navTo('/subpkg/submit/submit?type='+3);
-          }
-        } catch (e) {
-          uni.hideLoading();
-          Toast(e.msg || '合同发送失败');
-        }
-      },
-      // 定时器
-      startTimer(time = 60) {
-        this.timerCount = time.toFixed(0);
-        this.timer = setInterval(() => {
-          this.timerCount--;
-          if (this.timerCount <= 0) {
-            clearInterval(this.timer);
-            this.loadUserDetail();
-          }
-        }, 1000);
-      },
-      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: {
+					is_captain: false,
+					id_card: false,
+				},
+				typeShow: false,
+				timer: null, // 计时器
+				timerCount: 0, //倒计时
+				updateForm: {
+					is_captain: 0,
+					id_card: '',
+				},
+				userInfo: {
+					qualification: {},
+					contract: {},
+					roles: {}
+				},
+				contractTypeList: []
+			}
+		},
+		onLoad(options) {
+			if (options.id) this.id = options.id;
+			this.initContractTypeList();
+			this.loadUserDetail();
+			let time = uni.getStorageSync('time' + this.id);
+			if (time > 0 && (time - Date.now()) / 1000 > 0) {
+				this.startTimer((time - Date.now()) / 1000);
+			}
+		},
+		onUnload() {
+			if (this.timerCount > 0) uni.setStorageSync('time' + this.id, this.timerCount * 1000 + Date.now());
+		},
+		computed: {
+			cTimerCount() {
+				return this.timerCount;
+			}
+		},
+		methods: {
+			// 查看合同
+			naviToContract(contract_no) {
+				if (this.userInfo.is_contract) {
+					download_file({
+						applyNo: contract_no
+					}).then(res => {
+						if (res.code != 1) {
+							Toast(res.msg)
+						}
+						uni.navigateTo({
+							url: `/subpkg/pdfView/pdfView?url=${res.data.url}`
+						})
+					})
+				} else uni.navigateTo({
+					url: `/subpkg/pdfView/pdfView?url=${this.userInfo?.contract?.file}`
+				})
+			},
+			navTo(url) {
+				url ?
+					uni.navigateTo({
+						url: url,
+					}) : Toast('暂未开放')
+			},
+			updateShow(value, type) {
+				this.updateForm[type] = value;
+				this.show[type] = true;
+			},
+			// 更新信息
+			async updateInfo(type) {
+				try {
+					let form = {
+						user_id: this.userInfo.id,
+					};
+					form[type] = this.updateForm[type];
+					let res = await loginSetInfo(form);
+					this.userInfo[type] = this.updateForm[type];
+					Toast('更新成功');
+					this.show = false;
+				} catch (e) {
+					Toast(e.msg || '更新失败')
+				}
+			},
+			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;
+			},
+			// 生成合同
+			createContract(data) {
+				uni.showModal({
+					content: '请检查信息无误后再生成合同',
+					confirmText: '确认无误',
+					cancelText: '我再看看',
+					confirmColor: '#3175f9',
+					success: async (e) => {
+						if (e.confirm) {
+							uni.showLoading({
+								title: '合同生成中',
+								mask: true
+							})
+							let res = await userInitiateContract({
+								party_b: data.party_b,
+								contract_type: data.contract_type,
+								type: data.type
+							})
+							this.loadUserDetail();
+							uni.hideLoading();
+							Toast('合同已生成');
+							this.navTo('/subpkg/submit/submit?type=' + 1);
+						}
+					}
+				})
+			},
+			// 发送合同
+			async addContract(data) {
+				uni.showModal({
+					content: '请检查合同无误后再发送',
+					confirmText: '确认无误',
+					cancelText: '我再看看',
+					confirmColor: '#3175f9',
+					success: async (e) => {
+						if (e.confirm) {
+							try {
+								uni.showLoading({
+									title: '合同发送中',
+									mask: true
+								})
+								let res = await userDraftingcontracts({
+									id: this.userInfo.id
+								});
+								this.loadUserDetail();
+								this.startTimer();
+								uni.hideLoading();
+								Toast('合同已发送');
+								// this.navTo('/subpkg/submit/submit?type='+2);
+							} catch (e) {
+								uni.hideLoading();
+								Toast(e.msg || '合同发送失败');
+							}
+						}
+					}
+				})
+			},
+			// 发送短信
+			async getPostsms() {
+				try {
+					uni.showLoading({
+						title: '发送中',
+						mask: true
+					})
+					if (this.timerCount == 0) {
+						this.startTimer();
+						let res = await userPostsms({
+							id: this.userInfo.id
+						})
+						uni.hideLoading();
+						Toast('短信已发送');
+						// this.navTo('/subpkg/submit/submit?type='+3);
+					}
+				} catch (e) {
+					uni.hideLoading();
+					Toast(e.msg || '合同发送失败');
+				}
+			},
+			// 定时器
+			startTimer(time = 60) {
+				this.timerCount = time.toFixed(0);
+				this.timer = setInterval(() => {
+					this.timerCount--;
+					if (this.timerCount <= 0) {
+						clearInterval(this.timer);
+						this.loadUserDetail();
+					}
+				}, 1000);
+			},
+			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 {
-          flex: 1;
-          display: flex;
-          flex-direction: column;
-          justify-content: space-between;
+				.text {
+					flex: 1;
+					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; /* 使用省略号表示被隐藏的文本 */
+						}
+					}
 
-          .id_card {
-            display: flex;
-            justify-content: space-between;
-          }
-        }
-      }
+					.id_card {
+						display: flex;
+						justify-content: space-between;
+					}
+				}
+			}
 
-      .bottom {
-        .update {
-          display: flex;
-          align-items: center;
-          color: #F9AA32;
-        }
-      }
+			.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;
+			.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_title {
+					margin-top: 20rpx;
+					text-align: center;
+					font-weight: bold;
+					font-size: 33rpx;
+				}
 
-        .p_body {
-          margin: 28rpx;
-        }
+				.p_body {
+					margin: 28rpx;
+				}
 
-        .p_button {
-          display: flex;
-          border-top: 1rpx solid #ccc;
+				.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;
+					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;
-            }
-          }
-        }
-      }
-    }
-  }
+						&:nth-child(1) {
+							border-left: none;
+							color: #333;
+						}
+					}
+				}
+			}
+		}
+	}
 
-  .certification {
-    margin-bottom: 28rpx;
+	.certification {
+		margin-bottom: 28rpx;
 
-    .title {
-      margin-bottom: 0;
-    }
+		.title {
+			margin-bottom: 0;
+		}
 
-    .c_item {
-      width: 694rpx;
+		.c_item {
+			width: 694rpx;
 
-      .card_box {
-        display: flex;
-        justify-content: space-between;
+			.card_box {
+				display: flex;
+				justify-content: space-between;
 
-        image {
-          width: 336rpx;
-          height: 238rpx;
-          background: #FFFFFF;
-          border-radius: 14rpx 14rpx 14rpx 14rpx;
-          border: 2rpx solid #CCCCCC;
-        }
-      }
-    }
-  }
+				image {
+					width: 336rpx;
+					height: 238rpx;
+					background: #FFFFFF;
+					border-radius: 14rpx 14rpx 14rpx 14rpx;
+					border: 2rpx solid #CCCCCC;
+				}
+			}
+		}
+	}
 
-  .contract {
-    margin-bottom: 28rpx;
+	.contract {
+		margin-bottom: 28rpx;
 
-    .title {
-      width: 694rpx;
-    }
+		.title {
+			width: 694rpx;
+		}
 
 
-    .card {
-      padding-top: 0;
+		.card {
+			padding-top: 0;
 
-      .contract_box {
-        display: flex;
-        justify-content: space-between;
+			.contract_box {
+				display: flex;
+				justify-content: space-between;
 
-        .left {
-          display: flex;
+				.left {
+					display: flex;
 
-          .contract_img {
-            width: 102rpx;
-            height: 102rpx;
-            background: #F5F5F5;
-            border-radius: 14rpx 14rpx 14rpx 14rpx;
-            margin-right: 21rpx;
-          }
+					.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;
+					.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;
-            }
+						.name {
+							font-size: 32rpx;
+							;
+							font-weight: 500;
+							color: rgba(0, 0, 0, 0.8);
+							line-height: 35rpx;
+						}
 
-            .nickname {
-              margin-right: 35rpx;
-            }
+						.nickname {
+							margin-right: 35rpx;
+						}
 
-            text {
-              height: 39rpx;
-              font-size: 28rpx;
-              font-weight: 400;
-              color: #666666;
-              line-height: 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;
+				.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
-          }
-        }
+					.icon {
+						width: 35rpx;
+						height: 39rpx;
+						background-color: #3274F9;
+						opacity: 1;
+						margin-right: 10rpx
+					}
+				}
 
-      }
+			}
 
-      .send {
-        padding-top: 28rpx;
-      }
+			.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;
-      }
+			.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;
-      }
-    }
+			.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;
-    }
+		.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;
-    }
-  }
+		.tips_center {
+			background-color: #666;
+			color: #eee;
+		}
+	}
 </style>
\ No newline at end of file