杂项

app.css

@@ -147,4 +147,5 @@ view {
 	align-items: center;
 	justify-content: center;
 	margin-top: 120rpx;
-}
+}
+

common/config_gyq.js

@@ -1,5 +1,5 @@
 var params = require('./params.js');
-
+var storage = require('./storage.js');
 var api_web_url = params.api_web_url;
 var up_img_url = params.up_img_url;
 const gps_url = params.gps_url;
@@ -74,6 +74,6 @@ var config = {
 	API_FLK_ORDER_RESERVE: api_web_url +'?r=flk/order/reserve',
 	//获取逾期金额:
 	API_FLK_CAR_OVERDUE_MONEY: api_web_url +'?r=flk/car/overdue-money',
-	
+	API_DEVICE_TRACK: `http://bmsapi.dev.bms16.com/device/track?token=${storage.getUserToken()}`,
 };
 module.exports = config;

common/request.js

@@ -132,13 +132,16 @@ async function getApi(url, data) {
 	data.token = token;
 	data.v = config.APP_VERSION;
 	data.appid = appid
-	data.from = 'app'
-	//#ifdef MP-ALIPAY
-	data.from = 'ali'
-	//#endif
-	//#ifdef MP-WEIXIN
-	data.from = 'wx'
-	//#endif
+	if(!data.from){
+		data.from = 'app'
+		//#ifdef MP-ALIPAY
+		data.from = 'ali'
+		//#endif
+		//#ifdef MP-WEIXIN
+		data.from = 'wx'
+		//#endif
+	}
+	
 
 	data.language = language
 	return await getRequest(url, data);
@@ -150,13 +153,15 @@ async function postApi(url, data) {
 	data.token = token;
 	data.v = config.APP_VERSION;
 	data.appid = appid
-	data.from = 'app'
-	//#ifdef MP-ALIPAY
-	data.from = 'ali'
-	//#endif
-	//#ifdef MP-WEIXIN
-	data.from = 'wx'
-	//#endif
+	if(!data.from){
+		data.from = 'app'
+		//#ifdef MP-ALIPAY
+		data.from = 'ali'
+		//#endif
+		//#ifdef MP-WEIXIN
+		data.from = 'wx'
+		//#endif
+	}
 	data.language = language
 	return await postRequest(url, data);
 }

component/carPlan/carPlan.vue

@@ -5,10 +5,10 @@
 				<view style="margin-right: 24rpx;"><img style="width: 160rpx;height: 160rpx;border-radius: 16rpx;" :src="params.image" alt=""></view>
 				<view class="car-model-detail flex-row">
 					<!-- <priceTool :price="58" :font_size="40"/> -->
-					<allPrice :amount="(priceAll/100)"/>
-					<view v-if="params.overdueData.money" style="align-items: baseline;" class="flex-row">
+					<allPrice :amount="((priceAll || 0)/100)"/>
+					<view v-if="params.overdueData && params.overdueData.money" style="align-items: baseline;" class="flex-row">
 						<text>逾期金额：</text>
-						<allPrice  :amount="(params.overdueData.money/100)"/>
+						<allPrice  :amount="(params.overdueData.money || 0/100)"/>
 					</view>
 					
 					<view v-if="type!=100" class="car-model-price-view">
@@ -103,7 +103,7 @@
 			</view>
 		</view>
 		
-		<PayTypeModel @closeShow="isShowToBuy = false" @payToOrder="payToOrder" :free_price="Number(priceAll) + (Number(params.overdueData.money) || 0)" :isShowToBuy="isShowToBuy"/>
+		<PayTypeModel @closeShow="isShowToBuy = false" @payToOrder="payToOrder" :free_price="Number(priceAll) + (Number(params.overdueData ? params.overdueData.money : 0) || 0)" :isShowToBuy="isShowToBuy"/>
 	</view>
 </template>
 <script module="tools" lang="wxs" src="@/pages/common/wxs/tools.wxs"></script>
@@ -145,8 +145,8 @@
 				default:{}
 			},
 			selectType:{
-				type:String,
-				default:''
+				type:Number,
+				default:1
 			},
 		},
 		components: {
@@ -275,7 +275,7 @@
 				let current_time = this.params.overdueData.time ? this.params.overdueData.time:parseInt(new Date().getTime() / 1000);
 				let money = 0
 				if(this.params.overdueData.time){
-					money = Number(this.params.overdueData.money)
+					money = this.params.overdueData.money ? Number(this.params.overdueData.money) : 0
 				}
 				let hire_duration = 0
 				this.params.rental_setting.map(item=>{

component/customTabbar/index.vue

@@ -75,6 +75,10 @@ export default {
   //   	})
   //   }
   // },
+  
+  mounted() {
+  	console.log(uni.getSystemInfoSync().safeArea)
+  },
   methods: {
     routerPush(url) {
       // uni.setStorageSync('selectedIndex', data.index);
@@ -84,8 +88,8 @@ export default {
 	
     async navToInputPage() {
       const me = this
-      const { userInfo = '' } = storage.getUserInfoData()
-      if (userInfo.is_auth - 0 == 1 && userInfo.status - 0 == 2) {
+      const userInfo = storage.getUserInfoData()
+      if (userInfo.user_name) {
         const params =  await this._getParams()
 		var plate_number = params.carList.length!=0&&params.carList[0].license_plate_number?params.carList[0].license_plate_number:me.plate_number
 		if (params.wait_active_predetermine != null) { //预约车辆为待激活状态
@@ -218,43 +222,52 @@ export default {
   bottom: 0;
   left: 0;
   right: 0;
-  border-bottom: env(safe-area-inset-bottom) solid #fff;
+  /* border-bottom: env(safe-area-inset-bottom) solid #fff; */
   z-index: 9999;
+  /* #ifdef APP */
+  /* 兼容 iOS < 11.2 */
+    padding-bottom: constant(safe-area-inset-bottom);
+    /* 兼容 iOS >= 11.2 */
+    padding-bottom: env(safe-area-inset-bottom);
+  /* #endif */
+  
+  
 }
 .tabbar {
-  height: 188rpx;
+  height: 140rpx;
   width: 100%;
   /* background: url('https://qiniu.bms16.com/FiYy2ZOV_hGSJx32YAQSLZSbAOFq') no-repeat; */
-  background: url('https://qiniu.bms16.com/Fk8jEU5-RbARagKDYZy0tKWErKNF') no-repeat;
+  /* background: url('https://qiniu.bms16.com/Fk8jEU5-RbARagKDYZy0tKWErKNF') no-repeat; */
   background-size: 100%;
   display: flex;
   justify-content: space-between;
-  padding-top: 60rpx;
+  align-items: center;
   position: relative;
-  bottom: -5rpx;
+  bottom: 0;
+  background-color: #fff;
+  padding: 0 50rpx;
 }
 .tab-item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  flex: 1;
 }
 .tab-item:nth-child(2) {
   margin-right: 20%;
 }
 .tab-icon {
-  width: 24px;
-  height: 24px;
-  margin-bottom: 4px;
+  width: 48rpx;
+  height: 48rpx;
+  display: block;
+  margin: auto;
 }
 .center-entrance {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  bottom: 28rpx;
+  bottom: 34rpx;
   display: flex;
   flex-direction: column;
+  border-radius: 50%;
+  border: 10rpx solid #fff;
+  
 }
 .scan-text {
 	font-size: 10px;

component/googleMap/googleMap.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view id="container">
-			<view :style="{width:width,height:height}" id="mapModule"  :prop="mapData" :change:prop="mapModule.update" :lngLat="myLocation" :change:lngLat="mapModule.initAmap"></view>
+			<view :style="{width:width,height:height}" :keyId='keyId' :change:keyId='keyId' :id="`mapModule` + keyId"  :prop="mapData" :change:prop="mapModule.update" :lngLat="myLocation" :change:lngLat="mapModule.initAmap"></view>
 
 		</view>
 	</view>
@@ -14,6 +14,8 @@
 	export default {
 		data() {
 			return {
+				zoom:14,
+				keyId:'',
 				types:1,
 				Markers:[],
 				markersArray: [],
@@ -71,7 +73,7 @@
 					gestureHandling: "greedy", // 强制单指拖动
 					fullscreenControl: false,
 					draggable: true, // 显式启用拖拽
-					zoom: 14,
+					zoom: _this.zoom,
 					panControl: false,
 					zoomControl: false,
 					scaleControl: false,
@@ -82,7 +84,7 @@
 
 				// 存储当前选中的 Marker
 				_this.selectedMarker = null;
-				_this.map = new google.maps.Map(document.getElementById("mapModule"), myOptions);
+				_this.map = new google.maps.Map(document.getElementById("mapModule" + this.keyId), myOptions);
 
 				//地图绑定事件
 				new google.maps.event.addListener(_this.map, "click", function(event) {
@@ -144,6 +146,7 @@
 			},
 
 			update(newValue, _, ownerInstance) {
+				if(newValue.zoom) this.zoom = newValue.zoom || 14
 				if (newValue.markers && newValue.markers.length < 1) return
 				this.Markers = newValue.markers || []
 				this.types = newValue.type
@@ -219,6 +222,14 @@
 <script>
 	export default {
 		props: {
+			keyId:{
+				type: String,
+				default: '0'
+			},
+			id:{
+				type: String,
+				default: 'mapModule'
+			},
 			width: {
 				type: String,
 				default: '100%'

component/smartCalendar/index.vue

@@ -88,10 +88,11 @@
 						_minutes.push(i);
 					}
 				}
+				
+				
 				let _isNextDay=(new Date().getMinutes()-0)>30&&((new Date().getHours()-0+1)==0)
 				let _startH=(new Date().getMinutes()-0)>30?(new Date().getHours()-0+1):(new Date().getHours()-0)
 				let _startM=(new Date().getMinutes()-0)>30?(new Date().getMinutes()-30):(new Date().getMinutes()-0+30)
-
 				return {
 					defaultDate: null,
 					show: true,
@@ -103,7 +104,7 @@
 					startDate: '', // 取车日期
 					endDate: '',  // 还车日期
 					duration_unit: 0, //周期单位
-					startH: _startH,
+					startH: (new Date().getMinutes()-0)>30?(new Date().getHours()-0+1):(new Date().getHours()-0),
 					startM: _startM,
 					startN: 0,
 					hours: _hours,
@@ -128,13 +129,17 @@
 				this.bindTime()
 				this.time = this.isNextDay?common.getToDay(1):common.getToDay()
 				//#ifdef MP-ALIPAY
-				const _startH = this.startH< 10&&this.startH!== '00' ? '0' + this.startH : this.startH
+				let _startH = this.startH< 10&&this.startH!== '00' ? '0' + this.startH : this.startH
 				const _startM = this.startM< 10&&this.startM!== '00' ? '0' + this.startM : this.startM
 				//#endif
 				//#ifdef MP-WEIXIN
-				const _startH = this.startH< 10&&this.startH!== '00' ? '0' + this.startH : this.startH
+				let _startH = this.startH< 10&&this.startH!== '00' ? '0' + this.startH : this.startH
 				const _startM = this.startM< 10&&this.startM!== '00' ? '0' + this.startM : this.startM
 				//#endif
+				// #ifdef APP
+				let _startH = this.startH< 10&&this.startH!== '00' ? '0' + this.startH : this.startH
+				const _startM = this.startM< 10&&this.startM!== '00' ? '0' + this.startM : this.startM
+				// #endif
 				this.startDate = this.time+'T'+_startH+':'+_startM
 				const DATE = new Date()
 				this.curMonth = `${DATE.getFullYear()}年${DATE.getMonth()+1}月`

component/useGuidance/useGuidance.vue

@@ -2,24 +2,24 @@
 	<view class="tip-view">
 		<view class="tip-title-view flex-row align-center">
 			<image style="width: 144rpx;height: 40rpx;" src="https://qiniu.bms16.com/FjUW1kuRvXWTEftyn9nH1AbGWuxK"
-				mode='aspectFill'></image>
+				mode='aspectFit'></image>
 			<image style="width: 86rpx;height: 80rpx;" src="https://qiniu.bms16.com/FibAaPERzqi6m95EP2jREUKixjUi"
 				mode='aspectFill'></image>
 			<view class="w-bg flex-row"></view>
 		</view>
 		<view class="step-view flex-row  align-center">
 			<view class="icon-list-view">
-				<image class="img" src="https://qiniu.bms16.com/Fp0BE27Q0VTD8qUJRHUVhWO6VEbO" mode='aspectFill'></image>
+				<image class="img1" src="https://qiniu.bms16.com/Fp0BE27Q0VTD8qUJRHUVhWO6VEbO" mode='aspectFit'></image>
 			</view>
 			<view class="dashed-line"></view>
 			<view class="icon-list-view">
-				<image style="width: 80rpx;height: 72rpx;" src="https://qiniu.bms16.com/FqDzYwAbnSEgf3yv9SAb92Vq4ZEB"
-					mode='aspectFill'></image>
+				<image class="img1" src="https://qiniu.bms16.com/FqDzYwAbnSEgf3yv9SAb92Vq4ZEB"
+					mode='aspectFit'></image>
 			</view>
 			<view class="dashed-line"></view>
 			<view class="icon-list-view">
-				<image style="width: 80rpx;height: 72rpx;" src="https://qiniu.bms16.com/FlFMHzco6j9XOpMI21tSnR9500Un"
-					mode='aspectFill'></image>
+				<image class="img1" src="https://qiniu.bms16.com/FlFMHzco6j9XOpMI21tSnR9500Un"
+					mode='aspectFit'></image>
 			</view>
 		</view>
 		<view class="step-tip-view flex-row  align-center">
@@ -37,6 +37,7 @@
 			</view>
 		</view>
 	</view>
+
 </template>
 
 <script>
@@ -54,6 +55,7 @@
 		methods: {}
 	};
 </script>
+
 <style scoped>
 	.tip-view {
 		background: #0A59F7;
@@ -66,7 +68,6 @@
 		padding-left: 24rpx;
 		/* border-radius: 40rpx; */
 	}
-
 	.w-bg {
 		width: 100%;
 		height: 80rpx;
@@ -81,7 +82,7 @@
 		border-top-left-radius: 32rpx;
 	}
 
-	.icon-list-view .img {
+	.icon-list-view .img1 {
 		width: 80rpx;
 		height: 72rpx;
 	}

manifest.json

@@ -24,7 +24,8 @@
             "Payment" : {},
             "Bluetooth" : {},
             "Geolocation" : {},
-            "Share" : {}
+            "Share" : {},
+            "Maps" : {}
         },
         "distribute" : {
             "android" : {

pages.json

@@ -14,6 +14,7 @@
 		{
 			"path": "pages/my/my",
 			"style": {
+				"navigationStyle": "custom",
 				"app-plus" : {
 					"titleNView": {
 						"type": "transparent"
@@ -319,6 +320,7 @@
 	"tabBar": {
 		"custom": true,
 		"customize": true,
+		"height": "0.1px",
 		"color": "#8a8a8a",
 		"selectedColor": "#0074FF",
 		"list": [{

pages/batteryRecord/batteryRecord.vue

@@ -1,11 +1,12 @@
 <template>
 	<view class="container-view">
 		<view class="order-type-view flex-row flex-between">
-			<view class="car-model-list flex-row">
-				<view class="car-model-text">小米Su5</view><img class="right-corner-icon"
+			<view @click="srcFn(`/pages/carList/carList`)" class="car-model-list flex-row">
+				<view class="car-model-text">{{car_info.car_name}}</view><img class="right-corner-icon"
 					src="https://qiniu.bms16.com/Fqs6TrEmcdT7QNEdKWs9Hir2cacO" alt="">
 			</view>
 		</view>
+		
 		<view v-for="(item,index) of list" :key="index" class="batteryList">
 			<view class="header">
 				<view v-if="item.status == 1" class="h5">开始换电</view>
@@ -51,20 +52,26 @@
 	export default {
 		data() {
 			return {
+				car_info:{},
 				car_sn: "",
 				list: []
 			}
 		},
-		onLoad() {
-			this.car_sn = uni.getStorageSync('car_info').car_sn
+		onShow() {
+			this.car_info = uni.getStorageSync('car_info')
 			this.listFn()
 		},
 		methods: {
+			srcFn(url){
+				uni.navigateTo({
+					url
+				})
+			},
 			async listFn() {
 				let {
 					data
 				} = await request.postApi(config_gyq.API_FLK_CABINET_EXCHANGE_ORDER, {
-					car_sn: this.car_sn
+					car_sn: this.car_info.car_sn
 				})
 				if (data.code == 200) {
 					this.list = data.data.list

pages/carDetail/carDetail.vue

@@ -6,7 +6,7 @@
 		</view>
 		<view class="car-detail-model">
 			<view class="car-detail-name">{{car_detail.car_model_name}}</view>
-			<view class="car-detail-price"><allPrice :amount="price"/></view>
+			<view class="car-detail-price"><allPrice :amount="Number(price)"/></view>
 			<view style="flex-wrap: wrap;justify-content: flex-start;" class="flex-row car-detail-time">
 				<view v-for="(item,index) in car_detail.rental_setting"  :key="index" @tap="tapSelectType" :data-price="item.hire_price"
 					:data-select_type="item.hire_duration_unit"
@@ -112,86 +112,31 @@
 			allPrice
 		},
 		onLoad: function(options) {
-			console.log(options, 'options');
 			if(options.model_id){
-				this.model_id=options.model_id
-				this.loadCarInfo()
+				this.model_id= options.model_id
+				this.locationFn()
 			}
 			// this.loadCarInfo()
 			// getFlatternDistance 获取直线距离
 		},
 		methods: {
-			async locationFn() {
-					let res = await uni.getLocation()
-					if (res[1]) {
-						return {
-							latitude: res[1].latitude,
-							longitude: res[1].longitude,
-						}
-					}
+			 locationFn() {
+				 let _this = this
+					 uni.getLocation({
+						 success(res) {
+						 	_this.loadCarInfo(res.longitude, res.latitude)
+						 	
+						 }
+					 })
 				},
-			async loadCarInfo() {
+			 loadCarInfo(latitude,longitude) {
 				const me = this
-				// let test = {
-				// 	"recommend_id": 3,
-				// 	"title": "噢抬哇塞红擦无论谁",
-				// 	"image": "https://loremflickr.com/400/400?lock=201810282360670",
-				// 	"desc": "voluptate commodo quis fugiat ut",
-				// 	"model_id": 1,
-				// 	"car_model_name": "电摩-12",
-				// 	"sell_price": 100,
-				// 	"deposit": 10,
-				// 	"rental_setting": [
-				// 	  {
-				// 		"setting_id": 1,
-				// 		"admin_id": 1,
-				// 		"hire_duration": 1,
-				// 		"hire_duration_unit": 1,
-				// 		"hire_price": 15,
-				// 		"ctime": 1736330909,
-				// 		"delete_time": 0
-				// 	  },
-				// 	  {
-				// 		"setting_id": 2,
-				// 		"admin_id": 1,
-				// 		"hire_duration": 1,
-				// 		"hire_duration_unit": 2,
-				// 		"hire_price": 5,
-				// 		"ctime": 1736386379,
-				// 		"delete_time": 0
-				// 	  }
-				// 	],
-				// 	"services_list": [
-				// 	  {
-				// 		"service_id": 3,
-				// 		"admin_id": 1,
-				// 		"service_name": "手套",
-				// 		"ctime": 1736476283,
-				// 		"delete_time": 0
-				// 	  }
-				// 	],
-				// 	"shop_name": "智寻出行 - 测试",
-				// 	"longitude": "115.815236",
-				// 	"latitude": "28.691463",
-				// 	"address": "江西省南昌市新建区友谊路与自强路交叉口北80米",
-				// 	"work_begin_time": "03:00:00",
-				// 	"work_end_time": "23:59:59",
-				// 	"link_phone": "18779187403",
-				// 	"distance": 11
-				//   }
-				// me.destance = common.getFlatternDistance(me.myLocation.latitude, me.myLocation.longitude, test.latitude,test.longitude)
-				// console.log(me.destance);
-				// me.setData({
-				// 	car_detail: test
-				// })
-				let adress = await this.locationFn()
 				http.postApi(config.API_FLK_INDEX_CAR_MODEL_DETAIL, {
 					model_id:me.model_id,
-					latitude: adress.latitude,
-					longitude: adress.longitude,
+					latitude: latitude,
+					longitude: longitude,
 				}, (resp) => {
 					if (resp.data.code === 200) {
-						
 						me.setData({
 							car_detail:resp.data.data,
 							price:(resp.data.data.rental_setting[0].hire_price/100).toFixed(2)

pages/carFunctionSet/unbind.vue

@@ -1,9 +1,9 @@
 <template>
     <view class="zx-container unbind-page">
       <view class="zx-wrap car-info-wrap">
-        <image :src="icons.carImg" class="car-img" />
+        <image :src="carInfo.model_images" class="car-img" />
         <view class="car-name">
-          {{ '智能电动摩托车智驾 M7' }}
+          {{ carInfo.car_name }}
         </view>
       </view>
       <view class="zx-wrap input-wrap">
@@ -69,6 +69,7 @@
     },
     data() {
       return {
+		  carInfo:{},
         car_sn: '',
         icons: ICONS,
         showConfirm: false,
@@ -76,7 +77,7 @@
       }
     },
     onLoad() {
-			this.car_sn = uni.getStorageSync('car_info').car_sn
+			this.carInfo = uni.getStorageSync('car_info')
 		},
     methods: {
       unbindTap() {
@@ -88,7 +89,7 @@
       async unbindSubmit() {
         console.log('解除绑定', this.passwd)
         let { data } = await request.postApi(config.API_FLK_CAR_UNBIND_CAR, {
-          car_sn: this.car_sn,
+          car_sn: this.carInfo.car_sn,
           passwd: this.passwd
         })
         if (data.code == 200) {

pages/carList/carList.vue

@@ -62,6 +62,7 @@
 			},
 			clickItem(item){
 				if(item.car_sn == this.car_info.car_sn) return
+				
 				this.clickItemData = item
 				// console.log(item);
 				this.showConfirm = true
@@ -69,16 +70,27 @@
 				// this.car_info = item
 			},
 			unbindSubmit(){
-				console.log('unbindSubmit');
+				let car_sn = this.clickItemData.car_sn
+				if(!car_sn) return
+				const me = this
+				common.loading()
+				http.postApi(config.API_FLK_CAR_DETAIL, {car_sn}, (resp) => {
+					uni.hideLoading();
+					if (resp.data.code === 200) {
+						resp.data.data.car_sn = car_sn
+						uni.setStorageSync('car_info', resp.data.data);
+						me.car_info = resp.data.data
+						common.simpleToast('切换成功！')
+						setTimeout(()=> {
+							uni.navigateBack({
+								delta:1
+							})
+						}, 900)
+					} else {
+						common.simpleToast(resp.data.msg);
+					}
+				})
 				
-				uni.setStorageSync('car_info',this.clickItemData)
-				this.car_info = this.clickItemData
-				common.simpleToast('选择成功！')
-				setTimeout(()=> {
-					uni.switchTab({
-						url: `/pages/index/index`,
-					});
-				}, 900)
 			},
 			loadUserCarList(){
 				this.car_info = uni.getStorageSync('car_info') || {};

pages/carLocation/carLocation.vue

@@ -1,12 +1,17 @@
 <template>
 	<view class="">
-		<map @touchmove="hiddenNav" @markertap="showNav" style="width: 100%; height: 100vh;" :latitude="latitude"
+		<!-- #ifndef APP -->
+		<map @touchmove="hiddenNav" @markertap="showNav" style="width: 100%; height: calc(100vh - 506rpx);" :latitude="latitude"
 			:longitude="longitude" :markers="markers" show-location>
 		</map>
+		<!-- #endif -->
+		<!-- #ifdef APP -->
+		<googleMap keyId="1" width='100%' height='calc(100vh - 506rpx)' v-if="myLocation.latitude"  :mapData="{type:3,markers,zoom:13}" :myLocation='myLocation'></googleMap>
+		<!-- #endif -->
 		<!-- 由于cover-view一些样式及点击事件不支持 -->
 		<!-- 气泡内容 -->
 		<view v-if="is_show_nav" class="block-view">
-			<view class="custom-bubble-name">广东省深圳市宝安区西乡街道普宁升记炒饭肠粉(绿海名苑店)</view>
+			<view class="custom-bubble-name">{{address}}</view>
 			<view class="flex-row flex-between">
 				<view class="flex-row block-car-time align-center">
 					<img style="width: 52rpx;height: 52rpx;" src="https://qiniu.bms16.com/FhKkijkN__9UzhYNgamBFSggIlYo" alt="">
@@ -14,39 +19,34 @@
 				</view>
 				<img style="width: 112rpx;height: 64rpx;" src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" alt="">
 			</view>
-			<view class="updata-time">更新于 11-25 23:05 </view>
+			<view v-if="car_info.heart_time" class="updata-time">更新于 {{car_info.heart_time}} </view>
 			<view class="car-config-btn">闪灯鸣笛</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	const http = require('../../common/http.js');
+	import dayjs from "dayjs";
+import googleMap from "@/component/googleMap/googleMap";
+	const http = require('../../common/request.js');
 
 	const config = require('../../common/config.js');
 	const common = require('../../common/common.js');
 	export default {
+		components:{
+			googleMap
+		},
 		data() {
 			return {
 				id: 0, // 使用 marker点击事件 需要填写id
 				latitude: 39.909,
 				longitude: 116.39742,
-				address_name: '',
+				address: '',
 				city_name: '',
 				is_show_nav: true,
-				markers: [{
-					id: 1345,
-					latitude: 39.909,
-					longitude: 116.39742,
-					iconPath: 'https://qiniu.bms16.com/Fim2CWvIaWVoqPwQsJbNn-fcS-Ku',
-					width: 30,
-					height: 30,
-					customCallout: {
-						anchorY: -45, // Y轴偏移量
-						anchorX: -100, // X轴偏移量
-						display: 'ALWAYS', // 'BYCLICK':点击显示; 'ALWAYS':常显
-					},
-				}], // 标记点
+				car_info:{},
+				myLocation:{},
+				markers: [], // 标记点
 				plate_number: '',
 				carLocationTimer: null, // 定时器变量，用于清除定时器
 			}
@@ -55,9 +55,17 @@
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad: function(options) {
-			this.plate_number = options.plate_number
-			this.latitude=options.latitude||''
-			this.longitude=options.longitude||''
+			
+			this.car_info = uni.getStorageSync('car_info') || {}
+			this.car_info.heart_time = this.car_info.heart_time ?  dayjs(this.car_info.heart_time).format('YYYY-MM-DD hh:mm:ss') : '未知时间'
+			this.init()
+			// this.longitude = {
+			// 	longitude:car_info.longitude,
+			// 	latitude:car_info.latitude
+			// }
+			// this.plate_number = options.plate_number
+			// this.latitude=options.latitude||''
+			// this.longitude=options.longitude||''
 			// this.loadCarAddress()
 			// // 五秒后重新调用加载车辆位置信息的方法
 			// this.carLocationTimer = setTimeout(() => {
@@ -80,6 +88,38 @@
 			}
 		},
 		methods: {
+			init(){
+				this.latitude = this.car_info.latitude || 39.909
+				this.longitude = this.car_info.longitude || 116.39742
+				this.getAddressName(this.latitude,this.longitude)
+				let _this = this
+				uni.getLocation({
+					success(res) {
+						_this.myLocation.latitude = res.latitude
+						_this.myLocation.longitude = res.longitude
+						_this.markers = [
+							{
+								width: 80 / 2,
+								height: 108 / 2,
+								id: _this.car_info.car_sn,
+								longitude: _this.longitude,
+								latitude: _this.latitude,
+								iconPath: 'https://qiniu.bms16.com/Fim2CWvIaWVoqPwQsJbNn-fcS-Ku',
+								iconPathActive: 'https://qiniu.bms16.com/Fim2CWvIaWVoqPwQsJbNn-fcS-Ku',
+								content:''
+							},
+							{
+								width: 22,
+								height: 40,
+								id: 50000,
+								iconPath: "https://zxappfile.bms16.com/zx_client/location_n.png",
+								longitude: res.longitude,
+								latitude: res.latitude,
+							}
+						]
+					}
+				})
+			},
 			navAddress() {
 				const that = this;
 				uni.openLocation({
@@ -92,9 +132,9 @@
 				});
 			},
 			
-			loadCarAddress() {
+			async loadCarAddress() {
 				const that = this
-				http.postApi(config.API_DAYHIRE_CAR_LOCATION, {
+				 http.postApi(config.API_DAYHIRE_CAR_LOCATION, {
 					plate_number: this.plate_number
 				}, (resp) => {
 					if (resp.data.code === 200) {
@@ -102,7 +142,7 @@
 						this.longitude = resp.data.data.longitude
 						this.markers[0].latitude = resp.data.data.latitude
 						this.markers[0].longitude = resp.data.data.longitude
-						this.getAddressName()
+						
 					} else {
 						// 默认返回上一个页面再提示报错
 						uni.navigateBack({
@@ -113,7 +153,7 @@
 				})
 			},
 			
-			getAddressName(latitude, longitude, type) {
+			async getAddressName(latitude, longitude) {
 				const that = this
 				//#ifdef MP-ALIPAY
 				var _pi = "ali_index"
@@ -121,19 +161,19 @@
 				//#ifdef MP-WEIXIN
 				var _pi = "wx_index"
 				//#endif
+				//#ifdef APP
+				var _pi = "APP"
+				//#endif
 				const location = {
 					lat: that.latitude,
 					lng: that.longitude,
 					pi: _pi
 				}
-				http.postApi(config.API_MAP_REGEO, location, (resp) => {
-					if (resp.data.code === 200) {
-						that.address_name = resp.data.data.data.address
-						that.city_name = resp.data.data.data.province + resp.data.data.data.city
-					} else {
-						common.simpleToast('获取车辆定位失败')
-					}
-				})
+				let {data} = await http.postApi(config.API_MAP_REGEO, location)
+				console.log(data.data.data)
+				if(data.code == 200){
+					this.address = data.data.data.address
+				}
 			},
 			
 			hiddenNav() {

pages/index/components/mapCard/mapCard.vue

@@ -1,5 +1,15 @@
 <template>
 	<view class="container-view-car" @tap="navCarLocation">
+		<!-- #ifdef APP -->
+		<view style="width:300rpx;height: 258rpx;" class="map">
+			<googleMap keyId="1" width='300rpx' height='258rpx' v-if="latitude"  :mapData="{type:3}" :myLocation='{
+				longitude,
+				latitude
+			}'></googleMap>
+		</view>
+		
+		<!-- #endif -->
+		<!-- #ifndef APP -->
 		<map class="map"  :longitude="longitude"
 			:latitude="latitude" scale="16" show-location style="width:300rpx;height: 258rpx;" :markers="carLocation">
 			<view class="top-car-location flex-row">
@@ -7,13 +17,19 @@
 				<text>车辆位置</text>
 			</view>
 		</map>
+		<!-- #endif -->
+		
 		<view class="car-address">{{carAddress}}</view>
 	</view>
 </template>
 
 <script>
+	import googleMap from "@/component/googleMap/googleMap";
 	// component/nomore/nomore.js
 	export default {
+		components: {
+			googleMap,
+		},
 		data() {
 			return {};
 		},

pages/index/index.vue

@@ -7,15 +7,15 @@
 					<text style="margin-right: 10rpx;">{{car_info.car_name}}</text>
 					<img src="https://qiniu.bms16.com/FoSXDpVGvbdmwbX3CMUBvR7X4IzI" style="width: 14rpx;height: 14rpx;" alt="">
 				</view>
-				<img src="https://qiniu.bms16.com/FtlfBtBE5-TeTI5EdrciX_u8u_Sx" style="width: 48rpx;height: 48rpx;" alt="">
+				<image @click="routerLink('/pages/message/index')" src="https://qiniu.bms16.com/FtlfBtBE5-TeTI5EdrciX_u8u_Sx" style="width: 48rpx;height: 48rpx;" mode=""></image>
 			</view>
-			<!-- <view class="overdue-view flex-row flex-between">
+			<view v-if="isOverdueShow" class="overdue-view flex-row flex-between">
 				<view class="overdue-view-text flex-row">
 					<text class="overdue-text-left">您已逾期 <text class="overdue-num">38</text>天</text>
 					<text style="font-size: 24rpx;opacity: 0.5;">请及时续费或归还车辆</text>
 				</view>
 				<view class="renew-btn">去续费</view>
-			</view> -->
+			</view>
 			<view class="car-img-view"  @tap="toMoreInfoPage">
 				<view class="quantity-view flex-row">
 					<text class="quantity flex-row">{{car_info.soc}} <text style="font-size: 28rpx;font-weight: 500;">%</text></text>
@@ -38,6 +38,7 @@
 			
 			<view v-if="car_info.exchange_package_info.activity_time" class="flex-row flex-between map-card-view" >
 				<MapCard latitude="23.099994" longitude="113.324004" :carAddress="carAddress" :carLocation="carLocation"/>
+				
 				<view class="card-right">
 					<view class="card-bg" @tap="navTravelingTrack">
 						<view class="flex-row flex-between card-top-title">
@@ -119,6 +120,7 @@
 		
 		data() {
 			return {
+				isOverdueShow:false,
 				contrilList:[],
 				carLocation: [{
 					id: 1345,
@@ -169,35 +171,16 @@
 		 * 生命周期函数--监听页面显示
 		 */
 		onShow: function() {
-			// const permissionArr=permision.requestAndroidPermissions()
-			// app.globalData.permissionArr=permissionArr
-			// permision.gotoAppPermissionSetting()
-			// let status = checkBatteryOptimizationStatus();
-			// if (!permissionArr) {
-			//     uni.showModal({
-			//         title: "电池优化提示",
-			//         content: "您的设备开启了电池优化，可能会影响应用后台运行，请在设置中关闭。",
-			//         showCancel: true,
-			//         cancelText: "忽略",
-			//         confirmText: "去设置",
-			//         success(res) {
-			//             if (res.confirm) {
-			//                 permision.gotoAppPermissionSetting(); // 跳转到电池优化设置
-			//             }
-			//         }
-			//     });
-			// }
-			// app.globalData.permissionArr=permissionArr
-			console.log(33333333)
-			console.log(getFunctionTag().activeTag)
 			this.contrilList = getFunctionTag().activeTag
 			const user_token = storage.getUserToken()
-			console.log(user_token)
+			this.car_info = uni.getStorageSync('car_info') || {};
 				if (!user_token) {
 					this.loadIsLogin()
 					return
 				}
-				this.loadUserCarList()
+				if(!this.car_info.car_sn){
+					this.loadUserCarList()
+				}
 			
 		},
 		// 分享给好友
@@ -208,6 +191,11 @@
 			}
 		},
 		methods: {
+			routerLink(url){
+				uni.navigateTo({
+					url
+				})
+			},
 			loadIsLogin(){
 				uni.showModal({
 					title: '提示',

pages/message/deviceInfo.vue

@@ -6,7 +6,15 @@
         <view v-for="(item, index) in msgList" :key="index" class="list-item">
             <view class="time">{{ item.ctime }}</view>
             <view class="msg-wrap">
-                <view class="map"></view>
+                <view v-if="item.latitude" class="map">
+					<!-- #ifdef APP -->
+					<googleMap :keyId="index" width="100%" height='100%'   :mapData='{type:1}' :myLocation='{
+					latitude:item.latitude,	
+					longitude:item.longitude,	
+					}'  ></googleMap>
+					<!-- #endif -->
+				</view>
+				
                 <view class="msg-text">
                     <view class="title">{{ item.title }}</view>
                     <view class="dtl-txt">{{ item.overview }}</view>
@@ -20,7 +28,11 @@
 const config = require('@/common/config.js');
 const http = require('@/common/http.js');
 var common = require('../../common/common.js');
+import googleMap from "@/component/googleMap/googleMap";
 export default {
+	components:{
+		googleMap
+	},
     data() {
         return {
             // latitude: 23.090994,

pages/my/my.vue

@@ -1,5 +1,12 @@
 <template>
 	<view class="container-view zx-page-linear">
+		<!-- #ifdef MP-WEIXIN -->
+		<view :style="{height: `${statusBarHeight + 20}px`}"></view>
+		<!-- #endif -->
+		<!-- #ifdef APP -->
+		<view :style="{height: `${statusBarHeight}px`}"></view>
+		<!-- #endif -->
+		
 		<view class="user-switch-row">
 			<image :src="QINIU_URL + 'FlL5BtEdMES2-mntjR9D3CX_LWYv'" class="message"
 				@tap="routerLink({ url: '/pages/message/index' })" />
@@ -56,6 +63,7 @@
 		},
 		data() {
 			return {
+				statusBarHeight:0,
 				car_info: {},
 				QINIU_URL,
 				defaultAvatarUrl: defaultHeadImg,
@@ -116,6 +124,9 @@
 			user_token && this.loadUserInfo()
 
 		},
+		onLoad() {
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
+		},
 		methods: {
 			async loadUserInfo() {
 				const userInfo = storage.getUserInfoData()
@@ -164,6 +175,7 @@
 					this[`checkHandle_${jumpCheck}`]()
 					return
 				}
+				console.log(url)
 				uni.navigateTo({
 					url
 				})

pages/order/order.vue

@@ -184,11 +184,10 @@
 				orderInfoTime: {},
 				nowTime: 0
 			};
-		}
+		},
 		/**
 		 * 生命周期函数--监听页面加载
 		 */
-		,
 		onLoad: function(options) {
 			this.car_info = uni.getStorageSync('car_info') || {};
 			const locationStr = uni.getStorageSync('user_current_location');

pages/orderStatus/orderStatus.vue

@@ -32,11 +32,15 @@
 				<view v-if="orderInfo.order_type != 3" class="flex-row flex-between">
 					<view class="money-item">
 						<view :class="orderInfo.order_status == 4?'red-status':''">
-							{{orderInfo.hire_duration_time.day > 0 ? orderInfo.hire_duration_time.day :'' }}<text
-								v-if="orderInfo.hire_duration_time.day>0">日</text>{{orderInfo.hire_duration_time.hour > 0 ? orderInfo.hire_duration_time.hour :'' }}<text
-								v-if="orderInfo.hire_duration_time.hour>0">小时</text>{{orderInfo.hire_duration_time.minute > 0 ? orderInfo.hire_duration_time.minute :'' }}<text
-								v-if="orderInfo.hire_duration_time.minute>0">分</text>
+							<block v-if="orderInfo.hire_duration_time">
+								{{orderInfo.hire_duration_time.day > 0 ? orderInfo.hire_duration_time.day :'' }}<text
+									v-if="orderInfo.hire_duration_time.day>0">日</text>{{orderInfo.hire_duration_time.hour > 0 ? orderInfo.hire_duration_time.hour :'' }}<text
+									v-if="orderInfo.hire_duration_time.hour>0">小时</text>{{orderInfo.hire_duration_time.minute > 0 ? orderInfo.hire_duration_time.minute :'' }}<text
+									v-if="orderInfo.hire_duration_time.minute>0">分</text>
+							</block>
+
 						</view>
+
 						<view
 							v-if="(orderInfo.order_status == 2&&orderInfo.hire_type==2) || orderInfo.order_status == 3">
 							租期剩余</view>
@@ -64,8 +68,6 @@
 							:src="isExpanded?'https://qiniu.bms16.com/FvRah8ro91B_TUVEmInBq6n69W2f':'https://qiniu.bms16.com/FtbxPP0aXYG8hyJTEJfNTXa_Puuc'" />
 					</view>
 				</view>
-
-
 				<view v-if="orderInfo.order_type == 3" class="flex-row flex-between">
 					<view class="money-item">
 						<view></view>
@@ -230,13 +232,14 @@
 				<view @tap="navToScan" class="sesame-btn ">去上传</view>
 			</view>
 
-			<view v-else-if="(orderInfo.order_status == 3||orderInfo.order_status == 4) && orderInfo.order_type != 3 && orderInfo.pay_status != 5"
+			<view
+				v-else-if="(orderInfo.order_status == 3||orderInfo.order_status == 4) && orderInfo.order_type != 3 && orderInfo.pay_status != 5"
 				class="flex-row"> <!-- 使用中 -->
 				<view @tap="callStorePhone" class="cancel">联系门店</view>
 				<view @tap="tapReturnCar" class="deposit-btn">到店还车</view>
 				<view @tap="bindRenew" class="sesame-btn">续租</view>
 			</view>
-			
+
 			<view v-else-if="orderInfo.order_status == 5||orderInfo.order_status == 6" @tap="callStorePhone"
 				class="pay-btn">
 				联系门店</view> <!-- 待门店确认||还车中,等待门店取车 -->
@@ -246,7 +249,7 @@
 			<view v-if="orderInfo.order_type == 3 && (orderInfo.order_status == 3||orderInfo.order_status == 4)"
 				@tap="callStorePhone" class="pay-btn">联系门店</view>
 		</view>
-		
+
 		<view v-if="isShowCancel" class="cancel-b">
 			<view class="cancel-box">
 				<view class="cancel-title flex-row flex-between">
@@ -313,7 +316,7 @@
 		},
 		data() {
 			return {
-				overdueData:{},
+				overdueData: {},
 				select_type: '',
 				car_detail: {},
 				showCarPlan: false,
@@ -350,7 +353,7 @@
 		 * 生命周期函数--监听页面显示
 		 */
 		onShow: function(e) {
-			if(this.sub_sn && this.orderInfo.sub_sn){
+			if (this.sub_sn && this.orderInfo.sub_sn) {
 				this.bindOrderInfo()
 			}
 		},
@@ -360,17 +363,21 @@
 		computed: {},
 
 		methods: {
-
+			payReturn() {},
 			//逾期费用计算
 			async overdueMoneyFn(car_sn) {
-				let {data} = await request.postApi(config_gyq.API_FLK_CAR_OVERDUE_MONEY,{car_sn})
-				if(data.code == 200){
+				let {
+					data
+				} = await request.postApi(config_gyq.API_FLK_CAR_OVERDUE_MONEY, {
+					car_sn
+				})
+				if (data.code == 200) {
 					this.overdueData = data.data
-				}else{
+				} else {
 					common.simpleToast(data.msg)
 				}
 			},
-
+			payToOrder() {},
 			async loadCarInfo(model_id) {
 				const me = this
 				http.postApi(config.API_FLK_INDEX_CAR_MODEL_DETAIL, {
@@ -472,47 +479,57 @@
 			},
 
 			async bindOrderInfo() {
-				let res = await uni.getLocation()
 				const me = this
+				const locationStr = uni.getStorageSync('user_current_location');
+				// if (locationStr) {
+				// 	this.myLocation = locationStr;
+				// }
 				http.postApi(config.API_FLK_ORDER_INFO, {
 					sub_sn: me.sub_sn,
-					latitude: res[1].latitude,
-					longitude: res[1].longitude,
+					latitude: locationStr.latitude,
+					longitude: locationStr.longitude,
 				}, (resp) => {
 					if (resp.data.code === 200) {
 						me.orderInfo = resp.data.data.order_info
-						
+				
 						// 
 						if (resp.data.data.order_info.model_id) {
 							me.loadCarInfo(resp.data.data.order_info.model_id)
 						}
-						let distance = common.getFlatternDistance(res[1].longitude, res[1].latitude, me
+						let distance = common.getFlatternDistance(locationStr.longitude, locationStr.latitude, me
 							.orderInfo.longitude, me.orderInfo.latitude)
 						resp.data.data.order_info.distance = distance
 						// 取还时间展示
 						// me.orderInfo.hire_return_time = common.getTimeToDay(Math.ceil(me.orderInfo
 						// 	.hire_end_time - me.orderInfo.hire_begin_time) / 60)
-
-						me.orderInfo.hire_return_time = getRemainingTime(me.orderInfo.hire_begin_time, me
+				
+						me.orderInfo.hire_return_time = getRemainingTime(me.orderInfo
+							.hire_begin_time, me
 							.orderInfo.hire_end_time)
-						me.orderInfo.hire_begin_times = me.orderInfo.hire_begin_time ? dayjs(me.orderInfo
+						me.orderInfo.hire_begin_times = me.orderInfo.hire_begin_time ? dayjs(me
+							.orderInfo
 							.hire_begin_time * 1000).format(
 							'YY-MM-DD') : 0
-						me.orderInfo.hire_end_times = me.orderInfo.hire_end_time ? dayjs(me.orderInfo
+						me.orderInfo.hire_end_times = me.orderInfo.hire_end_time ? dayjs(me
+							.orderInfo
 							.hire_end_time * 1000).format(
 							'YY-MM-DD') : 0
-
+				
 						// 剩余租期判断
-						if ((me.orderInfo.hire_type == 2 && me.orderInfo.order_status == 2) || me
+						if ((me.orderInfo.hire_type == 2 && me.orderInfo.order_status == 2) ||
+							me
 							.orderInfo.order_status == 3) {
 							me.orderInfo.hire_duration_time = common.getTimeToDay(Math.ceil(me
-									.orderInfo.hire_end_time - (Math.floor(new Date()) / 1000)) /
+									.orderInfo.hire_end_time - (Math.floor(new Date()) /
+										1000)) /
 								60)
 						} else {
 							if (me.orderInfo.order_status == 4) {
 								me.overdueMoneyFn(me.orderInfo.car_sn)
-								me.orderInfo.hire_duration_time = common.getTimeToDay(Math.ceil(Math
-										.floor(new Date()) / 1000 - me.orderInfo.hire_end_time) /
+								me.orderInfo.hire_duration_time = common.getTimeToDay(Math
+									.ceil(Math
+										.floor(new Date()) / 1000 - me.orderInfo
+										.hire_end_time) /
 									60)
 							} else {
 								me.orderInfo.hire_duration_time = me.orderInfo.hire_return_time
@@ -526,6 +543,7 @@
 						common.simpleToast(resp.data.msg)
 					}
 				})
+
 			},
 			navStoreBtn() {
 				const {

pages/purchaseOrder/purchaseOrder.vue

@@ -144,7 +144,7 @@
 				</view>
 			</view>
 		</view>
-		<PayTypeModel @closeShow="closeShow" @payToOrder="payToOrder" :free_price="totalPrice"
+		<PayTypeModel @closeShow="closeShow" @payToOrder="payToOrder" :free_price="Number(totalPrice)"
 			:isShowToBuy="isShowToBuy" />
 	</view>
 </template>
@@ -173,6 +173,8 @@
 		},
 		data() {
 			return {
+				isShowReturnCar:false,
+				isShowCheckOrder:false,
 				sub_sn: "",
 				service_list: [],
 				isShowCalendar: false, //选择预约订单时间

pages/service/service.vue

@@ -14,7 +14,7 @@
 		<!-- #endif -->
 		
 		<!-- #ifdef APP -->
-		<googleMap width="100%" height='calc(50vh - 0rpx)'   @click="changMarkertap"  v-if="myLocation.latitude" :mapData='markers' :myLocation='myLocation'  ></googleMap>
+		<googleMap keyId="1" width="100%" height='calc(50vh - 0rpx)'   @click="changMarkertap"  v-if="myLocation.latitude" :mapData='markers' :myLocation='myLocation'  ></googleMap>
 		<!-- #endif -->
 		
 		<!-- 地图控件 -->

pages/storeDetails/aaaa.vue

@@ -0,0 +1,26 @@
+<template>
+	<view class="aa">
+		23213123123
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.aa {
+		width: 100px;
+		height: 200rpx;
+		background-color: red;
+	}
+</style>

pages/storeDetails/storeDetails.css

@@ -239,4 +239,85 @@
 	color: #FFFFFF;
 	line-height: 64rpx;
 	text-align: center;
-}
+}
+
+.tip-view {
+		background: #0A59F7;
+		border-radius: 50rpx;
+		margin-bottom: 20rpx;
+		/* height: 80rpx; */
+	}
+
+	.tip-title-view {
+		padding-left: 24rpx;
+		/* border-radius: 40rpx; */
+	}
+	.w-bg {
+		width: 100%;
+		height: 80rpx;
+		background: #FFFFFF;
+		border-radius: 0rpx 40rpx 0rpx 0rpx;
+	}
+
+	.step-view {
+		justify-content: space-around;
+		background: #FFFFFF;
+		padding: 32rpx 80rpx 0;
+		border-top-left-radius: 32rpx;
+	}
+
+	.icon-list-view .img1 {
+		width: 80rpx;
+		height: 72rpx;
+	}
+
+	.dashed-line {
+		/* border: 3rpx solid #F1F3F4; */
+		border-style: dashed;
+		border-width: 3rpx;
+		/* 定义边框粗细 */
+		border-color: #F1F3F4;
+		/* 定义边框颜色 */
+		width: 136rpx;
+		height: 2rpx;
+		display: flex;
+		flex-grow: 1;
+		padding: 0 80rpx;
+	}
+
+	.step-tip-view {
+		justify-content: space-around;
+		background-color: #FFF;
+		padding: 22rpx 24rpx 40rpx;
+		border-radius: 0rpx 0rpx 40rpx 40rpx;
+	}
+
+	.step-tip-text {
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #060809;
+		opacity: 0.8;
+
+	}
+
+	.step-tip-text:nth-child(2) {
+		margin: 0 38rpx 0 40rpx;
+	}
+
+	.step-num-1 {
+		width: 14rpx;
+		height: 22rpx;
+		margin-right: 4rpx;
+	}
+
+	.step-num-2 {
+		width: 20rpx;
+		height: 22rpx;
+		margin-right: 4rpx;
+	}
+
+	.step-num-3 {
+		width: 20rpx;
+		height: 24rpx;
+		margin-right: 4rpx;
+	}

pages/storeDetails/storeDetails.vue

@@ -13,6 +13,7 @@
 			<image v-else class="bg-img" src="https://qiniu.bms16.com/FhRnr7rADHHsOFfpWO4duD15SgIt" mode="aspectFill">
 			</image>
 		</view>
+		
 		<view class="p-bg">
 			<view class="store-info-view">
 				<view class="store-name">{{storeInfo.shop_name}}</view>
@@ -35,7 +36,7 @@
 								{{isWorkTimer ? '营业中' : '已休息'}}
 							</view>
 						</view>
-						<view class="grid_text_2">
+						<view v-if="storeInfo.work_begin_time" class="grid_text_2">
 							{{storeInfo.work_begin_time[0]}}:{{storeInfo.work_begin_time[1]}}-{{storeInfo.work_end_time[0]}}:{{storeInfo.work_end_time[1]}}
 						</view>
 					</view>
@@ -53,7 +54,49 @@
 					</view>
 				</view>
 			</view>
-			<useGuidance />
+			
+			
+			<view class="tip-view">
+				<view class="tip-title-view flex-row align-center">
+					<image style="width: 144rpx;height: 40rpx;" src="https://qiniu.bms16.com/FjUW1kuRvXWTEftyn9nH1AbGWuxK"
+						mode='aspectFit'></image>
+					<image style="width: 86rpx;height: 80rpx;" src="https://qiniu.bms16.com/FibAaPERzqi6m95EP2jREUKixjUi"
+						mode='aspectFill'></image>
+					<view class="w-bg flex-row"></view>
+				</view>
+				<view class="step-view flex-row  align-center">
+					<view class="icon-list-view">
+						<image class="img1" src="https://qiniu.bms16.com/Fp0BE27Q0VTD8qUJRHUVhWO6VEbO" mode='aspectFit'></image>
+					</view>
+					<view class="dashed-line"></view>
+					<view class="icon-list-view">
+						<image class="img1" src="https://qiniu.bms16.com/FqDzYwAbnSEgf3yv9SAb92Vq4ZEB"
+							mode='aspectFit'></image>
+					</view>
+					<view class="dashed-line"></view>
+					<view class="icon-list-view">
+						<image class="img1" src="https://qiniu.bms16.com/FlFMHzco6j9XOpMI21tSnR9500Un"
+							mode='aspectFit'></image>
+					</view>
+				</view>
+				<view class="step-tip-view flex-row  align-center">
+					<view class="step-tip-text">
+						<image class="step-num-1" src="https://qiniu.bms16.com/Fm4gMRmW6UOwLcU-eW8LDLNfiUJe" mode='aspectFill'>
+						</image>线上选择用车方案生成待支付订单
+					</view>
+					<view class="step-tip-text">
+						<image class="step-num-2" src="https://qiniu.bms16.com/FvYN7SxOYIhXEqSAJZrQIBQuTx79" mode='aspectFill'>
+						</image>导航到店向商家支付订单金额
+					</view>
+					<view class="step-tip-text">
+						<image class="step-num-3" src="https://qiniu.bms16.com/FhZ7w0X8iVuxFPdetEF9C3YYkJ7Z" mode='aspectFill'>
+						</image>支付完成后直接现场取车
+					</view>
+				</view>
+			</view>
+			
+			
+			
 			<view class="unit-type-view">
 				<view @click="status = 0;modelListsFn()" class="unit-type " :class="{'unit-type-i' : status == 0}">短租
 				</view>
@@ -62,6 +105,7 @@
 				<view @click="status = 2;modelListsFn()" class="unit-type " :class="{'unit-type-i' : status == 2}">出售
 				</view>
 			</view>
+			
 			<view class="car-info-list-view">
 				<view v-for="(item,index) of modelListsFn()" :key="index" class="car-info-view align-center flex-row">
 					<!-- <img class="car-img" src="https://qiniu.bms16.com/FsxOysJT2V3KNYev2YWadvjyKn2j" alt=""> -->
@@ -74,7 +118,7 @@
 								<text v-if="status == 0" style="margin-right: 8rpx;">短租</text>
 								<text v-if="status == 1" style="margin-right: 8rpx;">长租</text>
 								<text v-if="status == 2" style="margin-right: 8rpx;">出售</text>
-								<priceTool :price="item.money" :font_size="40" />
+								<priceTool :price="Number(item.money)" :font_size="40" />
 							</view>
 							<view @click="srcFn(`/pages/carDetail/carDetail?model_id=${item.model_id}`)"
 								class="lease-btn">购/租</view>
@@ -94,11 +138,13 @@
 	var http = require('../../common/http.js');
 	var storage = require('../../common/storage.js');
 	import priceTool from '@/component/priceTool/priceTool';
-	import UseGuidance from '@/component/useGuidance/useGuidance';
+	import aaaa from './aaaa.vue';
+	// import UseGuidance from '@/component/useGuidance/useGuidance';
 	export default {
 		components: {
 			priceTool,
-			UseGuidance
+			aaaa
+			// UseGuidance
 		},
 		data() {
 			return {
@@ -117,7 +163,7 @@
 		 */
 		onLoad:  function(options) {
 			console.log(options, 'options');
-			this.shop_id = options.admin_id || ''
+			this.shop_id = 25240 || ''
 			this.locationFn()
 			
 		},
@@ -263,6 +309,6 @@
 	};
 </script>
 
-<style>
+<style scoped>
 	@import './storeDetails.css';
 </style>

pages/travelingTrack/travelingTrack.vue

@@ -52,12 +52,14 @@
 	var common = require('../../common/common.js');
 	var amap = require('../../common/amap-wx.js');
 	var config = require('../../common/config.js');
+	var config_gyq = require('../../common/config_gyq.js');
 	var http = require('../../common/http.js');
+	var request = require('../../common/request.js');
 	var storage = require('../../common/storage.js');
 	export default {
 		data() {
 			return {
-				id:0, // 使用 marker点击事件 需要填写id
+				id: 0, // 使用 marker点击事件 需要填写id
 				title: 'map',
 				// markers: [],
 				mapParams: {
@@ -67,12 +69,12 @@
 				},
 				myInfo: {},
 				myLocation: {
-					latitude:  39.910925,
+					latitude: 39.910925,
 					longitude: 116.413384,
 				},
-				star_address:'',
-				end_address:'',
-				address:{},
+				star_address: '',
+				end_address: '',
+				address: {},
 				scale: 16,
 				devicelist: [],
 				devs: [],
@@ -82,14 +84,15 @@
 				isPageUnloaded: false,
 				polylines: [], // 路线
 				markers: [], // 标记点
-				trackInfo:{},
-				plate_number:''
+				trackInfo: {},
+				plate_number: ''
 			};
 		},
 		/**
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad(options) {
+			console.log(uni.getStorageSync('car_info'))
 			this.plate_number = options.plate_number
 			const me = this
 			// common.loading();
@@ -100,64 +103,79 @@
 					myLocation: storedLocation
 				})
 				me.loadTrackInfo()
-			} else {  
-			    me.getLocationAndSave();
+			} else {
+				me.getLocationAndSave();
 			}
-			
+			this.init()
 		},
 		/**
 		 * 生命周期函数--监听页面显示
 		 */
 		onShow: function() {
-	
+
 		},
 		methods: {
-			loadTrackInfo(){
-				const me=this
-				http.postApi(config.API_DAYHIRE_CAR_TRACK_INFO,{plate_number:this.plate_number},(resp) => {
-					if(resp.data.code === 200) {
-						me.trackInfo=resp.data.data
-						me.pointsList=resp.data.data.points
+			async init() {
+				let {
+					data
+				} = await request.postApi(config_gyq.API_DEVICE_TRACK, {
+					"macid": "013656219992",
+					"from": 1742572800,
+					"to": 1742659199,
+					"language": ""
+				})
+				console.log(data)
+			},
+			loadTrackInfo() {
+				const me = this
+				http.postApi(config.API_DAYHIRE_CAR_TRACK_INFO, {
+					plate_number: this.plate_number
+				}, (resp) => {
+					if (resp.data.code === 200) {
+						me.trackInfo = resp.data.data
+						me.pointsList = resp.data.data.points
 						//接口返回描绘线段
-						me.polylines=  [{
-							points:resp.data.data.points,
+						me.polylines = [{
+							points: resp.data.data.points,
 							color: "#0BD28E",
 							width: 6
 						}]
-						if(me.pointsList.length>=2){
-							const len=me.pointsList.length-1
+						if (me.pointsList.length >= 2) {
+							const len = me.pointsList.length - 1
 							//点收尾标记
-							me.markers= [{
-								id:1,
+							me.markers = [{
+								id: 1,
 								latitude: me.pointsList[0].latitude,
 								longitude: me.pointsList[0].longitude,
 								iconPath: 'https://qiniu.bms16.com/Fo5xXb4G6AEQpRcqZybvV29jVvIw',
 								width: 30,
-								height:40
-								}, {
-								id:2,
-								latitude: me.pointsList[len].latitude, 
+								height: 40
+							}, {
+								id: 2,
+								latitude: me.pointsList[len].latitude,
 								longitude: me.pointsList[len].longitude,
 								iconPath: 'https://qiniu.bms16.com/FgfUVOFAeY-tXUilteSpVem3HTb7',
 								width: 30,
-								height:34
+								height: 34
 							}]
-							me.getAddressName(me.pointsList[0].latitude,me.pointsList[0].longitude,1)
-							me.getAddressName(me.pointsList[len].latitude,me.pointsList[len].longitude,2)
-						}else{
-							me.markers= [{
-								id:2,
-								latitude: me.pointsList[0] ? me.pointsList[0].latitude : me.myLocation.latitude, 
-								longitude: me.pointsList[0] ? me.pointsList[0].longitude : me.myLocation.longitude,
+							me.getAddressName(me.pointsList[0].latitude, me.pointsList[0].longitude, 1)
+							me.getAddressName(me.pointsList[len].latitude, me.pointsList[len].longitude, 2)
+						} else {
+							me.markers = [{
+								id: 2,
+								latitude: me.pointsList[0] ? me.pointsList[0].latitude : me.myLocation
+									.latitude,
+								longitude: me.pointsList[0] ? me.pointsList[0].longitude : me.myLocation
+									.longitude,
 								iconPath: 'https://qiniu.bms16.com/FgfUVOFAeY-tXUilteSpVem3HTb7',
 								width: 48,
-								height:52
+								height: 52
 							}]
 							// 这里的markers的length只为1
-							me.getAddressName(me.markers[0].latitude,me.markers[0].longitude,1)
+							me.getAddressName(me.markers[0].latitude, me.markers[0].longitude, 1)
 						}
-						console.log(me.markers,'me.markers');
-					}else{
+						console.log(me.markers, 'me.markers');
+					} else {
 						// 默认返回上一个页面再提示报错
 						// uni.navigateBack({
 						// 	delta: 1
@@ -166,34 +184,34 @@
 					}
 				})
 			},
-			
-			getAddressName(latitude,longitude,type){
+
+			getAddressName(latitude, longitude, type) {
 				const pData = {
 					lng: longitude,
 					lat: latitude,
-					pi:"wx_index"
+					pi: "wx_index"
 				}
-				const that=this
-				http.postApi(config.API_MAP_REGEO,pData,(resp) => {
-					if(resp.data.code === 200) {
-						if(type==1){
-							that.star_address=resp.data.data.data.address
+				const that = this
+				http.postApi(config.API_MAP_REGEO, pData, (resp) => {
+					if (resp.data.code === 200) {
+						if (type == 1) {
+							that.star_address = resp.data.data.data.address
 							// that.setData({
 							// 	star_address: resp.data.data.data.address
 							// });
-						}else{
+						} else {
 							that.setData({
 								end_address: resp.data.data.data.address
 							});
 						}
-					}else{
+					} else {
 						common.simpleToast(resp.data.msg)
 					}
 				})
 			},
-			
+
 			getLocationAndSave: function() {
-				const me = this;  
+				const me = this;
 				uni.getLocation({
 					type: 'gcj02',
 					isHighAccuracy: true,
@@ -217,7 +235,7 @@
 					}
 				});
 			},
-		
+
 			navToPage(e) {
 				const url = e.currentTarget.dataset.url;
 				if (!url) {