diff --git a/App.vue b/App.vue
index 6125b89..52058dd 100644
--- a/App.vue
+++ b/App.vue
@@ -1,51 +1,55 @@
 <script>
 	//#ifdef APP-PLUS
 	const jpushModule = uni.requireNativePlugin("JG-JPush");
-  import Updater from '@/uni_modules/guyue-updater/index';
+	import Updater from '@/uni_modules/guyue-updater/index';
 	// #endif
 	export default {
 		onLaunch: async function() {
+			// let noticeArr = []
+			// jpushModule.addNotificationListener(res => {
+			// 	if (!noticeArr.includes(res.messageID)) {
+			// 		const audioContext = uni.createInnerAudioContext()
+			// 		// 设置音频文件地址
+			// 		audioContext.src = `/static/audio/order.mp3`;
+			// 		// console.log(res.messageID)
+			// 		audioContext.play()
+			// 		noticeArr.push(res.messageID)
+			// 		console.log("app的监听")
+			// 	}
+			// })
 			console.log('App Launch')
-      this.$store.dispatch('initConfig');
-      try {
-      	if (!this.$store.state.app.token) uni.reLaunch({
-      		url: '/pages/oaLogin/oaLogin'
-      	})
-      } catch (e) {
-      	uni.reLaunch({
-      		url: '/pages/oaLogin/oaLogin'
-      	})
-      }
+			this.$store.dispatch('initConfig');
+			try {
+				if (!this.$store.state.app.token) uni.reLaunch({
+					url: '/pages/oaLogin/oaLogin'
+				})
+			} catch (e) {
+				uni.reLaunch({
+					url: '/pages/oaLogin/oaLogin'
+				})
+			}
 		},
 		onShow: function() {
 			const audioContext = uni.createInnerAudioContext()
 			// 设置音频文件地址
-			audioContext.src = './static/mp3/order.mp3'
-			let noticeArr = []
+			audioContext.src = '/static/mp3/order.mp3'
 			// 播放音频
 			//#ifdef APP-PLUS
 			jpushModule.addNotificationListener(res => {
-				if (!noticeArr.includes(res.messageID)) {
-					console.log(res.messageID)
-					audioContext.play()
-					noticeArr.push(res.messageID)
-					console.log("app的")
-					uni.vibrateLong({
-						success: function() {
-							console.log('success');
-						}
-					});
-				}
+				if (res.notificationEventType == 'notificationOpened') return
+				audioContext.play()
+				uni.vibrateLong();
+				console.log("app的监听")
 			})
-      // 版本更新
-      // Updater.update({
-      //   title: '发现新版本',
-      //   content: '1. 我们更新了新的UI设计\n2. 我们更新了新的UI设计\n3. 我们更新了新的UI设计\n4. 我们更新了新的UI设计\n',
-      //   versionName: '1.3.6',
-      //   downUrl: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/__UNI__B5B1EDD__20230816174515.apk',
-      //   force: false, // 是否强制更新
-      //   quiet: false // 是否静默更新
-      // })
+			// 版本更新
+			// Updater.update({
+			//   title: '发现新版本',
+			//   content: '1. 我们更新了新的UI设计\n2. 我们更新了新的UI设计\n3. 我们更新了新的UI设计\n4. 我们更新了新的UI设计\n',
+			//   versionName: '1.3.6',
+			//   downUrl: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/__UNI__B5B1EDD__20230816174515.apk',
+			//   force: false, // 是否强制更新
+			//   quiet: false // 是否静默更新
+			// })
 			// #endif
 			console.log('App Show')
 		},
diff --git a/api/property.js b/api/property.js
index 942acec..21334e1 100644
--- a/api/property.js
+++ b/api/property.js
@@ -1,19 +1,24 @@
-import oahttp from "@/utils/logistics.js";
+import oahttp from "@/utils/oahttp.js";;
 
 /**
  * 车辆列表
  */
-export const getvehicleList = (data) => oahttp.get('/courierLstData', data)
+// https://worker-task.lihaink.cn/api/vehicle/addCar
+export const getvehicleListApi = (data) => oahttp.get('/vehicle/vehicleIndex', data)
 // 车辆详情
-export const getvehicleDetail = (data) => oahttp.get('/courierLstData', data)
+export const getvehicleDetailApi = (data) => oahttp.get('/courierLstData', data)
+// 车辆上传
+export const upVehicleApi = (data) => oahttp.post('/vehicle/addCar', data)
+// 申请用车
+export const applycarApi = (data) => oahttp.post('/vehicle/addCar', data)
 // 显示轨迹
 export const locusApi = (data) => oahttp.get('/courierLstData', data)
 // 签约列表
-export const getAgencyList = (data) => oahttp.get('/courierLstData', data)
+export const getAgencyListApi = (data) => oahttp.get('/courierLstData', data)
 // 签约公司详情
-export const getAgencyDetail = (data) => oahttp.get('/courierLstData', data)
+export const getAgencyDetailApi = (data) => oahttp.get('/courierLstData', data)
 // 车辆租赁
-export const leaseApi = (data) => oahttp.get('/courierLstData', data)
+export const leaseApi = (data) => oahttp.post('/vehicle/setContractByTownCompany', data)
 // 生成合同
 export const contractApi = (data) => oahttp.get('/courierLstData', data)
 // 申请驳回
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index d51e2ae..26ccd15 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -6,8 +6,25 @@
       class="home_header"
       :class="!ApproveList.length > 0 ? 'home_header_no_data' : ''"
     >
-      <view style="position: absolute;bottom: 0;left: 0;overflow: hidden;border-radius: 0 0 30rpx 30rpx;">
-        <hx-lottie :options="options" ref="lottie" style="width: 100vw;height: 440rpx;transform: scale(1.2);background-color: #0122c7;"/>
+      <view
+        style="
+          position: absolute;
+          bottom: 0;
+          left: 0;
+          overflow: hidden;
+          border-radius: 0 0 30rpx 30rpx;
+        "
+      >
+        <hx-lottie
+          :options="options"
+          ref="lottie"
+          style="
+            width: 100vw;
+            height: 440rpx;
+            transform: scale(1.2);
+            background-color: #0122c7;
+          "
+        />
       </view>
       <!-- #ifdef APP-PLUS||H5 -->
       <view style="height: var(--status-bar-height)"></view>
@@ -123,6 +140,7 @@
       <!-- <block v-if="myTaskList.length>0">
    		<taskCard></taskCard>
    	</block> -->
+      <!-- <button @click="test">按钮</button> -->
       <view v-if="orderList.length > 0">
         <globalPopup ref="globalPopup"></globalPopup>
         <logistiBriefCard
@@ -277,24 +295,24 @@ export default {
     // this.initOaHomeDada();
     this.getOrderList();
     // console.log(this.oaHomeData, this.oaHomeData.length==0);
-    if(this.oaHomeData.length==0){
-      this.$nextTick(()=>{
+    if (this.oaHomeData.length == 0) {
+      this.$nextTick(() => {
         this.$store.dispatch('initConfig');
       })
     }
   },
   computed: {
-    oaHomeData(){
+    oaHomeData () {
       const route = getCurrentPages()[0]?.route;
       let arr = [];
-      this.$store.state.config?.config?.menu?.forEach((item)=>{
-        if(item.paths.includes(route)){
-          arr=item.children;
+      this.$store.state.config?.config?.menu?.forEach((item) => {
+        if (item.paths.includes(route)) {
+          arr = item.children;
         }
       })
-      if(arr.length>=8){
+      if (arr.length >= 8) {
         arr = arr.slice(0, 7);
-        let obj = this.$store.state.config?.config?.menu?.find(item=>item.paths.includes('/pages/moreFun/moreFun'));
+        let obj = this.$store.state.config?.config?.menu?.find(item => item.paths.includes('/pages/moreFun/moreFun'));
         arr.push(obj);
       }
       return arr;
@@ -384,29 +402,29 @@ export default {
       });
     },
     navTo (url) {
-      if(url){
+      if (url) {
         uni.showLoading({
           title: '加载中',
           mask: true
         });
         uni.navigateTo({
-        	url: url,
-          success() {
+          url: url,
+          success () {
             uni.hideLoading()
           },
           fail () {
             uni.switchTab({
               url: url,
-              success() {
+              success () {
                 uni.hideLoading()
               },
-              fail() {
+              fail () {
                 uni.hideLoading()
               }
             });
           },
         })
-      }else Toast('暂未开放')
+      } else Toast('暂未开放')
     },
     navTwo (url, key) {
       // let role_id = this.$store.state.app?.userInfo?.admin?.role_id || null;
@@ -514,6 +532,7 @@ export default {
         transform: translate(-50%, -50%);
       }
     }
+
     .head_text {
       font-size: 33rpx;
       text-overflow: ellipsis;
diff --git a/subpkg/property/chosseCompany.vue b/subpkg/property/chosseCompany.vue
index 5b78441..7c085b4 100644
--- a/subpkg/property/chosseCompany.vue
+++ b/subpkg/property/chosseCompany.vue
@@ -63,7 +63,7 @@
 		<view class="btns">
 			<u-button type="primary" @click="showPop=true" style="margin-bottom: 20rpx;width: 100%;" color="#FF7C32"
 				text="申请驳回"></u-button>
-			<u-button type="primary" text="生成合同" color="#0122C7"></u-button>
+			<u-button type="primary" text="生成合同" @tap="contractFn" color="#0122C7"></u-button>
 		</view>
 		<view class="">
 			<u-modal :show="showPop" @close="showPop=false" @confirm="confirm" :closeOnClickOverlay="true"
@@ -86,19 +86,36 @@
 		contractApi,
 		overruleApi
 	} from "@/api/property.js"
+	import {
+		Toast
+	} from "../../libs/uniApi"
 	export default {
 		data() {
 			return {
+				dataList: [],
 				overruleValue: "",
 				showPop: false,
 				checked: [],
 				carList: [1, 2]
 			}
 		},
+		onLaunch() {
+			getAgencyDetail().then(res => {
+				this.dataList = res
+			})
+		},
 		methods: {
 			confirm() {
-				console.log(this.overruleValue)
-				this.showPop = false
+				// console.log(this.overruleValue)
+				overruleApi().then(res => {
+					Toast("操作成功")
+					this.showPop = false
+				})
+			},
+			contractFn() {
+				contractApi().then(res => {
+					Toast("操作成功")
+				})
 			},
 			navTo(url) {
 				uni.navigateTo({
@@ -113,11 +130,9 @@
 <style lang="scss" scoped>
 	.date {
 		padding: 10rpx 28rpx 0;
-
 	}
 
 	.cards {
-
 		margin: 28rpx;
 		width: 694rpx;
 		background: #ffffff;
diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue
index 8ce8869..7a0c539 100644
--- a/subpkg/property/index.vue
+++ b/subpkg/property/index.vue
@@ -1,180 +1,156 @@
 <template>
-	<view>
-		<!-- <view class="serch">
-			<u-search placeholder="输入车牌号进行搜索" :show-action="true" bg-color="white" v-model="keywords" @search="serchFn"
-				@custom="serchFn"></u-search>
-		</view> -->
-		<view class="info">
-			<text>可监管车辆数量 10</text>
-			<view @click="showPop=true" class="not_leased">
+	<view class="">
+		<!-- 没有测含量 -->
+		<view class="noCar" v-if='dataList.length==0'>
+			<!-- 申请 -->
+			<view class="" v-if="step==1">
 				<view class="">
-					租赁 10
+					你还没有所属车辆哦,请向镇公司申请用车或使用自有车辆并绑定系统
 				</view>
-				<view class="triangle-up" v-if="1">
+				<view class="" style="margin: 20rpx 0;">
+					<u-button @tap="applycarFn" type="primary" style="background-color: #0122C7;border: none;"
+						class="btn">
+						申请用车</u-button>
 				</view>
-				<view class="message_bottom" v-if="1">
-					可再租赁车辆:2辆
+				<view class="">
+					<u-button @tap="show=true" type="primary" style="background-color: #0122C7;border: none;"
+						class="btn">
+						上传自有车辆</u-button>
+				</view>
+				<u-modal :show="show" @close="show=false" @confirm="upCarFn" :closeOnClickOverlay="true" title="车辆上传">
+					<view class="slot-content">
+						<u--input placeholder="请输入您的车牌号" v-model="carLicense"></u--input>
+					</view>
+				</u-modal>
+			</view>
+			<!-- 等待 -->
+			<view class="" v-if='step==2'>
+				<view class="">
+					您已上传自用车辆,系统正在审核中,请耐心等待
 				</view>
 			</view>
-			<text>自有车辆 10</text>
 		</view>
-		<!-- 公告栏 -->
-		<view class="application_tit">
-			<view class="head" @click="navgo('/subpkg/property/agencyList')">
-				<text>签约申请</text>
-				<view style="display: flex;">
-					<text>更多 </text>
-					<u-icon name="arrow-right"></u-icon>
+		<view v-else>
+			<!-- <view class="serch">
+				<u-search placeholder="输入车牌号进行搜索" :show-action="true" bg-color="white" v-model="keywords" @search="serchFn"
+					@custom="serchFn"></u-search>
+			</view> -->
+			<view class="info">
+				<text>可监管车辆数量 10</text>
+				<view @click="showPop=true" class="not_leased">
+					<view class="">
+						租赁 10
+					</view>
+					<view class="triangle-up" v-if="1">
+					</view>
+					<view class="message_bottom" v-if="1">
+						可再租赁车辆:2辆
+					</view>
 				</view>
-
+				<text>自有车辆 10</text>
 			</view>
-			<view class="content">
-				<view class="li" @click="navgo('/subpkg/property/chosseCompany')"
-					v-for="item,index in applicationList.slice(0, 2)">
-					<view class="date">
-						<!-- {{item.}} -->
-					</view>
-					<view class="text">
-						<!-- {{item.}} -->
-					</view>
-					<view class="detail">
+			<!-- 公告栏 -->
+			<view class="application_tit">
+				<view class="head" @click="navgo('/subpkg/property/agencyList')">
+					<text>签约申请</text>
+					<view style="display: flex;">
+						<text>更多 </text>
 						<u-icon name="arrow-right"></u-icon>
 					</view>
+
 				</view>
-
-			</view>
-		</view>
-
-		<view v-if="true" class="personnel_list">
-			<view v-if="dataList.length">
-				<view class="cards" v-for="item,index in dataList" :key="index"
-					@click="navgo('/subpkg/property/vehicle_a')">
-					<view class="cards_head">
-						<text><!-- {{item.}} --></text>
+				<view class="content">
+					<view class="li" @click="navgo('/subpkg/property/chosseCompany')"
+						v-for="item,index in applicationList.slice(0, 2)">
+						<view class="date">
+							<!-- {{item.}} -->
+						</view>
+						<view class="text">
+							<!-- {{item.}} -->
+						</view>
+						<view class="detail">
+							<u-icon name="arrow-right"></u-icon>
+						</view>
 					</view>
-					<view class="cards_content">
-						<view class="right">
-							<!-- 已出租 -->
-							<view v-if="1">
-								<view class="li">
-									<text>使用人: </text>
-									<text> <!-- {{item.}} --></text>
-									<view style="float: right;">
-										<text style="color: green;" v-if="true">自有车辆</text>
-										<text style="color: orange;" v-else>租赁车辆</text>
+
+				</view>
+			</view>
+
+			<view v-if="true" class="personnel_list">
+				<view v-if="dataList.length">
+					<view class="cards" v-for="item,index in dataList" :key="index"
+						@click="navgo('/subpkg/property/vehicle_a')">
+						<view class="cards_head">
+							<text><!-- {{item.}} --></text>
+						</view>
+						<view class="cards_content">
+							<view class="right">
+								<!-- 已出租 -->
+								<view v-if="1">
+									<view class="li">
+										<text>使用人: </text>
+										<text> <!-- {{item.}} --></text>
+										<view style="float: right;">
+											<text style="color: green;" v-if="true">自有车辆</text>
+											<text style="color: orange;" v-else>租赁车辆</text>
+										</view>
+									</view>
+									<view class="li">
+										<text>联系方式: </text>
+										<text><!-- {{item.}} --></text>
+									</view>
+									<view class="li">
+										<text>所属公司: </text>
+										<text> <!-- {{item.}} --> </text>
+									</view>
+									<view class="li">
+										<text>签约时间: </text>
+										<text> <!-- {{item.}} --> </text>
 									</view>
-								</view>
-								<view class="li">
-									<text>联系方式: </text>
-									<text><!-- {{item.}} --></text>
-								</view>
-								<view class="li">
-									<text>所属公司: </text>
-									<text> <!-- {{item.}} --> </text>
-								</view>
-								<view class="li">
-									<text>签约时间: </text>
-									<text> <!-- {{item.}} --> </text>
-								</view>
 
 
-							</view>
-							<!-- 未出租 -->
-							<view class="" v-else>
-								<view class="li">
-									<text>车牌号: </text>
-									<text> <!-- {{item.}} --></text>
-									<view style="float: right;">
-										<text style="color: green;" v-if="true">自有车辆</text>
-										<text style="color: orange;" v-else>租赁车辆</text>
-									</view>
 								</view>
-								<view class="li">
-									暂未出租，快去选择承租对象吧！
+								<!-- 未出租 -->
+								<view class="" v-else>
+									<view class="li">
+										<text>车牌号: </text>
+										<text> <!-- {{item.}} --></text>
+										<view style="float: right;">
+											<text style="color: green;" v-if="true">自有车辆</text>
+											<text style="color: orange;" v-else>租赁车辆</text>
+										</view>
+									</view>
+									<view class="li">
+										暂未出租，快去选择承租对象吧！
+									</view>
 								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-			</view>
-			<view v-if="dataList.length==0&&!isNewCheck">
-				<view class="empty">
-					<!-- <view>
-						当前没有可以签约的的车辆,快去签约新车吧!
-					</view> -->
-					<!-- <u-button @click="showPop=true" type="primary" style="background-color: #0122C7;border: none;"
-						class="btn">
-						签约新车</u-button> -->
-				</view>
-			</view>
-			<!-- <view style="padding: 0 60rpx;" v-if="isNewCheck">
-				你已发起租赁{{newCarNum}}两新车的申请,后台正在为您加急处理中,请稍后~~
-			</view> -->
-		</view>
-		<!-- 
-		<view v-else>
-			<view class="personnel_list" @click="toDetail('/subpkg/property/vehicle_a')">
-				<view class="cards">
-					<view class="cards_head">
-						<text>车牌号</text>
-
-					</view>
-					<view class="cards_content">
-						<view class="right">
-							<view class="li">
-								<text>行驶总里程: </text>
-								<text> { item.name }</text>
-							</view>
-							<view class="li">
-								<text>本公司签约时间: </text>
-								<text>{ item.phone }</text>
-							</view>
-							<view class="li">
-								<text>承租公司: </text>
-								<text> 所属片区 </text>
-							</view>
-							<view class="li">
-								<text>负责人: </text>
-								<text> 所属片区 </text>
-							</view>
-							<view class="li">
-								<text>联系方式: </text>
-								<text> 所属片区 </text>
-							</view>
-							<view class="li">
-								<text>所属区域: </text>
-								<text> 所属片区 </text>
-							</view>
-							<view class="li">
-								<text>承租时间: </text>
-								<text> 所属片区 </text>
-							</view>
-						</view>
-
-
+				<view v-if="dataList.length==0&&!isNewCheck">
+					<view class="empty">
+						<!-- <view>
+							当前没有可以签约的的车辆,快去签约新车吧!
+						</view> -->
+						<!-- <u-button @click="showPop=true" type="primary" style="background-color: #0122C7;border: none;"
+							class="btn">
+							签约新车</u-button> -->
 					</view>
 				</view>
+				<!-- <view style="padding: 0 60rpx;" v-if="isNewCheck">
+					你已发起租赁{{newCarNum}}两新车的申请,后台正在为您加急处理中,请稍后~~
+				</view> -->
 			</view>
 
-
-		</view> -->
-
-		<u-modal :show="showPop" @close="showPop=false" @confirm="confirm" :closeOnClickOverlay="true"
-			:title="newcarTit">
-			<view class="slot-content">
-				<u--input placeholder="请输入内容" type="number" v-model="newCarNum"></u--input>
-			</view>
-		</u-modal>
-		<!-- <u-modal @close="show=false" @cancel="show=false" @confirm="relieveFn" :show="show" :showCancelButton="true"
-			:showConfirmButton='true' :content='content'></u-modal> -->
-		<view class="" v-if='!curNow && dataList.length>0'>
-			<!-- <view class="add" @click="showPop=true">
-				<u-icon name="plus-circle" color="#0122C7" size="60"></u-icon>
-				签约新车
-			</view> -->
-			<!-- <mybtn position="position" text="签约" @click="signFn">
-				<u-icon name="edit-pen-fill" color="white" size="20"></u-icon>
-			</mybtn> -->
+			<u-modal :show="showPop" @close="showPop=false" @confirm="confirm" :closeOnClickOverlay="true"
+				:title="`请输入您需要租赁的车辆数量(上限为${dataList[0]})`">
+				<view class="slot-content">
+					<u--input placeholder="请输入内容" type="number" v-model="newCarNum"></u--input>
+				</view>
+			</u-modal>
+			<!-- <u-modal @close="show=false" @cancel="show=false" @confirm="relieveFn" :show="show" :showCancelButton="true"
+				:showConfirmButton='true' :content='content'></u-modal> -->
 		</view>
 
 	</view>
@@ -184,9 +160,10 @@
 
 <script>
 	import {
-		getvehicleList,
-		getAgencyList,
-		leaseApi
+		getvehicleListApi,
+		getAgencyListApi,
+		leaseApi,
+		upVehicleApi
 	} from "@/api/property.js"
 	// import mybtn from "@/components/mybtn/mybtn.vue"
 	import {
@@ -200,10 +177,13 @@
 		name: "vehicle",
 		data() {
 			return {
+				step: 1,
 				applicationList: [1, 1],
-				isNewCheck: true,
+				// isNewCheck: true,
+				show: false,
+				carLicense: "",
 				showPop: false,
-				dataList: [1, 2, 3],
+				dataList: [],
 				tabLists: [{
 					name: '未出租',
 				}, {
@@ -218,10 +198,11 @@
 			};
 		},
 		onLoad() {
-			getvehicleList().then(res => {
+			getvehicleListApi().then(res => {
+				console.log(res)
 				// this.getvehicleList = res
 			})
-			getAgencyList().then(res => {
+			getAgencyListApi().then(res => {
 				// this.applicationList=res
 
 			})
@@ -230,18 +211,32 @@
 
 
 		methods: {
+			applycarFn() {
+				this.step = 2
+			},
+			upCarFn() {
+				upVehicleApi({
+					license: this.carLicense
+
+				}).then(res => {
+					this.show = false
+				})
+				console.log(this.carLicense)
+			},
 			signFn() {
 				this.toDetail("/subpkg/property/chosseCompany")
-
 			},
-			// serchFn() {
-			// 	console.log(this.keywords)
-			// },
 			confirm() {
 				if (!this.newCarNum) return
-				// leaseApi().then(res=>{})
+				leaseApi({
+					num: Number(this.newCarNum)
+				}).then(res => {
+					this.newCarNum = ""
+					Toast(res.msg)
+				})
 				this.showPop = false
-				this.isNewCheck = true
+
+				// this.isNewCheck = true
 
 
 			},
@@ -265,6 +260,11 @@
 		margin: 28rpx 28rpx 0 28rpx;
 	}
 
+	.noCar {
+		// background-color: red;
+		padding: 50rpx;
+	}
+
 	.info {
 		display: flex;
 		justify-content: space-around;
diff --git a/subpkg/property/vehicle_a.vue b/subpkg/property/vehicle_a.vue
index c35c35b..90d2ebd 100644
--- a/subpkg/property/vehicle_a.vue
+++ b/subpkg/property/vehicle_a.vue
@@ -22,7 +22,7 @@
 					<view class="personnel_list" @click="toDetail('/subpkg/property/vehicle')">
 						<view class="cards">
 							<view class="cards_head">
-								<text><!-- <!-- {{datas.}} --> --></text>
+								<text><!-- <!-- {{datas.}} --></text>
 							</view>
 							<view class="cards_content">
 								<view class="right">