From 081901392f11255c20894408dbddd3b450b1b83e Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Tue, 29 Aug 2023 11:11:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E8=B5=84=E4=BA=A7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/property.js                   |  27 +++
 pages.json                        |  50 +++---
 subpkg/property/agencyList.vue    |  78 +++++++++
 subpkg/property/chosseCompany.vue | 166 ++++++++++++++----
 subpkg/property/index.vue         | 279 +++++++++++++++++++++++-------
 subpkg/property/vehicle_a.vue     | 208 +++++-----------------
 6 files changed, 517 insertions(+), 291 deletions(-)
 create mode 100644 api/property.js
 create mode 100644 subpkg/property/agencyList.vue

diff --git a/api/property.js b/api/property.js
new file mode 100644
index 0000000..942acec
--- /dev/null
+++ b/api/property.js
@@ -0,0 +1,27 @@
+import oahttp from "@/utils/logistics.js";
+
+/**
+ * 车辆列表
+ */
+export const getvehicleList = (data) => oahttp.get('/courierLstData', data)
+// 车辆详情
+export const getvehicleDetail = (data) => oahttp.get('/courierLstData', data)
+// 显示轨迹
+export const locusApi = (data) => oahttp.get('/courierLstData', data)
+// 签约列表
+export const getAgencyList = (data) => oahttp.get('/courierLstData', data)
+// 签约公司详情
+export const getAgencyDetail = (data) => oahttp.get('/courierLstData', data)
+// 车辆租赁
+export const leaseApi = (data) => oahttp.get('/courierLstData', data)
+// 生成合同
+export const contractApi = (data) => oahttp.get('/courierLstData', data)
+// 申请驳回
+export const overruleApi = (data) => oahttp.get('/courierLstData', data)
+// 资产详情
+// export const getpropertyDetil = (data) => oahttp.get('/lstDetail', data)
+
+/**
+ * 更新商机
+ */
+// export const informationOpportunityUpdate = (data) => oahttp.post('/information/opportunity_update', data)
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 4c4986a..bda99ac 100644
--- a/pages.json
+++ b/pages.json
@@ -66,7 +66,7 @@
 				"app-plus": {
 					"titleNView": false
 				},
-        "navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white"
 			}
 		}, {
 			"path": "pages/oaManager/oaManager",
@@ -139,26 +139,25 @@
 				"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": "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"
-    }
-}
-],
+	],
 	"subPackages": [{
 		"root": "pages/views",
 		"name": "views",
@@ -544,6 +543,17 @@
 
 			}
 
+			, {
+				"path": "property/agencyList",
+				"style": {
+
+					"navigationBarTitleText": "签约列表",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#0122C7",
+					"navigationBarTextStyle": "white"
+				}
+
+			}
 		]
 	}],
 	"globalStyle": {
diff --git a/subpkg/property/agencyList.vue b/subpkg/property/agencyList.vue
new file mode 100644
index 0000000..7d95621
--- /dev/null
+++ b/subpkg/property/agencyList.vue
@@ -0,0 +1,78 @@
+<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>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getAgencyList,
+	} from "@/api/property.js"
+	export default {
+		data() {
+			return {
+				dataList: [1, 1, 1]
+			}
+		},
+		methods: {
+			navgo(url) {
+				uni.navigateTo({
+					url
+				})
+			}
+		},
+		onLoad() {
+			getAgencyList().then(res => {
+				// this.dataList=res
+			})
+		}
+	}
+</script>
+
+<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;
+			border-radius: 15rpx;
+			// width: 170rpx;
+		}
+
+		.text {
+			// background-color: lightyellow;
+			max-width: 450rpx;
+
+		}
+
+		.detail {
+			// background-color: black;
+			// width: 50rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/subpkg/property/chosseCompany.vue b/subpkg/property/chosseCompany.vue
index b5cf474..5b78441 100644
--- a/subpkg/property/chosseCompany.vue
+++ b/subpkg/property/chosseCompany.vue
@@ -1,58 +1,121 @@
 <template>
-	<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>
-			</view>
-			<text @click="navTo('/subpkg/companySign/companySign?id=')">详情 <uni-icons type="forward"
-					style="margin-left: 10rpx;" color="white"></uni-icons></text>
+	<view class="">
+		<view class="date">
+			2022年12月12日提出申请
 		</view>
-		<view class="cards_content">
-			<view class="right">
-				<view class="is_contract">
-					<view>
-						<text>法人姓名 :</text>
-						<text>{item.master_name}</text>
-					</view>
-					<view>
-						<text style="color: green;" v-if="true">已签约</text>
-						<text style="color: red;" v-else>未签约</text>
-					</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>
+				</view>
+				<text @click="navTo('/subpkg/companySign/companySign?id=')">详情 <uni-icons type="forward"
+						style="margin-left: 10rpx;" color="white"></uni-icons></text>
+			</view>
+			<view class="cards_content">
+				<view class="right">
+					<view class="is_contract">
+						<view>
+							<text>法人姓名 :</text>
+							<text>{item.master_name}</text>
+						</view>
+						<view>
+							<text style="color: green;" v-if="true">已签约</text>
+							<text style="color: red;" v-else>未签约</text>
+						</view>
 
-				</view>
-				<view class="is_contract">
-					<view>
-						<text>担任职务 :</text>
-						<text>{item.master_position}</text>
 					</view>
-					<view>
-						<u-checkbox-group>
-							<u-checkbox active-color="#0122C7" v-model="checked" shape="square" label=""></u-checkbox>
-						</u-checkbox-group>
+					<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>
 					</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>
 				</view>
 			</view>
 		</view>
+		<view class="car_info">
+			<view class="car_type">
+				<text v-if="true">空闲车辆</text>
+				<text v-else>自有车辆</text>
+			</view>
+			<view class="car_li" v-for="item,index in carList">
+				车牌号： 川Y103D2
+				<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"
+							label=""></u-checkbox>
+					</u-checkbox-group>
+				</view>
+			</view>
+		</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="生成合同" color="#0122C7"></u-button>
+		</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,
+		contractApi,
+		overruleApi
+	} from "@/api/property.js"
+	export default {
+		data() {
+			return {
+				overruleValue: "",
+				showPop: false,
+				checked: [],
+				carList: [1, 2]
+			}
+		},
+		methods: {
+			confirm() {
+				console.log(this.overruleValue)
+				this.showPop = false
+			},
+			navTo(url) {
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+
+	}
 </script>
 
 <style lang="scss" scoped>
+	.date {
+		padding: 10rpx 28rpx 0;
+
+	}
+
 	.cards {
 
 		margin: 28rpx;
@@ -131,4 +194,31 @@
 			transform: translate(-50%, -50%);
 		}
 	}
+
+	.car_info {
+		padding: 10rpx 28rpx 0;
+
+		.car_type {
+			margin-bottom: 20rpx;
+		}
+
+		.car_li {
+			background-color: white;
+			margin-bottom: 17.54rpx;
+			padding: 20rpx;
+			border-radius: 10rpx;
+		}
+	}
+
+	.btns {
+		position: fixed;
+		bottom: 5rpx;
+		width: 100%;
+		padding: 10rpx 28rpx 0;
+	}
+
+	.textarea_cls {
+		width: 70vw;
+		border: 1px solid #DADBDE;
+	}
 </style>
\ No newline at end of file
diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue
index adaa085..8ce8869 100644
--- a/subpkg/property/index.vue
+++ b/subpkg/property/index.vue
@@ -1,63 +1,118 @@
 <template>
 	<view>
-		<u-sticky bgColor="#0122C7" style="width: 100vw">
-			<u-tabs :list="tabLists" @change="sectionChange" lineColor="#fff" :scrollable="false" lineWidth="40"
-				inactiveStyle="color:#fff" activeStyle="color:#fff"></u-tabs>
-		</u-sticky>
-		<view class="serch">
-			<u-search placeholder="输入车牌号进行搜索" :show-action="true" bg-color="white" v-model="keywords"></u-search>
+		<!-- <view class="serch">
+			<u-search placeholder="输入车牌号进行搜索" :show-action="true" bg-color="white" v-model="keywords" @search="serchFn"
+				@custom="serchFn"></u-search>
+		</view> -->
+		<view class="info">
+			<text>可监管车辆数量 10</text>
+			<view @click="showPop=true" class="not_leased">
+				<view class="">
+					租赁 10
+				</view>
+				<view class="triangle-up" v-if="1">
+				</view>
+				<view class="message_bottom" v-if="1">
+					可再租赁车辆:2辆
+				</view>
+			</view>
+			<text>自有车辆 10</text>
+		</view>
+		<!-- 公告栏 -->
+		<view class="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 class="content">
+				<view class="li" @click="navgo('/subpkg/property/chosseCompany')"
+					v-for="item,index in applicationList.slice(0, 2)">
+					<view class="date">
+						<!-- {{item.}} -->
+					</view>
+					<view class="text">
+						<!-- {{item.}} -->
+					</view>
+					<view class="detail">
+						<u-icon name="arrow-right"></u-icon>
+					</view>
+				</view>
+
+			</view>
 		</view>
 
-		<view v-if="curNow==0" class="personnel_list">
+		<view v-if="true" class="personnel_list">
 			<view v-if="dataList.length">
-				<view class="cards" v-for="item,index in dataList" :key="index">
+				<view class="cards" v-for="item,index in dataList" :key="index"
+					@click="navgo('/subpkg/property/vehicle_a')">
 					<view class="cards_head">
-						<text>XSDSDSD</text>
+						<text><!-- {{item.}} --></text>
 					</view>
 					<view class="cards_content">
 						<view class="right">
-							<view class="li">
-								<text>车牌号: </text>
-								<text> { item.name }</text>
-							</view>
-							<view class="li">
-								<text>行驶总里程: </text>
-								<text>{ item.phone }</text>
-								<view style="float: right;">
-									<u-checkbox-group v-model="checked">
-										<u-checkbox active-color="#0122C7" :label="item" :name="item" shape="square"
-											label=""></u-checkbox>
-									</u-checkbox-group>
+							<!-- 已出租 -->
+							<view v-if="1">
+								<view class="li">
+									<text>使用人: </text>
+									<text> <!-- {{item.}} --></text>
+									<view style="float: right;">
+										<text style="color: green;" v-if="true">自有车辆</text>
+										<text style="color: orange;" v-else>租赁车辆</text>
+									</view>
+								</view>
+								<view class="li">
+									<text>联系方式: </text>
+									<text><!-- {{item.}} --></text>
+								</view>
+								<view class="li">
+									<text>所属公司: </text>
+									<text> <!-- {{item.}} --> </text>
+								</view>
+								<view class="li">
+									<text>签约时间: </text>
+									<text> <!-- {{item.}} --> </text>
+								</view>
 
+
+							</view>
+							<!-- 未出租 -->
+							<view class="" v-else>
+								<view class="li">
+									<text>车牌号: </text>
+									<text> <!-- {{item.}} --></text>
+									<view style="float: right;">
+										<text style="color: green;" v-if="true">自有车辆</text>
+										<text style="color: orange;" v-else>租赁车辆</text>
+									</view>
+								</view>
+								<view class="li">
+									暂未出租，快去选择承租对象吧！
 								</view>
 							</view>
-							<view class="li">
-								<text>本公司签约时间: </text>
-								<text> 所属片区 </text>
-							</view>
 						</view>
-
-
 					</view>
 				</view>
 			</view>
 			<view v-if="dataList.length==0&&!isNewCheck">
 				<view class="empty">
-					<view>
+					<!-- <view>
 						当前没有可以签约的的车辆,快去签约新车吧!
-					</view>
-					<u-button @click="showPop=true" type="primary" style="background-color: #0122C7;border: none;"
+					</view> -->
+					<!-- <u-button @click="showPop=true" type="primary" style="background-color: #0122C7;border: none;"
 						class="btn">
-						签约新车</u-button>
+						签约新车</u-button> -->
 				</view>
 			</view>
-			<view style="padding: 0 60rpx;" v-if="isNewCheck">
+			<!-- <view style="padding: 0 60rpx;" v-if="isNewCheck">
 				你已发起租赁{{newCarNum}}两新车的申请,后台正在为您加急处理中,请稍后~~
-			</view>
+			</view> -->
 		</view>
-
+		<!-- 
 		<view v-else>
-
 			<view class="personnel_list" @click="toDetail('/subpkg/property/vehicle_a')">
 				<view class="cards">
 					<view class="cards_head">
@@ -102,21 +157,24 @@
 			</view>
 
 
-		</view>
+		</view> -->
+
 		<u-modal :show="showPop" @close="showPop=false" @confirm="confirm" :closeOnClickOverlay="true"
 			:title="newcarTit">
 			<view class="slot-content">
 				<u--input placeholder="请输入内容" type="number" v-model="newCarNum"></u--input>
 			</view>
 		</u-modal>
+		<!-- <u-modal @close="show=false" @cancel="show=false" @confirm="relieveFn" :show="show" :showCancelButton="true"
+			:showConfirmButton='true' :content='content'></u-modal> -->
 		<view class="" v-if='!curNow && dataList.length>0'>
-			<view class="add" @click="showPop=true">
+			<!-- <view class="add" @click="showPop=true">
 				<u-icon name="plus-circle" color="#0122C7" size="60"></u-icon>
 				签约新车
-			</view>
-			<mybtn position="position" text="签约" @click="signFn">
+			</view> -->
+			<!-- <mybtn position="position" text="签约" @click="signFn">
 				<u-icon name="edit-pen-fill" color="white" size="20"></u-icon>
-			</mybtn>
+			</mybtn> -->
 		</view>
 
 	</view>
@@ -125,19 +183,25 @@
 </template>
 
 <script>
-	import mybtn from "@/components/mybtn/mybtn.vue"
+	import {
+		getvehicleList,
+		getAgencyList,
+		leaseApi
+	} from "@/api/property.js"
+	// import mybtn from "@/components/mybtn/mybtn.vue"
 	import {
 		Toast
 	} from "../../libs/uniApi";
 	// Toast("请至少选择一辆车")
 	export default {
 		components: {
-			mybtn
+			// mybtn
 		},
 		name: "vehicle",
 		data() {
 			return {
-				isNewCheck: false,
+				applicationList: [1, 1],
+				isNewCheck: true,
 				showPop: false,
 				dataList: [1, 2, 3],
 				tabLists: [{
@@ -146,31 +210,43 @@
 					name: '已出租'
 				}, ],
 				curNow: 0,
-				checked: 0,
 				keywords: "",
 				newCarNum: "",
-				newcarTit: "请输入你想要的车辆数量"
+				newcarTit: "请输入您需要租赁的车辆数量(上限为2)"
 
 
 			};
 		},
+		onLoad() {
+			getvehicleList().then(res => {
+				// this.getvehicleList = res
+			})
+			getAgencyList().then(res => {
+				// this.applicationList=res
+
+			})
+		},
+
+
+
 		methods: {
 			signFn() {
-				console.log(this.checked)
-				if (!this.checked.length) Toast("请至少选择一辆车")
-				else {
-					this.toDetail("/subpkg/property/chosseCompany")
-				}
-			},
-			confirm() {
-				if (!this.newCarNum) return
-				console.log(this.newCarNum)
-				this.showPop = false
-				this.isNewCheck = true
-				// this.newCarNum = ""
+				this.toDetail("/subpkg/property/chosseCompany")
 
 			},
-			toDetail(url) {
+			// serchFn() {
+			// 	console.log(this.keywords)
+			// },
+			confirm() {
+				if (!this.newCarNum) return
+				// leaseApi().then(res=>{})
+				this.showPop = false
+				this.isNewCheck = true
+
+
+			},
+
+			navgo(url) {
 				uni.navigateTo({
 					url
 				})
@@ -189,18 +265,89 @@
 		margin: 28rpx 28rpx 0 28rpx;
 	}
 
-	.add {
-		position: fixed;
-		bottom: 100rpx;
-		right: 0;
+	.info {
+		display: flex;
+		justify-content: space-around;
+		margin: 10rpx 0 0 0;
+
+		.not_leased {
+			display: flex;
+			align-items: center;
+			// background-color: red;
+			flex-direction: column;
+		}
+
+		.triangle-up {
+			width: 0;
+			height: 0;
+			border-left: 5px solid transparent;
+			border-right: 5px solid transparent;
+			border-bottom: 10px solid rgba(0, 0, 0, .5);
+		}
+
+		.message_bottom {
+			background-color: rgba(0, 0, 0, .5);
+			color: white;
+			// transform: translateX();
+			padding: 20rpx;
+			border-radius: 30rpx;
+		}
 	}
 
+	.application_tit {
+		background-color: white;
+		padding: 20rpx;
+		width: 694rpx;
+		border-radius: 20rpx;
+		margin: 20rpx auto 0;
+
+		.head {
+			display: flex;
+			justify-content: space-between;
+		}
+
+		.content {
+			.li {
+				margin: 10rpx 0;
+				display: flex;
+				justify-content: space-between;
+
+				.date {
+					background-color: #FF7C32;
+					color: white;
+					padding: 0 10rpx;
+					border-radius: 15rpx;
+					// width: 170rpx;
+				}
+
+				.text {
+					// background-color: lightyellow;
+					max-width: 450rpx;
+					white-space: nowrap;
+
+					/* 让文本不换行 */
+					overflow: hidden;
+					/* 隐藏溢出的文本 */
+					text-overflow: ellipsis;
+				}
+
+				.detail {
+					// background-color: black;
+					// width: 50rpx;
+				}
+			}
+
+
+
+		}
+	}
+
+
+
 	.personnel_list {
 		padding: 28rpx 0;
 		margin-bottom: 130rpx;
 
-
-
 		.empty {
 			padding-top: 200rpx;
 			text-align: center;
@@ -212,8 +359,6 @@
 
 			}
 
-
-
 			// height: 80vh;
 			// background-color: red;
 		}
@@ -276,7 +421,7 @@
 							// color: red;
 						}
 
-						// background-color: red;
+
 						text:nth-child(1) {
 							margin-right: 20rpx;
 						}
diff --git a/subpkg/property/vehicle_a.vue b/subpkg/property/vehicle_a.vue
index 58526a0..c35c35b 100644
--- a/subpkg/property/vehicle_a.vue
+++ b/subpkg/property/vehicle_a.vue
@@ -22,37 +22,41 @@
 					<view class="personnel_list" @click="toDetail('/subpkg/property/vehicle')">
 						<view class="cards">
 							<view class="cards_head">
-								<text>车牌号</text>
+								<text><!-- <!-- {{datas.}} --> --></text>
 							</view>
 							<view class="cards_content">
 								<view class="right">
 									<view class="li">
 										<text>行驶总里程: </text>
-										<text> { item.name }</text>
+										<text> <!-- {{datas.}} --></text>
 									</view>
 									<view class="li">
 										<text>本公司签约时间: </text>
-										<text>{ item.phone }</text>
+										<text><!-- {{datas.}} --></text>
 									</view>
 									<view class="li">
 										<text>承租公司: </text>
-										<text> 所属片区 </text>
+										<text><!-- {{datas.}} --> </text>
 									</view>
 									<view class="li">
 										<text>负责人: </text>
-										<text> 所属片区 </text>
+										<text><!-- {{datas.}} --> </text>
 									</view>
 									<view class="li">
 										<text>联系方式: </text>
-										<text> 所属片区 </text>
+										<text> <!-- {{datas.}} --> </text>
 									</view>
 									<view class="li">
 										<text>所属区域: </text>
-										<text> 所属片区 </text>
+										<text> <!-- {{datas.}} --></text>
 									</view>
 									<view class="li">
-										<text>承租时间: </text>
-										<text> 所属片区 </text>
+										<text>签约时间: </text>
+										<text><!-- {{datas.}} --> </text>
+									</view>
+									<view class="li">
+										<text>到期时间: </text>
+										<text> <!-- {{datas.}} --> </text>
 									</view>
 								</view>
 							</view>
@@ -62,13 +66,13 @@
 
 				</view>
 			</view>
-			<u-calendar @close='showDate=false' :show="showDate" @confirm="dataFn"></u-calendar>
+			<u-calendar @close='showDate=false' color="#0122C7" :show="showDate" @confirm="dateFn"></u-calendar>
 		</view>
 
 
 
 		<!-- 没有车辆 -->
-		<view class="" v-else>
+		<!-- <view class="" v-else>
 			<view class="" v-if="!isMycar">
 				<view class="empty_car">
 					<view>
@@ -91,6 +95,8 @@
 			</view>
 
 		</view>
+ -->
+
 
 	</view>
 
@@ -99,9 +105,9 @@
 <script>
 	import mybtn from "@/components/mybtn/mybtn.vue"
 	import {
-		taskTricycleDetail,
-		taskAddTricycleCoordinate
-	} from "@/api/task.js"
+		getvehicleDetail,
+		locusApi
+	} from "@/api/property.js"
 	import {
 		Toast
 	} from "../../libs/uniApi";
@@ -113,10 +119,11 @@
 			return {
 				allMap: false,
 				showDate: false,
-				isMycar: false,
+				// isMycar: false,
 				showPop: false,
+				datas: {},
 				queryData: "请选择时间",
-				myCarnum: "",
+				// myCarnum: "",
 				mapClass: 'custom-map',
 				scale: 17,
 				markers: [
@@ -141,164 +148,29 @@
 			}
 		},
 		onLoad(options) {
-
+			// getvehicleDetail().then(res => {
+			// this.datas = res
+			// })
 
 		},
 		methods: {
-			fousFn() {
-				uni.hideKeyboard()
-				this.showDate = true
-			},
-			dataFn(e) {
-				console.log(e)
+
+			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
-				}
-			},
+			// confirm() {
+			// 	if (this.myCarnum) {
+			// 		console.log(this.myCarnum)
+			// 		this.showPop = false
+			// 		this.isMycar = true
+			// 	}
+			// },
 			showPloyline() {
-				// points: points,
-				// color: "#0091ff",
-				// dottedLine: true,
-				// width: 30,
+				// console.log(this.queryData)
+				// this.queryData
 				let points = [{
-						latitude: 28.916022,
-						longitude: 105.442732,
-					},
-					{
-						latitude: 28.916848,
-						longitude: 105.443175,
-					},
-					{
-						latitude: 28.916918,
-						longitude: 105.443269,
-					},
-					{
-						latitude: 28.917041,
-						longitude: 105.443466,
-					},
-					{
-						latitude: 28.917073,
-						longitude: 105.443522,
-					},
-					{
-						latitude: 28.91705,
-						longitude: 105.443607,
-					},
-					{
-						latitude: 28.917057,
-						longitude: 105.443643,
-					},
-					{
-						latitude: 28.916925,
-						longitude: 105.443546,
-					},
-					{
-						latitude: 28.916796,
-						longitude: 105.443466,
-					},
-					{
-						latitude: 28.916615,
-						longitude: 105.443344,
-					},
-					{
-						latitude: 28.916437,
-						longitude: 105.443274,
-					},
-					{
-						latitude: 28.916356,
-						longitude: 105.443222,
-					},
-					{
-						latitude: 28.916515,
-						longitude: 105.442643,
-					},
-					{
-						latitude: 28.916591,
-						longitude: 105.442448,
-					},
-					{
-						latitude: 28.916944,
-						longitude: 105.442338,
-					},
-					{
-						latitude: 28.91706,
-						longitude: 105.442376,
-					},
-					{
-						latitude: 28.917169,
-						longitude: 105.442489,
-					},
-					{
-						latitude: 28.917345,
-						longitude: 105.442601,
-					},
-					{
-						latitude: 28.917433,
-						longitude: 105.442663,
-					},
-					{
-						latitude: 28.917461,
-						longitude: 105.442683,
-					},
-					{
-						latitude: 28.917461,
-						longitude: 105.442683,
-					},
-					{
-						latitude: 28.917518,
-						longitude: 105.442874,
-					},
-					{
-						latitude: 28.917537,
-						longitude: 105.443032,
-					},
-					{
-						latitude: 28.917537,
-						longitude: 105.443032,
-					},
-					{
-						latitude: 28.917497,
-						longitude: 105.443198,
-					},
-					{
-						latitude: 28.917409,
-						longitude: 105.443256,
-					},
-					{
-						latitude: 28.91732,
-						longitude: 105.443318,
-					},
-					{
-						latitude: 28.917234,
-						longitude: 105.443442,
-					},
-					{
-						latitude: 28.917072,
-						longitude: 105.443497,
-					},
-					{
-						latitude: 28.916977,
-						longitude: 105.443539,
-					},
-					{
-						latitude: 28.916867,
-						longitude: 105.443529,
-					},
-					{
-						latitude: 28.916867,
-						longitude: 105.443529,
-					},
-					{
-						latitude: 28.916761,
-						longitude: 105.443404,
-					},
-					{
 						latitude: 28.916722,
 						longitude: 105.443274,
 					},
@@ -307,6 +179,10 @@
 						longitude: 105.443132,
 					},
 				]
+				// locusApi().then(res => {
+				// 	points=res
+				// })
+
 				this.polyline = [{
 					points: points,
 					color: "#0091ff",