diff --git a/.gitignore b/.gitignore
index 5931c11..45dca11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ node_modules
 /dist
 .hbuilderx
 
+
 # local env files
 .env.local
 .env.*.local
diff --git a/api/property.js b/api/property.js
index 21334e1..2acb91e 100644
--- a/api/property.js
+++ b/api/property.js
@@ -1,28 +1,33 @@
-import oahttp from "@/utils/oahttp.js";;
-
+import oahttp from "@/utils/oahttp.js";
+import oahttp2 from "@/utils/logistics.js";
+// http://logistics.lihaink.cn/api/getCarHistory
 /**
  * 车辆列表
  */
-// https://worker-task.lihaink.cn/api/vehicle/addCar
-export const getvehicleListApi = (data) => oahttp.get('/vehicle/vehicleIndex', data)
+// /api/vehicle/townCompanyVehicleIndex
+export const getvehicleListApi = (data) => oahttp.get('/vehicle/townCompanyVehicleIndex', data)
 // 车辆详情
-export const getvehicleDetailApi = (data) => oahttp.get('/courierLstData', data)
+export const getvehicleDetailApi = (data) => oahttp.get('/vehicle/vehicleInfo', data)
 // 车辆上传
-export const upVehicleApi = (data) => oahttp.post('/vehicle/addCar', data)
+export const upVehicleApi = (data) => oahttp.post('/vehicle/rentApply', data)
 // 申请用车
-export const applycarApi = (data) => oahttp.post('/vehicle/addCar', data)
+export const applycarApi = (data) => oahttp.post('/vehicle/rentApply', data)
 // 显示轨迹
-export const locusApi = (data) => oahttp.get('/courierLstData', data)
+export const locusApi = (data) => oahttp.post('/vehicle/vehicleTrack', data)
 // 签约列表
-export const getAgencyListApi = (data) => oahttp.get('/courierLstData', data)
+export const getAgencyListApi = (data) => oahttp.get('/vehicle/rentApplyList', data)
 // 签约公司详情
-export const getAgencyDetailApi = (data) => oahttp.get('/courierLstData', data)
+export const getAgencyDetailApi = (data) => oahttp.get('/vehicle/rentApplyInfo', data)
 // 车辆租赁
 export const leaseApi = (data) => oahttp.post('/vehicle/setContractByTownCompany', data)
 // 生成合同
-export const contractApi = (data) => oahttp.get('/courierLstData', data)
+export const contractApi = (data) => oahttp.post('/vehicle/setContractByVillageCompany', data)
+// 发送合同
+export const sendcontractApi = (data) => oahttp.post('/vehicle/initiatingRentCarContract', data)
 // 申请驳回
-export const overruleApi = (data) => oahttp.get('/courierLstData', data)
+export const overruleApi = (data) => oahttp.post('/vehicle/rejectRentApply', data)
+// 小组公司详情
+export const villageCompanyApi = (data) => oahttp.get('/vehicle/villageCompanyIndex', data)
 // 资产详情
 // export const getpropertyDetil = (data) => oahttp.get('/lstDetail', data)
 
diff --git a/manifest.json b/manifest.json
index e4db749..c4e5410 100644
--- a/manifest.json
+++ b/manifest.json
@@ -110,7 +110,176 @@
                 }
             }
         },
-        "nativePlugins" : {}
+        "nativePlugins" : {
+            "JG-JCore" : {
+                "JPUSH_APPKEY_ANDROID" : "5ced5ec5fa7bb86302944f0f",
+                "JPUSH_APPKEY_IOS" : "",
+                "JPUSH_CHANNEL_ANDROID" : "",
+                "JPUSH_CHANNEL_IOS" : "",
+                "__plugin_info__" : {
+                    "name" : "极光推送 JCore 官方 SDK",
+                    "description" : "极光推送 JCore 官方 SDK HBuilder 插件版本",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=4028",
+                    "android_package_name" : "uni.UNIB5B1EDD",
+                    "ios_bundle_id" : "uni.UNIB5B1EDD",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "4028",
+                    "parameters" : {
+                        "JPUSH_APPKEY_ANDROID" : {
+                            "des" : "[Android]极光portal配置应用信息时分配的AppKey",
+                            "key" : "JPUSH_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_APPKEY_IOS" : {
+                            "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
+                            "key" : "JCore:APP_KEY",
+                            "value" : ""
+                        },
+                        "JPUSH_CHANNEL_ANDROID" : {
+                            "des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default",
+                            "key" : "JPUSH_CHANNEL",
+                            "value" : ""
+                        },
+                        "JPUSH_CHANNEL_IOS" : {
+                            "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
+                            "key" : "JCore:CHANNEL",
+                            "value" : ""
+                        }
+                    }
+                }
+            },
+            "JG-JPush" : {
+                "JPUSH_ADVERTISINGID_IOS" : "",
+                "JPUSH_DEFAULTINITJPUSH_IOS" : "",
+                "JPUSH_GOOGLE_API_KEY" : "",
+                "JPUSH_GOOGLE_APP_ID" : "",
+                "JPUSH_GOOGLE_PROJECT_ID" : "",
+                "JPUSH_GOOGLE_PROJECT_NUMBER" : "",
+                "JPUSH_GOOGLE_STORAGE_BUCKET" : "",
+                "JPUSH_HONOR_APPID" : "",
+                "JPUSH_HUAWEI_APPID" : "",
+                "JPUSH_ISPRODUCTION_IOS" : "",
+                "JPUSH_MEIZU_APPID" : "",
+                "JPUSH_MEIZU_APPKEY" : "",
+                "JPUSH_OPPO_APPID" : "",
+                "JPUSH_OPPO_APPKEY" : "",
+                "JPUSH_OPPO_APPSECRET" : "",
+                "JPUSH_VIVO_APPID" : "",
+                "JPUSH_VIVO_APPKEY" : "",
+                "JPUSH_XIAOMI_APPID" : "",
+                "JPUSH_XIAOMI_APPKEY" : "",
+                "__plugin_info__" : {
+                    "name" : "极光推送 JPush 官方 SDK",
+                    "description" : "极光推送JPush官方SDK HBuilder插件版本",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=4035",
+                    "android_package_name" : "uni.UNIB5B1EDD",
+                    "ios_bundle_id" : "uni.UNIB5B1EDD",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "4035",
+                    "parameters" : {
+                        "JPUSH_ADVERTISINGID_IOS" : {
+                            "des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
+                            "key" : "JPush:ADVERTISINGID",
+                            "value" : ""
+                        },
+                        "JPUSH_DEFAULTINITJPUSH_IOS" : {
+                            "des" : "[iOS]是否默认初始化，是填true，不是填false或者不填",
+                            "key" : "JPush:DEFAULTINITJPUSH",
+                            "value" : ""
+                        },
+                        "JPUSH_GOOGLE_API_KEY" : {
+                            "des" : "厂商google api_key,示例:g-12346578",
+                            "key" : "google_api_key",
+                            "value" : ""
+                        },
+                        "JPUSH_GOOGLE_APP_ID" : {
+                            "des" : "厂商google mobilesdk_app_id,示例：g-12346578",
+                            "key" : "google_app_id",
+                            "value" : ""
+                        },
+                        "JPUSH_GOOGLE_PROJECT_ID" : {
+                            "des" : "厂商google project_id ,示例：g-12346578",
+                            "key" : "project_id",
+                            "value" : ""
+                        },
+                        "JPUSH_GOOGLE_PROJECT_NUMBER" : {
+                            "des" : "厂商google project_number,示例：g-12346578",
+                            "key" : "gcm_defaultSenderId",
+                            "value" : ""
+                        },
+                        "JPUSH_GOOGLE_STORAGE_BUCKET" : {
+                            "des" : "厂商google storage_bucket,示例：g-12346578",
+                            "key" : "google_storage_bucket",
+                            "value" : ""
+                        },
+                        "JPUSH_HONOR_APPID" : {
+                            "des" : "厂商HONOR-appId,示例：12346578",
+                            "key" : "com.hihonor.push.app_id",
+                            "value" : ""
+                        },
+                        "JPUSH_HUAWEI_APPID" : {
+                            "des" : "厂商HUAWEI-appId,示例：appid=12346578",
+                            "key" : "com.huawei.hms.client.appid",
+                            "value" : ""
+                        },
+                        "JPUSH_ISPRODUCTION_IOS" : {
+                            "des" : "[iOS]是否是生产环境，是填true，不是填false或者不填",
+                            "key" : "JPush:ISPRODUCTION",
+                            "value" : ""
+                        },
+                        "JPUSH_MEIZU_APPID" : {
+                            "des" : "厂商MEIZU-appId,示例：MZ-12345678",
+                            "key" : "MEIZU_APPID",
+                            "value" : ""
+                        },
+                        "JPUSH_MEIZU_APPKEY" : {
+                            "des" : "厂商MEIZU-appKey,示例：MZ-12345678",
+                            "key" : "MEIZU_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPID" : {
+                            "des" : "厂商OPPO-appId,示例：OP-12345678",
+                            "key" : "OPPO_APPID",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPKEY" : {
+                            "des" : "厂商OPPO-appkey,示例：OP-12345678",
+                            "key" : "OPPO_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPSECRET" : {
+                            "des" : "厂商OPPO-appSecret,示例：OP-12345678",
+                            "key" : "OPPO_APPSECRET",
+                            "value" : ""
+                        },
+                        "JPUSH_VIVO_APPID" : {
+                            "des" : "厂商VIVO-appId,示例：12345678",
+                            "key" : "com.vivo.push.app_id",
+                            "value" : ""
+                        },
+                        "JPUSH_VIVO_APPKEY" : {
+                            "des" : "厂商VIVO-appkey,示例：12345678",
+                            "key" : "com.vivo.push.api_key",
+                            "value" : ""
+                        },
+                        "JPUSH_XIAOMI_APPID" : {
+                            "des" : "厂商XIAOMI-appId,示例：MI-12345678",
+                            "key" : "XIAOMI_APPID",
+                            "value" : ""
+                        },
+                        "JPUSH_XIAOMI_APPKEY" : {
+                            "des" : "厂商XIAOMI-appKey,示例：MI-12345678",
+                            "key" : "XIAOMI_APPKEY",
+                            "value" : ""
+                        }
+                    }
+                }
+            }
+        }
     },
     /* 快应用特有相关 */
     "quickapp" : {},
diff --git a/pages.json b/pages.json
index 1784148..98be749 100644
--- a/pages.json
+++ b/pages.json
@@ -1,644 +1,653 @@
 {
-  "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 
-    {
-      "path": "pages/oaHome/oaHome",
-      "style": {
-        "navigationBarTitleText": "首页",
-        "enablePullDownRefresh": true,
-        "app-plus": {
-          "titleNView": false
-        },
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
-    },
-    {
-      "path": "pages/oaLogin/oaLogin",
-      "style": {
-        "navigationBarTitleText": "登录",
-        "app-plus": {
-          "titleNView": false
-        },
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		{
+			"path": "pages/oaHome/oaHome",
+			"style": {
+				"navigationBarTitleText": "首页",
+				"enablePullDownRefresh": true,
+				"app-plus": {
+					"titleNView": false
+				},
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/oaLogin/oaLogin",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"app-plus": {
+					"titleNView": false
+				},
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    },
-    {
-      "path": "pages/business/business",
-      "style": {
-        "navigationBarTitleText": "商机信息",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		},
+		{
+			"path": "pages/business/business",
+			"style": {
+				"navigationBarTitleText": "商机信息",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    },
-    {
-      "path": "pages/index/index",
-      "style": {
-        "navigationBarTitleText": "uni-app",
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
-    },
-    {
-      "path": "pages/oaExamine/oaExamine",
-      "style": {
-        "navigationBarTitleText": "审批",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
-    },
-    {
-      "path": "pages/oaTask/oaTask",
-      "style": {
-        "navigationBarTitleText": "今日任务",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
-    },
-    {
-      "path": "pages/oaMy/oaMy",
-      "style": {
-        "navigationBarTitleText": "我的",
-        "app-plus": {
-          "titleNView": false
-        },
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
-    }, {
-      "path": "pages/oaManager/oaManager",
-      "style": {
-        "navigationBarTitleText": "片区经理",
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		},
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "uni-app",
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/oaExamine/oaExamine",
+			"style": {
+				"navigationBarTitleText": "审批",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/oaTask/oaTask",
+			"style": {
+				"navigationBarTitleText": "今日任务",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/oaMy/oaMy",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus": {
+					"titleNView": false
+				},
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
+		}, {
+			"path": "pages/oaManager/oaManager",
+			"style": {
+				"navigationBarTitleText": "片区经理",
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/oaNews/oaNews",
-      "style": {
-        "navigationBarTitleText": "公告详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/oaNews/oaNews",
+			"style": {
+				"navigationBarTitleText": "公告详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/logistics/index",
-      "style": {
-        "navigationBarTitleText": "订单列表",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/logistics/index",
+			"style": {
+				"navigationBarTitleText": "订单列表",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/logistics/te",
-      "style": {
-        "navigationBarTitleText": "测试",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/logistics/te",
+			"style": {
+				"navigationBarTitleText": "测试",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/logistics/logisticDetil",
-      "style": {
-        "navigationBarTitleText": "订单详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/logistics/logisticDetil",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/logistics/deliveryDetil",
-      "style": {
-        "navigationBarTitleText": "配送信息",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/logistics/deliveryDetil",
+			"style": {
+				"navigationBarTitleText": "配送信息",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/logistics/post",
-      "style": {
-        "navigationBarTitleText": "驿站",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/logistics/post",
+			"style": {
+				"navigationBarTitleText": "驿站",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/updatePassword/updatePassword",
-      "style": {
-        "navigationBarTitleText": "修改密码",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/updatePassword/updatePassword",
+			"style": {
+				"navigationBarTitleText": "修改密码",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "uni_modules/guyue-updater/pages/updater",
-      "style": {
-        "app-plus": {
-          "animationDuration": 200,
-          "animationType": "fade-in",
-          "background": "transparent",
-          "backgroundColorTop": "transparent",
-          "bounce": "none",
-          "popGesture": "none",
-          "scrollIndicator": false,
-          "titleNView": false
-        },
-        "backgroundColor": "transparent",
-        "disableScroll": true,
-        "navigationStyle": "custom"
-      }
-    }, {
-      "path": "pages/moreFun/moreFun",
-      "style": {
-        "navigationBarTitleText": "更多功能",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "uni_modules/guyue-updater/pages/updater",
+			"style": {
+				"app-plus": {
+					"animationDuration": 200,
+					"animationType": "fade-in",
+					"background": "transparent",
+					"backgroundColorTop": "transparent",
+					"bounce": "none",
+					"popGesture": "none",
+					"scrollIndicator": false,
+					"titleNView": false
+				},
+				"backgroundColor": "transparent",
+				"disableScroll": true,
+				"navigationStyle": "custom"
+			}
+		}, {
+			"path": "pages/moreFun/moreFun",
+			"style": {
+				"navigationBarTitleText": "更多功能",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }
-  ],
-  "subPackages": [{
-    "root": "pages/views",
-    "name": "views",
-    "pages": [{
-        "path": "application",
-        "style": {
-          "navigationBarTitleText": "地图首页",
-          "enablePullDownRefresh": false
-        }
-      },
-      {
-        "path": "new_task",
-        "style": {
-          "navigationBarTitleText": "新建任务",
-          "enablePullDownRefresh": false
-        }
-      },
-      {
-        "path": "com_approve",
-        "style": {
-          "navigationBarTitleText": "通用审批",
-          "enablePullDownRefresh": false
-        }
-      }, {
-        "path": "personal_center",
-        "style": {
-          "navigationBarTitleText": "个人中心1",
-          "enablePullDownRefresh": false
-        }
+		}
+	],
+	"subPackages": [{
+		"root": "pages/views",
+		"name": "views",
+		"pages": [{
+				"path": "application",
+				"style": {
+					"navigationBarTitleText": "地图首页",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "new_task",
+				"style": {
+					"navigationBarTitleText": "新建任务",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "com_approve",
+				"style": {
+					"navigationBarTitleText": "通用审批",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "personal_center",
+				"style": {
+					"navigationBarTitleText": "个人中心1",
+					"enablePullDownRefresh": false
+				}
 
-      }, {
-        "path": "task_details",
-        "style": {
-          "navigationBarTitleText": "",
-          "enablePullDownRefresh": false
-        }
+			}, {
+				"path": "task_details",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
 
-      }, {
-        "path": "personal_center_two",
-        "style": {
-          "navigationBarTitleText": "个人中心2",
-          "enablePullDownRefresh": false
-        }
+			}, {
+				"path": "personal_center_two",
+				"style": {
+					"navigationBarTitleText": "个人中心2",
+					"enablePullDownRefresh": false
+				}
 
-      }, {
-        "path": "public_document",
-        "style": {
-          "navigationBarTitleText": "公司公示文档",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
+			}, {
+				"path": "public_document",
+				"style": {
+					"navigationBarTitleText": "公司公示文档",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#0122C7",
+					"navigationBarTextStyle": "white"
+				}
 
-      }, {
-        "path": "leave_request",
-        "style": {
-          "navigationBarTitleText": "请假申请",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
+			}, {
+				"path": "leave_request",
+				"style": {
+					"navigationBarTitleText": "请假申请",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#0122C7",
+					"navigationBarTextStyle": "white"
+				}
 
-      }
-    ]
-  }, {
-    "root": "subpkg",
-    "name": "subpkg",
-    "pages": [{
-      "path": "personnel/personnel",
-      "style": {
-        "navigationBarTitleText": "人员管理",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+			}
+		]
+	}, {
+		"root": "subpkg",
+		"name": "subpkg",
+		"pages": [{
+			"path": "personnel/personnel",
+			"style": {
+				"navigationBarTitleText": "人员管理",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "finance/finance",
-      "style": {
-        "navigationBarTitleText": "财务管理",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "finance/finance",
+			"style": {
+				"navigationBarTitleText": "财务管理",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "topUp/topUp",
-      "style": {
-        "navigationBarTitleText": "账户充值",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white",
-        "app-plus": {
-          "titleNView": {
-            "buttons": [{
-              "color": "#fff",
-              "text": "充值记录",
-              "fontSize": "15",
-              "width": "90"
-            }]
-          }
-        }
-      }
+		}, {
+			"path": "topUp/topUp",
+			"style": {
+				"navigationBarTitleText": "账户充值",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"color": "#fff",
+							"text": "充值记录",
+							"fontSize": "15",
+							"width": "90"
+						}]
+					}
+				}
+			}
 
-    }, {
-      "path": "contract/contract",
-      "style": {
-        "navigationBarTitleText": "合同管理",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#0022C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "contract/contract",
+			"style": {
+				"navigationBarTitleText": "合同管理",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0022C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "contractDetail/contractDetail",
-      "style": {
-        "navigationBarTitleText": "合同详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "contractDetail/contractDetail",
+			"style": {
+				"navigationBarTitleText": "合同详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pdfView/pdfView",
-      "style": {
-        "navigationBarTitleText": "合同内容",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pdfView/pdfView",
+			"style": {
+				"navigationBarTitleText": "合同内容",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "companyInfo/companyInfo",
-      "style": {
-        "navigationBarTitleText": "公司信息",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "companyInfo/companyInfo",
+			"style": {
+				"navigationBarTitleText": "公司信息",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "companySign/companySign",
-      "style": {
-        "navigationBarTitleText": "签约公司详情",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "companySign/companySign",
+			"style": {
+				"navigationBarTitleText": "签约公司详情",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "personnelDetails/personnelDetails",
-      "style": {
-        "navigationBarTitleText": "人员详细信息",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "personnelDetails/personnelDetails",
+			"style": {
+				"navigationBarTitleText": "人员详细信息",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "orderDetail/orderDetail",
-      "style": {
-        "navigationBarTitleText": "流水详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "orderDetail/orderDetail",
+			"style": {
+				"navigationBarTitleText": "流水详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "withdrawDeposit/withdrawDeposit",
-      "style": {
-        "navigationBarTitleText": "提现余额",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white",
-        "app-plus": {
-          "titleNView": {
-            "buttons": [{
-              "color": "#fff",
-              "text": "提现记录",
-              "fontSize": "15",
-              "width": "90"
-            }]
-          }
-        }
-      }
-    }, {
-      "path": "withdrawList/withdrawList",
-      "style": {
-        "navigationBarTitleText": "提现记录",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "withdrawDeposit/withdrawDeposit",
+			"style": {
+				"navigationBarTitleText": "提现余额",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"color": "#fff",
+							"text": "提现记录",
+							"fontSize": "15",
+							"width": "90"
+						}]
+					}
+				}
+			}
+		}, {
+			"path": "withdrawList/withdrawList",
+			"style": {
+				"navigationBarTitleText": "提现记录",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "noticeList/noticeList",
-      "style": {
-        "navigationBarTitleText": "公告列表",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "noticeList/noticeList",
+			"style": {
+				"navigationBarTitleText": "公告列表",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "topUpList/topUpList",
-      "style": {
-        "navigationBarTitleText": "充值记录",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "topUpList/topUpList",
+			"style": {
+				"navigationBarTitleText": "充值记录",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "companyAdmin/companyAdmin",
-      "style": {
-        "navigationBarTitleText": "公司管理",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "companyAdmin/companyAdmin",
+			"style": {
+				"navigationBarTitleText": "公司管理",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "newPersonnel/newPersonnel",
-      "style": {
-        "navigationBarTitleText": "新增人员",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "newPersonnel/newPersonnel",
+			"style": {
+				"navigationBarTitleText": "新增人员",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "archives/archives",
-      "style": {
-        "navigationBarTitleText": "档案管理",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "archives/archives",
+			"style": {
+				"navigationBarTitleText": "档案管理",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "newArchives/newArchives",
-      "style": {
-        "navigationBarTitleText": "信息登记",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "newArchives/newArchives",
+			"style": {
+				"navigationBarTitleText": "信息登记",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "updateArchives/updateArchives",
-      "style": {
-        "navigationBarTitleText": "信息更新",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "updateArchives/updateArchives",
+			"style": {
+				"navigationBarTitleText": "信息更新",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "fixedAssets/fixedAssets",
-      "style": {
-        "navigationBarTitleText": "固定资产",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "fixedAssets/fixedAssets",
+			"style": {
+				"navigationBarTitleText": "固定资产",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "taskAdmin/taskAdmin",
-      "style": {
-        "navigationBarTitleText": "任务管理",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "taskAdmin/taskAdmin",
+			"style": {
+				"navigationBarTitleText": "任务管理",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "archivesDetail/archivesDetail",
-      "style": {
-        "navigationBarTitleText": "档案详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "archivesDetail/archivesDetail",
+			"style": {
+				"navigationBarTitleText": "档案详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "captain/captain",
-      "style": {
-        "navigationBarTitleText": "队长列表",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "captain/captain",
+			"style": {
+				"navigationBarTitleText": "队长列表",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "companyFinance/companyFinance",
-      "style": {
-        "navigationBarTitleText": "公司财务",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "companyFinance/companyFinance",
+			"style": {
+				"navigationBarTitleText": "公司财务",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "companyUnsign/companyUnsign",
-      "style": {
-        "navigationBarTitleText": "未签约公司列表",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "companyUnsign/companyUnsign",
+			"style": {
+				"navigationBarTitleText": "未签约公司列表",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "submit/submit",
-      "style": {
-        "navigationBarTitleText": "提交审核",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "submit/submit",
+			"style": {
+				"navigationBarTitleText": "提交审核",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "dispatching/dispatching",
-      "style": {
-        "navigationBarTitleText": "任务:宣传配送",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "dispatching/dispatching",
+			"style": {
+				"navigationBarTitleText": "任务:宣传配送",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "blockTransaction/blockTransaction",
-      "style": {
-        "navigationBarTitleText": "任务:片区交易",
-        "enablePullDownRefresh": true,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "blockTransaction/blockTransaction",
+			"style": {
+				"navigationBarTitleText": "任务:片区交易",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "fileTask/fileTask",
-      "style": {
-        "navigationBarTitleText": "已更新商机",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "fileTask/fileTask",
+			"style": {
+				"navigationBarTitleText": "已更新商机",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "property/index",
-      "style": {
-        "navigationBarTitleText": "资产管理",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "property/index",
+			"style": {
+				"navigationBarTitleText": "资产管理",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "property/chosseCompany",
-      "style": {
-        "navigationBarTitleText": "选择公司",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "property/chosseCompany",
+			"style": {
+				"navigationBarTitleText": "选择公司",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "property/vehicle",
-      "style": {
-        "navigationBarTitleText": "三轮车游走",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "property/vehicle",
+			"style": {
+				"navigationBarTitleText": "三轮车游走",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "property/vehicle_a",
-      "style": {
-        "navigationBarTitleText": "三轮车详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "property/vehicle_a",
+			"style": {
+				"navigationBarTitleText": "三轮车详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "buyShare/buyShare",
-      "style": {
-        "navigationBarTitleText": "任务:入股任务",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "property/success",
+			"style": {
+				"navigationBarTitleText": "生成合同",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "otherTask/otherTask",
-      "style": {
-        "navigationBarTitleText": "任务:其他任务",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "buyShare/buyShare",
+			"style": {
+				"navigationBarTitleText": "任务:入股任务",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "property/agencyList",
-      "style": {
-        "navigationBarTitleText": "签约列表",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "otherTask/otherTask",
+			"style": {
+				"navigationBarTitleText": "任务:其他任务",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "shareCapital/shareCapital",
-      "style": {
-        "navigationBarTitleText": "股金管理",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#0122C7",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "property/agencyList",
+			"style": {
+				"navigationBarTitleText": "签约列表",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
 
-    }]
-  }],
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
-  },
-  "tabBar": {
-    "color": "#282828",
-    "selectedColor": "#0122C7",
-    "borderStyle": "white",
-    "backgroundColor": "#ffffff",
-    "list": [{
-        "pagePath": "pages/oaHome/oaHome",
-        "text": "首页",
-        "iconPath": "/static/tabs-icon/home.png",
-        "selectedIconPath": "/static/tabs-icon/home-a.png"
-      },
-      {
-        "pagePath": "pages/oaExamine/oaExamine",
-        "text": "审批",
-        "iconPath": "/static/tabs-icon/Task.png",
-        "selectedIconPath": "/static/tabs-icon/Task-a.png"
-      },
-      {
-        "pagePath": "pages/oaTask/oaTask",
-        "text": "任务",
-        "iconPath": "/static/tabs-icon/approval.png",
-        "selectedIconPath": "/static/tabs-icon/approval-a.png"
-      },
-      // {
-      //   "pagePath": "pages/oaManager/oaManager",
-      //   "text": "片区经理",
-      //   "iconPath": "/static/tabs-icon/manager.png",
-      //   "selectedIconPath": "/static/tabs-icon/manager-a.png"
-      // },
-      {
-        "pagePath": "pages/business/business",
-        "text": "商机",
-        "iconPath": "/static/tabs-icon/manager.png",
-        "selectedIconPath": "/static/tabs-icon/manager-a.png"
-      },
-      {
-        "pagePath": "pages/oaMy/oaMy",
-        "text": "我的",
-        "iconPath": "/static/tabs-icon/my.png",
-        "selectedIconPath": "/static/tabs-icon/my-a.png"
-      }
-    ]
-  },
-  "uniIdRouter": {}
+		}, {
+			"path": "shareCapital/shareCapital",
+			"style": {
+				"navigationBarTitleText": "股金管理",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarTextStyle": "white"
+			}
+
+		}]
+	}],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8"
+	},
+	"tabBar": {
+		"color": "#282828",
+		"selectedColor": "#0122C7",
+		"borderStyle": "white",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/oaHome/oaHome",
+				"text": "首页",
+				"iconPath": "/static/tabs-icon/home.png",
+				"selectedIconPath": "/static/tabs-icon/home-a.png"
+			},
+			{
+				"pagePath": "pages/oaExamine/oaExamine",
+				"text": "审批",
+				"iconPath": "/static/tabs-icon/Task.png",
+				"selectedIconPath": "/static/tabs-icon/Task-a.png"
+			},
+			{
+				"pagePath": "pages/oaTask/oaTask",
+				"text": "任务",
+				"iconPath": "/static/tabs-icon/approval.png",
+				"selectedIconPath": "/static/tabs-icon/approval-a.png"
+			},
+			// {
+			//   "pagePath": "pages/oaManager/oaManager",
+			//   "text": "片区经理",
+			//   "iconPath": "/static/tabs-icon/manager.png",
+			//   "selectedIconPath": "/static/tabs-icon/manager-a.png"
+			// },
+			{
+				"pagePath": "pages/business/business",
+				"text": "商机",
+				"iconPath": "/static/tabs-icon/manager.png",
+				"selectedIconPath": "/static/tabs-icon/manager-a.png"
+			},
+			{
+				"pagePath": "pages/oaMy/oaMy",
+				"text": "我的",
+				"iconPath": "/static/tabs-icon/my.png",
+				"selectedIconPath": "/static/tabs-icon/my-a.png"
+			}
+		]
+	},
+	"uniIdRouter": {}
 }
\ No newline at end of file
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index bbd39a7..cf7aaa1 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -1,163 +1,122 @@
 <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' : ''"
-    >
-      <view
-        style="
+		<view 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="
+        ">
+				<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>
-      <view style="height: 30rpx"></view>
-      <!-- #endif -->
-      <view class="my_info">
-        <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 class="head_img">
-          <view class="img_box">
-            <u--image
-              :showLoading="true"
-              width="131.43rpx"
-              height="131.43rpx"
-              class="img_box_img"
-              :src="myOaInfo.avatar || '../../static/img/public/avatar.png'"
-              shape="circle"
-            ></u--image>
-          </view>
+          " />
+			</view>
+			<!-- #ifdef APP-PLUS||H5 -->
+			<view style="height: var(--status-bar-height)"></view>
+			<view style="height: 30rpx"></view>
+			<!-- #endif -->
+			<view class="my_info">
+				<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 class="head_img">
+					<view class="img_box">
+						<u--image :showLoading="true" width="131.43rpx" height="131.43rpx" class="img_box_img"
+							:src="myOaInfo.avatar || '../../static/img/public/avatar.png'" shape="circle"></u--image>
+					</view>
 
-          <text class="head_text">工作证: {{ myOaInfo.nickname }}</text>
-          <text class="head_text" style="flex-shrink: 0"
-            >身份: {{ myOaInfo.admin_id ? "管理员" : "普通用户" }}</text
-          >
-        </view>
-      </view>
+					<text class="head_text">工作证: {{ myOaInfo.nickname }}</text>
+					<text class="head_text" style="flex-shrink: 0">身份: {{ myOaInfo.admin_id ? "管理员" : "普通用户" }}</text>
+				</view>
+			</view>
 
-      <!-- 占位 -->
-      <view style="height: 150rpx"></view>
+			<!-- 占位 -->
+			<view style="height: 150rpx"></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).replace(/-/g, ".")
               }}</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"
+						<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>
+		</view>
 
-    <view class="fast_track">
-      <block v-for="(item, index) in oaHomeData" :key="item.id">
-        <view class="track_item" @click="navTwo(item.paths, index)">
-          <u--image
-            :showLoading="true"
-            :src="item.icon"
-            mode="widthFix"
-            width="77.19rpx"
-            height="77.19rpx"
-          ></u--image>
-          <view class="title">{{ item.name }}</view>
-        </view>
-      </block>
-    </view>
+		<view class="fast_track">
+			<block v-for="(item, index) in oaHomeData" :key="item.id">
+				<view class="track_item" @click="navTwo(item.paths, index)">
+					<u--image :showLoading="true" :src="item.icon" mode="widthFix" width="77.19rpx"
+						height="77.19rpx"></u--image>
+					<view class="title">{{ item.name }}</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> -->
-      <!-- <button @click="test">按钮</button> -->
-      <view v-if="orderList.length > 0">
-        <globalPopup ref="globalPopup"></globalPopup>
-        <logistiBriefCard
-          v-for="(item, index) in orderList"
-          :key="index"
-          :goodsInfo="item"
-        >
-        </logistiBriefCard>
-      </view>
+			<!-- <button @click="test">按钮</button> -->
+			<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,681 +140,686 @@
           </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";
-import { mapState } from 'vuex';
-import bj from "@/static/animation/home.json"
-//#ifdef APP-PLUS
-var jpushModule = uni.requireNativePlugin("JG-JPush");
-// #endif
-export default {
-  components: {
-    // tabbar
-    logistiBriefCard,
-    globalPopup,
-  },
-  data () {
-    return {
-      options: {
-        data: '',
-      },
-      is_captain: 0,
-      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: [],
-      showOaHomeData: false, //更新首页计算的值
-    };
-  },
-  onLoad () {
-    this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO")).is_captain
-    this.options.data = bj;
-    //#ifdef APP-PLUS
-    let that = this;
-    jpushModule.addNotificationListener(function (result) {
-      if (!that.notArr.includes(result.messageID)) {
-        that.$refs.globalPopup.showPopu();
-        that.getOrderList();
-        console.log("idnex的");
-        that.notArr.push(result.messageID);
-      }
-    });
-    // #endif
-  },
-  onShow () {
-    // this.getUserIndex()
-    // this.getIndexList()
-    this.getApproveList();
-    this.initUserInfo();
-    this.showToask();
-    // this.initOaHomeDada();
-    this.getOrderList();
-    this.noticeFn();
-    // console.log(this.oaHomeData, this.oaHomeData.length==0);
-    if (this.oaHomeData.length == 0) {
-      this.$nextTick(() => {
-        this.$store.dispatch('initConfig');
-      })
-    }
-  },
-  computed: {
-    oaHomeData () {
-      const route = getCurrentPages()[0]?.route;
-      let arr = [];
-      this.$store.state.config?.config?.menu?.forEach((item) => {
-        if (item.paths.includes(route)) {
-          arr = item.children;
-        }
-      })
-      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'));
-        arr.push(obj);
-      }
-      return arr;
-    }
-  },
-  methods: {
-    // 通知
-    noticeFn () {
-      const audioContext = uni.createInnerAudioContext()
-      audioContext.src = '/static/mp3/order.mp3'
-      jpushModule.addNotificationListener(res => {
-        if (res.notificationEventType == 'notificationOpened') return
-        audioContext.play()
-        uni.vibrateLong();
-        this.getOrderList()
-        this.$refs.globalPopup.showPopu();
-        console.log("index的监听")
-      })
-    },
-    async getOrderList () {
-      let id = JSON.parse(uni.getStorageSync("USER_INFO")).id || "";
-      let res = await getList({
-        user_id: id,
-        user_type: this.is_captain
-        // 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) {
-      if (url) {
-        uni.showLoading({
-          title: '加载中',
-          mask: true
-        });
-        uni.navigateTo({
-          url: url,
-          success () {
-            uni.hideLoading()
-          },
-          fail () {
-            uni.switchTab({
-              url: url,
-              success () {
-                uni.hideLoading()
-              },
-              fail () {
-                uni.hideLoading()
-              }
-            });
-          },
-        })
-      } else 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";
+	import {
+		mapState
+	} from 'vuex';
+	import bj from "@/static/animation/home.json"
+	//#ifdef APP-PLUS
+	var jpushModule = uni.requireNativePlugin("JG-JPush");
+	// #endif
+	export default {
+		components: {
+			// tabbar
+			logistiBriefCard,
+			globalPopup,
+		},
+		data() {
+			return {
+				options: {
+					data: '',
+				},
+				is_captain: 0,
+				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: [],
+				showOaHomeData: false, //更新首页计算的值
+			};
+		},
+		onLoad() {
+			this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO")).is_captain
+			this.options.data = bj;
+			//#ifdef APP-PLUS
+			let that = this;
+			jpushModule.addNotificationListener(function(result) {
+				if (!that.notArr.includes(result.messageID)) {
+					that.$refs.globalPopup.showPopu();
+					that.getOrderList();
+					console.log("idnex的");
+					that.notArr.push(result.messageID);
+				}
+			});
+			// #endif
+		},
+		onShow() {
+			// this.getUserIndex()
+			// this.getIndexList()
+			this.getApproveList();
+			this.initUserInfo();
+			this.showToask();
+			// this.initOaHomeDada();
+			this.getOrderList();
+			//#ifdef APP-PLUS
+			this.noticeFn();
+			// #endif
+			// console.log(this.oaHomeData, this.oaHomeData.length==0);
+			if (this.oaHomeData.length == 0) {
+				this.$nextTick(() => {
+					this.$store.dispatch('initConfig');
+				})
+			}
+		},
+		computed: {
+			oaHomeData() {
+				const route = getCurrentPages()[0]?.route;
+				let arr = [];
+				this.$store.state.config?.config?.menu?.forEach((item) => {
+					if (item.paths.includes(route)) {
+						arr = item.children;
+					}
+				})
+				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'));
+					arr.push(obj);
+				}
+				return arr;
+			}
+		},
+		methods: {
+			// 通知
+			noticeFn() {
+				const audioContext = uni.createInnerAudioContext()
+				audioContext.src = '/static/mp3/order.mp3'
+				jpushModule.addNotificationListener(res => {
+					if (res.notificationEventType == 'notificationOpened') return
+					audioContext.play()
+					uni.vibrateLong();
+					this.getOrderList()
+					this.$refs.globalPopup.showPopu();
+					console.log("index的监听")
+				})
+			},
+			async getOrderList() {
+				let id = JSON.parse(uni.getStorageSync("USER_INFO")).id || "";
+				let res = await getList({
+					user_id: id,
+					user_type: this.is_captain
+					// 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) {
+				if (url) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					});
+					uni.navigateTo({
+						url: url,
+						success() {
+							uni.hideLoading()
+						},
+						fail() {
+							uni.switchTab({
+								url: url,
+								success() {
+									uni.hideLoading()
+								},
+								fail() {
+									uni.hideLoading()
+								}
+							});
+						},
+					})
+				} else 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.getOrderList();
-    this.$store.dispatch('initConfig');
-    // 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.getOrderList();
+			this.$store.dispatch('initConfig');
+			// this.getIndexList()
+			uni.stopPullDownRefresh();
+		},
+	};
 </script>
 
 <style lang="scss">
-.oa_home {
-  // padding-bottom: rpx;
-}
+	.oa_home {
+		// padding-bottom: rpx;
+	}
 
-.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: 110rpx;
-  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: 110rpx;
+		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: 28rpx;
-    color: white;
-    font-size: 34rpx;
-    padding-left: 150rpx;
-    box-sizing: border-box;
+		.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: 28rpx;
+			color: white;
+			font-size: 34rpx;
+			padding-left: 150rpx;
+			box-sizing: border-box;
 
-    .img_box {
-      position: absolute;
+			.img_box {
+				position: absolute;
 
-      left: -10rpx;
-      top: -15rpx;
-      width: 140rpx;
-      height: 140rpx;
-      background-color: white;
-      border-radius: 140rpx;
+				left: -10rpx;
+				top: -15rpx;
+				width: 140rpx;
+				height: 140rpx;
+				background-color: white;
+				border-radius: 140rpx;
 
-      .img_box_img {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-      }
-    }
+				.img_box_img {
+					position: absolute;
+					top: 50%;
+					left: 50%;
+					transform: translate(-50%, -50%);
+				}
+			}
 
-    .head_text {
-      font-size: 33rpx;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-    }
+			.head_text {
+				font-size: 33rpx;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow: hidden;
+			}
 
-    // 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: #ff7c32;
-          color: white;
-          padding: 5rpx 10rpx;
-          margin-right: 10rpx;
-          border-radius: 15rpx;
-        }
+					/* 设置元素宽度，根据需要进行调整 */
+					.text_time {
+						display: inline-block;
+						background-color: #ff7c32;
+						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;
-    }
-  }
-}
+			.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/subpkg/property/agencyList.vue b/subpkg/property/agencyList.vue
index 7d95621..e449f60 100644
--- a/subpkg/property/agencyList.vue
+++ b/subpkg/property/agencyList.vue
@@ -1,15 +1,19 @@
 <template>
 	<view class="box">
-		<view class="li" v-for="item,index in dataList" :key="index" @tap="navgo('/subpkg/property/chosseCompany')">
-			<view class="date">
-				<!-- 2023.07.24 -->
-				<!-- {{item.}} -->
-			</view>
-			<view class="text">
-				<!-- {{item.}} -->
-			</view>
-			<view class="detail">
-				<u-icon name="arrow-right"></u-icon>
+		<view class="li" v-for="item,index in dataList" :key="index"
+			@tap="navgo(`/subpkg/property/chosseCompany?id=${item.id}`)">
+			<view class="">
+				<view style="display: flex;justify-content: space-between;">
+					<view class="">
+						签约申请
+					</view>
+					<view class="">
+						更多
+					</view>
+				</view>
+				<view class="" style="margin-top: 20rpx;">
+					{{item.village_company_name}}提出租赁车辆一辆
+				</view>
 			</view>
 		</view>
 	</view>
@@ -17,12 +21,12 @@
 
 <script>
 	import {
-		getAgencyList,
+		getAgencyListApi,
 	} from "@/api/property.js"
 	export default {
 		data() {
 			return {
-				dataList: [1, 1, 1]
+				dataList: []
 			}
 		},
 		methods: {
@@ -33,8 +37,8 @@
 			}
 		},
 		onLoad() {
-			getAgencyList().then(res => {
-				// this.dataList=res
+			getAgencyListApi().then(res => {
+				this.dataList = res.data
 			})
 		}
 	}
@@ -43,36 +47,12 @@
 <style>
 	.box {
 		padding: 20rpx;
-	}
 
-	.li {}
-
-	.li {
-		background-color: #fff;
-		margin-bottom: 10rpx;
-		padding: 20rpx;
-		border-radius: 15rpx;
-
-		display: flex;
-		justify-content: space-between;
-
-		.date {
-			background-color: #FF7C32;
-			color: white;
-			padding: 0 10rpx;
+		.li {
+			padding: 10rpx;
+			background-color: white;
 			border-radius: 15rpx;
-			// width: 170rpx;
-		}
-
-		.text {
-			// background-color: lightyellow;
-			max-width: 450rpx;
-
-		}
-
-		.detail {
-			// background-color: black;
-			// width: 50rpx;
+			margin-bottom: 10rpx;
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/subpkg/property/chosseCompany.vue b/subpkg/property/chosseCompany.vue
index 7c085b4..6b2a47e 100644
--- a/subpkg/property/chosseCompany.vue
+++ b/subpkg/property/chosseCompany.vue
@@ -1,14 +1,15 @@
 <template>
 	<view class="">
 		<view class="date">
-			2022年12月12日提出申请
+			<!-- 2022年12月12日提出申请 -->
+			{{dataList.create_time.slice(0,10)}} 提出申请
 		</view>
 		<view class="cards">
 			<view class="cards_head">
 				<view class="cards_head_top">
 					<text><u--image src="../../static/img/company/company.png" width="33.29rpx" height="33.29rpx"
 							style="margin-right:20rpx"></u--image></text>
-					<text>{item.company_name}</text>
+					<text>{{dataList.village_company_name}}</text>
 				</view>
 				<text @click="navTo('/subpkg/companySign/companySign?id=')">详情 <uni-icons type="forward"
 						style="margin-left: 10rpx;" color="white"></uni-icons></text>
@@ -18,28 +19,20 @@
 					<view class="is_contract">
 						<view>
 							<text>法人姓名 :</text>
-							<text>{item.master_name}</text>
+							<text>{{dataList.village_company_user}}</text>
 						</view>
 						<view>
 							<text style="color: green;" v-if="true">已签约</text>
-							<text style="color: red;" v-else>未签约</text>
+							<!-- <text style="color: red;" v-else>未签约</text> -->
 						</view>
 
 					</view>
-					<view class="is_contract">
-						<view>
-							<text>担任职务 :</text>
-							<text>{item.master_position}</text>
-						</view>
-					</view>
+
 					<view class="" @click="copyPhone()">
 						<text>联系电话 :</text>
-						<text>{item.master_phone}</text>
-					</view>
-					<view class="">
-						<text>负责区域 :</text>
-						<text> {item.city_name+item.area_name}</text>
+						<text>{{dataList.village_company_phone}}</text>
 					</view>
+
 				</view>
 			</view>
 		</view>
@@ -49,11 +42,11 @@
 				<text v-else>自有车辆</text>
 			</view>
 			<view class="car_li" v-for="item,index in carList">
-				车牌号： 川Y103D2
+				车牌号：{{item.car_license}}
 				<view class="" style="float: right;display: flex;">
 					<text style="margin-right: 10rpx;">租赁车辆</text>
 					<u-checkbox-group v-model="checked">
-						<u-checkbox active-color="#0122C7" :label="item" :name="item" shape="square"
+						<u-checkbox active-color="#0122C7" :label="id" :name="item" shape="square"
 							label=""></u-checkbox>
 					</u-checkbox-group>
 				</view>
@@ -61,30 +54,58 @@
 		</view>
 
 		<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="生成合同" @tap="contractFn" color="#0122C7"></u-button>
+			<!-- 生成合同 -->
+			<view class="" v-if="1">
+				<u-button :disabled="false" type="primary" @click="showPop=true"
+					style="margin-bottom: 20rpx;width: 100%;" color="#FF7C32" text="申请驳回"></u-button>
+				<u-button :disabled="false" type="primary" text="生成合同" @tap="contractFn" color="#0122C7"></u-button>
+			</view>
+			<!-- 审核中 -->
+			<view class="" v-if="0">
+				<u-button :disabled="true" type="primary" text="合同已上传,等待审核" @tap="contractFn" color="grey"></u-button>
+			</view>
+			<!-- 审核通过 -->
+			<view class="" v-if="0">
+
+				<view class="card">
+					<view class="contract">
+						<view class="left">
+							<image class="contract_img" src="../../static/img/contract/pdf.png"></image>
+							<view class="text">
+								<view class="name">《入股合同》</view>
+								<view>
+									<text>{{'2023-03-03'}}</text>
+								</view>
+							</view>
+						</view>
+						<view class="right" @click="navToContract('fdsf')">
+							<uni-icons type="paperclip" color="#3274F9"></uni-icons>
+							<view>查看</view>
+						</view>
+					</view>
+				</view>
+
+				<u-button :disabled="false" type="primary" text="发送合同" @tap="sendcontractFn" color="#0122C7"></u-button>
+			</view>
+
 		</view>
 		<view class="">
 			<u-modal :show="showPop" @close="showPop=false" @confirm="confirm" :closeOnClickOverlay="true"
 				title="请输入驳回理由">
 				<view class="slot-content">
-					<!-- <u--input placeholder="请输入内容" type="number" v-model="newCarNum"></u--input> -->
 					<u--textarea v-model="overruleValue" placeholder="请输入内容" class="textarea_cls"></u--textarea>
 				</view>
 			</u-modal>
 		</view>
 	</view>
-
-
-
 </template>
 
 <script>
 	import {
-		getAgencyDetail,
+		getAgencyDetailApi,
 		contractApi,
-		overruleApi
+		overruleApi,
+		sendcontractApi
 	} from "@/api/property.js"
 	import {
 		Toast
@@ -92,30 +113,49 @@
 	export default {
 		data() {
 			return {
-				dataList: [],
+				dataList: {},
 				overruleValue: "",
 				showPop: false,
 				checked: [],
 				carList: [1, 2]
 			}
 		},
-		onLaunch() {
-			getAgencyDetail().then(res => {
-				this.dataList = res
+		onLoad() {
+			console.log(this.$route.query)
+			// console.log(6565)
+			getAgencyDetailApi({
+				id: this.$route.query.id
+			}).then(res => {
+				// 13043214321
+				this.dataList = res.data.apply
+				this.carList = res.data.cars
 			})
 		},
 		methods: {
 			confirm() {
 				// console.log(this.overruleValue)
-				overruleApi().then(res => {
+				overruleApi({
+					apply_id: this.dataList.id,
+					content: this.overruleValue,
+				}).then(res => {
 					Toast("操作成功")
 					this.showPop = false
 				})
 			},
 			contractFn() {
-				contractApi().then(res => {
-					Toast("操作成功")
+				console.log(this.checked)
+				contractApi({
+					apply_id: this.dataList.id,
+					car_id: this.checked[0].car_id
+				}).then(res => {
+					this.navTo('/subpkg/property/success')
 				})
+				this.navTo('/subpkg/property/success')
+			},
+			sendcontractFn() {
+				// sendcontractApi({
+				// 	id:
+				// })
 			},
 			navTo(url) {
 				uni.navigateTo({
@@ -132,6 +172,79 @@
 		padding: 10rpx 28rpx 0;
 	}
 
+	.card {
+		margin: 28rpx;
+		width: 694rpx;
+		background-color: #fff;
+		border-radius: 14rpx;
+
+		.c_title {
+			color: #0022C7;
+			font-size: 32rpx;
+			font-weight: 500;
+			padding: 28rpx;
+		}
+
+		.c_body {
+			margin: 28rpx;
+			padding-bottom: 28rpx;
+			display: flex;
+			border-bottom: 1px solid #F3F4F8;
+
+			&:last-child {
+				border-bottom: none;
+			}
+
+			.icon {
+				width: 77rpx;
+				height: 77rpx;
+				flex-shrink: 0;
+				margin-right: 12rpx;
+			}
+
+			.body_text {
+				flex: 1;
+				font-size: 25rpx;
+
+				.b_title {
+					font-size: 32rpx;
+					color: #333;
+					font-weight: 500;
+				}
+
+				.b_text {
+					display: flex;
+					justify-content: space-between;
+					padding: 16rpx 0;
+					font-size: 28rpx;
+
+					.b_avatar {
+						width: 52rpx;
+						height: 52rpx;
+						margin-right: 8rpx;
+					}
+
+					&_left {
+						display: flex;
+						align-items: center;
+					}
+
+					&_right {
+						color: #F02828;
+						display: flex;
+						align-items: center;
+						font-size: 35rpx;
+					}
+				}
+
+				.b_time {
+					color: #666666;
+				}
+			}
+		}
+
+	}
+
 	.cards {
 		margin: 28rpx;
 		width: 694rpx;
diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue
index 7a0c539..ffa33ee 100644
--- a/subpkg/property/index.vue
+++ b/subpkg/property/index.vue
@@ -1,161 +1,186 @@
 <template>
-	<view class="">
-		<!-- 没有测含量 -->
-		<view class="noCar" v-if='dataList.length==0'>
-			<!-- 申请 -->
-			<view class="" v-if="step==1">
-				<view class="">
-					你还没有所属车辆哦,请向镇公司申请用车或使用自有车辆并绑定系统
-				</view>
-				<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="">
-					<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>
+	<view class="" style="position: relative;">
+		<view v-if='true'>
+			<u-loading-page :loading="showLoading"></u-loading-page>
 		</view>
-		<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="" v-else>
+			<!-- 小组公司 -->
+			<view class="noCar" v-if='company_type==18'>
+				<!-- 申请 -->
+				<view class="" v-if="step==999">
 					<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" :showCancelButton="true" @confirm="upCarFn"
+						:closeOnClickOverlay="true" @cancel="show=false" title="车辆上传">
+						<view class="slot-content">
+							<u--input placeholder="请输入您的车牌号" v-model="carLicense"></u--input>
+						</view>
+					</u-modal>
+				</view>
+				<!-- 等待 -->
+				<view class="" v-if='step==-1'>
+					<!-- 上传自有车辆 -->
+					<view v-if="0">
+						<view class="loading">
+							<span>您已上传自用车辆,系统正在审核中,请耐心等待</span>
+							<span class="dots">...</span>
+						</view>
+					</view>
+					<!-- 申请用车 -->
+					<view v-else>
+						<view class="loading">
+							<span>你已提交用车申请，后台正在加快处理中，请耐心等待哦</span>
+							<span class="dots">...</span>
+						</view>
+					</view>
+				</view>
+				<!-- 审核结束 -->
+				<view class="" v-if="step==4">
+					<view class="">
+						你的申请于2022年12月12日被驳回
+					</view>
+					<view class="">
+						驳回理由:xxxxxxxxxx
+					</view>
+					<view class="">
+						请修改相应内容重新提交哦
+					</view>
+					<view class="">
+						<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="">
+							<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>
-				<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-if='company_type==16'>
+				<view class="info">
+					<text>可监管车辆数量 {{datas.monitor_num}}</text>
+					<view @click="showPop=true" class="not_leased">
+						<view class="">
+							租赁 {{datas.rent_num}}
+						</view>
+						<view class="triangle-up" v-if="datas.can_rent_num">
+						</view>
+						<view class="message_bottom" v-if="datas.can_rent_num">
+							可再租赁车辆:{{datas.can_rent_num}}辆
+						</view>
 					</view>
-
+					<text>自有车辆 {{datas.self_num}}</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?id=${item.id}`)"
+							v-for="item,index in applicationList">
+							<view class="date">
+								{{item.create_time.slice(0, 10)}}
+							</view>
+							<view class="text">
+								{{item.village_company_name}}提出租赁车辆一台
+							</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 class="personnel_list">
+					<view>
+						<view class="cards" v-for="item,index in dataList" :key="index"
+							@click="navgo(`/subpkg/property/vehicle_a?id=${item.car_id}`)">
+							<view class="cards_head">
+								<text>{{item.car_license}}</text>
+							</view>
+							<view class="cards_content">
+								<view class="right">
+									<!-- 已出租 -->
+									<view v-if="item.status==1">
+										<view class="li">
+											<text>使用人: </text>
+											<text> {{item.rent_company.master_name}}</text>
+											<view style="float: right;">
+												<text style="color: green;" v-if="item.type==1">自有车辆</text>
+												<text style="color: orange;" v-else>租赁车辆</text>
+											</view>
+										</view>
+										<view class="li">
+											<text>联系方式: </text>
+											<text>{{item.rent_company.master_phone}}</text>
+										</view>
+										<view class="li">
+											<text>所属公司: </text>
+											<text> {{item.rent_company.company_name}} </text>
+										</view>
+										<view class="li">
+											<text>签约时间: </text>
+											<text> {{item.rent_time}} </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.car_license}}</text>
+											<view style="float: right;">
+												<text style="color: green;" v-if="item.type==1">自有车辆</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> -->
+				<u-modal :show="showPop" @close="showPop=false" @confirm="confirm" :closeOnClickOverlay="true"
+					:title="`请输入您需要租赁的车辆数量(上限为${datas.can_rent_num})`">
+					<view class="slot-content">
+						<u--input placeholder="请输入内容" type="number" v-model="newCarNum"></u--input>
 					</view>
-				</view>
-				<!-- <view style="padding: 0 60rpx;" v-if="isNewCheck">
-					你已发起租赁{{newCarNum}}两新车的申请,后台正在为您加急处理中,请稍后~~
-				</view> -->
+				</u-modal>
 			</view>
 
-			<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>
-
-
 </template>
 
 <script>
@@ -163,8 +188,12 @@
 		getvehicleListApi,
 		getAgencyListApi,
 		leaseApi,
-		upVehicleApi
+		upVehicleApi,
+		getAgencyDetailApi,
+		getvehicleDetailApi,
+		villageCompanyApi
 	} from "@/api/property.js"
+	import Cache from '@/utils/cache';
 	// import mybtn from "@/components/mybtn/mybtn.vue"
 	import {
 		Toast
@@ -177,50 +206,99 @@
 		name: "vehicle",
 		data() {
 			return {
+				showLoading: true,
+				company_type: "",
+				// 1上传2审核3审核结束
 				step: 1,
-				applicationList: [1, 1],
-				// isNewCheck: true,
+				applicationList: [1],
 				show: false,
 				carLicense: "",
 				showPop: false,
+				datas: {},
 				dataList: [],
-				tabLists: [{
-					name: '未出租',
-				}, {
-					name: '已出租'
-				}, ],
-				curNow: 0,
-				keywords: "",
 				newCarNum: "",
-				newcarTit: "请输入您需要租赁的车辆数量(上限为2)"
+				newcarTit: ""
 
 
 			};
 		},
 		onLoad() {
-			getvehicleListApi().then(res => {
-				console.log(res)
-				// this.getvehicleList = res
-			})
-			getAgencyListApi().then(res => {
-				// this.applicationList=res
+			let type = (JSON.parse(Cache.get("USER_INFO")).company.company_type)
+			this.company_type = type
+			// 小组公司
+			if (type == 18) {
+				// getvehicleDetailApi().then(res => {})
+				villageCompanyApi().then(res => {
+					this.showLoading = false
+					this.step = res.data.status || 999
+					console.log(res.data.cars_info.id)
+					switch (this.step) {
+						case 3:
+							uni.navigateTo({
+								url: `/subpkg/property/vehicle_a?type=2`
+							})
+							// this.step =
+							break;
+						default:
+							break;
+					}
 
-			})
+				})
+
+			}
+			// 镇街公司
+			else {
+				getvehicleListApi().then(res => {
+					this.datas = res.data
+					res.data.apply.length >= 2 ? this.applicationList = res.data.apply : this.applicationList = res
+						.data.apply.slice(0, 2)
+					this.applicationList = res.data.apply
+					this.dataList = res.data.car_list
+					this.showLoading = false
+				})
+				// getAgencyListApi().then(res => {
+				// 	this.applicationList = res.data
+				// })
+			}
+			// if (true) {
+			// 	uni.navigateTo({
+			// 		url: '/subpkg/property/vehicle_a'
+			// 	})
+			// }
+			// getvehicleListApi().then(res => {
+			// 	console.log(res)
+			// 	// this.getvehicleList = res
+			// })
+			// getAgencyListApi().then(res => {
+			// 	// this.applicationList=res
+
+			// })
 		},
 
 
 
 		methods: {
+			// 申请车辆
 			applycarFn() {
+				upVehicleApi().then(res => {
+					Toast(res.msg)
+				})
 				this.step = 2
 			},
+			// 自有车辆
 			upCarFn() {
 				upVehicleApi({
 					license: this.carLicense
-
 				}).then(res => {
 					this.show = false
+					this.step = 2
 				})
+				// upVehicleApi({
+				// 	license: this.carLicense
+
+				// }).then(res => {
+				// 	this.show = false
+				// })
 				console.log(this.carLicense)
 			},
 			signFn() {
@@ -235,10 +313,6 @@
 					Toast(res.msg)
 				})
 				this.showPop = false
-
-				// this.isNewCheck = true
-
-
 			},
 
 			navgo(url) {
@@ -246,23 +320,50 @@
 					url
 				})
 			},
-			sectionChange(index) {
-				this.curNow = index.index;
-				console.log(this.curNow)
-				// this.getOrderList()
-			},
+
 		}
 	}
 </script>
 
 <style lang="scss">
-	.serch {
-		margin: 28rpx 28rpx 0 28rpx;
+	.dots {
+		animation: loadingDots 1s infinite;
+	}
+
+	@keyframes loadingDots {
+		0% {
+			opacity: 0;
+		}
+
+		25% {
+			opacity: 0;
+		}
+
+		50% {
+			opacity: 1;
+		}
+
+		75% {
+			opacity: 1;
+		}
+
+		100% {
+			opacity: 0;
+		}
 	}
 
 	.noCar {
-		// background-color: red;
 		padding: 50rpx;
+		margin-top: 30vh;
+		// position: absolute;
+		// width: 80vw;
+		// height: auto;
+		// position: absolute;
+		// top: 40vh;
+		// left: 50vw;
+		// transform: translate(-50%, -50%);
+
+
 	}
 
 	.info {
@@ -316,13 +417,12 @@
 					background-color: #FF7C32;
 					color: white;
 					padding: 0 10rpx;
-					border-radius: 15rpx;
-					// width: 170rpx;
+					border-radius: 15rpx // width: 170rpx;
 				}
 
 				.text {
 					// background-color: lightyellow;
-					max-width: 450rpx;
+					max-width: 400rpx;
 					white-space: nowrap;
 
 					/* 让文本不换行 */
diff --git a/subpkg/property/success.vue b/subpkg/property/success.vue
new file mode 100644
index 0000000..83df54b
--- /dev/null
+++ b/subpkg/property/success.vue
@@ -0,0 +1,69 @@
+<template>
+	<view class="">
+
+		<view class="box">
+			<view class="">
+				<u--image :showLoading="true" src="/static/img/contract/ok_b.png" width="150rpx" height="150rpx"
+					mode="aspectFill">
+				</u--image>
+			</view>
+			<view class="info">
+				生成合同成功,等待风控部审核 <text class="dots">...</text>
+			</view>
+		</view>
+	</view>
+
+
+
+
+</template>
+
+<script>
+</script>
+
+<style lang="scss" scoped>
+	.box {
+
+		// background-color: red;
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		text-align: center;
+		margin-top: 30vh;
+
+	}
+
+	.info {
+		margin-top: 50rpx;
+		// font-size: 52.63rpx;
+		font-weight: bold;
+	}
+
+	.dots {
+		animation: loadingDots 1s infinite;
+		opacity: 0;
+		animation-delay: 0.2s;
+	}
+
+	@keyframes loadingDots {
+		0% {
+			opacity: 0;
+		}
+
+		25% {
+			opacity: 0;
+		}
+
+		50% {
+			opacity: 1;
+		}
+
+		75% {
+			opacity: 1;
+		}
+
+		100% {
+			opacity: 0;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/subpkg/property/vehicle_a.vue b/subpkg/property/vehicle_a.vue
index 90d2ebd..27771a9 100644
--- a/subpkg/property/vehicle_a.vue
+++ b/subpkg/property/vehicle_a.vue
@@ -1,175 +1,139 @@
 <template>
 	<view>
-		<!-- 有车辆 -->
-		<view v-if="1">
-			<view class="content">
-				<view :class="allMap?'map1':'map2'" style="position: relative;">
-					<map :class="mapClass" id="map" :enable-zoom="true" :polyline="polyline" :markers='markers'
-						:scale="scale" style="width:100%;height: 100%;" :latitude="markers[0].latitude"
-						:enable-scroll="true" :longitude="markers[0].longitude" @tap="allMap=!allMap">
-					</map>
-				</view>
-				<view v-if="!allMap">
-					<view class="query">
-						<!-- <u--input placeholder="请选择日期" suffixIcon="clock" class="ipt" border="surround"
-							v-model="queryData" @focus='fousFn'></u--input> -->
-						<view class="ipt" @click="showDate=true">
-							<text>{{queryData}}</text>
-							<u-icon name="clock" size="24"></u-icon>
-						</view>
-						<u-button type="primary" class='poline_btn' @click="showPloyline" text="显示轨迹"></u-button>
+		<view class="content">
+			<view :class="allMap?'map1':'map2'" style="position: relative;">
+				<map :class="mapClass" id="map" :enable-zoom="true" :polyline="polyline" :markers='markers'
+					:scale="scale" style="width:100%;height: 100%;" :latitude="markers[0].latitude"
+					:enable-scroll="true" :longitude="markers[0].longitude" @tap="allMap=!allMap">
+				</map>
+			</view>
+			<view v-if="!allMap">
+				<view class="query">
+					<view class="ipt" @click="showDate=true">
+						<text>{{queryData}}</text>
+						<u-icon name="clock" size="24"></u-icon>
 					</view>
-					<view class="personnel_list" @click="toDetail('/subpkg/property/vehicle')">
-						<view class="cards">
-							<view class="cards_head">
-								<text><!-- <!-- {{datas.}} --></text>
-							</view>
-							<view class="cards_content">
-								<view class="right">
-									<view class="li">
-										<text>行驶总里程: </text>
-										<text> <!-- {{datas.}} --></text>
-									</view>
-									<view class="li">
-										<text>本公司签约时间: </text>
-										<text><!-- {{datas.}} --></text>
-									</view>
-									<view class="li">
-										<text>承租公司: </text>
-										<text><!-- {{datas.}} --> </text>
-									</view>
-									<view class="li">
-										<text>负责人: </text>
-										<text><!-- {{datas.}} --> </text>
-									</view>
-									<view class="li">
-										<text>联系方式: </text>
-										<text> <!-- {{datas.}} --> </text>
-									</view>
-									<view class="li">
-										<text>所属区域: </text>
-										<text> <!-- {{datas.}} --></text>
-									</view>
-									<view class="li">
-										<text>签约时间: </text>
-										<text><!-- {{datas.}} --> </text>
-									</view>
-									<view class="li">
-										<text>到期时间: </text>
-										<text> <!-- {{datas.}} --> </text>
-									</view>
+					<u-button type="primary" class='poline_btn' @click="showPloyline" text="显示轨迹"></u-button>
+				</view>
+				<view class="personnel_list" @click="toDetail('/subpkg/property/vehicle')">
+					<view class="cards">
+						<view class="cards_head">
+							<text>{{datas.car_license}}</text>
+						</view>
+						<view class="cards_content">
+							<view class="right">
+								<view class="li">
+									<text>行驶总里程: {{datas.mileage}}</text>
+
+								</view>
+								<view class="li">
+									<text>承租公司: </text>
+									<text>{{datas.company.company_name}} </text>
+								</view>
+								<view class="li">
+									<text>负责人: </text>
+									<text>{{datas.company.master_name}} </text>
+								</view>
+								<view class="li">
+									<text>联系方式: </text>
+									<text> {{datas.company.master_phone}} </text>
+								</view>
+								<view class="li">
+									<text>所属区域: </text>
+									<text> {{datas.company.area_name}}</text>
+								</view>
+								<view class="li">
+									<text>签约时间: </text>
+									<text>{{datas.rent_time}} </text>
+								</view>
+								<view class="li">
+									<text>到期时间: </text>
+									<text> {{datas.rent_time}} </text>
 								</view>
 							</view>
 						</view>
 					</view>
-
-
 				</view>
 			</view>
-			<u-calendar @close='showDate=false' color="#0122C7" :show="showDate" @confirm="dateFn"></u-calendar>
 		</view>
-
-
-
-		<!-- 没有车辆 -->
-		<!-- <view class="" v-else>
-			<view class="" v-if="!isMycar">
-				<view class="empty_car">
-					<view>
-						您还没有所属车辆哦,请等待镇公司发放车辆或使用自有车辆并绑定系统
-					</view>
-					<u-button @click="showPop=true" type="primary" class="btn_cls">
-						上传自有车辆</u-button>
-				</view>
-				<view class="">
-					<u-modal :show="showPop" @close="showPop=false" @confirm="confirm" :closeOnClickOverlay="true"
-						title="请输入车牌号">
-						<view class="slot-content">
-							<u--input placeholder="请输入内容" v-model="myCarnum"></u--input>
-						</view>
-					</u-modal>
-				</view>
-			</view>
-			<view style="text-align: center;margin-top: 100rpx;" v-if="isMycar">
-				您上传自有车两,系统正在审核中,请耐心等待
-			</view>
-
-		</view>
- -->
-
-
+		<u-calendar @close='showDate=false' :minDate="minDate" :maxDate="maxDate" color="#0122C7" :show="showDate"
+			@confirm="dateFn"></u-calendar>
 	</view>
-
 </template>
-
 <script>
 	import mybtn from "@/components/mybtn/mybtn.vue"
 	import {
-		getvehicleDetail,
-		locusApi
+		getvehicleDetailApi,
+		locusApi,
+		villageCompanyApi
 	} from "@/api/property.js"
 	import {
 		Toast
 	} from "../../libs/uniApi";
+	const d = new Date()
+	const year = d.getFullYear()
+	let month = d.getMonth() + 1
+	month = month < 10 ? `0${month}` : month
+	const date = d.getDate()
 	export default {
 		components: {
 			mybtn
 		},
 		data() {
 			return {
+				minDate: `${year}-${month}-${date -30}`,
+				maxDate: `${year}-${month}-${date }`,
 				allMap: false,
 				showDate: false,
-				// isMycar: false,
 				showPop: false,
 				datas: {},
 				queryData: "请选择时间",
-				// myCarnum: "",
 				mapClass: 'custom-map',
 				scale: 17,
-				markers: [
-					// 目的地
-					{
-						id: 1,
-						latitude: 28.8733,
-						longitude: 105.445717,
-						iconPath: '../../static/img/logistics/WZ.png', //显示的图标        
-					},
-					// 当前所在位置
-					{
-						id: 2,
-						latitude: 28.8733,
-						longitude: 105.444828,
-						iconPath: '../../static/img/logistics/QS.png', //显示的图标        
-					}
-				],
+				markers: [{
+					id: 2,
+					latitude: 28.8733,
+					longitude: 105.444828,
+					iconPath: '../../static/img/logistics/QS.png', //显示的图标        
+				}],
 				polyline: [],
-
-
 			}
 		},
 		onLoad(options) {
-			// getvehicleDetail().then(res => {
-			// this.datas = res
-			// })
-
+			if (this.$route.query.type) {
+				villageCompanyApi().then(res => {
+					this.datas = res.data
+				})
+				return
+			}
+			// console.log(this.$route.query.id)
+			getvehicleDetailApi({
+				car_id: this.$route.query.id
+			}).then(res => {
+				this.datas = res.data
+				console.log()
+			})
 		},
 		methods: {
-
 			dateFn(e) {
 				// console.log(e)
 				this.queryData = e[0]
 				this.showDate = false
 			},
-			// confirm() {
-			// 	if (this.myCarnum) {
-			// 		console.log(this.myCarnum)
-			// 		this.showPop = false
-			// 		this.isMycar = true
-			// 	}
-			// },
 			showPloyline() {
-				// console.log(this.queryData)
+				console.log(this.queryData)
+				return
 				// this.queryData
+				locusApi({
+					// car_id: 7,
+					// start_time: `${this.queryData} 00:00:00`,
+					// end_time: `${this.queryData} 23:59:59`,
+					car_id: 7,
+					end_time: '2023-08-29 23:59:59',
+					start_time: '2023-08-29 00:00:00',
+				}).then(res => {
+					console.log(res)
+				})
 				let points = [{
 						latitude: 28.916722,
 						longitude: 105.443274,
@@ -192,8 +156,6 @@
 			},
 		},
 		onPullDownRefresh() {
-			// this.getOrderList();
-			// this.getIndexList()
 			uni.stopPullDownRefresh();
 		},
 
diff --git a/utils/logistics.js b/utils/logistics.js
index 637af8f..54efb2d 100644
--- a/utils/logistics.js
+++ b/utils/logistics.js
@@ -21,7 +21,7 @@ function baseRequestTwo(url, method, data, {
 	noAuth = false,
 	noVerify = false
 }) {
-	let Url = "http://logistics.lihaink.cn",
+	let Url = "https://logistics.lihaink.cn",
 		header = HEADER;
 	if (!noAuth) {
 		// 已经未登录了,禁止请求
@@ -49,7 +49,12 @@ function baseRequestTwo(url, method, data, {
 			// url: Url + '/api/v1' + url,
 			url: Url + '/api' + url,
 			method: method || 'GET',
-			header: header,
+			header: {
+				...header,
+				...{
+					'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+				}
+			},
 			data: method != 'GET' ? data || {} : {},
 			params: method == 'GET' ? data : {},
 			success: (res) => {
diff --git a/utils/oahttp.js b/utils/oahttp.js
index d147d9f..b61542c 100644
--- a/utils/oahttp.js
+++ b/utils/oahttp.js
@@ -1,113 +1,118 @@
 import {
-  HTTP_REQUEST_URL_THREE,
-  HEADER,
-  TOKENNAME,
+	HTTP_REQUEST_URL_THREE,
+	HEADER,
+	TOKENNAME,
 } from '@/config/app';
-import { Toast } from '../libs/uniApi';
+import {
+	Toast
+} from '../libs/uniApi';
 // import { checkLogin } from '../libs/login';
 import store from '../store';
 
 function toLogin() {
-  uni.showToast({
-    title: '请先登录',
-    icon: 'none',
-    duration: 1000
-  });
+	uni.showToast({
+		title: '请先登录',
+		icon: 'none',
+		duration: 1000
+	});
 }
 
 function baseRequestTwo(url, method, data, {
-  noAuth = false,
-  noVerify = false
+	noAuth = false,
+	noVerify = false
 }) {
-  let Url = HTTP_REQUEST_URL_THREE,
-    header = HEADER;
-  if (!noAuth) {
-    // 已经未登录了,禁止请求
-    if (!store.state.config.request) return Promise.reject({
-      msg: '未登录'
-    });
-    //登录过期自动登录 
-    if (!store.state.app.token) {
-      toLogin();
-      store.commit("SET_REQUEST", false);
-      return Promise.reject({
-        msg: '未登录'
-      });
-    }
-  }
+	let Url = HTTP_REQUEST_URL_THREE,
+		header = HEADER;
+	if (!noAuth) {
+		// 已经未登录了,禁止请求
+		if (!store.state.config.request) return Promise.reject({
+			msg: '未登录'
+		});
+		//登录过期自动登录 
+		if (!store.state.app.token) {
+			toLogin();
+			store.commit("SET_REQUEST", false);
+			return Promise.reject({
+				msg: '未登录'
+			});
+		}
+	}
 
-  // if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token;
-  if (store.state.app.token) header[TOKENNAME] = store.state.app.token;
-  
-  // header[TOKENNAME] = 'Bearer sdjflidshjgfkbdasgjmasbgvhauuiavhkesvndkaesbvkjsdbv';
-  return new Promise((reslove, reject) => {
-    // uni.showLoading({
-    //   title: '加载中'
-    // })
-    uni.request({
-      // url: Url + '/api/v1' + url,
-      url: Url + '/api' + url,
-      method: method || 'GET',
-      header: header,
-      data: method != 'GET' ? data || {} : {},
-      params: method == 'GET' ? data : {},
-      success: (res) => {
-        // uni.hideLoading()
-        if (noVerify)
-          // reslove(res.data, res);
-          reslove(res.data);
-        else if (res.data.code == -1) {
-          store.commit("LOGOUT");
-          store.commit("SET_REQUEST", false);
-          reject(res.data);
-        } else if (res.data.code == 0) {
-          // uni.hideLoading();
-          uni.showToast({
-            title: res.data.msg || '请检查网络',
-            icon: 'none',
-          })
-          reject(res.data);
-        } else if (res.data.code == 1){
-          store.commit("SET_REQUEST");
-          reslove(res.data);
-        }
-        else if (res.data.code == 200){
-          store.commit("SET_REQUEST");
-          reslove(res.data.data);
-        }
-        else if ([410000, 410001, 410002, 40000].indexOf(res.data.code) !== -1) {
-          toLogin();
-          reject(res.data);
-        } else if (res.data.code == 501) {
-          // uni.reLaunch({
-          //   url: '/pages/error/index'
-          // })
-          reject(res.data);
-        } else {
-          // uni.hideLoading();
-          uni.showToast({
-            title: res.data.msg || '请检查网络',
-            icon: 'none'
-          })
-          reject(res.data.msg || '请检查网络');
-        }
-      },
-      fail: (message) => {
-        // uni.hideLoading()
-        uni.showToast({
-          title: '网络错误',
-          icon: 'none'
-        })
-        reject('请求失败');
-      }
-    })
-  });
+	// if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token;
+	if (store.state.app.token) header[TOKENNAME] = store.state.app.token;
+
+	// header[TOKENNAME] = 'Bearer sdjflidshjgfkbdasgjmasbgvhauuiavhkesvndkaesbvkjsdbv';
+	return new Promise((reslove, reject) => {
+		// uni.showLoading({
+		//   title: '加载中'
+		// })
+		uni.request({
+			// url: Url + '/api/v1' + url,
+			url: Url + '/api' + url,
+			method: method || 'GET',
+			header: {
+				...header,
+				...{
+					'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+				}
+			},
+			data: method != 'GET' ? data || {} : {},
+			params: method == 'GET' ? data : {},
+			success: (res) => {
+				// uni.hideLoading()
+				if (noVerify)
+					// reslove(res.data, res);
+					reslove(res.data);
+				else if (res.data.code == -1) {
+					store.commit("LOGOUT");
+					store.commit("SET_REQUEST", false);
+					reject(res.data);
+				} else if (res.data.code == 0) {
+					// uni.hideLoading();
+					uni.showToast({
+						title: res.data.msg || '请检查网络',
+						icon: 'none',
+					})
+					reject(res.data);
+				} else if (res.data.code == 1) {
+					store.commit("SET_REQUEST");
+					reslove(res.data);
+				} else if (res.data.code == 200) {
+					store.commit("SET_REQUEST");
+					reslove(res.data.data);
+				} else if ([410000, 410001, 410002, 40000].indexOf(res.data.code) !== -1) {
+					toLogin();
+					reject(res.data);
+				} else if (res.data.code == 501) {
+					// uni.reLaunch({
+					//   url: '/pages/error/index'
+					// })
+					reject(res.data);
+				} else {
+					// uni.hideLoading();
+					uni.showToast({
+						title: res.data.msg || '请检查网络',
+						icon: 'none'
+					})
+					reject(res.data.msg || '请检查网络');
+				}
+			},
+			fail: (message) => {
+				// uni.hideLoading()
+				uni.showToast({
+					title: '网络错误',
+					icon: 'none'
+				})
+				reject('请求失败');
+			}
+		})
+	});
 }
 
 const oahttp = {};
 
 ['options', 'get', 'post', 'put', 'head', 'delete', 'trace', 'connect'].forEach((method) => {
-  oahttp[method] = (api, data, opt) => baseRequestTwo(api, method, data, opt || {})
+	oahttp[method] = (api, data, opt) => baseRequestTwo(api, method, data, opt || {})
 });
 
 export default oahttp;
\ No newline at end of file