杂项

common/common.js

@@ -64,9 +64,8 @@ function getFlatternDistance(lon1, lat1, lon2, lat2) {
 
 	dy = DEF_R * (ns1 - ns2); // 南北方向长度(在经度圈上的投影长度)
 	// 勾股定理求斜边长
-
 	distance = Math.sqrt(dx * dx + dy * dy).toFixed(0);
-	return distance;
+	return Number(distance);
 }
 
 function formatDateTime(time) {

common/config_gyq.js

@@ -47,5 +47,12 @@ var config = {
 	API_USER_MODIFY_USER_INFO: api_web_url +'?r=user/modify-user-info',
 	//用户信息,
 	API_USER_INFO: api_web_url +'?r=user/info',
+	
+	//机柜换电状态查询: ,
+	API_FLK_CABINET_EXCHANGE_STATUS: api_web_url +'?r=flk/cabinet/exchange-status',
+	//附近机柜列表: flk/cabinet/near-list
+	API_FLK_CABINET_NEAR_LIST: api_web_url +'?r=flk/cabinet/near-list',
+	//忘记密码
+	API_FLK_CABINET_RESET_PASSWORD: api_web_url +'?r=flk/account/reset-password',
 };
 module.exports = config;

component/scanCabBtn/scanBtn.vue

@@ -192,16 +192,47 @@
 			// 		url: url
 			// 	});
 			// },
-
+			isTagCodeFn(){
+				let userBattery = []
+				let boxBattery = []
+				
+				let tagCode = []
+				for (let index = 0; index < this.listData.user_battery_list.length; index++) {
+					let item = this.listData.user_battery_list[index];
+					userBattery.push(item.tag_info)
+				}
+				for (let index = 0; index < this.listData.boxList.length; index++) {
+					let item = this.listData.boxList[index];
+					if(item.tag_info) boxBattery.push(item.tag_info)
+				}
+				console.log(userBattery)
+				console.log(boxBattery)
+				for (let index = 0; index < userBattery.length; index++) {
+					let item = userBattery[index];
+					for (var i = 0; i < boxBattery.length; i++) {
+						var items = boxBattery[i];
+						if(item.child_tag_code == items.child_tag_code && item.child_tag_code){
+							tagCode.push(item.child_tag_code)
+						}else if(item.main_tag_code == items.main_tag_code && item.main_tag_code){
+							tagCode.push(item.main_tag_code)
+						}
+					}
+				}
+				console.log(tagCode)
+				return tagCode
+			},
 			async sacnBtn() {
-				console.log(this.listData)
 				if(this.listData.can_exchange_num == 0){
 					this.isModelCenter = true
 					this.packType = 2
 					return
 				}
 				if((this.listData.user_battery_list.length - this.listData.can_exchange_num) >= 0 && this.listData.can_exchange_num != -1){
-					msg('您的次数不足无法换电！')
+					common.simpleToast('您的次数不足无法换电！')
+					return
+				}
+				if(this.isTagCodeFn().length < 1){
+					common.simpleToast('未找到和您匹配的电源！')
 					return
 				}
 				let res = await uni.scanCode({
@@ -383,6 +414,13 @@
 					pay_type:0,
 					battery_sn_list,
 				})
+				if(data.code == 200){
+					uni.navigateTo({
+						url:`/pages/openCabinet/openCabinet?order_sn=${data.data.order_sn}`
+					})
+				}else{
+					common.simpleToast(data.msg)
+				}
 				console.log(data)
 				
 				// await http.postApi(config.API_FLK_CABINET_CHANGE_BATTERY,{

locale/en.json

@@ -576,5 +576,6 @@
 	"租赁类型": "Lease type",
 	"电池和车": "Battery and car",
 	"请关联车辆": "Please contact vehicle",
-	"请输入车辆编号": "Enter vehicle number"
+	"请输入车辆编号": "Enter vehicle number",
+	"修改成功":"修改成功"
 }

locale/zh.json

@@ -81,5 +81,6 @@
 	"打开应用锁":"打开应用锁",
 	"后台运行":"后台运行",
 	"电池优化":"电池优化",
-	"位置权限":"位置权限"
+	"位置权限":"位置权限",
+	"修改成功":"修改成功"
 }

manifest.json

@@ -22,7 +22,6 @@
         },
         "modules" : {
             "Payment" : {},
-            "Maps" : {},
             "Bluetooth" : {},
             "Geolocation" : {},
             "Share" : {}
@@ -69,9 +68,8 @@
                     }
                 },
                 "maps" : {
-                    "amap" : {
-                        "appkey_ios" : "unknown",
-                        "appkey_android" : "255bc0dfb27a04f9c4aaacf0fd80cff8"
+                    "tencent" : {
+                        "key" : ""
                     }
                 },
                 "oauth" : {},

package.json

@@ -29,6 +29,7 @@
         ]
     },
     "dependencies": {
+        "@amap/amap-jsapi-loader": "^1.0.1",
         "crypto-js": "^4.2.0",
         "dayjs": "^1.11.13",
         "echarts": "^5.6.0",

pages.json

@@ -294,6 +294,13 @@
 			"style": {
 				"navigationBarTitleText": ""
 			}
+		},
+		{
+			"path" : "pages/batteryRecord/batteryRecord",
+			"style" : 
+			{
+				"navigationBarTitleText" : "换电记录"
+			}
 		}
 		
 		

pages/addUser/addUser.vue

@@ -36,7 +36,7 @@
 				if(data.code == 200){
 					if(data.data.exist){
 						uni.navigateTo({
-							url:`/pages/powerSetting/powerSetting?email=${this.email}&headimg=${data.data.headimg}&nickname=${data.data.nickname}`
+							url:`/pages/powerSetting/powerSetting?email=${this.email}&headimg=${data.data.headimg}&nickname=${data.data.nickname}&isSet=1`
 						})
 					}else{
 						msg('该用户不存在！')

pages/batteryRecord/batteryRecord.vue

@@ -0,0 +1,48 @@
+<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"
+					src="https://qiniu.bms16.com/Fqs6TrEmcdT7QNEdKWs9Hir2cacO" alt="">
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.order-type-view{
+	padding: 32rpx;
+	height: 96rpx;
+	margin-bottom: 20rpx;
+	background: #FFFFFF;
+	align-items: center;
+}
+.car-model-list{
+	position: relative;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 600;
+	font-size: 40rpx;
+	color: #060809;
+}
+.right-corner-icon{
+	width: 14rpx;
+	height: 14rpx;
+	position: absolute;
+	bottom: 9rpx;
+	right: -22rpx;
+}
+</style>

pages/carDetail/carDetail.css

@@ -23,7 +23,7 @@
 	background: #F3F8FF;
 	border-radius: 24rpx;
 	padding: 6rpx 0 6rpx 6rpx;
-	height: 80rpx;
+	min-height: 80rpx;
 	
 	font-weight: 400;
 	font-size: 32rpx;
@@ -31,7 +31,8 @@
 	justify-content: space-around;
 }
 .time-unit{
-	width: 25%;
+	width: calc(25% - 20rpx);
+	margin: 0 10rpx;
 	text-align: center;
 	height: 68rpx;
 	line-height: 68rpx;

pages/carDetail/carDetail.vue

@@ -1,20 +1,25 @@
 <template>
 	<view class="car-detail-main">
-		<view class="flex-row">
+		<view v-if="car_detail.image" class="flex-row">
 			<img style="width: 600rpx;height: 406rpx;" :src="car_detail.image"
 				alt="">
 		</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="flex-row car-detail-time">
-				<view v-for="(item,index) in car_detail.rental_setting" :key="index" @tap="tapSelectType" :data-price="item.hire_price"
+			<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"
 					:class="['time-unit',selectType==item.hire_duration_unit? 'time-unit-i':'']">
 					<text v-if="item.hire_duration_unit==1">日租</text>
 					<text v-if="item.hire_duration_unit==2">月租</text>
 					<text v-if="item.hire_duration_unit==3">年租</text>
+					<text v-if="item.hire_duration_unit==4">时租</text>
+					<text v-if="item.hire_duration_unit==5">分租</text>
+					<text v-if="item.hire_duration_unit==6">周租</text>
+					<text v-if="item.hire_duration_unit==7">季租</text>
 				</view>
+				
 				<view @tap="tapSelectType" :data-select_type="100" :data-price="car_detail.sell_price"
 					:class="['time-unit',selectType==100? 'time-unit-i':'']">购买</view>
 			</view>
@@ -45,7 +50,7 @@
 						<view>{{car_detail.shop_name}}</view>
 						<view class="address-txt">{{car_detail.address}}</view>
 					</view>
-					<view class="distance-num">{{car_detail.destance}}m</view>
+					<view class="distance-num">{{car_detail.distance}}m</view>
 				</view>
 				<view class="flex-row flex-between align-center">
 					<view class="time-view flex-row alert-center">
@@ -116,7 +121,16 @@
 			// getFlatternDistance 获取直线距离
 		},
 		methods: {
-			loadCarInfo() {
+			async locationFn() {
+					let res = await uni.getLocation()
+					if (res[1]) {
+						return {
+							latitude: res[1].latitude,
+							longitude: res[1].longitude,
+						}
+					}
+				},
+			async loadCarInfo() {
 				const me = this
 				// let test = {
 				// 	"recommend_id": 3,
@@ -170,9 +184,14 @@
 				// me.setData({
 				// 	car_detail: test
 				// })
-
-				http.postApi(config.API_FLK_INDEX_CAR_MODEL_DETAIL, {model_id:me.model_id}, (resp) => {
+				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,
+				}, (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/index/index.vue

@@ -154,8 +154,6 @@ import {
 		 * 生命周期函数--监听页面显示
 		 */
 		onShow: function() {
-			console.log(33333333)
-			console.log(getFunctionTag().activeTag)
 			this.contrilList = getFunctionTag().activeTag
 			const user_token = storage.getUserToken()
 				if (!user_token) {

pages/loginRegister/changePassword.vue

@@ -1,17 +1,17 @@
 <template>
     <view class="changePassword-page">
         <ZxInput
-            v-model="form.oldPassword"
+            v-model="form.old_passwd"
             :placeholder="$t('请输入旧密码')"
             isPassword
         />
         <ZxInput
-            v-model="form.password"
+            v-model="form.new_passwd"
             :placeholder="$t('请输入新密码')"
             isPassword
         />
         <ZxInput
-            v-model="form.passwordAgain"
+            v-model="form.second_passwd"
             :placeholder="$t('请再次输入新密码')"
             isPassword
         />
@@ -24,6 +24,7 @@
 
 
 <script>
+import common from '../../common/common';
 import ZxInput from './components/ZxInput.vue'
 var config = require('../../common/config_gyq.js');
 	var http = require('../../common/request.js');
@@ -40,11 +41,31 @@ export default {
     },
     computed: {
         isSubmit({ form }) {
-            return form.oldPassword && form.password && form.passwordAgain
+            return form.old_passwd && form.new_passwd && form.second_passwd
         }
     },
     methods: {
-        changePassword() {
+        async changePassword() {
+			if(!this.isSubmit) return
+			let res = await uni.showModal({
+				confirmText:this.$t('确定'),
+				cancelText:this.$t('取消'),
+				title:this.$t('是否确认修改密码？')
+			})
+			if(res[1].confirm){
+				let {data} = await http.postApi(config.API_FLK_CABINET_RESET_PASSWORD,this.form)
+				if(data.code == 200){
+					common.simpleToast(this.$t('修改成功'))
+					setTimeout(()=>{
+						uni.navigateBack({
+							delta:1
+						})
+					},800)
+				}else{
+					common.simpleToast(data.msg)
+				}
+			}
+			
 			
         }
     }

pages/my/my.vue

@@ -89,7 +89,7 @@
         const lang = t => this.$t(t)
         return [
           { name: `${lang('我的订单')}`, url: '/pages/order/order', icon: 'FkLJGLo1faYtJWhW4Q0gt5dphI7g' },
-          { name: `${lang('换电记录')}`, url: '', icon: 'FnSjwcN7Mcpa-WA7Cqx2cGTvX2V1' },
+          { name: `${lang('换电记录')}`, url: '/pages/batteryRecord/batteryRecord', icon: 'FnSjwcN7Mcpa-WA7Cqx2cGTvX2V1' },
           { name: `${lang('意见反馈')}`, url: '/pages/feedback/index', icon: 'FnSjwcN7Mcpa-WA7Cqx2cGTvX2V1' },
         //   { name: `${lang('关于我们')}`, url: '/pages/bluetoothUnlock/unlockSet', icon: 'Fmin1_DG6ZkENCdsI1qJZJpDNkhQ' },
           { name: `${lang('客服中心')}`, url: '/pages/bluetoothUnlock/bluetoothPair', icon: 'FhA9TUbTMF0e7ma6NZXqPrkscN6l' },

pages/openCabinet/openCabinet.vue

@@ -6,334 +6,114 @@
 		<view class="explain-view">
 			<view class="explain-num-view flex-row">
 				<!-- <text><text class="explain-num">{{empty_door_id}} </text>号仓门已打开</text> -->
-				<text>仓门已打开</text>
+				<text v-if="list.status == 1">仓门已打开</text>
+				<text v-if="list.status == 2">换电中</text>
+				<text v-if="list.status == 3">换电成功</text>
+				<text v-if="list.status == 4">换电失败</text>
 			</view>
-			<view class="explain-text">请存入更换电池,取走满电电池,并关好仓门</view>
+			<view v-if="list.status == 1" class="explain-text">请存入更换电池,取走满电电池,并关好仓门</view>
+			<view v-if="list.status == 2" class="explain-text">换电中</view>
+			<view v-if="list.status == 3" class="explain-text">换电成功</view>
+			<view v-if="list.status == 4" class="explain-text-grap">{{list.fail_reason}}</view>
 			<!-- <view class="explain-text">请 归还 / 取出 电池并关上仓门</view> -->
 			<!-- <view class="explain-text">请取出电池并关上仓门</view> -->
 			<!-- <view class="explain-text-grap">归还完成后电柜会自动打开可租仓门</view> -->
 			<!-- <view class="explain-text-grap">自动为您匹配最高电量电池</view> -->
 		</view>
 		<!-- 完成弹窗 -->
-			<view v-if="isOverModal" class="modal-group">
-				<view class="payment-info-main">
-					<view class="payment-info-top flex-row">
-						<img class="check-icon" :src="showtxt.img" alt="">
-						<!-- <img src="https://qiniu.bms16.com/FmGcOOZZm09nx9lH3lez7D3DYHKn" alt=""> -->
-					</view>
-					<view class="open-result-view">
-						<view class="open-result flex-row">{{showtxt.title}}</view>
-						<view class="open-result-tip flex-row">{{showtxt.text}}</view>
-					</view>
-					<view class="over-btn-view">
-						<view v-if="status==3" @tap="tapToIndex" class="over-btn flex-row">完成.{{countdown}}</view>
-						<view v-if="status==4" @tap="connectStore" class="over-btn flex-row">联系门店</view>
-					</view>
+		<view v-if="isOverModal" class="modal-group">
+			<view class="payment-info-main">
+				<view class="payment-info-top flex-row">
+					<!-- <img class="check-icon" :src="showtxt.img" alt=""> -->
+					<img v-if="list.status==3" class="check-icon" src="https://qiniu.bms16.com/Fg5C4OVF17Q8p5-mHu7CoFne0Zqp" alt="">
+					<img v-if="list.status==4" class="check-icon" src="https://qiniu.bms16.com/FmGcOOZZm09nx9lH3lez7D3DYHKn" alt="">
+				</view>
+				<view v-if="list.status==3" class="open-result-view">
+					<view class="open-result flex-row">换电成功</view>
+					<view class="open-result-tip flex-row">即将跳转至首页，祝您骑行愉快</view>
+				</view>
+				<view v-if="list.status==4" class="open-result-view">
+					<view class="open-result flex-row">换电失败</view>
+					<view class="open-result-tip flex-row">{{list.fail_reason}}</view>
+				</view>
+				<view class="over-btn-view">
+					<view v-if="list.status==3" @tap="tapToIndex" class="over-btn flex-row">回到首页</view>
+					<view v-if="list.status==4" @tap="connectStore" class="over-btn flex-row">联系门店</view>
 				</view>
 			</view>
-		
+		</view>
 	</view>
 </template>
 
 <script>
-	const http = require('../../common/http.js');
-	const config = require('../../common/config.js');
+	const http = require('../../common/request.js');
+	const config = require('../../common/config_gyq.js');
 	const common = require('../../common/common.js');
 	var bluetooth = require('../../common/bluetooth.js');
 	const DF_CAB_INFO_DONE = 10000; //机柜信息传输完成
 	const app = getApp();
-export default {
+	export default {
 		data() {
 			return {
 				isOverModal:false,
-				orderStatusTimer: null,//查询订单状态
-				order_sn:'',
-				showtxt:{
-					img:'',
-					title:'',
-					text:''
-				},
-				status:0,
-				countdown:5,
-				empty_door_id:'', //空仓（归还仓）编号
-				full_door_id:'', //满电仓(借出电池仓)编号
-				phone:'', //换电失败联系电话
-				cabinetInfo:{},
-				isShow:false,
-				intervalTime:null
+				order_sn: '',
+				time: null,
+				list: {}
 			};
 		},
 		/**
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad: function(options) {
-			const me=this
-			const paramsString = decodeURIComponent(options.pdata)
-			const cabinetInfoString = decodeURIComponent(options.cabinet_info)
-			this.cabinetInfo= JSON.parse(cabinetInfoString)||{}
-			const pData=JSON.parse(paramsString)||{}
-			this.phone=this.cabinetInfo.link_phone||''
-			if(this.cabinetInfo.online_status==1){
-				me.order_sn=pData.order_sn
-				me.clearTimer()
-				//机柜直接下发指令开始换电
-				me.orderStatusTimer = setInterval(function () {
-				  me.getChangeBatteryStatus(me.order_sn)
-				}, 1200)
-				setTimeout(function () {
-				  wx.showLoading({
-				    title: '正在换电中，请稍后',
-				  })
-				}, 200)
-			}else{
-				// 离线蓝牙换电
-				me.sendExchangeCommand({...pData,...this.cabinetInfo})
-			}
+			this.order_sn = options.order_sn
+			this.exchangeStatusFn()
+			this.time = setInterval(() => {
+				this.exchangeStatusFn()
+			}, 3000)
 		},
 		/**
 		 * 生命周期函数--监听页面显示
 		 */
 		onShow: function() {
-			
+
+		},
+		onUnload() {
+			this.clearIntervalTimer()
 		},
 		methods: {
-			getChangeBatteryStatus(order_sn){
-				const me=this
-				//定时查询换电状态
-				 http.postApi(config.API_DAY_HIRE_CABINRT_CHANGE_BATTERY_STATUS, { order_sn: order_sn }, resp => {
-				      if (resp.data.code === 200) {
-				        const statusInfo = resp.data.data.statusInfo
-				        const status = statusInfo.status
-				        if (status == 0||status == 1 || status == 2) {
-				          return;
-				        }
-						me.empty_door_id=
-				        uni.hideLoading();
-				        me.clearTimer()
-						
-				        if (status == 3) {
-							const _showtxt = {
-									title:'换电成功',
-									text:'即将跳转至首页，祝您骑行愉快',
-									img:'https://qiniu.bms16.com/Fg5C4OVF17Q8p5-mHu7CoFne0Zqp'
-									}
-							me.setData({
-								isOverModal:true,
-								status:3,
-								showtxt:_showtxt
-							})
-							me.startCountdown()
-				        } else {
-							const _showtxt  = {
-								title:'换电失败',
-								text:statusInfo.fail_reason,
-								img:'https://qiniu.bms16.com/FmGcOOZZm09nx9lH3lez7D3DYHKn'
-								}
-							me.setData({
-								isOverModal:true,
-								status:4,
-								showtxt:_showtxt
-							})
-				        }
-				      }
-				    })
-			},
-			 // 开始倒计时  
-			  startCountdown: function() {  
-			    let that = this;  
-			    this.intervalTime = setInterval(function() {  
-			      if (that.countdown > 1) {  
-			        that.setData({  
-			          countdown: that.countdown - 1  
-			        });  
-			      } else {  
-			        clearInterval(that.intervalTime); // 清除定时器  
-			        that.tapToIndex() 
-			      }  
-			    }, 1000); // 每隔1000毫秒（1秒）执行一次  
-			  },
-			tapToIndex(){
-				this.isOverModal=false
-				this.bluetoothClose()
-				this.clearTimer()
-				this.clearIntervalTimer()
+			tapToIndex() {
+				this.isOverModal = false
 				uni.reLaunch({
-				  url: '/pages/index/index',
+					url: '/pages/index/index',
 				})
 			},
-			connectStore(){
-				const me = this
-				const phone = this.phone
-				// const phone = 18170410707
-				uni.showModal({
-					content: `您是否要拨打电话${phone}？`,
-					confirmText: '确定',
-					success: (res) => {
-						if (res.confirm) {
-							me.clearTimer()
-							uni.makePhoneCall({
-								phoneNumber: phone,
-								success() {},
-								fail() {}
-							})
-						}
-					},
-					fail: (res) => {}
-				})
+			connectStore() {
+				uni.makePhoneCall({
+					phoneNumber: this.list.link_phone //仅为示例
+				});
+			},
+			clearIntervalTimer() {
+				if (this.time == null) return
+				clearInterval(this.time)
+				this.time = null
 			},
-			clearTimer () {
-			   if (this.orderStatusTimer == null) return
-			   clearInterval(this.orderStatusTimer)
-			   this.orderStatusTimer = null
-			 },
-			 clearIntervalTimer () {
-			   if (this.intervalTime == null) return
-			   clearInterval(this.intervalTime)
-			   this.intervalTime = null
-			 },
-			 sendExchangeCommand(pdata) {
-				 console.log(pdata,'pdata');
-			 	var device = {};
-			 	device.orderNo = pdata.order_sn;
-			 	device.battertNum = pdata.cabbatterysn;
-			 	device.empityBoxNo = pdata.empty_door_id;
-			 	device.fullBoxNo = pdata.full_door_id;
-			 	device.dev_id = this.cabinetInfo.dev_id;
-			 	device.serialNum = new Date().getTime().toString();
-			 	device.key = this.decodeKey(this.cabinetInfo.bt_sec)
-			 	device.mac_id = this.cabinetInfo.bt_mac;
-			 	app.globalData.reportData = null;
-			 	app.globalData.reponseData = null;
-			 	const me = this;
-			 
-			 	if (bluetooth.isConnected(device.mac_id)) {
-			 		// me.loadBluetooth()
-			 		bluetooth.sendExchangeCommand(
-			 			device.mac_id,
-			 			device,
-			 			function() {
-			 				me.clearTimer();
-			 				me.orderStatusTimer = setInterval(function() {
-			 					if (app.globalData.reponseData !== null) {
-			 						var reponseData = app.globalData.reponseData;
-			 						if (reponseData.reponse == 1) {
-			 							if (reponseData.state != 1) {
-			 								if (reponseData.msg != '上次操作未确认') {
-			 									uni.hideLoading();
-			 									me.clearTimer();
-			 									common.simpleToast(reponseData.msg);
-			 								} else {
-			 									if (bluetooth.isConnected(device.mac_id)) {
-			 										bluetooth.sendCancelCommand(
-			 											device.mac_id,
-			 											reponseData.serialNo,
-			 											function() {},
-			 											function() {
-			 												me.sendExchangeCommand(pdata);
-			 											}
-			 										);
-			 									} else {
-			 										// this.loadBluetooth();
-													//蓝牙未连接
-			 									}
-			 								}
-			 							}
-			 						}
-			 					}
-			 
-			 					if (app.globalData.reportData !== null) {
-			 						var reportData = app.globalData.reportData;
-			 
-			 						if (reportData.report == 1) {
-			 							common.simpleToast(reportData.msg);
-			 							uni.hideLoading();
-			 							me.clearTimer();
-			 
-			 							if (!me.isShow) {
-											if(reportData.msg=='换电成功'||reportData.msg=='成功'){
-												// 换电成功
-												me.isShow = true;
-												me.isOverModal=true
-												me.status=3
-												me.showtxt = {
-													title:'换电成功',
-													text:'即将跳转至首页，祝您骑行愉快',
-													img:'https://qiniu.bms16.com/Fg5C4OVF17Q8p5-mHu7CoFne0Zqp'
-													}
-												// countdown
-												// 倒计时跳转首页
-												me.clearTimer();
-												me.bluetoothClose();
-												me.startCountdown()	
-											}else{
-												me.isShow = true;
-												me.status=4
-												me.isOverModal=true
-												me.showtxt  = {
-													title:'换电失败',
-													text:reportData.msg,
-													img:'https://qiniu.bms16.com/FmGcOOZZm09nx9lH3lez7D3DYHKn'
-													}
-												me.clearTimer();
-												me.bluetoothClose();
-											}
-											
-			 							}
-			 						}
-			 					}
-			 				}, 2000);
-			 				uni.showLoading({
-			 					title: '正在换电中，请稍后'
-			 				});
-			 			},
-			 			function() {
-			 				//common.simpleToast('发送失败')
-			 				uni.showModal({
-			 					title: '提示',
-			 					confirmText: '重新发送',
-			 					content: '请重新发起换电',
-			 					success: function(res) {
-			 						if (res.confirm) {
-			 							me.sendExchangeCommand(pdata);
-			 						} else {
-			 							uni.navigateBack({
-			 								delta: 1
-			 							});
-			 						}
-			 					}
-			 				});
-			 			}
-			 		);
-			 	} else {
-			 		// this.loadBluetooth();
-					// 重新获取蓝牙
-			 	}
-			 },
-			 bluetoothClose: function() {
-			 	bluetooth.closeBluetoothAdapter();
-			 	bluetooth.closeDevice(
-			 		this.cabinetInfo.bt_mac,
-			 		() => {
-			 			// this.setData({
-			 			// 	bt_loading: false
-			 			// });
-			 		},
-			 		() => {}
-			 	);
-			 	bluetooth.offCharacteristicStateChange(this.cabinetInfo.bt_mac, 'home');
-			 	bluetooth.offConnectionStateChange(this.cabinetInfo.bt_mac, 'home');
-			 },
-			 decodeKey(str) {
-			 	var val = []
-			 	for (var i = 0; i < str.length / 2; i++) {
-			 		val.push(parseInt(str.substring(0 + i * 2, 2 + i * 2), 16))
-			 	}
-			 	var str = ""
-			 	for (var i = 0; val.length > i; i++) {
-			 		str += String.fromCharCode(~val[i] & 0xff)
-			 	}
-			 	return str
-			 },
+			async exchangeStatusFn() {
+				let {
+					data
+				} = await http.postApi(config.API_FLK_CABINET_EXCHANGE_STATUS, {
+					order_sn: this.order_sn
+				})
+				if (data.code == 200) {
+					this.list = data.data.statusInfo
+					if (data.data.statusInfo.status == 3 || data.data.statusInfo.status == 4) {
+						this.clearIntervalTimer()
+						this.isOverModal = true
+					}
+				} else {
+					common.simpleToast(data.msg)
+				}
+			}
+
 		}
 	};
 </script>

pages/orderStatus/orderStatus.vue

@@ -3,12 +3,12 @@
 		<view class="time-info">
 			<view>
 				<view v-if="orderInfo.pay_status!=2">
-					<view  v-if="orderInfo.pay_status == 0">待支付</view>
-					<view  v-else-if="orderInfo.pay_status == 1">支付中</view>
-					<view  v-else-if="orderInfo.pay_status == 3">支付失败</view>
-					<view  v-else-if="orderInfo.pay_status == 4">支付取消</view>
-					<view  v-else-if="orderInfo.pay_status == 5">线下待审核</view>
-					<view  v-else-if="orderInfo.pay_status == 6">线下审核拒绝</view>
+					<view v-if="orderInfo.pay_status == 0">待支付</view>
+					<view v-else-if="orderInfo.pay_status == 1">支付中</view>
+					<view v-else-if="orderInfo.pay_status == 3">支付失败</view>
+					<view v-else-if="orderInfo.pay_status == 4">支付取消</view>
+					<view v-else-if="orderInfo.pay_status == 5">线下待审核</view>
+					<view v-else-if="orderInfo.pay_status == 6">线下审核拒绝</view>
 				</view>
 				<view v-if="orderInfo.order_status == 1">
 					{{orderInfo.return_type == 1?('请于'+tools.formatTimeSecond(orderInfo.hire_begin_time)+'到门店取车'):('将于'+tools.formatTimeSecond(orderInfo.hire_begin_time)+'送车上门')}}
@@ -20,22 +20,22 @@
 				<view v-else-if="orderInfo.order_status == 6">还车中,等待门店取车</view>
 				<view v-else-if="orderInfo.order_status == 7">已完成</view>
 				<view v-else-if="orderInfo.order_status == 8||orderInfo.order_status == 9">已取消</view>
-				</view>
+			</view>
 			<view class="time-money">
 				<view 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>
+								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>
 						</view>
-						<view v-if="(orderInfo.order_status == 2&&orderInfo.hire_type==2) || orderInfo.order_status == 3">租期剩余</view>
+						<view
+							v-if="(orderInfo.order_status == 2&&orderInfo.hire_type==2) || orderInfo.order_status == 3">
+							租期剩余</view>
 						<view v-else-if="orderInfo.order_status == 4" class="red-status">逾期时长</view>
-						<view v-else>租借周期</view>
-							<!-- <view
-							v-if="(orderInfo.order_status != 2&&orderInfo.hire_type==1) && orderInfo.order_status != 3 && orderInfo.order_status != 4">
-							租借周期</view> -->
+						<view v-else>
+							租借周期：{{orderInfo.hire_duration}}{{hireDurationUnitFn(orderInfo.hire_duration_unit)}}</view>
 					</view>
 					<view class="money-item">
 						<view :class="orderInfo.order_status == 4?'red-status':''">
@@ -52,53 +52,56 @@
 				</view>
 				<view v-if="isExpanded" class="dashed-border"></view>
 				<view v-if="isExpanded">
-						<view class="big-text">订单信息</view>
-						<view class="sn-content flex-row flex-between">
-							<view class="sn-title">订单编号</view>
-							<view class="sn-text" >{{orderInfo.sub_sn}}</view>
-						</view>
-						<view class="sn-content flex-row flex-between">
-							<view class="sn-title">下单时间</view>
-							<view class="sn-text">{{tools.formatTime(orderInfo.ctime)}}</view>
-						</view>
-						<view class="sn-content flex-row flex-between">
-							<view class="sn-title">支付时间</view>
-							<view class="sn-text">{{tools.formatTime(orderInfo.pay_time)}}</view>
-						</view>
-						<view class="sn-content flex-row flex-between">
-							<view class="sn-title">支付方式</view>
-							<view v-if="orderInfo.pay_type == 0" class="sn-text">微信支付</view>
-							<view v-if="orderInfo.pay_type == 1" class="sn-text">线下支付</view>
-							<view v-if="orderInfo.pay_type == 2" class="sn-text">支付宝支付</view>
-							<view v-if="orderInfo.pay_type == 9" class="sn-text">钱包余额支付</view>
-						</view>
-						<view class="sn-content flex-row flex-between">
-							<view class="sn-title">租车金额</view>
-							<view class="sn-text">$ {{tools.toFix(orderInfo.hire_money/1000)}}</view>
-						</view>
-						<view class="sn-content flex-row flex-between">
-							<view class="sn-title">租车押金</view>
-							<view class="sn-text"><text class="grey-text">订单结束后随时退</text> $ {{tools.toFix(orderInfo.deposit/1000)}}</view>
-						</view>
+					<view class="big-text">订单信息</view>
+					<view class="sn-content flex-row flex-between">
+						<view class="sn-title">订单编号</view>
+						<view class="sn-text">{{orderInfo.sub_sn}}</view>
+					</view>
+					<view class="sn-content flex-row flex-between">
+						<view class="sn-title">下单时间</view>
+						<view class="sn-text">{{tools.formatTime(orderInfo.ctime)}}</view>
+					</view>
+					<view v-if="orderInfo.pay_time" class="sn-content flex-row flex-between">
+						<view class="sn-title">支付时间</view>
+						<view class="sn-text">{{tools.formatTime(orderInfo.pay_time)}}</view>
+					</view>
+					<view class="sn-content flex-row flex-between">
+						<view class="sn-title">支付方式</view>
+						<view v-if="orderInfo.pay_type == 0" class="sn-text">微信支付</view>
+						<view v-if="orderInfo.pay_type == 1" class="sn-text">线下支付</view>
+						<view v-if="orderInfo.pay_type == 2" class="sn-text">支付宝支付</view>
+						<view v-if="orderInfo.pay_type == 9" class="sn-text">钱包余额支付</view>
+					</view>
+					<view class="sn-content flex-row flex-between">
+						<view class="sn-title">租车金额</view>
+						<view class="sn-text">$ {{tools.toFix(orderInfo.hire_money/1000)}}</view>
+					</view>
+					<view class="sn-content flex-row flex-between">
+						<view class="sn-title">租车押金</view>
+						<view class="sn-text"><text class="grey-text">订单结束后随时退</text> $
+							{{tools.toFix(orderInfo.deposit/1000)}}</view>
+					</view>
 				</view>
 			</view>
 		</view>
 		<view class="car-info">
 			<view class="flex-row flex-between" style="margin-bottom: 40rpx;">
 				<text>自行去门店取还</text>
-				<text class="distance-num">100m</text>
+				<text class="distance-num">{{orderInfo.distance}}m</text>
 			</view>
 			<view class="flex-row store-img-view">
 				<img src="https://qiniu.bms16.com/FrwDlFZdSMiBgqnqDjB19PiDUmuu" alt="">
 				<view style="width: 100%;margin-left: 24rpx;">
-					<view class="store-name">小众租车深圳店</view>
-					<view class="store-name-address">西丽留仙洞留仙村路97号</view>
+					<view class="store-name">{{orderInfo.shop_name}}</view>
+					<view class="store-name-address">{{orderInfo.address}}</view>
 					<view class="flex-row flex-between align-center">
 						<view class="flex-row time-style align-center">
-							<img style="width: 40rpx;height: 40rpx;" src="https://qiniu.bms16.com/Fp-G1pdXxnTV-G3qFbgS453AuqcU" alt="">
+							<img style="width: 40rpx;height: 40rpx;"
+								src="https://qiniu.bms16.com/Fp-G1pdXxnTV-G3qFbgS453AuqcU" alt="">
 							<text>10:00-22:00</text>
 						</view>
-						<img style="width: 112rpx;height: 64rpx;" src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" alt="">
+						<img @click="navToCabinet" style="width: 112rpx;height: 64rpx;"
+							src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" alt="">
 					</view>
 				</view>
 			</view>
@@ -107,12 +110,13 @@
 			<view>车辆信息</view>
 			<view class="car-top flex-row flex-between">
 				<view class="top-flex">
-					<view>智能电动摩托车智驾</view>
-					<view>续航{{orderInfo.endurance}}｜重量{{orderInfo.weight}}</view>
+					<view>{{orderInfo.model_name}}</view>
+					<view>续航{{orderInfo.endurance /100}}km｜重量{{orderInfo.weight}}kg</view>
 				</view>
-				<img src="https://qiniu.bms16.com/FhEvnKUckAHPtWaC04mi2s53IEVj" alt="">
+				<img v-if="orderInfo.model_images" :src="orderInfo.model_images" alt=""></img>
+				<img v-else src="https://qiniu.bms16.com/FhEvnKUckAHPtWaC04mi2s53IEVj" alt="">
 			</view>
-			<view class="exchange-info">
+			<!-- <view class="exchange-info">
 				<view class="flex-row flex-between">
 					<view class="exchange-info-title flex-row align-center">
 						<img style="width: 40rpx;height: 40rpx;" src="https://qiniu.bms16.com/Fj_ifr41AqH2PijZBdOBa3SCxADg" alt="">
@@ -124,22 +128,21 @@
 					</view>
 				</view>			
 				<view class="exchange-content">本单可享3次免费换电数，超出后需单独支付</view>
-				<view class="exchange-content">自费换电:S1/次</view>
-				<!-- <view class="exchange-content">本单您可享受{{orderInfo.gift_exchange_num}}次免费换电，
+				<view class="exchange-content">自费换电:S1/次</view> -->
+			<!-- <view class="exchange-content">本单您可享受{{orderInfo.gift_exchange_num}}次免费换电，
 				当前免费换电剩余{{(orderInfo.gift_exchange_num - orderInfo.used_exchange_num) > 0 ? (orderInfo.gift_exchange_num - orderInfo.used_exchange_num) : '0' }}次，超出后需要单独支付换电费用
 				</view> -->
-			</view>
+			<!-- </view> -->
 		</view>
 		
-
 		<view v-if="orderInfo.hire_begin_time!=0&&orderInfo.hire_end_time!=0" class="return-info">
 			<view class="return-top flex-row flex-between">
 				<view>取还时间</view>
 				<view>
-						共3天{{orderInfo.hire_return_time.day > 0 ? orderInfo.hire_return_time.day :'' }}<text
-							v-if="orderInfo.hire_return_time.day>0">日</text>{{orderInfo.hire_return_time.hour > 0 ? orderInfo.hire_return_time.hour :'' }}<text
-							v-if="orderInfo.hire_return_time.hour>0">小时</text>{{orderInfo.hire_return_time.minute > 0 ? orderInfo.hire_return_time.minute :'' }}<text
-							v-if="orderInfo.hire_return_time.minute>0">分</text>
+					共3天{{orderInfo.hire_return_time.day > 0 ? orderInfo.hire_return_time.day :'' }}<text
+						v-if="orderInfo.hire_return_time.day>0">日</text>{{orderInfo.hire_return_time.hour > 0 ? orderInfo.hire_return_time.hour :'' }}<text
+						v-if="orderInfo.hire_return_time.hour>0">小时</text>{{orderInfo.hire_return_time.minute > 0 ? orderInfo.hire_return_time.minute :'' }}<text
+						v-if="orderInfo.hire_return_time.minute>0">分</text>
 				</view>
 			</view>
 			<view class="return-bottom flex-row">
@@ -172,16 +175,18 @@
 			<view v-if="orderInfo.order_status == 1" class="flex-row"> <!-- 待取车 -->
 				<view class="cancel" @tap="clickCancel">结束订单</view>
 				<view @tap="callStorePhone" class="deposit-btn w_224">联系门店</view>
-				<view  @tap="navToScan" class="sesame-btn w_288">扫码绑定</view>
+				<view @tap="navToScan" class="sesame-btn w_288">扫码绑定</view>
 			</view>
 			<view v-else-if="orderInfo.order_status == 3||orderInfo.order_status == 4" class="flex-row"> <!-- 使用中 -->
 				<view @tap="callStorePhone" class="cancel">联系门店</view>
 				<view @tap="tapReturnCar" class="deposit-btn w_254">到店还车</view>
 				<view @tap="bindRenew" class="sesame-btn w_224">续租</view>
 			</view>
-			<view v-else-if="orderInfo.order_status == 5||orderInfo.order_status == 6" @tap="callStorePhone" class="pay-btn">
+			<view v-else-if="orderInfo.order_status == 5||orderInfo.order_status == 6" @tap="callStorePhone"
+				class="pay-btn">
 				联系门店</view> <!-- 待门店确认||还车中,等待门店取车 -->
-			<view v-else-if="orderInfo.order_status == 7" @tap="callStorePhone" class="pay-btn">联系门店</view> <!--车辆已归还 已完成 -->
+			<view v-else-if="orderInfo.order_status == 7" @tap="callStorePhone" class="pay-btn">联系门店</view>
+			<!--车辆已归还 已完成 -->
 		</view>
 
 		<view v-if="isShowCancel" class="cancel-b">
@@ -207,8 +212,10 @@
 				</view>
 			</view>
 		</view>
-		<returnCar :isShowReturnCar="isShowReturnCar" @closeShowReturnCarBtn="()=>isShowReturnCar=false" @navStoreBtn="navStoreBtn" @immediatelyReturnBtn="immediatelyReturnBtn"/>
-		<PayTypeModel @closeShow="()=>isShowToBuy=false" @payToOrder="payToOrder" :free_price="totalPrice" :isShowToBuy="isShowToBuy"/>
+		<returnCar :isShowReturnCar="isShowReturnCar" @closeShowReturnCarBtn="()=>isShowReturnCar=false"
+			@navStoreBtn="navStoreBtn" @immediatelyReturnBtn="immediatelyReturnBtn" />
+		<PayTypeModel @closeShow="()=>isShowToBuy=false" @payToOrder="payToOrder" :free_price="totalPrice"
+			:isShowToBuy="isShowToBuy" />
 	</view>
 </template>
 <script module="tools" lang="wxs" src="@/pages/common/wxs/tools.wxs"></script>
@@ -244,15 +251,15 @@
 				isSelectStatus: 1,
 				price_list: [], //车辆价格  hire_duration_unit 1 日 4 小时 6 周
 				insurance_status: 0,
-				over_fee:0,//逾期金额
+				over_fee: 0, //逾期金额
 				plate_number: '',
 				isScanCondeRentalCar: '',
-				isShowReturnCar:false,
-				isShowToBuy:false,
-				totalPrice:0, //逾期支付金额
+				isShowReturnCar: false,
+				isShowToBuy: false,
+				totalPrice: 0, //逾期支付金额
 			};
 		},
-		
+
 		/**
 		 * 生命周期函数--监听页面加载
 		 */
@@ -263,47 +270,19 @@
 		/**
 		 * 生命周期函数--监听页面显示
 		 */
-		onShow: function() {
-		},
-			
-		onUnload: function () {
-		},
-		
+		onShow: function() {},
+
+		onUnload: function() {},
+
 		computed: {},
 
 		methods: {
-			bindOrderInfo() {
-				const me = this
-				http.postApi(config.API_FLK_ORDER_INFO, {
-					sub_sn: me.sub_sn,
-				}, (resp) => {
-					if (resp.data.code === 200) {
-						me.orderInfo = resp.data.data.order_info
-						// 取还时间展示
-						me.orderInfo.hire_return_time = common.getTimeToDay(Math.ceil(me.orderInfo.hire_end_time - me.orderInfo.hire_begin_time)/60)
-						// 剩余租期判断
-						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))/60)
-						}else{
-							if(me.orderInfo.order_status==4){
-								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
-								}
-						}
-					} else {
-						// 默认返回上一个页面再提示报错
-						uni.navigateBack({
-							delta: 1
-						})
-						common.simpleToast(resp.data.msg)
-					}
-				})
-			},
-			navStoreBtn(){
+
+			navToCabinet() {
 				const {
 					latitude,
 					longitude,
+					cityname,
 					address,
 					shop_name
 				} = this.orderInfo
@@ -315,398 +294,492 @@
 					address: address,
 					success: function(res) {}
 				});
-			},
-			tapReturnCar(){
-				this.setData({
-					isShowReturnCar:true
-				})
-			},
-			immediatelyReturnBtn(){
-				//到店还车  判断逾期状态 如果逾期要交逾期费用 跳转到上传车辆图片再支付逾期费用还车
-				const isOverdue=this.orderInfo.order_status==4
-				const {car_sn,shop_id,overdue_money}=this.orderInfo
-				const returnCarParams={car_sn,shop_id,overdue_money,isReturnCar:true,}
-				if(isOverdue){
-					this.setData({
-						totalPrice:overdue_money,
-						isShowToBuy:true
-					})
-				}else{
-					//提交还车图片
-					uni.navigateTo({
-						url: '/pages/activation/activation?isReturnCar=' + true +'&car_sn='+car_sn +'&shop_id=' + shop_id,
-					});
-				}
-				
-			},
-			callStorePhone(){
-				const phone =this.orderInfo.link_phone
-				common.callPhone(this,phone)
-			},
-			clickCancel() {
-				const me = this
-				uni.showModal({
-					title: '取消订单',
-					content: '您是否需要取消该订单',
-					confirmText: '是',
-					confirmColor: '#0074FF',
-					cancelText: '否',
-					cancelColor: '#191D23',
-					success: function(res) {
-						if (res.confirm) {
-							me.isShowCancel = true
+				},
+				hireDurationUnitFn(type) {
+						if (type == 1) {
+							return '天'
+						} else if (type == 2) {
+							return '月'
+						} else if (type == 3) {
+							return '年'
+						} else if (type == 4) {
+							return '小时'
+						} else if (type == 5) {
+							return '分钟'
+						} else if (type == 6) {
+							return '周'
+						} else if (type == 7) {
+							return '季'
 						}
-					}
-				});
-			},
+					},
 
-			bindCancel(e) {
-				const me = this
-				me.reason = e.currentTarget.dataset.status;
-				me.cancel = true
-				common.loading()
-				setTimeout(function() {
-					http.postApi(config.API_DAYHIRE_HIRE_CANCEL_ORDER, {
-						order_sn: me.order_sn
-					}, (resp) => {
-						if (resp.data.code === 200) {
-							uni.hideLoading()
-							common.simpleToast('取消成功')
-							setTimeout(()=> {
-								me.bindOrderInfo()
-							}, 500);
-						} else{
-							common.simpleToast('订单取消失败')
-						}
-						me.reason = 0
-						me.isShowCancel = false
-					})
-				}, 600);
-			},
+					async bindOrderInfo() {
+							let res = await uni.getLocation()
+							const me = this
+							http.postApi(config.API_FLK_ORDER_INFO, {
+								sub_sn: me.sub_sn,
+								latitude: res[1].latitude,
+								longitude: res[1].longitude,
+							}, (resp) => {
+								if (resp.data.code === 200) {
+									me.orderInfo = resp.data.data.order_info
 
-			bindToNav() {
-				console.log(111);
-				const {
-					address,
-					latitude,
-					longitude,
-					shop_name
-				} = this.shopInfo
-				uni.openLocation({
-					latitude: latitude - 0,
-					longitude: longitude - 0,
-					scale: 15,
-					name: shop_name,
-					address: address,
-					success: function(res) {},
-				})
-			},
+									let distance = common.getFlatternDistance(res[1].longitude, res[1].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)
+									// 剩余租期判断
+									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)) /
+											60)
+									} else {
+										if (me.orderInfo.order_status == 4) {
+											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
+										}
+									}
+								} else {
+									// 默认返回上一个页面再提示报错
+									uni.navigateBack({
+										delta: 1
+									})
+									common.simpleToast(resp.data.msg)
+								}
+							})
+						},
+						navStoreBtn() {
+							const {
+								latitude,
+								longitude,
+								address,
+								shop_name
+							} = this.orderInfo
+							uni.openLocation({
+								latitude: latitude - 0,
+								longitude: longitude - 0,
+								scale: 15,
+								name: shop_name,
+								address: address,
+								success: function(res) {}
+							});
+						},
+						tapReturnCar() {
+							this.setData({
+								isShowReturnCar: true
+							})
+						},
+						immediatelyReturnBtn() {
+							//到店还车  判断逾期状态 如果逾期要交逾期费用 跳转到上传车辆图片再支付逾期费用还车
+							const isOverdue = this.orderInfo.order_status == 4
+							const {
+								car_sn,
+								shop_id,
+								overdue_money
+							} = this.orderInfo
+							const returnCarParams = {
+								car_sn,
+								shop_id,
+								overdue_money,
+								isReturnCar: true,
+							}
+							if (isOverdue) {
+								this.setData({
+									totalPrice: overdue_money,
+									isShowToBuy: true
+								})
+							} else {
+								//提交还车图片
+								uni.navigateTo({
+									url: '/pages/activation/activation?isReturnCar=' + true + '&car_sn=' + car_sn +
+										'&shop_id=' + shop_id,
+								});
+							}
 
-			bindToHome() {
-				uni.reLaunch({
-					url: '/pages/index/index',
-					success: function(res) {},
-					fail: function(res) {},
-					complete: function(res) {}
-				});
-			},
+						},
+						callStorePhone() {
+							const phone = this.orderInfo.link_phone
+							common.callPhone(this, phone)
+						},
+						clickCancel() {
+							const me = this
+							uni.showModal({
+								title: '取消订单',
+								content: '您是否需要取消该订单',
+								confirmText: '是',
+								confirmColor: '#0074FF',
+								cancelText: '否',
+								cancelColor: '#191D23',
+								success: function(res) {
+									if (res.confirm) {
+										me.isShowCancel = true
+									}
+								}
+							});
+						},
 
-			callPhone() {
-				const me = this
-				const phone = me.shopInfo.link_phone
-				uni.showModal({
-					content: `您是否要拨打电话${phone}？`,
-					confirmText: '确定',
-					success: (res) => {
-						if (res.confirm) {
-							uni.makePhoneCall({
-								phoneNumber: phone,
-								success() {},
-								fail() {}
+						bindCancel(e) {
+							const me = this
+							me.reason = e.currentTarget.dataset.status;
+							me.cancel = true
+							common.loading()
+							setTimeout(function() {
+								http.postApi(config.API_DAYHIRE_HIRE_CANCEL_ORDER, {
+									order_sn: me.order_sn
+								}, (resp) => {
+									if (resp.data.code === 200) {
+										uni.hideLoading()
+										common.simpleToast('取消成功')
+										setTimeout(() => {
+											me.bindOrderInfo()
+										}, 500);
+									} else {
+										common.simpleToast('订单取消失败')
+									}
+									me.reason = 0
+									me.isShowCancel = false
+								})
+							}, 600);
+						},
+
+						bindToNav() {
+							console.log(111);
+							const {
+								address,
+								latitude,
+								longitude,
+								shop_name
+							} = this.shopInfo
+							uni.openLocation({
+								latitude: latitude - 0,
+								longitude: longitude - 0,
+								scale: 15,
+								name: shop_name,
+								address: address,
+								success: function(res) {},
 							})
-						}
-					},
-					fail: (res) => {}
-				})
-			},
+						},
 
-			bindRenew() {
-				this.isReturnHome = false
-				let isRenew = true
-				uni.navigateTo({
-					url: '/pages/carIntroduce/carIntroduce?plate_number=' + this.orderInfo.license_plate_number +
-						'&isRenew=' + isRenew +
-						'&order_sn=' + this.order_sn,
-					success: function(res) {},
-					fail: function(res) {},
-					complete: function(res) {}
-				});
-			},
+						bindToHome() {
+							uni.reLaunch({
+								url: '/pages/index/index',
+								success: function(res) {},
+								fail: function(res) {},
+								complete: function(res) {}
+							});
+						},
 
-			bindBattery() {
-				this.isReturnHome = false
-				uni.navigateTo({
-					url: '/pages/battery/battery?plate_number=' + this.orderInfo.license_plate_number,
-					success: function(res) {},
-					fail: function(res) {},
-					complete: function(res) {}
-				});
-			},
+						callPhone() {
+							const me = this
+							const phone = me.shopInfo.link_phone
+							uni.showModal({
+								content: `您是否要拨打电话${phone}？`,
+								confirmText: '确定',
+								success: (res) => {
+									if (res.confirm) {
+										uni.makePhoneCall({
+											phoneNumber: phone,
+											success() {},
+											fail() {}
+										})
+									}
+								},
+								fail: (res) => {}
+							})
+						},
 
-			bindExpanded() {
-				this.isExpanded = !this.isExpanded
-			},
+						bindRenew() {
+							this.isReturnHome = false
+							let isRenew = true
+							uni.navigateTo({
+								url: '/pages/carIntroduce/carIntroduce?plate_number=' + this.orderInfo
+									.license_plate_number +
+									'&isRenew=' + isRenew +
+									'&order_sn=' + this.order_sn,
+								success: function(res) {},
+								fail: function(res) {},
+								complete: function(res) {}
+							});
+						},
 
-			navToInput() {
-				this.isReturnHome = false
-				uni.navigateTo({
-					url: '/pages/inputLicensePlate/inputLicensePlate?order_sn=' + this.orderInfo.order_sn,
-					success: function(res) {},
-					fail: function(res) {},
-					complete: function(res) {}
-				});
-			},
+						bindBattery() {
+							this.isReturnHome = false
+							uni.navigateTo({
+								url: '/pages/battery/battery?plate_number=' + this.orderInfo.license_plate_number,
+								success: function(res) {},
+								fail: function(res) {},
+								complete: function(res) {}
+							});
+						},
 
-			// 激活车辆
-			navToActive() {
-				this.isReturnHome = false
-				const me = this
-				if (this.orderInfo.hire_type == 1) {  // 预约
-					if(me.isScanCondeRentalCar) {
-						uni.scanCode({
-							onlyFromCamera: true,
-							success: function (res) {
-								me.loadScanCode(res.result)
-							},
-							fail: function (res) { },
-							complete: function (res) { },
-						})
-					} else {
-						uni.navigateTo({
-							url: '/pages/inputLicensePlate/inputLicensePlate?order_sn=' + this.order_sn +'&order_model_id='+this.orderInfo.model_id,
-							success: function(res) {},
-							fail: function(res) {},
-							complete: function(res) {}
-						});
-					}
-				} else {  // 非预约
-					const isJumpReturn = false
-					uni.navigateTo({
-						url: '/pages/activation/activation?order_sn=' + this.order_sn + '&plate_number=' + this
-							.orderInfo.license_plate_number +'&isJumpReturn=' + isJumpReturn,
-						success: function(res) {},
-						fail: function(res) {},
-						complete: function(res) {}
-					});
-				}
-			},
-			
-			loadScanCode(battery_sn) {
-				const pData = {
-					longitude: this.longitude,
-					latitude: this.latitude,
-					battery_sn: battery_sn
-				}
-				const me = this
-				http.postApi(config.API_DAYHIRE_CAR_CAR_INFO, pData, (resp) => {
-					uni.hideLoading()
-					if (resp.data.code === 200) {
-						const timestamp = Date.now(); // 获取当前时间戳（毫秒）  
-						const isOffline = (Math.floor(timestamp / 1000) - resp.data.data.last_comm_time) > 1800
-						me.plate_number = resp.data.data.license_plate_number
-						if (resp.data.data.last_comm_time === 0 || isOffline) {
-							common.simpleToast('此车辆已离线，请选择其他车辆')
-						} else {
-							let carInfo = JSON.stringify(resp.data.data)
-							const car_model = resp.data.data.model_info.car_model
-							const model_images = resp.data.data.model_info.model_images.split(',')
-							const return_imgs = resp.data.data.return_imgs
-							var model_id = resp.data.data.model_info.model_id
-							if (resp.data.data.has_owner) { //车辆正在被使用
-								if (resp.data.data.is_mine) { //是本人在使用
-									wx.showModal({
-										title: '提示',
-										content: '已有正在使用的车辆，是否跳转至车辆详情页?',
-										cancelText: '取消',
-										confirmText: '确定',
+						bindExpanded() {
+							this.isExpanded = !this.isExpanded
+						},
+
+						navToInput() {
+							this.isReturnHome = false
+							uni.navigateTo({
+								url: '/pages/inputLicensePlate/inputLicensePlate?order_sn=' + this.orderInfo
+									.order_sn,
+								success: function(res) {},
+								fail: function(res) {},
+								complete: function(res) {}
+							});
+						},
+
+						// 激活车辆
+						navToActive() {
+							this.isReturnHome = false
+							const me = this
+							if (this.orderInfo.hire_type == 1) { // 预约
+								if (me.isScanCondeRentalCar) {
+									uni.scanCode({
+										onlyFromCamera: true,
 										success: function(res) {
-											this.isReturnHome = false
-											uni.navigateTo({
-												url: '/pages/battery/battery?plate_number=' +
-													this.plate_number
-											});
+											me.loadScanCode(res.result)
 										},
 										fail: function(res) {},
 										complete: function(res) {},
 									})
 								} else {
-									common.simpleToast('此车辆正在被使用')
+									uni.navigateTo({
+										url: '/pages/inputLicensePlate/inputLicensePlate?order_sn=' + this
+											.order_sn + '&order_model_id=' + this.orderInfo.model_id,
+										success: function(res) {},
+										fail: function(res) {},
+										complete: function(res) {}
+									});
 								}
-							} else {
-								if (me.order_sn&&me.order_sn != '') {
-									if (this.orderInfo.model_id != model_id) { // 预租车型与之前预约车型不一致
-										common.simpleToast('与预约车型不符')
+							} else { // 非预约
+								const isJumpReturn = false
+								uni.navigateTo({
+									url: '/pages/activation/activation?order_sn=' + this.order_sn +
+										'&plate_number=' + this
+										.orderInfo.license_plate_number + '&isJumpReturn=' + isJumpReturn,
+									success: function(res) {},
+									fail: function(res) {},
+									complete: function(res) {}
+								});
+							}
+						},
+
+						loadScanCode(battery_sn) {
+							const pData = {
+								longitude: this.longitude,
+								latitude: this.latitude,
+								battery_sn: battery_sn
+							}
+							const me = this
+							http.postApi(config.API_DAYHIRE_CAR_CAR_INFO, pData, (resp) => {
+								uni.hideLoading()
+								if (resp.data.code === 200) {
+									const timestamp = Date.now(); // 获取当前时间戳（毫秒）  
+									const isOffline = (Math.floor(timestamp / 1000) - resp.data.data
+										.last_comm_time) > 1800
+									me.plate_number = resp.data.data.license_plate_number
+									if (resp.data.data.last_comm_time === 0 || isOffline) {
+										common.simpleToast('此车辆已离线，请选择其他车辆')
 									} else {
-										this.isReturnHome = false
-										uni.navigateTo({
-											url: '/pages/activation/activation?plate_number=' + 
-												this.plate_number + '&order_sn=' + this.order_sn +
-												'&car_model=' + car_model + '&model_image=' +
-												model_images[0] + '&return_imgs=' + JSON.stringify(
-													return_imgs),
-											fail() {}
-										})
+										let carInfo = JSON.stringify(resp.data.data)
+										const car_model = resp.data.data.model_info.car_model
+										const model_images = resp.data.data.model_info.model_images.split(',')
+										const return_imgs = resp.data.data.return_imgs
+										var model_id = resp.data.data.model_info.model_id
+										if (resp.data.data.has_owner) { //车辆正在被使用
+											if (resp.data.data.is_mine) { //是本人在使用
+												wx.showModal({
+													title: '提示',
+													content: '已有正在使用的车辆，是否跳转至车辆详情页?',
+													cancelText: '取消',
+													confirmText: '确定',
+													success: function(res) {
+														this.isReturnHome = false
+														uni.navigateTo({
+															url: '/pages/battery/battery?plate_number=' +
+																this.plate_number
+														});
+													},
+													fail: function(res) {},
+													complete: function(res) {},
+												})
+											} else {
+												common.simpleToast('此车辆正在被使用')
+											}
+										} else {
+											if (me.order_sn && me.order_sn != '') {
+												if (this.orderInfo.model_id != model_id) { // 预租车型与之前预约车型不一致
+													common.simpleToast('与预约车型不符')
+												} else {
+													this.isReturnHome = false
+													uni.navigateTo({
+														url: '/pages/activation/activation?plate_number=' +
+															this.plate_number + '&order_sn=' + this
+															.order_sn +
+															'&car_model=' + car_model + '&model_image=' +
+															model_images[0] + '&return_imgs=' + JSON
+															.stringify(
+																return_imgs),
+														fail() {}
+													})
+												}
+
+											} else {
+												this.isReturnHome = false
+												uni.navigateTo({
+													url: '/pages/carIntroduce/carIntroduce?carInfo=' +
+														encodeURIComponent(carInfo) + '&plate_number=' +
+														this.plate_number,
+													fail() {}
+												})
+											}
+										}
 									}
-				
 								} else {
-									this.isReturnHome = false
-									uni.navigateTo({
-										url: '/pages/carIntroduce/carIntroduce?carInfo=' +
-											encodeURIComponent(carInfo) + '&plate_number=' + this.plate_number,
-										fail() {}
-									})
+									common.simpleToast(resp.data.msg)
 								}
-							}
-						}
-					} else {
-						common.simpleToast(resp.data.msg)
-					}
-				})
-			},
+							})
+						},
 
-			bindToPay() {
-				const me = this
-				//#ifdef MP-ALIPAY
-				const _from = 'ali'
-				const _pay_type = 2
-				//#endif
-				//#ifdef MP-WEIXIN
-				const _from = 'wx'
-				const _pay_type = 0
-				//#endif
-				http.postApi(config.API_DAYHIRE_HIRE_CONTINUE_PAY, {
-					order_sn: me.order_sn,
-					from: _from,
-					pay_type: _pay_type
-				}, (resp) => {
-					common.loading()
-					if (resp.data.code === 200) {
-						uni.hideLoading()
-						//#ifdef MP-ALIPAY
-						my.tradePay({
-							tradeNO: resp.data.data.trade_no,
-							success: function(res) {
-								if (res.resultCode == 9000) {
-									common.simpleToast('支付成功');
+						bindToPay() {
+							const me = this
+							//#ifdef MP-ALIPAY
+							const _from = 'ali'
+							const _pay_type = 2
+							//#endif
+							//#ifdef MP-WEIXIN
+							const _from = 'wx'
+							const _pay_type = 0
+							//#endif
+							http.postApi(config.API_DAYHIRE_HIRE_CONTINUE_PAY, {
+								order_sn: me.order_sn,
+								from: _from,
+								pay_type: _pay_type
+							}, (resp) => {
+								common.loading()
+								if (resp.data.code === 200) {
+									uni.hideLoading()
+									//#ifdef MP-ALIPAY
+									my.tradePay({
+										tradeNO: resp.data.data.trade_no,
+										success: function(res) {
+											if (res.resultCode == 9000) {
+												common.simpleToast('支付成功');
+											}
+											setTimeout(function() {
+												me.bindOrderInfo()
+											}, 1000)
+										},
+										fail: function(res) {
+											common.simpleToast('支付失败，请重试')
+										},
+									})
+									//#endif
+									//#ifdef MP-WEIXIN
+									var payParams = JSON.parse(resp.data.data.payParams);
+									user.wxPay(me.order_sn, payParams, function(isSuccess) {
+										if (isSuccess) {
+											common.simpleToast('支付成功')
+											setTimeout(function() {
+												me.bindOrderInfo()
+											}, 1000)
+										} else {
+											common.simpleToast('支付失败，请重试')
+										}
+									});
+									//#endif
+								} else {
+									uni.hideLoading()
+									common.simpleToast(resp.data.msg)
 								}
-								setTimeout(function() {
-									me.bindOrderInfo()
-								}, 1000)
-							},
-							fail: function(res) {
-								common.simpleToast('支付失败，请重试')
-							},
-						})
-						//#endif
-						//#ifdef MP-WEIXIN
-						var payParams = JSON.parse(resp.data.data.payParams);
-						user.wxPay(me.order_sn, payParams, function(isSuccess) {
-							if (isSuccess) {
-								common.simpleToast('支付成功')
-								setTimeout(function() {
-									me.bindOrderInfo()
-								}, 1000)
+							})
+						},
+
+						// 计算拖车说明收费价格
+						calculateFare(distance, charge_list) {
+							let fare = 0
+							if (distance <= charge_list.start_mil) {
+								fare = charge_list.start_price / 100
 							} else {
-								common.simpleToast('支付失败，请重试')
+								// actual_start_mil:实际距离单位米
+								// over_start_price:向上取整的公里数*超出首公里的费用
+								var actual_start_mil = distance - charge_list.start_mil
+								var over_start_price = (Math.ceil(actual_start_mil / charge_list.step_mil)) * charge_list
+									.step_price
+								fare = (charge_list.start_price + over_start_price) / 100
 							}
-						});
-						//#endif
-					} else {
-						uni.hideLoading()
-						common.simpleToast(resp.data.msg)
-					}
-				})
-			},
-
-			// 计算拖车说明收费价格
-			calculateFare(distance, charge_list) {
-				let fare = 0
-				if (distance <= charge_list.start_mil) {
-					fare = charge_list.start_price / 100
-				} else {
-					// actual_start_mil:实际距离单位米
-					// over_start_price:向上取整的公里数*超出首公里的费用
-					var actual_start_mil = distance - charge_list.start_mil
-					var over_start_price = (Math.ceil(actual_start_mil / charge_list.step_mil)) * charge_list.step_price
-					fare = (charge_list.start_price + over_start_price) / 100
-				}
-				const fareArray = fare.toFixed(2).split('.'); //将价格拆分为整数部分和小数部分
-				const price_list = {
-					start_mil: (charge_list.start_mil / 1000).toFixed(2),
-					start_price: (charge_list.start_price / 100).toFixed(2),
-					step_mil: (charge_list.step_mil / 1000).toFixed(2),
-					step_price: (charge_list.step_price / 100).toFixed(2),
-					actual_start_mil: actual_start_mil ? (actual_start_mil / 1000).toFixed(2) : 0,
-					over_start_price: over_start_price ? (over_start_price / 100).toFixed(2) : 0,
-					fare: fare.toFixed(2), // 保留两位小数
-					fareArray: fareArray //将价格拆分为整数部分和小数部分
-				}
-				return price_list
-			},
+							const fareArray = fare.toFixed(2).split('.'); //将价格拆分为整数部分和小数部分
+							const price_list = {
+								start_mil: (charge_list.start_mil / 1000).toFixed(2),
+								start_price: (charge_list.start_price / 100).toFixed(2),
+								step_mil: (charge_list.step_mil / 1000).toFixed(2),
+								step_price: (charge_list.step_price / 100).toFixed(2),
+								actual_start_mil: actual_start_mil ? (actual_start_mil / 1000).toFixed(2) : 0,
+								over_start_price: over_start_price ? (over_start_price / 100).toFixed(2) : 0,
+								fare: fare.toFixed(2), // 保留两位小数
+								fareArray: fareArray //将价格拆分为整数部分和小数部分
+							}
+							return price_list
+						},
 
-			bindChangeStatus(e) {
-				const {
-					status,
-					unit
-				} = e.currentTarget.dataset
-				this.setData({
-					isSelectStatus: unit,
-					selectIndex: status
-				})
-				// this.bindDuration()
-			},
+						bindChangeStatus(e) {
+							const {
+								status,
+								unit
+							} = e.currentTarget.dataset
+							this.setData({
+								isSelectStatus: unit,
+								selectIndex: status
+							})
+							// this.bindDuration()
+						},
 
-			//计算价格
-			// bindDuration(){
-			// 	const me = this
-			// 	var _insurance_price  //保险金
-			// 	const unit_price=(me.price_list[0].hire_price/100) * me.leaseTime  //租金
-			// 	// insurance_setting 保险
-			// 	if (me.insurance_setting!=null) {  // 有保险的时候
-			// 		// isSelectDeposit==0为免押  isOpenNoDeposit为是否成功开通免押  total_money为总金额
-			// 		// unit_price 租金   insurance_setting.price 保险金   deposit 押金
-			// 		if (me.duration_unit == 4) { // 时
-			// 			_insurance_price = (me.insurance_setting.price - 0) * 1
-			// 		} else if(me.duration_unit == 6) { // 周
-			// 			_insurance_price = (me.insurance_setting.price - 0) * 7 * me.leaseTime
-			// 		} else { //天
-			// 			_insurance_price = (me.insurance_setting.price - 0) * me.leaseTime
-			// 		}
-			// 	} else {  // 无保险
-			// 		_insurance_price = 0
-			// 	}
+						//计算价格
+						// bindDuration(){
+						// 	const me = this
+						// 	var _insurance_price  //保险金
+						// 	const unit_price=(me.price_list[0].hire_price/100) * me.leaseTime  //租金
+						// 	// insurance_setting 保险
+						// 	if (me.insurance_setting!=null) {  // 有保险的时候
+						// 		// isSelectDeposit==0为免押  isOpenNoDeposit为是否成功开通免押  total_money为总金额
+						// 		// unit_price 租金   insurance_setting.price 保险金   deposit 押金
+						// 		if (me.duration_unit == 4) { // 时
+						// 			_insurance_price = (me.insurance_setting.price - 0) * 1
+						// 		} else if(me.duration_unit == 6) { // 周
+						// 			_insurance_price = (me.insurance_setting.price - 0) * 7 * me.leaseTime
+						// 		} else { //天
+						// 			_insurance_price = (me.insurance_setting.price - 0) * me.leaseTime
+						// 		}
+						// 	} else {  // 无保险
+						// 		_insurance_price = 0
+						// 	}
 
-			// 	if (me.isOpenNoDeposit) {
-			// 		// 金额=(周期数*周期价格)+保险金
-			// 			me.amount = ((me.leaseTime * me.price_list[0].hire_price -0) + (_insurance_price - 0)) / 100
-			// 	} else {
-			// 		// 金额=(周期数*周期价格)+押金+保险金
-			// 		me.amount = ((me.leaseTime * me.price_list[0].hire_price -0) + (me.modelInfo.deposit -0) + (_insurance_price - 0)) / 100
-			// 	}
-			// },
+						// 	if (me.isOpenNoDeposit) {
+						// 		// 金额=(周期数*周期价格)+保险金
+						// 			me.amount = ((me.leaseTime * me.price_list[0].hire_price -0) + (_insurance_price - 0)) / 100
+						// 	} else {
+						// 		// 金额=(周期数*周期价格)+押金+保险金
+						// 		me.amount = ((me.leaseTime * me.price_list[0].hire_price -0) + (me.modelInfo.deposit -0) + (_insurance_price - 0)) / 100
+						// 	}
+						// },
 
-			loadEnd() {
-				this.bindOrderInfo()
-			},
-			navToExchange(){
-				console.log('跳转换电记录');
-				uni.navigateTo({
-					url: '/pages/exchangeRecord/exchangeRecord'+
-					'?order_sn=' + this.orderInfo.order_sn
-				})
+						loadEnd() {
+							this.bindOrderInfo()
+						},
+						navToExchange() {
+							console.log('跳转换电记录');
+							uni.navigateTo({
+								url: '/pages/exchangeRecord/exchangeRecord' +
+									'?order_sn=' + this.orderInfo.order_sn
+							})
+						}
 			}
-		}
-	};
+		};
 </script>
 
 <style>

pages/powerSetting/powerSetting.vue

@@ -44,7 +44,7 @@
 				<view class="setting-list-text flex-row">感应解锁</view>
 			</view>
 		</view>
-		<view v-if="!isSet" @tap="addUserBtn" class="check-btn add-btn">确认添加</view>
+		<view v-if="isSet" @tap="submit" class="check-btn add-btn">确认添加</view>
 		<view v-else @tap="delUserBtn" class="check-btn del-btn">删除成员</view>
 	</view>
 </template>
@@ -58,6 +58,7 @@
 	export default {
 		data() {
 			return {
+				isSet:"",
 				headimg: "",
 				nickname: "",
 				target_user_id:0,
@@ -73,6 +74,7 @@
 		 */
 		,
 		onLoad: function(options) {
+			this.isSet = options.isSet
 			this.form.car_sn = uni.getStorageSync('car_info').car_sn || '';
 			if(options.id){
 				this.target_user_id = options.id

pages/purchaseOrder/purchaseOrder.vue

@@ -130,7 +130,7 @@
 				<view style="text-align: center;margin-bottom: 120rpx;">
 					<img style="width: 88rpx;height: 88rpx;" src="https://qiniu.bms16.com/Fqb-i2uJWlZOg8EvUXHr_1qhlndf" alt="">
 					<view class="check-order-text">租车订单已提交</view>
-					<view>请于 <text class="get-car-time">3.5-20:00</text>  到 <text class="get-car-name">深圳南山深大店</text>  取车</view>
+					<view>请于 <text class="get-car-time">{{takeCar}}</text>  到 <text class="get-car-name">{{modelInfo.shop_name}}</text>  取车</view>
 				</view>
 				<view class="return-btn flex-row">
 					<view @tap="toIndexPage">我知道了</view>
@@ -163,6 +163,7 @@
 		},
 		data() {
 			return {
+				sub_sn:"",
 				service_list:[],
 				isShowCalendar: false, //选择预约订单时间
 				price:0,
@@ -287,6 +288,7 @@
 						if(!resp.data.data.need_pay){
 							common.simpleToast(me,me.$t('支付成功'));
 							me.order_sn = resp.data.data.order_sn;
+							me.sub_sn = resp.data.data.sub_sn;
 							me.setData({
 								isShowToBuy:false,
 								isShowCheckOrder:true
@@ -304,7 +306,7 @@
 				})
 			},
 			toOrderInfo(){
-				uni.navToPage({ url: '/pages/orderStatus/orderStatus?order_sn=' + this.order_sn })
+				uni.navigateTo({ url: '/pages/orderStatus/orderStatus?sub_sn=' + this.sub_sn })
 			}
 		}
 	};

pages/service/service.vue

@@ -1,350 +1,386 @@
 <template>
-  <view class="service-main">
-    <map
-      class="my_app"
-      id="myMap"
-      :longitude="myLocation.longitude"
-      :latitude="myLocation.latitude"
-      :scale="14"
-      show-location
-      enable-3D
-      show-compass
-      enable-overlooking
-      :enable-satellite="false"
-      :markers="nearStoreOrCabinetList"
-      :polyline="polylines"
-      :enable-traffic="false"
-      style="width: 100%; height: calc(50vh - 0rpx)"
-    >
-      <block  v-for="(item, index) in nearStoreOrCabinetList" :key="index">
-        <cover-view
-          v-if="selectType === 'cabinet'"
-          slot="callout"
-          :marker-id="item.id"
-          class="mark blue_bg"
-        >
-          {{ item.available_cnt }}
-        </cover-view>
-      </block>
-    </map>
-    <!-- 地图控件 -->
-    <cover-view
-      :class="[
+	<view class="service-main">
+		<map @markertap='markertapFn' class="my_app" id="myMap" :longitude="myLocation.longitude"
+			:latitude="myLocation.latitude" :scale="18" show-location enable-3D show-compass enable-overlooking
+			:enable-satellite="false" :markers="markers" :polyline="polylines" :enable-traffic="false"
+			style="width: 100%; height: calc(50vh - 0rpx)">
+			<block v-for="(item, index) in nearCabinetList" :key="index">
+				<cover-view v-if="selectType === 'cabinet'" slot="callout" :marker-id="item.id" class="mark blue_bg">
+					{{ item.available_cnt }}
+				</cover-view>
+			</block>
+		</map>
+		<!-- 地图控件 -->
+		<cover-view :class="[
         'control-icon-view',
         'flex-row',
         isSearch ? 'flex-between' : 'flex-end',
-      ]"
-    >
-      <cover-view v-if="isSearch" class="seach-return-view flex-row"
-        ><cover-image
-          class="seach-return-img"
-          src="https://qiniu.bms16.com/Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG"
-        ></cover-image
-      ></cover-view>
-      <cover-view @tap="moveToLocation" class="current-location-view flex-row"
-        ><cover-image
-          class="current-location-icon"
-          src="https://qiniu.bms16.com/FgLe8FKDOzgt3wxi2lZt-yQGmbP3"
-        ></cover-image
-      ></cover-view>
-    </cover-view>
-    <view class="store-cabinet-block">
-      <view class="block-p"></view>
-      <view v-if="isSearch" class="search-view flex-row">
-        <view class="search-input-view">
-          <img
-            class="search-icon"
-            src="https://qiniu.bms16.com/FgvJrOE8Lps7tyNL86SOZKbLT1uH"
-            alt=""
-          />
-          <input
-            v-model="inputSearchValue"
-            type="text"
-            class="search-input"
-            placeholder="请输入搜索内容"
-            placeholder-class="input-placeholder"
-			:focus="isFocused"
-            @focus="handleFocus"
-            @blur="handleBlur"
-          />
-          <img
-            v-if="isFocused"
-            @tap="clearSearch"
-            class="search-close-icon"
-            src="https://qiniu.bms16.com/FhKzwftEPo70kloqIVxKH7g0pD6I"
-            alt="清空"
-          />
-        </view>
-        <view
-          v-if="isFocused"
-		  @tap="tapSearch"
-          :class="['search-btn', isFocused ? 'search-btn-i' : '']"
-          >搜索</view
-        >
-      </view>
-      <view class="flex-row flex-between" style="margin-bottom: 40rpx">
-        <view class="check-type flex-row">
-          <view
-            @tap="tapSelectType"
-            data-type="store"
-            :class="[
+      ]">
+			<cover-view v-if="isSearch" class="seach-return-view flex-row"><cover-image class="seach-return-img"
+					src="https://qiniu.bms16.com/Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG"></cover-image></cover-view>
+			<!-- <cover-view @tap="moveToLocation" class="current-location-view flex-row"><cover-image
+					class="current-location-icon"
+					src="https://qiniu.bms16.com/FgLe8FKDOzgt3wxi2lZt-yQGmbP3"></cover-image></cover-view> -->
+		</cover-view>
+		<view class="store-cabinet-block">
+			<view class="block-p"></view>
+			<view v-if="isSearch" class="search-view flex-row">
+				<view class="search-input-view">
+					<img class="search-icon" src="https://qiniu.bms16.com/FgvJrOE8Lps7tyNL86SOZKbLT1uH" alt="" />
+					<input v-model="inputSearchValue" type="text" class="search-input" placeholder="请输入搜索内容"
+						placeholder-class="input-placeholder" :focus="isFocused" @focus="handleFocus"
+						@blur="handleBlur" />
+					<img v-if="isFocused" @tap="clearSearch" class="search-close-icon"
+						src="https://qiniu.bms16.com/FhKzwftEPo70kloqIVxKH7g0pD6I" alt="清空" />
+				</view>
+				<view v-if="isFocused" @tap="tapSearch" :class="['search-btn', isFocused ? 'search-btn-i' : '']">搜索
+				</view>
+			</view>
+			<view class="flex-row flex-between" style="margin-bottom: 40rpx">
+				<view class="check-type flex-row">
+					<view @tap="tapSelectType" data-type="store" :class="[
               'store-type',
               selectType === 'store' ? 'store-type-i' : 'store-type-s',
-            ]"
-            >门店</view
-          >
-          <view
-            @tap="tapSelectType"
-            data-type="cabinet"
-            :class="[
+            ]">门店</view>
+					<view @tap="tapSelectType" data-type="cabinet" :class="[
               'cabinet-type',
               selectType === 'cabinet' ? 'cabinet-type-i' : 'cabinet-type-s',
-            ]"
-            >换电柜</view
-          >
-        </view>
-        <view class="config-view flex-row">
-          <view class="seach-img" @tap="openSearch"
-            ><img
-              src="https://qiniu.bms16.com/FiWnFuZm5vWQ_Si3CEYLGJnVhSal"
-              alt="搜索"
-          /></view>
-          <view @tap="openSelectType" class="screen-img"
-            ><img
-              :src="'https://qiniu.bms16.com/'+(shop_type!=''?'FikPWd13ENc2SWnC3q1n5F22uUDs':'FpElQHM5NbxHDjz1LrwaHYN668LR')"
-              alt="筛选"
-          /></view>
-        </view>
-      </view>
-      <CarRentalList
-        v-if="selectType === 'store'"
-        :near_store_list="nearStoreList"
-      />
-      <CabinetList
-        v-if="selectType === 'cabinet'"
-        :near_cabinet_list="nearCabinetList"
-      />
-    </view>
-    <leaseType
-      :showLeaseType="showLeaseType"
-      :selectType="selectType"
-      :modelTypeList="modelTypeList"
-      @closeSelectType="closeSelectType"
-      @checkCabinetType="checkCabinetType"
-    />
-    <CustomTabbar curt-tab="service" />
-  </view>
+            ]">换电柜</view>
+				</view>
+				<view class="config-view flex-row">
+					<view class="seach-img" @tap="openSearch"><img
+							src="https://qiniu.bms16.com/FiWnFuZm5vWQ_Si3CEYLGJnVhSal" alt="搜索" /></view>
+					<view @tap="openSelectType" class="screen-img"><img
+							:src="'https://qiniu.bms16.com/'+(shop_type!=''?'FikPWd13ENc2SWnC3q1n5F22uUDs':'FpElQHM5NbxHDjz1LrwaHYN668LR')"
+							alt="筛选" /></view>
+				</view>
+			</view>
+			<CarRentalList v-if="selectType === 'store'" :near_store_list="nearCabinetList" />
+			<CabinetList v-if="selectType === 'cabinet'" :near_cabinet_list="nearCabinetList" />
+		</view>
+		<leaseType :showLeaseType="showLeaseType" :selectType="selectType" :modelTypeList="modelTypeList"
+			@closeSelectType="closeSelectType" @checkCabinetType="checkCabinetType" />
+		<CustomTabbar curt-tab="service" />
+	</view>
 </template>
 
 <script>
-var app = getApp();
-var config = require("@/common/config.js");
-var common = require("@/common/common.js");
-var http = require("@/common/http.js");
-var storage = require("@/common/storage.js");
-import LeaseType from "./components/leaseType/leaseType";
-import CarRentalList from "./components/carRentalList/carRentalList";
-import CabinetList from "./components/cabinetList/cabinetList";
-import CustomTabbar from "@/component/customTabbar/index";
-import {LEASE_TYPE_ARR} from '@/common/constant.js'
-export default {
-  data() {
-    return {
-      myLocation: {
-        latitude: 23.099994,
-        longitude: 113.324004,
-      },
-      selectType: "store",
-      nearStoreList: [],
-      nearCabinetList: [],
+	var app = getApp();
+	var config = require("@/common/config.js");
+	var config_gyq = require("@/common/config_gyq.js");
+	var common = require("@/common/common.js");
+	var http = require("@/common/http.js");
+	var http_gyq = require("@/common/request.js");
+	var storage = require("@/common/storage.js");
+	import LeaseType from "./components/leaseType/leaseType";
+	import CarRentalList from "./components/carRentalList/carRentalList";
+	import CabinetList from "./components/cabinetList/cabinetList";
+	import CustomTabbar from "@/component/customTabbar/index";
+	import {
+		LEASE_TYPE_ARR
+	} from '@/common/constant.js'
+	const SHOPSELECTIMG = `https://qiniu.bms16.com/FkS7hjd6tl6ydLIi9-SQI0vGboMW`
+	const CABINET_ICON_URL =
+		"https://zxappfile.bms16.com/zx_client/shop_mark.png";
+		
+	const CABINET_ICON_URLS =
+			"https://qiniu.bms16.com/FmYKRICv7sPvsFuFB3wo9MIkpd0-";
+	export default {
+		data() {
+			return {
+				activeMarkersId: 0,
+				myLocation: {
+					latitude: 23.099994,
+					longitude: 113.324004,
+				},
+				selectType: "store",
+				nearStoreList: [],
+				nearCabinetList: [],
+				markers: [],
+				polylines: [],
+				mapContext: null, // map上下文
+				isSearch: false, //是否处于搜索状态
+				inputSearchValue: "123",
+				isFocused: false,
+				showLeaseType: false,
+				modelTypeList: [],
+				shop_type: ''
+			};
+		},
+		components: {
+			LeaseType,
+			CarRentalList,
+			CabinetList,
+			CustomTabbar,
+		},
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		onLoad: function(options) {
+			this.loadModelType();
+			this.locationFn()
+			// this.nearStoreOrCabinetList = [
+			// 	{
+			// 		id:1,
+			// 		latitude:'',
+			// 		longitude:'',
+			// 		iconPath:"",
+			// 		width:"",
+			// 		height:"",
+			// 		label:{
+			// 			content:"",
+			// 			color:"#333",
+			// 			bgColor:"#fff",
+			// 			borderRadius:10,
+			// 			padding:10
+			// 		}
+			// 	}
+			// ]
+		},
 
-      polylines: [],
-      mapContext: null, // map上下文
-      isSearch: false, //是否处于搜索状态
-      inputSearchValue: "123",
-      isFocused: false,
-      showLeaseType: false,
-      modelTypeList:[],
-	  shop_type:''
-    };
-  },
-  components: {
-    LeaseType,
-    CarRentalList,
-    CabinetList,
-    CustomTabbar,
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.loadCarRentalList();
-    this.loadModelType();
-  },
-  methods: {
-    tapSelectType(e) {
-      const { type } = e.currentTarget.dataset;
-      this.setData({
-        selectType: type,
-      });
-      if (type === "store") {
-        this.loadCarRentalList();
-      } else {
-        this.loadNearCabinetList();
-      }
-      
-    },
-    //附近门店列表
-    loadCarRentalList(name='',shop_type='') {
-      const pData = {
-        limit: 10,
-        longitude: this.myLocation.longitude,
-        latitude: this.myLocation.latitude,
-		name,
-		shop_type
-      };
-      const me = this;
-      var nearCabinetList = [];
-      const CABINET_ICON_URL =
-        "https://zxappfile.bms16.com/zx_client/shop_mark.png";
-      http.postApi(config.API_NEAR_SHOP_LIST, pData, (resp) => {
-        if (resp.data.code === 200) {
-          nearCabinetList = resp.data.data.list || [];
-          if (nearCabinetList.length != 0) {
-            nearCabinetList.forEach((store, index) => {
-              store.width = 50;
-              store.height = 52;
-              store.available_cnt = 2;
-              store.id = 100000 + (store.id - 0);
-              store.type = "SHOP";
-              store.iconPath = CABINET_ICON_URL;
-            });
-          }
-          this.getLocationPostion(this.myLocation, nearCabinetList);
-          console.log(nearCabinetList, "nearCabinetList");
-          me.setData({
-            nearStoreList: nearCabinetList,
-          });
-        } else {
-          common.simpleToast(resp.data.msg);
-        }
-      });
-    },
-    //附近机柜列表
-    loadNearCabinetList(name='') {
-      const pData = {
-        limit: 10,
-        longitude: this.myLocation.longitude,
-        latitude: this.myLocation.latitude,
-		name
-      };
-      const CABINET_ICON_URL =
-        "https://qiniu.bms16.com/FktjmQ4rGZqYVj6taEtjown-_k5x";
-      const me = this;
-      var nearCabinetList = [];
-      http.postApi(config.API_NEAR_CABINET_LIST, pData, (resp) => {
-        if (resp.data.code === 200) {
-          nearCabinetList = resp.data.data.cabinetList || [];
-          if (nearCabinetList.length !== 0) {
-            nearCabinetList.forEach((cabinet, index) => {
-              cabinet.width = 50;
-              cabinet.height = 52;
-              cabinet.available_cnt = 2;
-              cabinet.id = 100000 + (cabinet.cabinet_id - 0);
-              cabinet.type = "SHOP";
-              cabinet.iconPath = CABINET_ICON_URL;
-            });
-          }
-          this.getLocationPostion(this.myLocation, nearCabinetList);
-          me.setData({
-            nearCabinetList: nearCabinetList,
-          });
-        } else {
-          common.simpleToast(resp.data.msg);
-        }
-      });
-    },
-    getLocationPostion(centerLocation, nearCabinetList) {
-      const locationData = {
-        longitude: centerLocation.longitude,
-        latitude: centerLocation.latitude,
-        width: 22,
-        height: 40,
-        id: 50000,
-        iconPath: "https://zxappfile.bms16.com/zx_client/location_n.png",
-        model_list: [],
-      };
-      nearCabinetList.push(locationData);
-    },
-    moveToLocation() {
-      // 将marker移动至中心点
-      const mapContext = uni.createMapContext("myMap", this);
-      this.mapContext = mapContext;
-      this.mapContext.moveToLocation({
-        longitude: this.myLocation.longitude,
-        latitude: this.myLocation.latitude,
-        success: (res) => {
-          console.log("marker已移动至中心点");
-        },
-      });
-    },
-    handleFocus() {
-      this.isFocused = true;
-    },
-    handleBlur() {
-      this.isFocused = false;
-    },
-    clearSearch() {
-      this.setData({
-        inputSearchValue: "",
-      });
-    },
-    openSearch() {
-      this.isSearch = true;
-      this.isFocused = true;
-    },
-    openSelectType() {
-      this.setData({
-        showLeaseType: true,
-      });
-    },
-    closeSelectType() {
-      this.setData({
-        showLeaseType: false,
-      });
-    },
-	tapSearch(){
-		if(this.selectType==='store'){
-			this.loadCarRentalList(this.inputSearchValue)
-		}else{
-			this.loadNearCabinetList(this.inputSearchValue)
-		}	
-	},
-    checkCabinetType(e) {
-      console.log(e, "e");
-		  const  obj = LEASE_TYPE_ARR.find(v => v.value == e)
-		  const shop_type= (e==100) ? '' : obj.type
-		  this.setData({
-		  	showLeaseType: false,
-			shop_type
-		  });
-		  this.loadCarRentalList('',shop_type)
-    },
-    loadModelType() {
-      const me=this
-      http.postApi(config.API_NEAR_BATTERY_TYPE_LIST, {}, (resp) => {
-        if (resp.data.code === 200) {
-          me.setData({
-            modelTypeList:resp.data.data.list
-          })
-        } else {
-          common.simpleToast(resp.data.msg);
-        }
-      });
-    },
-  },
-};
+		methods: {
+			markertapFn(e) {
+				let markerId = e.markerId
+				if (markerId == 5000) return
+				if (this.selectType == 'store') {
+					this.markers.map(item => {
+						if (markerId == item.id) {
+							item.iconPath = SHOPSELECTIMG
+							let distance = common.getFlatternDistance(this.myLocation.longitude, this.myLocation
+								.latitude, item.longitude, item.latitude)
+							let time = Math.ceil(Number(((distance - 0) / 1000).toFixed(2)) * 25 / 10)
+							let content = `${common.formatDistance(Number(distance))} 骑行${time}分钟`
+							item.label = {
+								content,
+								color: "#0074FF",
+								fontSize: 10,
+								bgColor: "#fff",
+								borderRadius: 10,
+								padding: 5,
+								anchorX: -45,
+								anchorY: -6
+							}
+							this.activeMarkersId = item.id
+						} else {
+							item.iconPath = CABINET_ICON_URL
+							item.label = {}
+						}
+					})
+				}else if(this.selectType == 'cabinet'){
+					
+				}
+
+			},
+
+
+			async locationFn() {
+				let res = await uni.getLocation()
+				if (res[1]) {
+					this.myLocation = {
+						latitude: res[1].latitude,
+						longitude: res[1].longitude,
+					}
+					this.loadCarRentalList();
+
+				}
+			},
+
+			tapSelectType(e) {
+				const {
+					type
+				} = e.currentTarget.dataset;
+				this.nearCabinetList = []
+				this.setData({
+					selectType: type,
+				});
+				if (type === "store") {
+					this.loadCarRentalList();
+				} else {
+					this.loadNearCabinetList();
+				}
+
+			},
+			//附近门店列表
+			loadCarRentalList(name = '', shop_type = '') {
+				const pData = {
+					limit: 50,
+					longitude: this.myLocation.longitude,
+					latitude: this.myLocation.latitude,
+					name,
+					shop_type
+				};
+				const me = this;
+				var nearCabinetList = [];
+
+
+				console.log(99999)
+				http.postApi(config.API_NEAR_SHOP_LIST, pData, (resp) => {
+					if (resp.data.code == 200) {
+						me.markers = []
+						nearCabinetList = resp.data.data.list || [];
+						// if (nearCabinetList.length != 0) {
+						// 	nearCabinetList.forEach((store, index) => {
+						// 		store.width = 50;
+						// 		store.height = 52;
+						// 		store.available_cnt = 2;
+						// 		store.id = 100000 + (store.id - 0);
+						// 		store.type = "SHOP";
+						// 		store.iconPath = CABINET_ICON_URL;
+						// 	});
+						// }
+						this.markers = nearCabinetList.map(item => {
+							return {
+								width: 50,
+								height: 52,
+								id: Number(item.id),
+								longitude: item.longitude,
+								latitude: item.latitude,
+								iconPath: CABINET_ICON_URL,
+								// label:{
+								// 	content:"21",
+								// 	color:"#0074FF",
+								// 	fontSize:10,
+								// 	bgColor:"#fff",
+								// 	borderRadius:1000,
+								// 	padding:3,
+								// 	anchorX:0,
+								// 	anchorY:-50
+								// }
+							}
+						})
+						this.getLocationPostion(this.myLocation, nearCabinetList);
+						console.log(nearCabinetList, "nearCabinetList");
+						me.setData({
+							nearCabinetList: nearCabinetList,
+						});
+					} else {
+						common.simpleToast(resp.data.msg);
+					}
+				});
+			},
+			//附近机柜列表
+			async loadNearCabinetList(name = '') {
+				const pData = {
+					limit: 50,
+					longitude: this.myLocation.longitude,
+					latitude: this.myLocation.latitude,
+					name
+				};
+				const me = this;
+				var nearCabinetList = [];
+				let {data} = await http_gyq.postApi(config_gyq.API_FLK_CABINET_NEAR_LIST,pData)
+				if (data.code === 200) {
+					nearCabinetList = data.data.cabinetList || [];
+					this.markers = nearCabinetList.map(item=>{
+						return {
+							width: 50,
+							height: 52,
+							id: Number(item.id),
+							longitude: item.longitude,
+							latitude: item.latitude,
+							iconPath: CABINET_ICON_URLS,
+							label:{
+								content:"21",
+								color:"#0074FF",
+								fontSize:10,
+								bgColor:"#fff",
+								borderRadius:1000,
+								padding:3,
+								anchorX:0,
+								anchorY:-50
+							}
+						}
+					})
+					this.getLocationPostion(this.myLocation, nearCabinetList);
+					me.setData({
+						nearCabinetList: nearCabinetList,
+					});
+				
+				} else {
+					common.simpleToast(data.msg);
+				}
+			},
+			getLocationPostion(centerLocation, nearCabinetList) {
+				const locationData = {
+					longitude: centerLocation.longitude,
+					latitude: centerLocation.latitude,
+					width: 22,
+					height: 40,
+					id: 50000,
+					iconPath: "https://zxappfile.bms16.com/zx_client/location_n.png",
+					model_list: [],
+				};
+				this.markers.push(locationData);
+			},
+			moveToLocation() {
+				// 将marker移动至中心点
+				const mapContext = uni.createMapContext("myMap", this);
+				this.mapContext = mapContext;
+				this.mapContext.moveToLocation({
+					longitude: this.myLocation.longitude,
+					latitude: this.myLocation.latitude,
+					success: (res) => {
+						console.log("marker已移动至中心点");
+					},
+				});
+			},
+			handleFocus() {
+				this.isFocused = true;
+			},
+			handleBlur() {
+				this.isFocused = false;
+			},
+			clearSearch() {
+				this.setData({
+					inputSearchValue: "",
+				});
+			},
+			openSearch() {
+				this.isSearch = true;
+				this.isFocused = true;
+			},
+			openSelectType() {
+				this.setData({
+					showLeaseType: true,
+				});
+			},
+			closeSelectType() {
+				this.setData({
+					showLeaseType: false,
+				});
+			},
+			tapSearch() {
+				if (this.selectType === 'store') {
+					this.loadCarRentalList(this.inputSearchValue)
+				} else {
+					this.loadNearCabinetList(this.inputSearchValue)
+				}
+			},
+			checkCabinetType(e) {
+				console.log(e, "e");
+				const obj = LEASE_TYPE_ARR.find(v => v.value == e)
+				const shop_type = (e == 100) ? '' : obj.type
+				this.setData({
+					showLeaseType: false,
+					shop_type
+				});
+				this.loadCarRentalList('', shop_type)
+			},
+			loadModelType() {
+				const me = this
+				http.postApi(config.API_NEAR_BATTERY_TYPE_LIST, {}, (resp) => {
+					if (resp.data.code === 200) {
+						me.setData({
+							modelTypeList: resp.data.data.list
+						})
+					} else {
+						common.simpleToast(resp.data.msg);
+					}
+				});
+			},
+		},
+	};
 </script>
 <style>
-@import "./service.css";
+	@import "./service.css";
 </style>

pages/storeDetails/storeDetails.css

@@ -1,6 +1,16 @@
 .container-view{
 	background: #F1F3F4;
 }
+.bg-img {
+	width: 100%;
+	height: 420rpx;
+	/* background-size: contain; */
+}
+.store-img-view .swiper-item-img {
+	width: 100%;
+	height: 100%;
+}
+
 .store-img-view{
 	height: 500rpx;
 	width: 100%;

pages/storeDetails/storeDetails.vue

@@ -1,63 +1,88 @@
 <template>
 	<view class="container-view">
-		<view class="store-img-view" style="background-image: url('https://qiniu.bms16.com/FhG-xwyMdxPVjYNrxXnq5enGFT-2');background-repeat: no-repeat;background-size: 100% 500rpx;">
+		<!-- <view class="store-img-view" style="background-image: url('https://qiniu.bms16.com/FhG-xwyMdxPVjYNrxXnq5enGFT-2');background-repeat: no-repeat;background-size: 100% 500rpx;">
 			
+		</view> -->
+		<view class="store-img-view">
+			<swiper v-if="shop_image.length!=0" class="swiper" :indicator-dots="true" :autoplay="true" :interval="2000"
+				indicator-color="rgba(0, 0, 0, 0.3)" indicator-active-color="#000000" :duration="1000" circular>
+				<swiper-item class="swiper-item" v-for="(item,index) in shop_image" :key="index">
+					<image class="swiper-item-img" :src="item" mode="aspectFill"></image>
+				</swiper-item>
+			</swiper>
+			<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>
 				<view class="flex-row align-center" style="margin-bottom: 24rpx;">
-					<view class="store-type">租车</view>
-					<view class="store-type">租车</view>
-					<view class="store-type">租车</view>
-					<view class="store-num-type"> <text class="store-num">7</text> 款车型</view>
-					<view class="store-phone" @tap="tapPhone"><img style="width: 84rpx;height: 64rpx;" src="https://qiniu.bms16.com/Ft0YA1JYmq66hdoeEN-PgBHy5vLa" alt=""></view>
+					<view v-for="(item,index) of storeInfo.service_type_list" :key="index" class="store-type">
+						{{item.title}}
+					</view>
+					<view class="store-num-type"> <text class="store-num">{{storeInfo.model_list.length || 0}}</text>
+						款车型
+					</view>
+					<view class="store-phone" @tap="tapPhone"><img style="width: 84rpx;height: 64rpx;"
+							src="https://qiniu.bms16.com/Ft0YA1JYmq66hdoeEN-PgBHy5vLa" alt=""></view>
 				</view>
 				<view class="flex-row flex-between">
 					<view :class="isWorkTimer ? 'left_grid_2' : 'left_grid_1'">
 						<view class="flex-row">
 							<img style="width: 40rpx;height: 40rpx;"
 								:src="!isWorkTimer ? 'https://zxappfile.bms16.com/zx_admin/cab_timer.png' : 'https://zxappfile.bms16.com/zx_admin/cab_timer_work.png'">
-							<view :class="isWorkTimer ? 'grid_text_1' : 'grid_text_rest' ">{{isWorkTimer ? '营业中' : '已休息'}}
+							<view :class="isWorkTimer ? 'grid_text_1' : 'grid_text_rest' ">
+								{{isWorkTimer ? '营业中' : '已休息'}}
 							</view>
 						</view>
-						<view class="grid_text_2">{{isWorkTimer}}</view>
+						<view 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>
 					<view @tap="bindToNav" class="right_grid flex-between">
 						<view>
 							<view class="cab_distance">
-								直线距您 600 m
+								直线距您 {{storeInfo.distance}}
 							</view>
-							<view class="cab_address">{{shopInfo.address}}</view>
+							<view class="cab_address">{{storeInfo.address}}</view>
 						</view>
-						<view >
+						<view>
 							<img class="icon_grid_1" src="https://zxappfile.bms16.com/zx_admin/cab_nav.png">
 							<view class="grid_nav">导航</view>
 						</view>
 					</view>
 				</view>
 			</view>
-			<useGuidance/>
+			<useGuidance />
 			<view class="unit-type-view">
-				<view class="unit-type ">日租</view>
-				<view class="unit-type unit-type-i">日租</view>
-				<view class="unit-type ">日租</view>
-				<view class="unit-type ">日租</view>
+				<view @click="status = 0;modelListsFn()" class="unit-type " :class="{'unit-type-i' : status == 0}">短租
+				</view>
+				<view @click="status = 1;modelListsFn()" class="unit-type" :class="{'unit-type-i' : status == 1}">长租
+				</view>
+				<view @click="status = 2;modelListsFn()" class="unit-type " :class="{'unit-type-i' : status == 2}">出售
+				</view>
 			</view>
 			<view class="car-info-list-view">
-				<view class="car-info-view align-center flex-row">
-					<img class="car-img" src="https://qiniu.bms16.com/FsxOysJT2V3KNYev2YWadvjyKn2j" alt="">
+				<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=""> -->
+					<image class="car-img" :src="item.model_images" mode="aspectFill"></image>
 					<view class="car-info">
-						<view class="car-name flex-row">基础智能电动车</view>
-						<view class="car-model-info">续航70km｜重量54kg</view>
+						<view class="car-name flex-row">{{item.model_name}}</view>
+						<view class="car-model-info">续航{{item.endurance}}km｜重量{{item.weight}}kg</view>
 						<view class="flex-row flex-between">
-							<view class="unit-type-price flex-row"><text style="margin-right: 8rpx;">日租</text><priceTool :price="50" :font_size="40"/></view>
-							<view class="lease-btn">立即租</view>
+							<view class="unit-type-price flex-row">
+								<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" />
+							</view>
+							<view @click="srcFn(`/pages/carDetail/carDetail?model_id=${item.model_id}`)"
+								class="lease-btn">购/租</view>
 						</view>
 					</view>
 				</view>
 			</view>
-			
+
 		</view>
 	</view>
 </template>
@@ -70,7 +95,6 @@
 	var storage = require('../../common/storage.js');
 	import priceTool from '@/component/priceTool/priceTool';
 	import UseGuidance from '@/component/useGuidance/useGuidance';
-	
 	export default {
 		components: {
 			priceTool,
@@ -78,76 +102,156 @@
 		},
 		data() {
 			return {
-				storeInfo:{},
-				isWorkTimer:"00:00-23:59"
+				status: 0,
+				shop_image: [],
+				storeInfo: {
+					model_list: []
+				},
+				isWorkTimer: null
 			};
-		}
+		},
+		computed: {},
 		/**
 		 * 生命周期函数--监听页面加载
 		 */
-		,
-		onLoad: function(options) {
-			console.log(options,'options');
+		onLoad: async function(options) {
+			console.log(options, 'options');
 			const shop_id = options.admin_id || ''
-			this.loadStoreDetail(shop_id)
+			let data = await this.locationFn()
+			console.log(data)
+			this.loadStoreDetail(shop_id, data.longitude, data.latitude)
 		},
 		/**
 		 * 生命周期函数--监听页面显示
 		 */
 		onShow: function() {
-			
+
 		},
 		methods: {
-			loadStoreDetail(shop_id){
-				const me=this
-				console.log(shop_id,'shop_id');
-				http.postApi(config.API_NEAR_SHOP_INFO, {shop_id}, (resp) => {
-					if (resp.data.code === 200) {
-						me.setData({
-							storeInfo:resp.data.data.info
-						})
-					}else{
-						common.simpleToast(resp.data.msg)
-					}
-				})
-			},
-			tapPhone(){
-				const me=this
-				uni.showModal({
-					content: `您是否要拨打电话${me.storeInfo.link_phone}？`,
-					confirmText: '确定',
-					success: (res) => {
-						if (res.confirm) {
-							me.clearTimer()
-							uni.makePhoneCall({
-								phoneNumber: me.storeInfo.link_phone,
-								success() {},
-								fail() {}
+			modelListsFn() {
+				let obj = []
+				for (let index = 0; index < this.storeInfo.model_list.length; index++) {
+					let item = this.storeInfo.model_list[index];
+					for (var i = 0; i < item.price_setting.length; i++) {
+						var items = item.price_setting[i];
+						let money = (items.hire_price / 100).toFixed(2)
+						if (this.status == 0 && (items.hire_duration_unit == 1 || items.hire_duration_unit == 4 || items
+								.hire_duration_unit == 5 || items.hire_duration_unit == 6)) {
+							obj.push({
+								...item,
+								money
 							})
+							break
 						}
-					},
-					fail: (res) => {}
-				})
-			},
-			bindToNav(){
-				const {
-					address,
-					latitude,
-					longitude,
-					shop_name
-				} = this.storeInfo
-				uni.openLocation({
-					latitude: latitude - 0,
-					longitude: longitude - 0,
-					scale: 15,
-					name: shop_name,
-					address: address,
-					success: function (res) {},
-				})
-			},
-		}
-			
-		};
+						if (this.status == 1 && (items.hire_duration_unit == 2 || items.hire_duration_unit == 3 || items
+								.hire_duration_unit == 4)) {
+							obj.push({
+								...item,
+								money
+							})
+							break
+						}
+				}
+			}
+			return obj
+	},
+	async locationFn() {
+			let res = await uni.getLocation()
+			if (res[1]) {
+				return {
+					latitude: res[1].latitude,
+					longitude: res[1].longitude,
+				}
+			}
+		},
+		srcFn(url) {
+			uni.navigateTo({
+				url
+			})
+		},
+		isWorkTimerFn() {
+			this.storeInfo.work_end_time = ''
+			this.storeInfo.work_end_time = ''
+		},
+		loadStoreDetail(shop_id, longitude, latitude) {
+			const me = this
+			http.postApi(config.API_NEAR_SHOP_INFO, {
+				shop_id,
+				longitude,
+				latitude,
+			}, (resp) => {
+				if (resp.data.code === 200) {
+					me.setData({
+						storeInfo: resp.data.data.info
+					})
+					this.storeInfo.distance = common.formatDistance(Number(this.storeInfo.distance))
+					this.shop_image = JSON.parse(resp.data.data.info.shop_image) || []
+					var cabinetInfo = resp.data.data.info
+					this.storeInfo.work_begin_time = (cabinetInfo.work_begin_time == null ? '00:00:00' :
+						cabinetInfo
+						.work_begin_time).split(':')
+					this.storeInfo.work_end_time = (cabinetInfo.work_end_time == null ? '00:00:00' :
+						cabinetInfo
+						.work_end_time).split(':')
+					this.isWorkTimer = this.isWithinTimeRange(cabinetInfo.work_begin_time,
+						cabinetInfo.work_end_time)
+				} else {
+					common.simpleToast(resp.data.msg)
+				}
+			})
+		},
+		isWithinTimeRange(startTime, endTime) {
+			// 获取当前时间
+			const now = new Date();
+			const currentMinutes = now.getHours() * 60 + now.getMinutes();
+
+			// 将传入的时间转换为分钟
+			const [startHour, startMinute] = startTime.map(Number);
+			const [endHour, endMinute] = endTime.map(Number);
+
+			const startMinutes = startHour * 60 + startMinute;
+			const endMinutes = endHour * 60 + endMinute;
+
+			// 判断当前时间是否在指定范围内
+			return currentMinutes >= startMinutes && currentMinutes <= endMinutes;
+		},
+		tapPhone() {
+			const me = this
+			uni.showModal({
+				content: `您是否要拨打电话${me.storeInfo.link_phone}？`,
+				confirmText: '确定',
+				success: (res) => {
+					if (res.confirm) {
+						me.clearTimer()
+						uni.makePhoneCall({
+							phoneNumber: me.storeInfo.link_phone,
+							success() {},
+							fail() {}
+						})
+					}
+				},
+				fail: (res) => {}
+			})
+		},
+		bindToNav() {
+			const {
+				address,
+				latitude,
+				longitude,
+				shop_name
+			} = this.storeInfo
+			uni.openLocation({
+				latitude: latitude - 0,
+				longitude: longitude - 0,
+				scale: 15,
+				name: shop_name,
+				address: address,
+				success: function(res) {},
+			})
+		},
+	}
+
+	};
 </script>
 
 <style>

utils/map.js

@@ -0,0 +1,20 @@
+import AMapLoader from "@amap/amap-jsapi-loader";
+
+export default class map{
+	static key = '16c1afa83d703d8c73ef0a64f150d000'
+	static map = null
+	static constructor(){
+		if(!this.map){
+			this.initAMap()
+		}
+	}
+	static async initAMap(){
+		let map = await AMapLoader.load({
+			key:key, // 申请好的Web端开发者Key，首次调用 load 时必填
+			version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+			plugins: ["AMap.RangingTool"], //支持添加多个如：['...','...']
+		})
+		console.log(map)
+		this.map = map
+	}
+}