diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue
index 4cf41d5..26e08bc 100644
--- a/components/companyFinance/companyFinance.vue
+++ b/components/companyFinance/companyFinance.vue
@@ -2,7 +2,7 @@
 	<view class="c_card">
 		<view class="f_card">
 			<view class="item" @click="navTo('/subpkg/topUp/topUp')">
-				<view>公司账户余额(元)</view>
+				<view>履约保证金(元)</view>
 				<view class="price" v-if="company.deposit">{{cCount(+company.deposit)}}</view>
 				<view class="price" v-else>0.00</view>
 			</view>
diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index 586e5c8..7df07cf 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -12,7 +12,9 @@
 						<view class="" style="display: flex;">
 							<view>任务状态 :</view>
 							<view class="text" style="color: #ff7c32;">
-								<block v-if="(datas.type==31||datas.type==32||datas.type==33)">
+                <text v-if="datas.status==3" style="color: #488F00;">已完成</text>
+                <text v-else-if="datas.status==5" style="color: #ccc;">已关闭</text>
+								<block v-else-if="(datas.type==31||datas.type==32||datas.type==33)">
 									<block v-if="datas.extend&&datas.extend.informationg">
 										{{(datas.extend.informationg.update?datas.extend.informationg.update:0)+'/'+(datas.extend.informationg.count?datas.extend.informationg.count:0)}}
 									</block>
diff --git a/main.js b/main.js
index ffca151..87658df 100644
--- a/main.js
+++ b/main.js
@@ -13,7 +13,7 @@ Vue.use(taskCard)
 Vue.use(mybtn)
 Vue.use(company)
 
-initRouter()
+// initRouter()
 
 // #ifndef VUE3
 import Vue from 'vue'
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 00a60c5..25a797e 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -406,15 +406,15 @@ export default {
       }else Toast('暂未开放')
     },
     navTwo (url, key) {
-      let role_id = this.$store.state.app?.userInfo?.admin?.role_id || null;
-      var arr = [3, 6];
+      // 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;
-        }
-      }
+      // if (role_id && role_id[0] == 9) {
+      //   if (arr.indexOf(key) == -1) {
+      //     Toast("请先成立公司后开放");
+      //     return false;
+      //   }
+      // }
       this.navTo(url);
     },
     // 点击公告
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index 861a13a..28496f9 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -132,7 +132,7 @@
 		methods: {
 			...mapActions(['getWxLogin']),
 			login() {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/oaLogin/oaLogin'
 				})
 			},
@@ -142,7 +142,7 @@
 				//   content: '确定要退出登录吗',
 				//   success: (e) => {
 				//     if (e.confirm) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/oaLogin/oaLogin?clear=' + true,
 					success() {
 						that.$store.commit('CLEAR');
diff --git a/subpkg/property/vehicle.vue b/subpkg/property/vehicle.vue
index 32b1d71..c4c1901 100644
--- a/subpkg/property/vehicle.vue
+++ b/subpkg/property/vehicle.vue
@@ -20,12 +20,12 @@
 								<text class="cir" style="background-color: #40BC5E;"></text>
 								中转站:
 							</view>
-							<view v-if="address.terminus">{{address.terminus.address}}</view>
+							<view v-if="address.transfer">{{address.transfer.address}}</view>
 						</view>
-						<view v-if="status!=5||address.terminus.status==2" :class="{lg_status1:address.terminus.status==2,lg_status2:address.terminus.status==1}" style="margin-top: 10rpx;">
+						<view v-if="status!=5||address.transfer.status==2" :class="{lg_status1:address.transfer.status==2,lg_status2:address.transfer.status==1}" style="margin-top: 10rpx;">
 							<text class="cir" style="background-color: transparent;"></text>
 							<text>车辆状态：</text>
-              <text v-if="address.terminus.status==2">已完成</text>
+              <text v-if="address.transfer.status==2">已完成</text>
 							<text v-else style="color: #FF7C32;">进行中</text>
 						</view>
             <view v-else class="red" style="margin-top: 10rpx;">
@@ -40,13 +40,13 @@
 								<text class="cir" style="background-color: #40BC5E;"></text>
 								终&emsp;点:
 							</view>
-							<view v-if="address.transfer">{{address.transfer.address}}</view>
+							<view v-if="address.terminus">{{address.terminus.address}}</view>
 						</view>
-						<view :class="{red: address.transfer.status!=2&&address.terminus.status==1,yellow:address.terminus.status!=1&&address.transfer.status!=2, green: address.transfer.status==2}" style="margin-top: 10rpx;">
+						<view :class="{red: address.terminus.status!=2&&address.transfer.status==1,yellow:address.transfer.status!=1&&address.terminus.status!=2, green: address.terminus.status==2}" style="margin-top: 10rpx;">
 							<text class="cir" style="background-color: transparent;"></text>
 							<text :class="{red: status==5}">车辆状态：</text>
-              <text v-if="address.transfer.status==2">已完成</text>
-							<text v-else-if="address.terminus.status==1">未开始</text>
+              <text v-if="address.terminus.status==2">已完成</text>
+							<text v-else-if="address.transfer.status==1">未开始</text>
               <text v-else-if="status!=5">进行中</text>
               <text v-else :class="{red: status==5}">未完成</text>
 						</view>
@@ -119,10 +119,10 @@
 				polyline: [],
 				task_id: -1,
 				address: {
-					terminus: {
+					transfer: {
 						status: 1
 					},
-					transfer: {
+					terminus: {
 						status: 1
 					}
 				}
@@ -140,20 +140,20 @@
 					id: this.task_id
 				});
 				this.address = res.data.extend;
-				if (res.data.extend?.update?.terminus?.lnglat[0]) { //已抵达中转站,更新目标点为终点
-					this.markers[0].latitude = +res.data.extend.transfer.lnglat[1];
-					this.markers[0].longitude = +res.data.extend.transfer.lnglat[0];
-					this.status = 2;
-					this.address.terminus['status'] = 2;
-				} else { // 未抵达中转站,设置中转站为目标点
+				if (res.data.extend?.update?.transfer?.lnglat[0]) { //已抵达中转站,更新目标点为终点
 					this.markers[0].latitude = +res.data.extend.terminus.lnglat[1];
 					this.markers[0].longitude = +res.data.extend.terminus.lnglat[0];
-					this.address.terminus['status'] = 1;
-				}
-				if (res.data.extend?.update?.transfer?.lnglat[0]||res.data.status==3) {
+					this.status = 2;
 					this.address.transfer['status'] = 2;
+				} else { // 未抵达中转站,设置中转站为目标点
+					this.markers[0].latitude = +res.data.extend.transfer.lnglat[1];
+					this.markers[0].longitude = +res.data.extend.transfer.lnglat[0];
+					this.address.transfer['status'] = 1;
+				}
+				if (res.data.extend?.update?.terminus?.lnglat[0]||res.data.status==3) {
+					this.address.terminus['status'] = 2;
 					this.status = 3;
-				} else this.address.transfer['status'] = 1;
+				} else this.address.terminus['status'] = 1;
         if(res.data.status==5){
           this.status = 5;
         }
@@ -263,7 +263,7 @@
 					let data;
 					if (this.status == 1) data = {
 						id: this.task_id,
-						terminus: {
+						transfer: {
 							lnglat: [
 								this.markers[1].longitude,
 								this.markers[1].latitude
@@ -272,7 +272,7 @@
 					};
 					else data = {
 						id: this.task_id,
-						transfer: {
+						terminus: {
 							lnglat: [
 								this.markers[1].longitude,
 								this.markers[1].latitude
diff --git a/subpkg/taskAdmin/taskAdmin.vue b/subpkg/taskAdmin/taskAdmin.vue
index bd95245..6af1564 100644
--- a/subpkg/taskAdmin/taskAdmin.vue
+++ b/subpkg/taskAdmin/taskAdmin.vue
@@ -50,9 +50,10 @@
     },
     onLoad() {
       this.initDate();
+    },
+    onReady() {
       this.loadTaskList();
     },
-    onShow() {},
     computed: {
       nowYMD() {
         let m = this.nowDate.m < 10 ? '0' + this.nowDate.m : this.nowDate.m;