Merge branch 'gyq_test' into lw_test

common/common.js

@@ -1,8 +1,8 @@
 /**
  * 通用函数
  */
+import i18n from '../locale/index.js';
 var config = require('./config.js');
-
 /**
  * 时间戳转为 xxxx-xx-xx xx:xx:xx 格式
  */
@@ -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) {
@@ -640,7 +639,7 @@ function maskPhoneNumber(phoneNumber) {
 
 
 function formatDistance(distanceMeters) {
-	if(!distanceMeters) return''
+	if (!distanceMeters) return ''
 	// 判断距离是否超过1000米  
 	if (distanceMeters >= 1000) {
 		// 如果超过1000米，则转换为千米并返回  
@@ -652,7 +651,7 @@ function formatDistance(distanceMeters) {
 }
 
 function formatWeight(weightMeters) {
-	if(!weightMeters) return''
+	if (!weightMeters) return ''
 	if (weightMeters >= 1000) {
 		return (weightMeters / 1000).toFixed(2) + 'kg';
 	} else {
@@ -718,22 +717,22 @@ function formatTimeDate(datetime) { // 时间戳格式化 返回x月x日 x:x
 }
 
 function getToDay(type) { //转化为yyyy-mm-dd
-	if(type === 1){
+	if (type === 1) {
 		const now = new Date();
 		const year = now.getFullYear();
 		const month = String(now.getMonth() + 1).padStart(2, '0');
-		const day = String(now.getDate()-0+1).padStart(2, '0');
+		const day = String(now.getDate() - 0 + 1).padStart(2, '0');
 		const formattedDate = `${year}-${month}-${day}`;
 		return formattedDate;
-	}else{
+	} else {
 		const now = new Date();
 		const year = now.getFullYear();
 		const month = String(now.getMonth() + 1).padStart(2, '0');
 		const day = String(now.getDate()).padStart(2, '0');
 		const formattedDate = `${year}-${month}-${day}`;
-		return formattedDate;	
+		return formattedDate;
 	}
-	
+
 }
 
 function getTimeToDay(time) { //转化为天时分
@@ -770,17 +769,18 @@ function isWithinTimeRange(startTime, endTime) {
 }
 
 // 时间戳格式化 x:x:x -> x:x
-var formatToHHMM = function (timeStr) {
-	var data=timeStr.split(':')
-   var hours = data[0];
-   var  minutes = data[1];
-   return hours+':'+minutes;
+var formatToHHMM = function(timeStr) {
+	var data = timeStr.split(':')
+	var hours = data[0];
+	var minutes = data[1];
+	return hours + ':' + minutes;
 }
 // 时间戳格式化 x:x:x -> x:x
-var hideProvinceAndCity = function (address) {
-   	var regex = /(?:[\u4e00-\u9fa5]+省|[\u4e00-\u9fa5]+市|[\u4e00-\u9fa5]+自治区|[\u4e00-\u9fa5]+特别行政区)/g;
-    return address.replace(regex, '').replace(/\s+/g, '').trim(); 
+var hideProvinceAndCity = function(address) {
+	var regex = /(?:[\u4e00-\u9fa5]+省|[\u4e00-\u9fa5]+市|[\u4e00-\u9fa5]+自治区|[\u4e00-\u9fa5]+特别行政区)/g;
+	return address.replace(regex, '').replace(/\s+/g, '').trim();
 }
+
 function calculateRemainingTime(serverTimestamp) {
 	const currentTimestamp = getCurrentTimestamp();
 	const remainingTime = serverTimestamp - currentTimestamp;
@@ -801,10 +801,10 @@ function formatTimeScan(seconds) {
 
 function getFormattedTime(time) {
 	// 获取当前时间
-	const now = time? time : new Date();
+	const now = time ? time : new Date();
 	// 加上30分钟
 	now.setMinutes(now.getMinutes() + 30);
-	
+
 	// 格式化时间
 	const month = String(now.getMonth() + 1).padStart(2, "0"); // 月份从0开始，需要加1
 	const day = String(now.getDate()).padStart(2, "0"); // 日期
@@ -813,7 +813,7 @@ function getFormattedTime(time) {
 
 	// 拼接成目标格式
 	return `${month}-${day} ${hours}:${minutes}`;
-  }
+}
 
 function countToDay(count, unit) {
 	let data = '';
@@ -836,22 +836,19 @@ function countToDay(count, unit) {
 	}
 	return data;
 }
-function callPhone(that,phone,callback = () => {}, fail = () => {}){
-	const text=that.$t(您是否要拨打电话)+phone+'?'
-	uni.showModal({
+
+async function callPhone(phone) {
+	const text = i18n.t('您是否要拨打电话' + phone + '?')
+	// const text=that.$t()+phone+'?'
+	let res = await uni.showModal({
 		content: text,
 		confirmText: '确定',
-		success: (res) => {
-			if (res.confirm) {
-				uni.makePhoneCall({
-					phoneNumber: phone,
-					success() {},
-					fail() {}
-				})
-			}
-		},
-		fail: (res) => {}
 	})
+	if(res[1].confirm){
+		uni.makePhoneCall({
+			phoneNumber: phone,
+		})
+	}
 }
 module.exports = {
 	formatTime: formatTime,
@@ -893,12 +890,12 @@ module.exports = {
 	getToDay: getToDay,
 	getTimeToDay: getTimeToDay,
 	isObjectEmpty: isObjectEmpty,
-	isWithinTimeRange:isWithinTimeRange,
-	formatToHHMM:formatToHHMM,
-	hideProvinceAndCity:hideProvinceAndCity,
-	formatTimeScan:formatTimeScan,
-	calculateRemainingTime:calculateRemainingTime,
-	countToDay:countToDay,
-	getFormattedTime:getFormattedTime,
-	callPhone:callPhone,
+	isWithinTimeRange: isWithinTimeRange,
+	formatToHHMM: formatToHHMM,
+	hideProvinceAndCity: hideProvinceAndCity,
+	formatTimeScan: formatTimeScan,
+	calculateRemainingTime: calculateRemainingTime,
+	countToDay: countToDay,
+	getFormattedTime: getFormattedTime,
+	callPhone: callPhone,
 };

common/config_gyq.js

@@ -47,5 +47,31 @@ 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',
+	
+	//取消订单
+	API_FLK_ORDER_CANCEL_PAY: api_web_url +'?r=flk/order/cancel-pay',
+	//激活车辆(绑定设备): 
+	API_CAR_ASSIGNMENT: api_web_url +'?r=flk/car/assignment',
+	//门店设置:
+	API_FLK_INDEX_SHOP_SETTING: api_web_url +'?r=flk/index/shop-setting',
+	//申请还车: :
+	API_FLK_CAR_RETURN_CAR: api_web_url +'?r=flk/car/return-car',
+	//换电记录:
+	API_FLK_CABINET_EXCHANGE_ORDER: api_web_url +'?r=flk/cabinet/exchange-order',
+	//续租: 
+	API_FLK_ORDER_RENEW: api_web_url +'?r=flk/order/renew',
+	
+	//车辆仪表盘
+	API_FLK_CAR_DASHBOARD: api_web_url +'?r=flk/car/dashboard',
+	//购买下单
+	API_FLK_ORDER_RESERVE: api_web_url +'?r=flk/order/reserve',
+	
 };
 module.exports = config;

common/constant.js

@@ -5,25 +5,33 @@ export const defaultHeadImg = `${QINIU_URL}/FpzmRTePsa2QSxemAbc-xWdzSsn1`
 
 // 租赁周期
 export const LEASE_TYPE = {
-	// 'hour': 4, // 时租
 	'day': 1, // 日租
 	'month': 2, // 月租
 	'year': 3, // 年租
+	'hour': 4, // 时租
+	'minute': 5, // 分租
+	'week': 6, // 周租
+	'quarter': 7, // 季租
 	'buy': 100, // 购买
 }
-
 export const LEASE_TYPE_ARR = [
 	{ label: '日租', value: LEASE_TYPE.day, type: 'day', unit: '天' },
 	{ label: '月租', value: LEASE_TYPE.month, type: 'month', unit: '月' },
 	{ label: '年租', value: LEASE_TYPE.year, type: 'year', unit: '年' },
+	{ label: '年租', value: LEASE_TYPE.hour, type: 'hour', unit: '时' },
+	{ label: '年租', value: LEASE_TYPE.minute, type: 'minute', unit: '分' },
+	{ label: '年租', value: LEASE_TYPE.week, type: 'week', unit: '周' },
+	{ label: '年租', value: LEASE_TYPE.quarter, type: 'quarter', unit: '季' },
 	{ label: '购买', value: LEASE_TYPE.buy, type: 'buy', unit: '买' }
 ]
 export const MAX_LIMITS = {
   4: { max: 24, message: '最多可以选择24小时' },
+  5: { max: 60, message: '最多可以选择60分钟' },
   1: { max: 30, message: '最多可以选择30天' },
   2: { max: 12, message: '最多可以选择12个月' },
   6: { max: 4, message: '最多可以选择4周' },
   7: { max: 4, message: '最多可以选择4季度' },
+  3: { max: 2, message: '最多可以选择2年' },
 };
 
 //不同appid对应不同的首页顶部导航栏字体 门店名字

component/carPlan/carPlan.css

@@ -57,7 +57,7 @@
 	margin-bottom: 32rpx;
 }
 .car-plan-list-view{
-	overflow-x: hidden;
+	overflow-x: auto;
 	margin-bottom: 28rpx;
 }
 .car-plan-list{

component/carPlan/carPlan.vue

@@ -5,16 +5,20 @@
 				<view style="margin-right: 24rpx;"><img style="width: 160rpx;height: 160rpx;border-radius: 16rpx;" :src="params.image" alt=""></view>
 				<view class="car-model-detail flex-row">
 					<!-- <priceTool :price="58" :font_size="40"/> -->
-					<allPrice :amount="(price/100)"/>
-					<view v-if="duration_unit!=100" class="car-model-price-view">
-						<text style="margin-right: 12rpx;">已选择</text>
+					<allPrice :amount="(priceAll/100)"/>
+					<view v-if="type!=100" class="car-model-price-view">
+						<text style="margin-right: 12rpx;">已选择{{priceAll}}</text>
 						<text>{{leaseUnitsResult}}</text>
 						<text>时长 {{count}} 
-							<text v-if="selectType==1">日</text>
-							<text v-if="selectType==2">月</text>
-							<text v-if="selectType==3">年</text>
+							<text v-if="type==1">日</text>
+							<text v-if="type==2">月</text>
+							<text v-if="type==3">年</text>
+							<text v-if="type==4">时</text>
+							<text v-if="type==5">分</text>
+							<text v-if="type==6">周</text>
+							<text v-if="type==7">季</text>
 						</text>
-						<text>共计{{tools.countToDay(count,selectType)}}天</text>
+						<text>共计{{tools.countToDay(count,type)}}天</text>
 					</view>
 					<view class="car-model-tip">现车 随时可到店提车</view>
 				</view>
@@ -26,21 +30,27 @@
 			<view class="car-plan-view">
 				<view class="car-plan-title">用车方案</view>
 				<view class="car-plan-list-view flex-row">
-					<view v-for="(item,index) in params.rental_setting" :key="index" @tap="tapSelectType" :class="['flex-row' , (selectType == item.hire_duration_unit ? 'car-plan-list-i' : 'car-plan-list')] " 
+					<view v-for="(item,index) in params.rental_setting" :key="index" @tap="tapSelectType" :class="['flex-row' , (type == item.hire_duration_unit ? 'car-plan-list-i' : 'car-plan-list')] " 
 					:data-price="item.hire_price"
 					:data-select_type="item.hire_duration_unit">
-						<view :class="(selectType == item.hire_duration_unit ? 'car-plan-unit-i' : 'car-plan-unit') ">
+					
+						<view :class="(type == item.hire_duration_unit ? 'car-plan-unit-i' : 'car-plan-unit') ">
 							<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 :class="(selectType == item.hire_duration_unit ? 'car-plan-price-i' : 'car-plan-price') ">$<text style="font-size: 48rpx;margin-left: 6rpx;">{{item.hire_price/100}}</text></view>
+						<view :class="(type == item.hire_duration_unit ? 'car-plan-price-i' : 'car-plan-price') ">$<text style="font-size: 48rpx;margin-left: 6rpx;">{{item.hire_price/100}}</text></view>
 					</view>
-					<view  @tap="tapSelectType" :class="['flex-row' , (selectType == 100 ? 'car-plan-list-i' : 'car-plan-list') ]" 
+					
+					<view  @tap="tapSelectType" :class="['flex-row' , (type == 100 ? 'car-plan-list-i' : 'car-plan-list') ]" 
 					:data-price="params.sell_price"
 					:data-select_type="100">
-						<view :class="(selectType == 100 ? 'car-plan-unit-i' : 'car-plan-unit') ">购买</view>
-						<view :class="(selectType == 100 ? 'car-plan-price-i' : 'car-plan-price') ">$<text style="font-size: 48rpx;margin-left: 6rpx;">{{params.sell_price/100}}</text></view>
+						<view :class="(type == 100 ? 'car-plan-unit-i' : 'car-plan-unit') ">购买</view>
+						<view :class="(type == 100 ? 'car-plan-price-i' : 'car-plan-price') ">$<text style="font-size: 48rpx;margin-left: 6rpx;">{{params.sell_price/100}}</text></view>
 					</view>
 				</view>
 				<!-- 暂时未安排开发 -->
@@ -55,12 +65,12 @@
 					<view class="flex-row free-num-tip">本单可享60次免费换电数，超出后需要单独支付换电费用</view>
 					<view class="flex-row free-num-tip">自费换电：$1/次</view>
 				</view> -->
-				<view v-if="selectType!=100" class="plan-time flex-row flex-between">
+				<view v-if="type!=100" class="plan-time flex-row flex-between">
 					<view>租车时长</view>
 					<view class="quantity-count flex-row flex-between">
 						<view class="total-time flex-row">
 							 共 
-							<view style="font-weight: 600;margin: 0 10rpx;">{{tools.countToDay(count,selectType)}}</view>
+							<view style="font-weight: 600;margin: 0 10rpx;">{{tools.countToDay(count,type)}}</view>
 							<!-- <view style="font-weight: 600;margin: 0 10rpx;">{{tools.countToDay(count,isSelectStatus)}}</view> -->
 							<text>天</text>
 						</view>
@@ -87,23 +97,32 @@
 				<view @tap="checkOrder" class="lift-btn">确认</view>
 			</view>
 		</view>
+		
+		<PayTypeModel @closeShow="isShowToBuy = false" @payToOrder="payToOrder" :free_price="priceAll" :isShowToBuy="isShowToBuy"/>
 	</view>
 </template>
 <script module="tools" lang="wxs" src="@/pages/common/wxs/tools.wxs"></script>
 <script module="tools" lang="sjs" src="@/pages/common/wxs/tools.sjs"></script>
 <script>
 	import allPrice from '@/component/allPrice/allPrice';
+	
 	import {
 		MAX_LIMITS,LEASE_TYPE_ARR
 	} from '@/common/constant.js'
 	import common from '../../common/common';
+	var config_gyq = require('../../common/config_gyq.js');
+	var request = require('../../common/request');
+	import PayTypeModel from '@/component/payTypeModel/payTypeModel';
 	export default {
 		data() {
 			return {
+				orderInfo:{},
+				isShowToBuy:false,
+				priceAll:0,
 				count:1,
 				price:0,
-				duration_unit:''
-
+				duration_unit:'',
+				type:'',
 			};
 		},
 		computed: {
@@ -127,6 +146,10 @@
 		},
 		components: {
 			allPrice,
+			PayTypeModel,
+		},
+		mounted() {
+			this.type = this.selectType
 		},
 		created: function () {
 			console.log(this.params,'this.params');
@@ -138,14 +161,38 @@
 		 * 组件的方法列表
 		 */
 		methods: {
+			async payToOrder(type){
+				const pay_type = type
+				var from=''
+				if(pay_type == 1){
+					from = 'wx'
+				}else if(pay_type == 2){
+					from = 'ali'
+				}
+				let {data} = await request.postApi(config_gyq.API_FLK_ORDER_RENEW,{
+					...this.orderInfo,
+					pay_type,
+					from
+				})
+				if(data.code == 200){
+					common.simpleToast('成功！')
+					this.isShowToBuy = false
+					setTimeout(function() {
+						uni.navigateBack({
+							delta: 1
+						});
+					}, 800);
+					
+				}else{
+					common.simpleToast(data.msg)
+				}
+			},
 			tapSelectType(e){
 				const {select_type,price} = e.currentTarget.dataset
-				console.log(e,select_type,price,'selectType,price');
-				this.$emit('changeSelectType',select_type,price)
-				this.setData({
-					price,
-					count:1
-				})
+				this.type = select_type
+				this.priceAll = price
+				this.price = price
+				this.count = 1
 			},
 			closeShowMore(){
 				this.$emit('closeShowMore')
@@ -206,29 +253,55 @@
 			bindDuration() {
 				const me = this
 				//未有显示总价钱的地方
-				// var new_price=0
-				// if(me.selectType == 100){
-				// 	new_price=me.params.sell_price
-				// }else{
-				// 	new_price=me.price*me.count
-				// }
-				// console.log(me.count,me.price,new_price,'new_price');
-				// this.setData({
-				// 	price:new_price
-				// })
+				var new_price=0
+				console.log(me.price)
+				if(me.type == 100){
+					new_price=me.params.sell_price
+				}else{
+					new_price=Number(me.price)*Number(me.count)
+				}
+				this.setData({
+					priceAll:new_price
+				})
+			},
+			async orderRenewFn(){
+				let current_time = parseInt(new Date().getTime() / 1000);
+				let hire_duration = 0
+				this.params.rental_setting.map(item=>{
+					if(item.hire_duration_unit == this.type){
+						hire_duration = item.hire_duration
+					}
+				})
+				this.orderInfo={
+					order_sn:this.params.order_sn,
+					hire_duration,
+					hire_cycle:this.count,
+					hire_duration_unit:this.type,
+					price:this.priceAll,
+					current_time,
+					currency_code:'CNY'
+				}
+				
+				this.isShowToBuy = true
 				
 			},
+			
 			checkOrder(){
 				const params={
 					...this.params,
-					selectType:this.selectType,
+					selectType:this.type,
 					count:this.count,
-					totalPrice:this.price,
-					selectUnit:LEASE_TYPE_ARR.find(v => v.value == this.selectType)?.label
+					totalPrice:this.priceAll,
+					selectUnit:this.type
 				}
-				uni.navigateTo({
-					url: `/pages/purchaseOrder/purchaseOrder?params=${encodeURIComponent(JSON.stringify(params))}`,
-				})
+				if(this.params.order_sn){
+					this.orderRenewFn()
+				}else{
+					uni.navigateTo({
+						url: `/pages/purchaseOrder/purchaseOrder?params=${encodeURIComponent(JSON.stringify(params))}`,
+					})
+				}
+				
 			},
 		}
 	};

component/payTypeModel/payTypeModel.vue

@@ -52,7 +52,7 @@
 	export default {
 		data() {
 			return {
-				payType:1
+				payType:1,
 			};
 		},
 		/**
@@ -93,7 +93,7 @@
 .modal-group {position: fixed;
 	bottom: 0;
 	left: 0;
-	z-index: 10;
+	z-index: 9999;
 	width: 100%;
 	height: 100vh;
 	background-color: rgba(0, 0, 0, 0.6);

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,{

component/uploader/uploader.css

@@ -10,8 +10,8 @@
 }
 
 .list-item {
-	width: 218rpx;
-	height: 218rpx;
+	width: 206rpx;
+	height: 206rpx;
 	background-color: #F4F5F6;
 	border-radius: 16rpx;
 	display: flex;
@@ -23,14 +23,14 @@
 }
 
 .img-item {
-    width: 218rpx;
-    height: 218rpx;
+    width: 206rpx;
+    height: 206rpx;
     background-color: #fff;
 	border-radius: 16rpx;
 }
 .img-item-demo {
-    width: 218rpx;
-    height: 218rpx;
+    width: 206rpx;
+    height: 206rpx;
     background-color: #fff;
 	border-radius: 16rpx;
 	/* 翻转图片的颜色 */

component/uploaders/upload.js.js

@@ -0,0 +1,51 @@
+// utils/upload.js
+const http = require('../../common/request');
+const config = require('../../common/config.js');
+
+class Upload {
+  static imgUp = [];
+  static index = 0;
+  static token = '';
+  // 获取七牛云 token
+  static async qiniuUpImg() {
+    const { data } = await http.getApi(config.API_QINIU_UP_IMG_TOKEN, {});
+    if (data.code === 200) {
+      this.token = data.data.token;
+    }
+  }
+  // 上传文件核心方法
+  static async uploadFile(tempFilePaths) {
+    if (!this.token) {
+      await this.qiniuUpImg(); 
+    }
+	
+    while (this.index < tempFilePaths.length) {
+		uni.showLoading({
+			mask:true,
+			title:`${this.index + 1}/${tempFilePaths.length}`
+		})
+      const res = await uni.uploadFile({
+        url: config.QINIU_UPLOAD_SITE,
+        filePath: tempFilePaths[this.index],
+        name: 'file',
+        formData: { token: this.token },
+      });
+
+      if (res[1]) {
+        const rtDataObj = JSON.parse(res[1].data);
+        const img = {url:config.QINIU_SITE + rtDataObj.key,title:""};
+        this.imgUp.push(img);
+        this.index += 1;
+      }else{
+		  uni.hideLoading()
+	  }
+    }
+	uni.hideLoading()
+    const result = [...this.imgUp];
+    this.imgUp = [];
+    this.index = 0;
+    return result;
+  }
+}
+
+export default Upload; // 确保导出类

component/uploaders/uploaders.vue

@@ -0,0 +1,90 @@
+<template>
+	<view class="container">
+		<view class="list-group">
+			<view class="list-item" @longpress="bindDelImage" :data-idx="index"
+				v-for="(item, index) in imgList" :key="item.unique">
+				<!-- <image  class="img-item-demo" :src="item.url"></image> -->
+				<image  class="img-item" :src="item.url" mode="aspectFill"></image>
+				<!-- <view class="img_text">{{ item.title? item.title : '车辆照片'}}</view> -->
+			</view>
+			<view v-if="imgList.length < max" class="list-item" @tap="bindUpImg">
+				<view class="img_text">车辆照片</view>
+				<view class="empity-item">＋</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+import upload from './upload.js';
+	export default {
+		props: {
+			car_info: {
+				type: Array,
+				required: true //必填项
+			},
+			max:{
+				type: Number,
+				default:1
+			}
+		},
+		data() {
+			return {
+				imgList:[]
+			}
+		}
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		,
+		mounted() {
+			this.imgList = this.car_info
+		},
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow: function() {
+
+		},
+		methods: {
+			// 上传
+			async bindUpImg(e) {
+				let res = await uni.chooseImage({
+					count: this.max - this.imgList.length,
+					sourceType: ['camera'],
+				})
+				if(res[1]){
+					const imgList = res[1].tempFilePaths
+					let data = await upload.uploadFile(imgList)
+					this.imgList = this.imgList.concat(data)
+					this.updateImages(data)
+				}
+			},	
+			
+            // 删除图片
+			async bindDelImage(e) {
+				const index = e.currentTarget.dataset.idx
+				// 样例图不删除
+				if (this.imgList[index].url == '') return false
+				let res = await uni.showModal({
+					title: '提示',
+					content: '你确定要删除吗？',
+					showCancel: true,
+				})
+				if (res[1].confirm) {
+					this.imgList.splice(index,1)
+					this.updateImages(this.imgList);
+				}
+			},
+			updateImages(imgList) {
+				this.$emit('update-car-images', imgList);
+			}
+
+		}
+	};
+</script>
+
+<style>
+	@import '../uploader/uploader.css';
+</style>

locale/en.json

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

locale/zh.json

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

manifest.json

@@ -22,7 +22,6 @@
         },
         "modules" : {
             "Payment" : {},
-            "Maps" : {},
             "Bluetooth" : {},
             "Geolocation" : {},
             "Share" : {}
@@ -71,9 +70,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/activation/activation.css

@@ -1,24 +1,33 @@
 .container-view {
-	height: 100vh;
-	background-color: #ffffff;
+	min-height: 100vh;
 }
 
 .return-info {
-	padding: 40rpx 32rpx 32rpx;
+	padding: 32rpx;
 	margin-bottom: 16rpx;
+	width: 710rpx;
+	margin: auto;
+	background-color: #ffffff;
+	border-radius: 32rpx;
+	margin-top: 20rpx;
 }
-
-.return-info img {
+.return-info .h5{
+	font-size: 32rpx;
+	color: #333;
+	font-weight: bold;
+	margin-bottom: 20rpx;
+}
+.return-info .img {
 	width: 125rpx;
 	height: 125rpx;
 	border-radius: 16rpx;
+	overflow: hidden;
 }
 
 .return-top > view:nth-of-type(1) {
-	color: #2A3A5A;
-	font-size: 36rpx;
+	color: #333;
+	font-size: 28rpx;
 	margin-bottom: 16rpx;
-	font-weight: bold;
 }
 
 .return-top > view:nth-of-type(2) {
@@ -34,11 +43,15 @@
 .pictures-info {
 	background-color: #ffffff;
 	padding: 40rpx 32rpx 32rpx;
+	width: 710rpx;
+	margin: auto;
+	margin-top: 20rpx;
+	border-radius: 32rpx;
 }
 
 .pictures-info > view:nth-of-type(1) {
-	color: #2A3A5A;
-	font-size: 40rpx;
+	color: #333;
+	font-size: 32rpx;
 	margin-bottom: 20rpx;
 }
 

pages/activation/activation.vue

@@ -1,39 +1,72 @@
 <template>
 	<view class="container-view">
-		<view class="return-info flex-row flex-between">
-			<view class="return-top">
-				<view>车牌：{{plate_number}}</view>
+		<view class="return-info">
+			<view class="h5">车辆信息</view>
+			<view class="return-top  flex-row flex-between">
+				<view>车辆编号：{{car_sn}}</view>
+			</view>
+			<view class="return-top  flex-row flex-between">
+				<view>车辆名称：{{carInfoData.car_name}}</view>
+			</view>
+			<view class="return-top  flex-row flex-between">
+				<view>车型：{{carInfoData.model_name}}</view>
+			</view>
+			<view class="return-top  flex-row flex-between">
+				<view>续航：{{carInfoData.endurance}}m</view>
+			</view>
+			<view class="return-top  flex-row flex-between">
+				<view>重量：{{carInfoData.weight}}kg</view>
+			</view>
+			<view class="return-top  flex-row ">
+				<view>照片：</view>
+				<image class="img" :src="carInfoData.model_images" mode="aspectFill"></image>
+			</view>
+		</view>
+		<view v-if="shopInfo.shop_name" class="return-info">
+			<view class="h5">门店信息</view>
+			<view class="return-top  flex-row flex-between">
+				<view>门店名称：{{shopInfo.shop_name}}</view>
+			</view>
+			<view class="return-top  flex-row flex-between">
+				<view>门店地址：{{shopInfo.address}}</view>
 			</view>
-
-			<view><img :src="model_image" /></view>
 		</view>
 		<view class="pictures-info">
 			<view>车辆照片</view>
 			<!-- <view>这里是关于激活车辆照片的文案描述，这里是关于激活车辆照片的文案描述</view> -->
-			<uploader :car_info="car_imgs" @update-car-images="handleCarImagesUpdate"></uploader>
-			<view @tap="submitEnabled" class="pictures-btn">激活车辆</view>
+			<uploaders :max="shopList.flk_hire_car_img_num" :car_info="car_imgs" @update-car-images="handleCarImagesUpdate"></uploaders>
+			<view v-if="isReturnCar" @tap="submitReturn" class="pictures-btn">归还车辆</view>
+			<view v-else @tap="submitEnabled" class="pictures-btn">激活车辆</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	import uploader from '@/component/uploader/uploader';
+	import uploaders from '@/component/uploaders/uploaders';
 	const http = require('@/common/http.js');
+	const request = require('../../common/request');
 	const config = require('@/common/config.js');
+	const config_gyq = require('@/common/config_gyq.js');
 	const common = require('@/common/common.js');
 	export default {
 		components: {
-			uploader
+			uploaders
 		},
 		data() {
 			return {
+				myLocation:{},
+				shopInfo:{},
+				isReturnCar:"",
+				model_id:"",
+				car_sn:"",
+				shopList:{},
+				carInfoData:{},
 				carInfo: {},
-				plate_number: '013657142736',
 				sub_sn: '',
 				model_image: '3',
 				car_model: '',
 				return_imgs: [],
-				car_imgs: [{img_url: ''}],
+				car_imgs: [],
 				model_image_list: ''
 			};
 		},
@@ -42,9 +75,22 @@
 		 */
 		onLoad: function(options) {
 			console.log(options,'options');
+			this.isReturnCar = options.isReturnCar
+			if(options.isReturnCar){
+				uni.setNavigationBarTitle({
+					title:'归还车辆'
+				})
+				this.shopInfoFn()
+			}
 			this.sub_sn =  options.sub_sn || ''
+			this.model_id =  options.model_id || ''
+			this.car_sn =  options.car_sn || ''
+			this.carDetFn()
+			this.shopSettingFn()
+			
+			
 		},
-
+		// API_FLK_CAR_DETAIL
 		/**
 		 * 生命周期函数--监听页面显示
 		 */
@@ -53,6 +99,79 @@
 		onUnload: function () {
 		},
 		methods: {
+			async locationFn() {
+				let res = await uni.getLocation()
+				if (res[1]) {
+					this.myLocation = {
+						latitude: res[1].latitude,
+						longitude: res[1].longitude,
+					}
+					this.shopInfoFn()
+				}
+			},
+			//还车
+			async submitReturn(){
+				const price = 0
+				let milliseconds = new Date().getTime();
+				const current_time = parseInt(milliseconds / 1000);
+				const _image_list = this.car_imgs.map(item => item.img_url)
+				if (_image_list.length < 1) return common.simpleToast('请上传车辆照片')
+				let {data} = await request.postApi(config_gyq.API_FLK_CAR_RETURN_CAR,{
+					latitude: this.myLocation.latitude,
+					longitude: this.myLocation.longitude,
+					shop_id:this.shopInfo.id,
+					car_sn:this.car_sn,
+					image_list:_image_list.join(','),
+					pay_type:0,
+					price,
+					current_time
+				})
+				if(data.code == 200){
+					common.simpleToast('还车成功！')
+					setTimeout(()=> {
+						uni.switchTab({
+							url: `/pages/index/index?plate_number=${this.car_sn}`,
+						});
+					}, 800)
+				}else{
+					common.simpleToast(resp.data.msg)
+				}
+			},
+			async shopInfoFn(){
+				let res = await uni.getLocation()
+				let {data} = await request.postApi(config.API_NEAR_SHOP_LIST,
+				{
+					limit:1,
+					latitude: this.myLocation.latitude,
+					longitude: this.myLocation.longitude,
+				}
+				)
+				if(data.code == 200){
+					if(data.data.list.length > 0){
+						this.shopInfo = data.data.list[0]
+					}else{
+						common.simpleToast('未获取到门店位置！')
+					}
+				}else{
+					common.simpleToast(data.msg)
+				}
+			},
+			async shopSettingFn(){
+				let {data} = await request.postApi(config_gyq.API_FLK_INDEX_SHOP_SETTING,{model_id:this.model_id})
+				if(data.code == 200){
+					this.shopList = data.data
+				}else{
+					common.simpleToast(data.msg)
+				}
+			},
+			async carDetFn(){
+				let {data} = await request.postApi(config.API_FLK_CAR_DETAIL,{car_sn:this.car_sn})
+				if(data.code == 200){
+					this.carInfoData = data.data
+				}else{
+					common.simpleToast(data.msg)
+				}
+			},
 			handleCarImagesUpdate(updatedImages) {
 				// 这里会接收到子组件传来的更新后的图片URL数组
 				this.car_imgs = updatedImages
@@ -61,22 +180,18 @@
 			submitEnabled() {
 				const me = this
 				const _image_list = this.car_imgs.map(item => item.img_url)
-				if (_image_list.includes('' || "")) return common.simpleToast('请上传车辆照片')
+				if (_image_list.length < 1) return common.simpleToast('请上传车辆照片')
 				const pData = {
-					car_sn: this.plate_number,
+					car_sn: this.car_sn,
 					sub_sn: this.sub_sn,
-					image_list: _image_list.join(', ')
+					image_list: _image_list.join(',')
 				}
 				http.postApi(config.API_FLK_CAR_ASSIGNMENT, pData, (resp) => {
 					if (resp.data.code === 200) {
 						common.simpleToast('车辆激活成功')
 						setTimeout(function() {
-							me.isCustomJump = false
 							uni.switchTab({
-								url: `/pages/index/index?plate_number=${me.plate_number}`,
-								success: function(res) {},
-								fail: function(res) {},
-								complete: function(res) {}
+								url: `/pages/index/index?plate_number=${me.car_sn}`,
 							});
 						}, 800)
 					} else {

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,168 @@
+<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 v-for="(item,index) of list" :key="index" class="batteryList">
+			<view class="header">
+				<view v-if="item.status == 1" class="h5">开始换电</view>
+				<view v-if="item.status == 2" class="h5">换电中</view>
+				<view v-if="item.status == 3" class="h5">换电成功</view>
+				<view v-if="item.status == 4" class="h5">换电失败</view>
+				<view v-if="item.status == 0" class="h5">未知</view>
+				<view class="time">{{item.ctime}}</view>
+			</view>
+			<view class="dl">
+				<view class="dt">换电单号</view>
+				<view class="dd">{{item.order_sn}}</view>
+			</view>
+			<view class="dl">
+				<view class="dt">归还电池</view>
+				<view class="dd">{{item.btn_battery}}</view>
+			</view>
+			<view class="dl">
+				<view class="dt">借出电池</view>
+				<view class="dd">{{item.bor_battery}}</view>
+			</view>
+			<view class="dl">
+				<view class="dt">换电类型</view>
+				<view v-if="item.type == 0" class="dd">机柜换电</view>
+				<view v-if="item.type == 1" class="dd">门店换电</view>
+			</view>
+			<view class="dl">
+				<view class="dt">电柜名称</view>
+				<view class="dd">{{item.dev_name}}</view>
+			</view>
+			<image class="top" src="https://qiniu.bms16.com/FpVjOP5pZY1gXcCcS3TwI0GkywEe" mode=""></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	import dayjs from 'dayjs'
+	import duration from 'dayjs/plugin/duration'
+	dayjs.extend(duration);
+	var config_gyq = require('../../common/config_gyq.js');
+	var request = require('../../common/request');
+	var common = require('../../common/common.js');
+	export default {
+		data() {
+			return {
+				car_sn: "",
+				list: []
+			}
+		},
+		onLoad() {
+			this.car_sn = uni.getStorageSync('car_info').car_sn
+			this.listFn()
+		},
+		methods: {
+			async listFn() {
+				let {
+					data
+				} = await request.postApi(config_gyq.API_FLK_CABINET_EXCHANGE_ORDER, {
+					car_sn: this.car_sn
+				})
+				if (data.code == 200) {
+					this.list = data.data.list
+					this.list.map(item=>{
+						item.btn_battery = item.btn_battery ? item.btn_battery.join(',') : ''
+						item.bor_battery = item.bor_battery ? item.bor_battery.join(',') : ''
+						item.ctime = common.formatTime(item.ctime)
+					})
+				}
+
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.batteryList {
+		width: 698rpx;
+		background: #FFFFFF;
+		border-radius: 32rpx;
+		padding: 32rpx;
+		margin: auto;
+		margin-top: 20rpx;
+		position: relative;
+
+		.top {
+			position: absolute;
+			right: 30rpx;
+			bottom: 30rpx;
+			width: 40rpx;
+			height: 40rpx;
+		}
+
+		.dl {
+			display: flex;
+			align-items: center;
+			margin-top: 30rpx;
+
+			.dt {
+				font-family: PingFangSC, PingFang SC;
+				font-size: 28rpx;
+				color: #9FA7B7;
+				padding-right: 30rpx;
+			}
+
+			.dd {
+				font-family: Futura, Futura;
+				font-weight: 500;
+				font-size: 30rpx;
+				color: #060809;
+			}
+		}
+
+		.header {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: bold;
+			border-bottom: 2rpx solid #F4F5F6;
+			padding-bottom: 30rpx;
+
+			.h5 {
+				font-size: 36rpx;
+				color: #060809;
+			}
+
+			.time {
+				font-family: Futura, Futura;
+				font-weight: 500;
+				font-size: 34rpx;
+				color: #5E6F90;
+				font-style: normal;
+			}
+		}
+	}
+
+	.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)
@@ -182,6 +201,8 @@
 					}
 				})
 			},
+			
+			
 			tapSelectType(e) {
 				const {select_type,price} = e.currentTarget.dataset
 				console.log(select_type,price,'select_type,price');

pages/dashboard/dashboard.vue

@@ -1,192 +1,224 @@
 <template>
-    <view class="dashboard-page zx-page-linear">
-       <view class="dashboard">
-            <view class="shadow" :style="{ '--progress': progress + '%' }"></view>
-            <view class="spe-wrap">
-                <view class="spe-num">
-                    {{ speed }}
-                </view>
-                <view class="unit">km/h</view>
-            </view>
-            <view class="power-wrap">
-                <u-count-to :startVal="0" bold :endVal="progress" fontSize="48rpx" />
-            </view>
-        </view>
-
-        <view class="battery_life_progress">
-            <view class="is_progress">
-                <text>续航</text>
-                <text>46.5km</text>
-            </view>
-        </view>
-
-        <view class="info-container">
-            <view class="info-wrap" v-for="(item, index) in infoList" :key="index">
-                <view class="label">{{ item.label }}</view>
-                <view class="value">{{ 10 + index }} <text class="unit">{{ item.unit }}</text></view>
-            </view>
-        </view>
-    </view>
+	<view class="dashboard-page zx-page-linear">
+		<view class="dashboard">
+			<view class="shadow" :style="{ '--progress': progress + '%' }"></view>
+			<view class="spe-wrap">
+				<view class="spe-num">
+					{{ infoList.speed }}
+				</view>
+				<view class="unit">km/h</view>
+			</view>
+			<view class="power-wrap">
+				<u-count-to :startVal="0" bold :endVal="progress" fontSize="48rpx" />
+			</view>
+		</view>
+
+		<view class="battery_life_progress">
+			<view class="is_progress">
+				<text>续航</text>
+				<text>{{infoList.remain_mail}}km</text>
+			</view>
+		</view>
+
+		<view class="info-container">
+			<view class="info-wrap" v-for="(item, index) in infoList.list" :key="index">
+				<view class="label">{{ item.label }}</view>
+				<view class="value">{{ item.prop }} <text class="unit">{{ item.unit }}</text></view>
+			</view>
+		</view>
+	</view>
 </template>
 
 
 <script>
-export default {
-    data() {
-        return {
-            speed: 50,
-            infoList: []
-        }
-    },
-    computed: {
-        progress() {
-            const MAX_SPEED = 120;
-            return this.speed / MAX_SPEED * 100
-        }
-    },
-    created() {
-        this._initInfoList()
-    },
-    methods: {
-        _initInfoList() {
-            this.infoList = [
-                { label: '骑行里程', prop: 'km', unit: 'km' },
-                { label: '骑行时长', prop: 'km', unit: 'h' },
-                { label: '最大速度', prop: 'km', unit: 'km/h' },
-                { label: '平均速度', prop: 'km', unit: 'km/h' },
-            ]
-        }
-    }
-}
+	var config_gyq = require('../../common/config_gyq.js');
+	var common = require('../../common/common.js');
+	var request = require('../../common/request');
+	export default {
+		data() {
+			return {
+				speed: 50,
+				infoList: {}
+			}
+		},
+		computed: {
+			progress() {
+				const MAX_SPEED = 120;
+				return this.infoList.speed / MAX_SPEED * 100
+			}
+		},
+		created() {
+			this._initInfoList()
+		},
+		methods: {
+			async _initInfoList() {
+				let car_sn = uni.getStorageSync('car_info').car_sn
+				let {
+					data
+				} = await request.postApi(config_gyq.API_FLK_CAR_DASHBOARD, {
+					car_sn
+				})
+				if (data.code == 200) {
+					this.infoList = data.data.data
+					this.infoList.list = [{
+							label: '骑行里程',
+							prop: this.infoList.current_mail || 0,
+							unit: 'km'
+						},
+						{
+							label: '骑行时长',
+							prop: this.infoList.current_time || 0,
+							unit: 'h'
+						},
+						{
+							label: '最大速度',
+							prop: this.infoList.max_speed || 0,
+							unit: 'km/h'
+						},
+						{
+							label: '平均速度',
+							prop: this.infoList.avg_speed || 0,
+							unit: 'km/h'
+						},
+					]
+				} else {
+					common.simpleToast(data.msg)
+				}
+
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-@import "@/libs/css/layout.scss";
-
-.dashboard-page {
-    padding: 24rpx 32rpx 0;
-    min-height: calc(100vh - 100rpx);
-
-    .dashboard {
-        width: 554rpx;
-        height: 554rpx;
-        margin: 0 auto 58rpx;
-        background: url('https://qiniu.bms16.com/Ftwa7u9tJYw3XSLaXYvrDyGNRuD5');
-        background-size: 100%;
-        position: relative;
-        .shadow {
-            box-shadow: inset 0rpx 2rpx 6rpx 0rpx #fff;
-            width: 490rpx;
-            height: 502rpx;
-            position: relative;
-            top: 20rpx;
-            left: 50%;
-            transform: translateX(-50%);
-            border-radius: 50%;
-            background: conic-gradient(from -122deg, #0A59F7 0%, #20FFCA var(--progress), #F3F8FF 0% 245deg, transparent 245deg 360deg);
-            mask: radial-gradient(transparent 200rpx, #000 200rpx);
-            -webkit-mask: radial-gradient(transparent 210rpx, #000 213rpx);
-        }
-
-        .spe-wrap {
-            width: 218rpx;
-            height: 218rpx;
-            background: #0A59F7;
-            border-radius: 50%;
-            position: absolute;
-            left: 50%;
-            top: 50%;
-            transform: translate(-50%, -50%);
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            flex-direction: column;
-            color: #fff;
-            .spe-num {
-                font-family: Futura, Futura;
-                font-weight: bold;
-                font-size: 80rpx;
-                color: #FFFFFF;
-                line-height: 64rpx;
-                text-align: center;
-                font-style: normal;
-                margin-bottom: 16rpx;
-            }
-            .unit {
-                line-height: 28rpx;
-                font-style: italic;
-            }
-        }
-
-        .power-wrap {
-            width: 230rpx;
-            height: 104rpx;
-            background: #D6E7FF;
-            border-radius: 64rpx;
-            position: absolute;
-            bottom: 22rpx;
-            left: 50%;
-            transform: translateX(-50%);
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            font-family: Futura, Futura;
-            font-weight: bold;
-            font-size: 48rpx;
-            color: #060809;
-        }
-    }
-
-    .battery_life_progress {
-        width: 100%;
-        margin-bottom: 40rpx;
-        background: #FFFFFF;
-        border-radius: 40rpx;
-        padding: 6rpx;
-        overflow: hidden;
-
-        .is_progress {
-            width: 50%;
-            height: 100%;
-            padding: 16rpx 32rpx;
-            background: #0A59F7;
-            border-radius: 36rpx;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            color: #fff;
-            font-size: 36rpx;
-        }
-    }
-
-    .info-container {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: space-between;
-
-        .info-wrap {
-            width: 336rpx;
-            margin-bottom: 14rpx;
-            background: #FFFFFF;
-            border-radius: 40rpx;
-            padding: 32rpx 24rpx;
-
-            .label {
-                font-size: 28rpx;
-                color: #060809;
-                margin-bottom: 24rpx;
-            }
-
-            .value {
-                font-size: 48rpx;
-
-                .unit {
-                    margin-left: 8rpx;
-                    font-size: 28rpx;
-                }
-            }
-        }
-    }
-}
-
+	@import "@/libs/css/layout.scss";
+
+	.dashboard-page {
+		padding: 24rpx 32rpx 0;
+		min-height: calc(100vh - 100rpx);
+
+		.dashboard {
+			width: 554rpx;
+			height: 554rpx;
+			margin: 0 auto 58rpx;
+			background: url('https://qiniu.bms16.com/Ftwa7u9tJYw3XSLaXYvrDyGNRuD5');
+			background-size: 100%;
+			position: relative;
+
+			.shadow {
+				box-shadow: inset 0rpx 2rpx 6rpx 0rpx #fff;
+				width: 490rpx;
+				height: 502rpx;
+				position: relative;
+				top: 20rpx;
+				left: 50%;
+				transform: translateX(-50%);
+				border-radius: 50%;
+				background: conic-gradient(from -122deg, #0A59F7 0%, #20FFCA var(--progress), #F3F8FF 0% 245deg, transparent 245deg 360deg);
+				mask: radial-gradient(transparent 200rpx, #000 200rpx);
+				-webkit-mask: radial-gradient(transparent 210rpx, #000 213rpx);
+			}
+
+			.spe-wrap {
+				width: 218rpx;
+				height: 218rpx;
+				background: #0A59F7;
+				border-radius: 50%;
+				position: absolute;
+				left: 50%;
+				top: 50%;
+				transform: translate(-50%, -50%);
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				flex-direction: column;
+				color: #fff;
+
+				.spe-num {
+					font-family: Futura, Futura;
+					font-weight: bold;
+					font-size: 80rpx;
+					color: #FFFFFF;
+					line-height: 64rpx;
+					text-align: center;
+					font-style: normal;
+					margin-bottom: 16rpx;
+				}
+
+				.unit {
+					line-height: 28rpx;
+					font-style: italic;
+				}
+			}
+
+			.power-wrap {
+				width: 230rpx;
+				height: 104rpx;
+				background: #D6E7FF;
+				border-radius: 64rpx;
+				position: absolute;
+				bottom: 22rpx;
+				left: 50%;
+				transform: translateX(-50%);
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-family: Futura, Futura;
+				font-weight: bold;
+				font-size: 48rpx;
+				color: #060809;
+			}
+		}
+
+		.battery_life_progress {
+			width: 100%;
+			margin-bottom: 40rpx;
+			background: #FFFFFF;
+			border-radius: 40rpx;
+			padding: 6rpx;
+			overflow: hidden;
+
+			.is_progress {
+				width: 50%;
+				height: 100%;
+				padding: 16rpx 32rpx;
+				background: #0A59F7;
+				border-radius: 36rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				color: #fff;
+				font-size: 36rpx;
+			}
+		}
+
+		.info-container {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+
+			.info-wrap {
+				width: 336rpx;
+				margin-bottom: 14rpx;
+				background: #FFFFFF;
+				border-radius: 40rpx;
+				padding: 32rpx 24rpx;
+
+				.label {
+					font-size: 28rpx;
+					color: #060809;
+					margin-bottom: 24rpx;
+				}
+
+				.value {
+					font-size: 48rpx;
+
+					.unit {
+						margin-left: 8rpx;
+						font-size: 28rpx;
+					}
+				}
+			}
+		}
+	}
 </style>

pages/index/index.vue

@@ -33,8 +33,10 @@
 				</view>
 			</view>
 			<Control :contrilList="contrilList" />
-			<view class="flex-row flex-between map-card-view" >
-				<MapCard v-if="isHideInduction" latitude="23.099994" longitude="113.324004" :carAddress="carAddress" :carLocation="carLocation"/>
+			
+			
+			<view v-if="car_info.exchange_package_info.activity_time" class="flex-row flex-between map-card-view" >
+				<MapCard latitude="23.099994" longitude="113.324004" :carAddress="carAddress" :carLocation="carLocation"/>
 				<view class="card-right">
 					<view class="card-bg" @tap="navTravelingTrack">
 						<view class="flex-row flex-between card-top-title">
@@ -46,12 +48,15 @@
 						</view>
 						<view class="card-top-text">27.4<text class="font_24">km</text></view>
 					</view>
+					
 					<view class="card-bg">
 						<view class="flex-row card-top-title">
 							<img style="width: 36rpx;height: 36rpx;" src="https://qiniu.bms16.com/FtalApKa3STyruaBxxRB4O9hHXyE" alt="">
 							<text class="margin_l_8">{{$t("换电套餐")}}</text>
 						</view>
-						<view class=" card-top-text">30 <text class="font_24">{{$t("天")}}</text></view>
+						<view v-if="car_info.package_type == 1" class=" card-top-text">{{calculateRemainingDays(car_info.exchange_package_info.expire_time)}} <text class="font_24">{{$t("天")}}</text></view>
+						<view v-if="car_info.package_type == 2" class=" card-top-text">{{item.last_num}} <text class="font_24">{{$t("次")}}</text></view>
+						<view v-if="car_info.package_type == 3" class=" card-top-text">{{item.total_day}}{{$t("天")}}/{{item.last_num}} <text class="font_24">{{$t("次")}}</text></view>
 					</view>
 				</view>
 			</view>
@@ -72,10 +77,10 @@
 					</view>
 					<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
 				</view>
-				<view @tap="navToPage" class="flex-row config-car-view">
+				<view @click="srcFn(`/pages/deviceInfo/deviceInfo`)" class="flex-row config-car-view">
 					<view class="margin_r_20"><img class="icon_style_64" src="https://qiniu.bms16.com/FsAg6mHEBJfbtpgIHBrDdNiPo1iH" alt=""></view>
 					<view class="flex-row config-text-view">
-						<view class="flex-row font_w_600">{{$t("设备信息")}}</view>
+						<view  class="flex-row font_w_600">{{$t("设备信息")}}</view>
 						<view class="flex-row tip-text-config">{{$t("软件版本")}}</view>
 					</view>
 					<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
@@ -110,6 +115,7 @@
 	import permision from "@/js_sdk/wa-permission/permission.js"
 
 	export default {
+		
 		data() {
 			return {
 				contrilList:[],
@@ -129,8 +135,12 @@
 				model_list:[],
 				car_list:[],//用户车辆列表
 				car_sn:'',//当前车辆编号
-				car_info:{},
-				isHideInduction:true
+				isHideInduction:true,
+				car_info:{
+					exchange_package_info:{
+						activity_time:0
+					}
+				}
 			};
 		},
 		computed: {},
@@ -250,6 +260,11 @@
 					}
 				})
 			},
+			srcFn(url){
+				uni.navigateTo({
+					url: url
+				});
+			},
 			navToPage(e) {
 				const me = this
 				const url = e.currentTarget.dataset.url;

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

@@ -1,140 +1,173 @@
 <template>
-    <view class="container-view zx-page-linear">
-      <view class="user-switch-row">
-        <image
-          :src="QINIU_URL + 'FlL5BtEdMES2-mntjR9D3CX_LWYv'"
-          class="message"
-          @tap="routerLink({ url: '/pages/message/index' })"
-        />
-      </view>
-      <view class="user-info-wrap" @tap="loginHandle">
-        <image :src="userInfo.headimg || defaultAvatarUrl" class="head-img" />
-        <view class="user-name">{{ userInfo.nickname || '请点击登录' }}</view>
-        <view
-          v-if="userInfo.user_name"
-          class="e-mail"
-        >
-          {{ userInfo.user_name }}
-        </view>
-      </view>
-      <view class="common-tabs">
-        <view
-          v-for="(item, index) in commonTabs"
-          :key="index"
-          class="item"
-          @click="routerLink(item)"
-        >
-          <image :src="QINIU_URL + item.icon" class="icon" />
-          <view class="name">{{ item.name }}</view>
-        </view>
-      </view>
-      <view class="tabs-wrap">
-        <view
-          v-for="(item, index) in baseTabs"
-          :key="index"
-          class="tab-item"
-          @click="routerLink(item)"
-        >
-          <image :src="QINIU_URL + item.icon" class="icon" />
-          <view class="name">{{ item.name }}</view>
-        </view>
-      </view>
-      <Confirm
-        v-model="comboDialoginfo.showConfirm"
-        :dialog-info="comboDialoginfo"
-        @confirm="dialogConfirm"
-      />
-      <CustomTabbar curt-tab="my" />
-    </view>
-  </template>
-  
-  <script>
-  const storage = require('@/common/storage.js')
-  import Confirm from '@/component/comPopup/Confirm'
-  import { QINIU_URL, defaultHeadImg } from '@/common/constant'
-  import CustomTabbar from '@/component/customTabbar/index'
-  
-  var config = require('../../common/config_gyq.js');
-  var http = require('../../common/request.js');
-  
-  export default {
-    components: {
-      Confirm,
-      CustomTabbar
-    },
-    data() {
-      return {
-        QINIU_URL,
-        defaultAvatarUrl: defaultHeadImg,
-        comboDialoginfo: {
-          showConfirm: false,
-          title: '温馨提示',
-          opType: 'combo',
-          text: '您还未购买换电套餐，是否前往进行换电套餐？',
-          confirmBtnText: '前往购买',
-          showCancelButton: false
-        },
-        userInfo: {}
-      }
-    },
-    computed: {
-      commonTabs() {
-        return [
-          { name: `${this.$t('我的车辆')}`, url: '/pages/mileageStatistics/index', icon: 'Fp6G-Kzb-YUGkP2WR-kjTlIbbTj1' },
-          { name: `${this.$t('用车人')}`, url: '/pages/userManagement/userManagement', icon: 'FnxGW52BCkTkK9HxsTdVrghU7B4D' },
-          { name: `${this.$t('换电套餐')}`, jumpCheck: 'combo', url: '', icon: 'FsOsd1SxYDHDm00aiwrTib_k0Mbr' }
-        ]
-      },
-      baseTabs() {
-        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/feedback/index', icon: 'FnSjwcN7Mcpa-WA7Cqx2cGTvX2V1' },
-        //   { name: `${lang('关于我们')}`, url: '/pages/bluetoothUnlock/unlockSet', icon: 'Fmin1_DG6ZkENCdsI1qJZJpDNkhQ' },
-          { name: `${lang('客服中心')}`, url: '/pages/bluetoothUnlock/bluetoothPair', icon: 'FhA9TUbTMF0e7ma6NZXqPrkscN6l' },
-          { name: `${lang('设置')}`, url: '/pages/my/set', icon: 'Fu3f2iRi5BspRfbVLPcw8ryWc4lu' }
-        ]
-      }
-    },
-    onShow() {
-      const user_token = storage.getUserToken()
-      user_token && this.loadUserInfo()
-    },
-    methods: {
-      async loadUserInfo() {
-        const userInfo = storage.getUserInfoData()
-        this.setData({ userInfo })
-		let {data} = await http.postApi(config.API_USER_INFO,{})
-		if(data.code == 200){
-			this.userInfo = data.data.userInfo
-			storage.setUserInfoData(this.userInfo)
+	<view class="container-view zx-page-linear">
+		<view class="user-switch-row">
+			<image :src="QINIU_URL + 'FlL5BtEdMES2-mntjR9D3CX_LWYv'" class="message"
+				@tap="routerLink({ url: '/pages/message/index' })" />
+		</view>
+		<view class="user-info-wrap" @tap="loginHandle">
+			<image :src="userInfo.headimg || defaultAvatarUrl" class="head-img" />
+			<view class="user-name">{{ userInfo.nickname || '请点击登录' }}</view>
+			<view v-if="userInfo.user_name" class="e-mail">
+				{{ userInfo.user_name }}
+			</view>
+		</view>
+		<view v-if="car_info.car_sn" class="common-tabs">
+			<view class="item" @click="routerLink({url:'/pages/dashboard/dashboard'})">
+				<image :src="QINIU_URL + 'Fp6G-Kzb-YUGkP2WR-kjTlIbbTj1'" class="icon" />
+				<view class="name">{{ $t('我的车辆') }}</view>
+			</view>
+			<view class="item" @click="routerLink({url:'/pages/userManagement/userManagement'})">
+				<image :src="QINIU_URL + 'FnxGW52BCkTkK9HxsTdVrghU7B4D'" class="icon" />
+				<view class="name">{{ $t('用车人') }}</view>
+			</view>
+			<view v-if="car_info.sold_time" class="item" @click="routerLink({url:'',jumpCheck:'combo'})">
+				<image :src="QINIU_URL + 'FsOsd1SxYDHDm00aiwrTib_k0Mbr'" class="icon" />
+				<view class="name">{{ $t('换电套餐') }}</view>
+			</view>
+		</view>
+
+		<view class="tabs-wrap">
+			<view v-for="(item, index) in baseTabs" :key="index" class="tab-item" @click="routerLink(item)">
+				<image :src="QINIU_URL + item.icon" class="icon" />
+				<view class="name">{{ item.name }}</view>
+			</view>
+		</view>
+		<Confirm v-model="comboDialoginfo.showConfirm" :dialog-info="comboDialoginfo" @confirm="dialogConfirm" />
+		<CustomTabbar curt-tab="my" />
+	</view>
+</template>
+
+<script>
+	const storage = require('@/common/storage.js')
+	import Confirm from '@/component/comPopup/Confirm'
+	import {
+		QINIU_URL,
+		defaultHeadImg
+	} from '@/common/constant'
+	import CustomTabbar from '@/component/customTabbar/index'
+
+	var config = require('../../common/config_gyq.js');
+	var http = require('../../common/request.js');
+
+	export default {
+		components: {
+			Confirm,
+			CustomTabbar
+		},
+		data() {
+			return {
+				car_info: {},
+				QINIU_URL,
+				defaultAvatarUrl: defaultHeadImg,
+				comboDialoginfo: {
+					showConfirm: false,
+					title: '温馨提示',
+					opType: 'combo',
+					text: '您还未购买换电套餐，是否前往进行换电套餐？',
+					confirmBtnText: '前往购买',
+					showCancelButton: false
+				},
+				userInfo: {}
+			}
+		},
+		computed: {
+			// commonTabs() {
+			//   return [
+			//     { name: `${this.$t('我的车辆')}`, url: '/pages/dashboard/dashboard', icon: 'Fp6G-Kzb-YUGkP2WR-kjTlIbbTj1' },
+			//     { name: `${this.$t('用车人')}`, url: '/pages/userManagement/userManagement', icon: 'FnxGW52BCkTkK9HxsTdVrghU7B4D' },
+			//     { name: `${this.$t('换电套餐')}`, jumpCheck: 'combo', url: '', icon: 'FsOsd1SxYDHDm00aiwrTib_k0Mbr' }
+			//   ]
+			// },
+			baseTabs() {
+				const lang = t => this.$t(t)
+				return [{
+						name: `${lang('我的订单')}`,
+						url: '/pages/order/order',
+						icon: 'FkLJGLo1faYtJWhW4Q0gt5dphI7g'
+					},
+					{
+						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'
+					},
+					{
+						name: `${lang('设置')}`,
+						url: '/pages/my/set',
+						icon: 'Fu3f2iRi5BspRfbVLPcw8ryWc4lu'
+					}
+				]
+			}
+		},
+		onShow() {
+			this.car_info = uni.getStorageSync('car_info') || {};
+			const user_token = storage.getUserToken()
+			user_token && this.loadUserInfo()
+
+		},
+		methods: {
+			async loadUserInfo() {
+				const userInfo = storage.getUserInfoData()
+				this.setData({
+					userInfo
+				})
+				let {
+					data
+				} = await http.postApi(config.API_USER_INFO, {})
+				if (data.code == 200) {
+					this.userInfo = data.data.userInfo
+					storage.setUserInfoData(this.userInfo)
+				}
+			},
+			loginHandle() {
+				if (!userInfo.nickname) {
+					uni.navigateTo({
+						url: '/pages/loginRegister/login'
+					})
+				}
+			},
+			checkHandle_combo() {
+				if(this.car_info.exchange_package_info){
+					uni.navigateTo({
+						url: `/pages/package/package`
+					})
+					return
+				}
+				this.comboDialoginfo.showConfirm = true
+				
+			},
+			dialogConfirm(type) {
+				uni.navigateTo({
+					url: `/pages/batteryPackage/batteryPackage`
+				})
+			},
+			routerLink({
+				url,
+				jumpCheck
+			}) {
+				console.log(url);
+				if (jumpCheck) {
+					this[`checkHandle_${jumpCheck}`]()
+					return
+				}
+				uni.navigateTo({
+					url
+				})
+			}
 		}
-      },
-      loginHandle() {
-        uni.navigateTo({ url: '/pages/loginRegister/login' })
-      },
-      checkHandle_combo() {
-        this.comboDialoginfo.showConfirm = true
-      },
-      dialogConfirm(type) {
-		uni.navigateTo({
-			url:`/pages/batteryPackage/batteryPackage`
-		})
-      },
-      routerLink({ url, jumpCheck }) {
-		  console.log(url);
-        if (jumpCheck) {
-          this[`checkHandle_${jumpCheck}`]()
-          return
-        }
-        uni.navigateTo({ url })
-      }
-    }
-  }
-  </script>
-  
-  <style lang="scss" scoped>
-  @import './my.scss';
-  </style>
-  
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import './my.scss';
+</style>

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/order/order.vue

@@ -2,7 +2,7 @@
 	<view class="container-view">
 		<view class="order-type-view flex-row flex-between">
 			<view class="car-model-list flex-row">
-				<view class="car-model-text">小米Su5</view><img class="right-corner-icon"
+				<view class="car-model-text">{{car_info.car_name}}</view><img class="right-corner-icon"
 					src="https://qiniu.bms16.com/Fqs6TrEmcdT7QNEdKWs9Hir2cacO" alt="">
 			</view>
 			<view class="order-package-type-view flex-row">
@@ -18,7 +18,9 @@
 		<view v-for="(item, index) in hireOrderList" :key="index" @tap="loadToNav" :data-sub_sn="item.sub_sn"
 			class="order-card">
 			<view class="card-top flex-row">
-				<view v-if="selectOrderType == 1">{{ item.car_model }}</view>
+				<view v-if="selectOrderType == 1">{{ item.car_name }}</view>
+				
+				
 				<block v-if="selectOrderType == 0">
 					<view v-if="item.package_type == 1">
 						{{item.total_day}}天
@@ -30,7 +32,8 @@
 						{{item.total_day}}天{{item.num}}次
 					</view>
 				</block>
-				<view v-if="item.pay_status==2">
+				
+				<view v-if="item.pay_status==2 && selectOrderType == 1">
 					<view class="card card-k" v-if="item.order_status == 1">待取车</view>
 					<view class="card card-k" v-else-if="item.order_status == 2">待激活</view>
 					<view class="card card-b" v-else-if="item.order_status == 3">使用中</view>
@@ -41,9 +44,20 @@
 					<view class="card card-k" v-else-if="item.order_status == 8 ">订单已支付,已取消</view>
 					<view class="card card-k" v-else-if=" item.order_status == 9">订单未支付,已取消</view>
 				</view>
-				<view v-if="item.pay_status!=2">
+				
+				<view v-if="item.pay_status!=2 && selectOrderType == 1">
+					<view class="card card-k" v-if="item.pay_status == 0">待支付</view>
+					<view class="card card-k" v-else-if="item.pay_status == 1">支付中</view>
+					<view class="card card-r" v-else-if="item.pay_status == 3">支付失败</view>
+					<view class="card card-k" v-else-if="item.pay_status == 4">支付取消</view>
+					<view class="card card-b" v-else-if="item.pay_status == 5">线下待审核</view>
+					<view class="card card-k" v-else-if="item.pay_status == 6">线下审核拒绝</view>
+				</view>
+
+				<view v-if="selectOrderType == 0">
 					<view class="card card-k" v-if="item.pay_status == 0">待支付</view>
 					<view class="card card-k" v-else-if="item.pay_status == 1">支付中</view>
+					<view class="card card-k" v-else-if="item.pay_status == 2">支付成功</view>
 					<view class="card card-r" v-else-if="item.pay_status == 3">支付失败</view>
 					<view class="card card-k" v-else-if="item.pay_status == 4">支付取消</view>
 					<view class="card card-b" v-else-if="item.pay_status == 5">线下待审核</view>
@@ -57,13 +71,14 @@
 					<block v-if="selectOrderType == 1">
 						<view class="item-label-view flex-row">
 							<view class="item-label">下单时间</view>
-							<view class="item-value">{{ tools.formatTime(item.pay_time) }}</view>
+							<view class="item-value">{{ tools.formatTime(item.ctime) }}</view>
 						</view>
-						<view class="item-label-view flex-row">
+						<view v-if="item.hire_end_time" class="item-label-view flex-row">
 							<view class="item-label">有效期至</view>
 							<view class="item-value">{{ tools.formatTime(item.hire_end_time) }}</view>
 						</view>
-						<view class="item-label-view flex-row">
+
+						<view v-if="item.hire_duration_time" class="item-label-view flex-row">
 							<view class="item-label">有效时长</view>
 							<view class="item-value">
 								{{ item.hire_duration_time.day > 0 ? item.hire_duration_time.day : '' }}<text
@@ -71,7 +86,6 @@
 									item.hire_duration_time.hour : '' }}<text v-if="item.hire_duration_time.hour > 0">小时</text>{{ item.hire_duration_time.minute > 0 ?
 									item.hire_duration_time.minute : '' }}<text v-if="item.hire_duration_time.minute > 0">分</text>
 							</view>
-							
 						</view>
 					</block>
 					<block v-if="selectOrderType == 0">
@@ -83,10 +97,11 @@
 							<view class="item-label">有效期至</view>
 							<view class="item-value">{{ tools.formatTime(item.expire_time) }}</view>
 						</view>
-						<view  v-if="item.expire_time" class="item-label-view flex-row">
+						<view v-if="item.package_type != 2 && item.expire_time" class="item-label-view flex-row">
 							<view class="item-label">有效时长</view>
 							<view class="item-value">
-								{{validDurationFn(item.activity_time,item.expire_time)}}
+								{{calculateRemainingDays(item.expire_time)}}<text
+									style="color: #9FA7B7;">/{{item.total_day}}天</text>
 							</view>
 						</view>
 						<view v-if="item.package_type == 1" class="item-label-view flex-row">
@@ -101,23 +116,25 @@
 							<view class="item-label">免费换电数</view>
 							<view class="item-value">{{item.total_day}}天/{{item.last_num}}次</view>
 						</view>
-						
+
 					</block>
+
 					<view v-if="selectOrderType==1" class="item-label-view flex-row">
 						<view class="item-label">订单类型</view>
 						<view class="item-value">{{ item.order_type==3?'购车':'租车' }}</view>
 					</view>
-					
+
 					<view v-if="selectOrderType==0" class="flex-row button-config-view">
 						<view v-if="item.order_refund_status == 1" class="return-money">申请中</view>
 						<view v-if="item.order_refund_status == 2" class="return-money">审核失败</view>
 						<view v-if="item.order_refund_status == 3" class="return-money">退款失败</view>
 						<view v-if="item.order_refund_status == 4" class="return-money">已退款</view>
-						<view class="item-value">套餐金额$ <text class="money-style">{{(item.package_money / 100).toFixed(2)}}</text></view>
+						<view class="item-value">套餐金额$ <text
+								class="money-style">{{(item.package_money / 100).toFixed(2)}}</text></view>
 					</view>
 					<view v-if="selectOrderType==1" class="flex-row button-config-view">
-						<view class="order-money">订单金额 $ 5.0</view>
-						<view @tap="activateCar" :data-sub_sn="item.sub_sn" class="activation-btn">激活车辆</view>
+						<view class="order-money">订单金额 $ {{(item.money / 100).toFixed(2)}}</view>
+						<view v-if="item.order_status == 2" class="activation-btn">激活车辆</view>
 					</view>
 				</view>
 			</view>
@@ -134,10 +151,15 @@
 	var http = require('../../common/http.js');
 	var request = require('../../common/request');
 	var storage = require('../../common/storage.js');
-	import { getRemainingTime } from '../../utils/util.js';
+	const dayjs = require('dayjs');
+	import {
+		getRemainingTime
+	} from '../../utils/util.js';
 	export default {
 		data() {
 			return {
+				is_next:0,
+				car_info: {},
 				selectOrderType: 1,
 				orderTypes: [{
 						value: 0,
@@ -168,6 +190,7 @@
 		 */
 		,
 		onLoad: function(options) {
+			this.car_info = uni.getStorageSync('car_info') || {};
 			const locationStr = uni.getStorageSync('user_current_location');
 			if (locationStr) {
 				this.myLocation = locationStr;
@@ -194,32 +217,51 @@
 		 * 页面上拉触底事件的处理函数
 		 */
 		onReachBottom: function() {
+			if(!this.is_next) return
 			this.page++
-			this.bindHireOrderList()
+			if (this.selectOrderType == 0) {
+				this.bindExchangeOrderFn()
+			} else if (this.selectOrderType == 1) {
+				this.bindHireOrderList()
+			}
 		},
 		/**
 		 * 页面下拉触底事件的处理函数
 		 */
 		onPullDownRefresh() {
 			this.page = 1
-			this.bindHireOrderList()
+			if (this.selectOrderType == 0) {
+				this.bindExchangeOrderFn()
+			} else if (this.selectOrderType == 1) {
+				this.bindHireOrderList()
+			}
 		},
 		methods: {
-			
+			calculateRemainingDays(expirationDate) {
+				// 获取当前时间
+				const now = dayjs();
+				// 解析到期时间
+				const endDate = dayjs(expirationDate);
+				// 计算剩余天数
+				const remainingDays = endDate.diff(now, 'day');
+				return remainingDays || 0;
+			},
 			//dayjs
-			validDurationFn(start,end){
-				return getRemainingTime(start,end)
+			validDurationFn(start, end) {
+				return getRemainingTime(start, end)
 			},
 			async bindExchangeOrderFn() {
-				
 				let {
 					data
 				} = await request.postApi(config_gyq.API_FLK_EXCHANGE_PACKAGE_ORDER_LIST, {
+					pay_status: -1,
+					car_sn: this.car_info.car_sn,
 					page: this.page,
 					limit: this.limit,
 				})
 				if (data.code == 200) {
 					this.hireOrderList.push.apply(this.hireOrderList, data.data.list)
+					this.is_next = data.data.is_next
 				} else {
 					common.simpleToast(resp.data.msg)
 				}
@@ -235,6 +277,7 @@
 				}, (resp) => {
 					if (resp.data.code === 200) {
 						me.hireOrderList.push.apply(me.hireOrderList, resp.data.data.list)
+						me.is_next = resp.data.data.is_next
 						if (me.hireOrderList.length > 0) {
 							me.sort_time = me.hireOrderList[me.hireOrderList.length - 1].ctime;
 							me.sort_num = me.hireOrderList[me.hireOrderList.length - 1].sort_num;
@@ -276,7 +319,7 @@
 			},
 
 			loadToNav(e) {
-				if(this.selectOrderType == 0){
+				if (this.selectOrderType == 0) {
 					return
 				}
 				const sub_sn = e.currentTarget.dataset.sub_sn
@@ -288,10 +331,19 @@
 					complete: function(res) {},
 				})
 			},
-			activateCar(e) {
-				const sub_sn = e.currentTarget.dataset.sub_sn
+			async activateCar(e) {
+				let car_sn = e.currentTarget.dataset.car_sn || ''
+				let model_id = e.currentTarget.dataset.model_id || ''
+				if (!car_sn) {
+					let res = await uni.scanCode({
+						onlyFromCamera: true,
+						scanType: [],
+					});
+					if (res[0]) return
+					car_sn = res[1].result
+				}
 				uni.navigateTo({
-					url: '/pages/activation/activation?sub_sn=' + sub_sn
+					url: `/pages/activation/activation?model_id=${this.orderInfo.model_id}&sub_sn=${this.sub_sn}&car_sn=${car_sn}`
 				})
 				// uni.scanCode({
 				// 			onlyFromCamera: true,

pages/orderStatus/orderStatus.css

@@ -446,17 +446,18 @@
 
 .cancel {
 	color: #828DA2;
-	font-size: 32rpx;
+	font-size: 28rpx;
 	margin-right: 20rpx;
 }
 
 .deposit-btn {
 	color: #060809;
-	font-size: 32rpx;
+	font-size: 28rpx;
 	background-color: #EBECEC;
-	height: 80rpx;
-	line-height: 80rpx;
+	height: 60rpx;
+	line-height: 60rpx;
 	border-radius: 40rpx;
+	padding: 0 20rpx;
 	/* padding-top: 24rpx;
 	padding-bottom: 24rpx; */
 	margin-right: 20rpx;
@@ -481,10 +482,11 @@
 
 .sesame-btn {
 	color: #ffffff;
-	font-size: 32rpx;
-	height: 80rpx;
-	line-height: 80rpx;
+	font-size: 28rpx;
+	height: 60rpx;
+	line-height: 60rpx;
 	background-color: #060809;
+	padding: 0 20rpx;
 	border-radius: 40rpx;
 	/* padding-top: 24rpx;
 	padding-bottom: 24rpx; */

pages/orderStatus/orderStatus.vue

@@ -3,46 +3,71 @@
 		<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)+'送车上门')}}
+				<view v-if="orderInfo.order_status == 1 && orderInfo.hire_begin_time">
+					{{('请于'+orderInfo.hire_begin_time+'到门店取车')}}
+					
 				</view>
-				<view v-else-if="orderInfo.order_status == 2">请上传车辆图片激活车辆</view>
-				<view v-else-if="orderInfo.order_status == 3" class="blue-text">使用中...</view>
-				<view v-else-if="orderInfo.order_status == 4" class="red-text">已逾期</view>
-				<view v-else-if="orderInfo.order_status == 5">待门店确认</view>
-				<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 v-if="orderInfo.order_status == 1 && !orderInfo.hire_begin_time">
+					待取车
 				</view>
+				<view v-if="orderInfo.order_status == 2">请上传车辆图片激活车辆</view>
+				<block v-if="orderInfo.pay_status == 2">
+					<view v-if="orderInfo.order_status == 3" class="blue-text">使用中...</view>
+					<view v-if="orderInfo.order_status == 4" class="red-text">已逾期</view>
+					<view v-if="orderInfo.order_status == 5">待门店确认</view>
+					<view v-if="orderInfo.order_status == 6">还车中,等待门店取车</view>
+					<view v-if="orderInfo.order_status == 7">已完成</view>
+				</block>
+				<view v-if="orderInfo.order_status == 8||orderInfo.order_status == 9">已取消</view>
+			</view>
+
 			<view class="time-money">
-				<view class="flex-row flex-between">
+				<view v-if="orderInfo.order_type != 3" class="flex-row flex-between">
 					<view class="money-item">
 						<view :class="orderInfo.order_status == 4?'red-status':''">
 							{{orderInfo.hire_duration_time.day > 0 ? orderInfo.hire_duration_time.day :'' }}<text
-							v-if="orderInfo.hire_duration_time.day>0">日</text>{{orderInfo.hire_duration_time.hour > 0 ? orderInfo.hire_duration_time.hour :'' }}<text
-							v-if="orderInfo.hire_duration_time.hour>0">小时</text>{{orderInfo.hire_duration_time.minute > 0 ? orderInfo.hire_duration_time.minute :'' }}<text
-							v-if="orderInfo.hire_duration_time.minute>0">分</text>
+								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':''">
+							{{tools.toFix(orderInfo.hire_money / 100)}}<text>元</text>
+						</view>
+						<view>订单金额</view>
+					</view>
+					<view @tap="bindExpanded">
+						<text>{{isExpanded?'收起':'展开'}}</text>
+						<img
+							:src="isExpanded?'https://qiniu.bms16.com/FvRah8ro91B_TUVEmInBq6n69W2f':'https://qiniu.bms16.com/FtbxPP0aXYG8hyJTEJfNTXa_Puuc'" />
+					</view>
+				</view>
+
+
+				<view v-if="orderInfo.order_type == 3" class="flex-row flex-between">
+					<view class="money-item">
+						<view></view>
+						<view>租借周期：购买</view>
 					</view>
 					<view class="money-item">
 						<view :class="orderInfo.order_status == 4?'red-status':''">
-							{{orderInfo.order_status == 4?tools.toFix(over_fee/100):tools.toFix(orderInfo.hire_money / 100)}}<text>元</text>
+							{{orderInfo.order_status == 4?tools.toFix(over_fee/100):tools.toFix(orderInfo.money / 100)}}<text>元</text>
 						</view>
-						<view v-if="orderInfo.order_status == 4" class="red-status">逾期金额</view>
-						<view v-else>订单金额</view>
+						<view>订单金额</view>
 					</view>
 					<view @tap="bindExpanded">
 						<text>{{isExpanded?'收起':'展开'}}</text>
@@ -50,55 +75,62 @@
 							:src="isExpanded?'https://qiniu.bms16.com/FvRah8ro91B_TUVEmInBq6n69W2f':'https://qiniu.bms16.com/FtbxPP0aXYG8hyJTEJfNTXa_Puuc'" />
 					</view>
 				</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 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 v-if="orderInfo.order_type != 3" 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  v-if="orderInfo.order_type != 3" 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="">
-							<text>10:00-22:00</text>
+							<img v-if="orderInfo.work_begin_time && orderInfo.work_end_time"
+								style="width: 40rpx;height: 40rpx;"
+								src="https://qiniu.bms16.com/Fp-G1pdXxnTV-G3qFbgS453AuqcU" alt="">
+							<text
+								v-if="orderInfo.work_begin_time && orderInfo.work_end_time">{{orderInfo.work_begin_time}}-{{orderInfo.work_end_time}}</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 +139,17 @@
 			<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="">
+				<!-- //配套服务 -->
+				<view class="">
+					asd
+				</view>
+				<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,33 +161,35 @@
 					</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> -->
+					共{{hireDurationUnitsFn(orderInfo.total_hire_time,orderInfo.hire_duration_unit)}}
 				</view>
 			</view>
 			<view class="return-bottom flex-row">
-				<view>3.8-20:00</view>
+				<view>{{orderInfo.hire_begin_time}}</view>
 				<img src="https://qiniu.bms16.com/FoXmBbj7YGWmjyeuVEY35nzieqnx" />
-				<view>3.8-20:00</view>
+				<view>{{orderInfo.hire_end_time}}</view>
 				<!-- <view>{{tools.formatTimeDate(orderInfo.hire_begin_time)}}</view>
 				<img src="https://qiniu.bms16.com/FoXmBbj7YGWmjyeuVEY35nzieqnx" />
 				<view>{{tools.formatTimeDate(orderInfo.hire_end_time)}}</view> -->
 			</view>
 		</view>
+
+
 		<view v-if="orderInfo.order_status==2||orderInfo.order_status==3||orderInfo.order_status==4"
 			class="overdue-info">
 			<view>逾期规则</view>
@@ -168,20 +207,33 @@
 			</view>
 		</view>
 		<!-- 考虑为空的情况 -->
+
 		<view class="payment-info flex-row flex-between">
+			<view v-if="(orderInfo.order_status == 1 || orderInfo.pay_status == 5) && orderInfo.pay_type != 1" class="cancel" @tap="clickCancel">结束订单
+			</view>
 			<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="callStorePhone" class="deposit-btn ">联系门店</view>
+				<view @tap="navToScan" class="sesame-btn ">扫码绑定</view>
+			</view>
+
+			<view v-if="orderInfo.order_status == 2" class="flex-row"> <!-- 待取车 -->
+				<view @tap="callStorePhone" class="deposit-btn ">联系门店</view>
+				<view @tap="navToScan" class="sesame-btn ">去上传</view>
 			</view>
-			<view v-else-if="orderInfo.order_status == 3||orderInfo.order_status == 4" class="flex-row"> <!-- 使用中 -->
+
+			<view v-else-if="(orderInfo.order_status == 3||orderInfo.order_status == 4) && orderInfo.order_type != 3" 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 @tap="tapReturnCar" class="deposit-btn">到店还车</view>
+				<view @tap="bindRenew" class="sesame-btn">续租</view>
 			</view>
-			<view v-else-if="orderInfo.order_status == 5||orderInfo.order_status == 6" @tap="callStorePhone" class="pay-btn">
+			<view 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 v-if="orderInfo.order_type == 3 && (orderInfo.order_status == 3||orderInfo.order_status == 4)" @tap="callStorePhone" class="pay-btn">联系门店</view>
+			
 		</view>
 
 		<view v-if="isShowCancel" class="cancel-b">
@@ -190,52 +242,74 @@
 					<view>选择取消原因</view>
 					<view @tap="isShowCancel = false" style="font-size: 60rpx;">×</view>
 				</view>
-				<view @tap="bindCancel" data-status="1" class="cancel-item flex-row flex-between">
+				<view @click="reason = '行程变更无需用车'"  class="cancel-item flex-row flex-between">
 					<view>行程变更无需用车</view>
 					<img
-						:src="reason == 1?'https://qiniu.bms16.com/FhWimtmWybKlYMB6mgIReVWArbfq':'https://qiniu.bms16.com/Fh0JH6_QbiXYmVy7FNYnDkVIGvLC'" />
+						:src="reason == '行程变更无需用车'?'https://qiniu.bms16.com/FhWimtmWybKlYMB6mgIReVWArbfq':'https://qiniu.bms16.com/Fh0JH6_QbiXYmVy7FNYnDkVIGvLC'" />
 				</view>
-				<view @tap="bindCancel" data-status="2" class="cancel-item flex-row flex-between">
+				<view @click="reason = '修改订单信息'"  class="cancel-item flex-row flex-between">
 					<view>修改订单信息</view>
 					<img
-						:src="reason == 2?'https://qiniu.bms16.com/FhWimtmWybKlYMB6mgIReVWArbfq':'https://qiniu.bms16.com/Fh0JH6_QbiXYmVy7FNYnDkVIGvLC'" />
+						:src="reason == '修改订单信息'?'https://qiniu.bms16.com/FhWimtmWybKlYMB6mgIReVWArbfq':'https://qiniu.bms16.com/Fh0JH6_QbiXYmVy7FNYnDkVIGvLC'" />
 				</view>
-				<view @tap="bindCancel" data-status="3" class="cancel-item flex-row flex-between">
+				<view @click="reason = '不想要了'"  class="cancel-item flex-row flex-between">
 					<view>不想要了</view>
 					<img
-						:src="reason == 3?'https://qiniu.bms16.com/FhWimtmWybKlYMB6mgIReVWArbfq':'https://qiniu.bms16.com/Fh0JH6_QbiXYmVy7FNYnDkVIGvLC'" />
+						:src="reason == '不想要了'?'https://qiniu.bms16.com/FhWimtmWybKlYMB6mgIReVWArbfq':'https://qiniu.bms16.com/Fh0JH6_QbiXYmVy7FNYnDkVIGvLC'" />
 				</view>
+				<view @click="bindCancel" class="cancel_btn">确认取消</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" />
+
+		<carPlan @payToOrder='payReturn' v-if="showCarPlan" @changeSelectType="changeSelectType"
+			@closeShowMore="showCarPlan = false" :params="params" :selectType="selectType" />
+
+		<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>
 <script module="tools" lang="sjs" src="@/pages/common/wxs/tools.sjs"></script>
 <script>
+	var config_gyq = require('../../common/config_gyq.js');
 	var config = require('../../common/config.js');
+	var request = require('../../common/request');
 	var common = require('../../common/common.js');
 	var http = require('../../common/http.js');
 	var storage = require('../../common/storage.js');
 	var user = require('../../common/user.js');
+	// 
+	import {
+		getRemainingTime
+	} from '@/utils/util';
 	var appWhiteListFilter = require('../../common/appWhiteListFilter.js');
 	import allPrice from '@/component/allPrice/allPrice';
 	import ReturnCar from '@/component/returnCar/returnCar';
+	import carPlan from '@/component/carPlan/carPlan';
 	import PayTypeModel from '@/component/payTypeModel/payTypeModel';
+	import dayjs from 'dayjs'
+	import duration from 'dayjs/plugin/duration'
+	dayjs.extend(duration);
 	export default {
 		components: {
 			allPrice,
 			ReturnCar,
-			PayTypeModel
+			PayTypeModel,
+			carPlan
 		},
 		data() {
 			return {
+				select_type: '',
+				car_detail: {},
+				showCarPlan: false,
 				return_imgs: {},
 				charge_standard: {},
 				isShowCancel: false,
 				order_sn: '',
-				reason: 0,
+				reason: '行程变更无需用车',
 				orderInfo: {},
 				shop_image: [],
 				isExpanded: false,
@@ -244,15 +318,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,33 +337,160 @@
 		/**
 		 * 生命周期函数--监听页面显示
 		 */
-		onShow: function() {
-		},
-			
-		onUnload: function () {
-		},
-		
+		onShow: function() {},
+
+		onUnload: function() {},
+
 		computed: {},
 
 		methods: {
-			bindOrderInfo() {
+
+			async loadCarInfo(model_id) {
+				const me = this
+				http.postApi(config.API_FLK_INDEX_CAR_MODEL_DETAIL, {
+					model_id,
+				}, (resp) => {
+					if (resp.data.code === 200) {
+						const pData = {
+							...this.car_detail,
+							price: this.price
+						}
+						me.setData({
+							car_detail: resp.data.data,
+							params: {
+								order_sn: this.orderInfo.order_sn,
+								...resp.data.data,
+								price: (resp.data.data.rental_setting[0].hire_price / 100).toFixed(2)
+							}
+						})
+						console.log('车辆信息')
+						console.log(resp.data.data)
+					} else {
+						common.simpleToast(resp.data.msg);
+					}
+				})
+			},
+
+			changeSelectType(select_type, price) {
+				this.setData({
+					selectType: select_type,
+					price: (price / 100).toFixed(2)
+				})
+			},
+			async navToScan() {
+				let car_sn = this.orderInfo.car_sn || ''
+				if (!car_sn) {
+					let res = await uni.scanCode({
+						onlyFromCamera: true,
+						scanType: [],
+					});
+					if (res[0]) return
+					car_sn = res[1].result
+				}
+				uni.navigateTo({
+					url: `/pages/activation/activation?model_id=${this.orderInfo.model_id}&sub_sn=${this.sub_sn}&car_sn=${car_sn}`
+				})
+				// let {data} = await request.postApi(config.API_CAR_ASSIGNMENT,{sub_sn:this.sub_sn,car_sn:res[1].result})
+			},
+
+			navToCabinet() {
+				const {
+					latitude,
+					longitude,
+					cityname,
+					address,
+					shop_name
+				} = this.orderInfo
+				uni.openLocation({
+					latitude: latitude - 0,
+					longitude: longitude - 0,
+					scale: 15,
+					name: shop_name,
+					address: address,
+					success: function(res) {}
+				});
+			},
+
+			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 '季'
+				}
+			},
+			hireDurationUnitsFn(time, type) {
+
+				if (type == 1) {
+					return Math.ceil(time / 60 / 60 / 24) + '天'
+				} else if (type == 2) {
+					return Math.ceil(time / 60 / 60 / 24 / 30) + '月'
+				} else if (type == 3) {
+					return Math.ceil(time / 60 / 60 / 24 / 30 / 365) + '年'
+				} else if (type == 4) {
+					return Math.ceil(time / 60 / 60) + '小时'
+				} else if (type == 5) {
+					return Math.ceil(time / 60) + '分钟'
+				} else if (type == 6) {
+					return Math.ceil(time / 60 / 60 / 24 / 7) + '周'
+				} else if (type == 7) {
+					return Math.ceil(time / 60 / 60 / 24 / 30 / 3) + '季'
+				}
+			},
+
+			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
+						// 
+						if (resp.data.data.order_info.model_id) {
+							me.loadCarInfo(resp.data.data.order_info.model_id)
+						}
+						let distance = common.getFlatternDistance(res[1].longitude, res[1].latitude, me
+							.orderInfo.longitude, me.orderInfo.latitude)
+						resp.data.data.order_info.distance = distance
 						// 取还时间展示
-						me.orderInfo.hire_return_time = common.getTimeToDay(Math.ceil(me.orderInfo.hire_end_time - me.orderInfo.hire_begin_time)/60)
+						// me.orderInfo.hire_return_time = common.getTimeToDay(Math.ceil(me.orderInfo
+						// 	.hire_end_time - me.orderInfo.hire_begin_time) / 60)
+
+						me.orderInfo.hire_return_time = getRemainingTime(me.orderInfo.hire_begin_time, me
+							.orderInfo.hire_end_time)
+						me.orderInfo.hire_begin_time = me.orderInfo.hire_begin_time ? dayjs(me.orderInfo
+							.hire_begin_time * 1000).format(
+							'YY-MM-DD') : 0
+						me.orderInfo.hire_end_time = me.orderInfo.hire_end_time ? dayjs(me.orderInfo
+							.hire_end_time * 1000).format(
+							'YY-MM-DD') : 0
+
 						// 剩余租期判断
-						if((me.orderInfo.hire_type==2&&me.orderInfo.order_status==2)||me.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{
+						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 {
 						// 默认返回上一个页面再提示报错
@@ -300,7 +501,7 @@
 					}
 				})
 			},
-			navStoreBtn(){
+			navStoreBtn() {
 				const {
 					latitude,
 					longitude,
@@ -316,72 +517,91 @@
 					success: function(res) {}
 				});
 			},
-			tapReturnCar(){
+			tapReturnCar() {
 				this.setData({
-					isShowReturnCar:true
+					isShowReturnCar: true
 				})
 			},
-			immediatelyReturnBtn(){
+			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){
+				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
+						totalPrice: overdue_money,
+						isShowToBuy: true
 					})
-				}else{
+				} else {
 					//提交还车图片
 					uni.navigateTo({
-						url: '/pages/activation/activation?isReturnCar=' + true +'&car_sn='+car_sn +'&shop_id=' + shop_id,
+						url: `/pages/activation/activation?isReturnCar=true,model_id=${this.orderInfo.model_id}&sub_sn=${this.sub_sn}&car_sn=${this.orderInfo.car_sn}`
 					});
 				}
-				
+
 			},
-			callStorePhone(){
-				const phone =this.orderInfo.link_phone
-				common.callPhone(this,phone)
+			callStorePhone() {
+				const phone = this.orderInfo.link_phone
+				common.callPhone(phone)
 			},
-			clickCancel() {
+			 async clickCancel() {
+				this.isShowCancel = true
+			},
+
+			async bindCancel() {
+				// 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);
 				const me = this
-				uni.showModal({
+				let res = await uni.showModal({
 					title: '取消订单',
 					content: '您是否需要取消该订单',
 					confirmText: '是',
 					confirmColor: '#0074FF',
 					cancelText: '否',
 					cancelColor: '#191D23',
-					success: function(res) {
-						if (res.confirm) {
-							me.isShowCancel = true
-						}
-					}
 				});
-			},
-
-			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
+				if (res[1].confirm) {
+					let {
+						data
+					} = await request.postApi(config.API_DAYHIRE_HIRE_CANCEL_ORDER, {
+						sub_sn: this.sub_sn,
+						remark:this.reason
 					})
-				}, 600);
+					if (data.code == 200) {
+						common.simpleToast(data.msg)
+						this.bindOrderInfo()
+					} else {
+						common.simpleToast(data.msg)
+					}
+				}
 			},
 
 			bindToNav() {
@@ -431,16 +651,18 @@
 			},
 
 			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) {}
-				});
+				this.showCarPlan = true
+				// 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) {}
+				// });
 			},
 
 			bindBattery() {
@@ -460,7 +682,8 @@
 			navToInput() {
 				this.isReturnHome = false
 				uni.navigateTo({
-					url: '/pages/inputLicensePlate/inputLicensePlate?order_sn=' + this.orderInfo.order_sn,
+					url: '/pages/inputLicensePlate/inputLicensePlate?order_sn=' + this.orderInfo
+						.order_sn,
 					success: function(res) {},
 					fail: function(res) {},
 					complete: function(res) {}
@@ -471,36 +694,38 @@
 			navToActive() {
 				this.isReturnHome = false
 				const me = this
-				if (this.orderInfo.hire_type == 1) {  // 预约
-					if(me.isScanCondeRentalCar) {
+				if (this.orderInfo.hire_type == 1) { // 预约
+					if (me.isScanCondeRentalCar) {
 						uni.scanCode({
 							onlyFromCamera: true,
-							success: function (res) {
+							success: function(res) {
 								me.loadScanCode(res.result)
 							},
-							fail: function (res) { },
-							complete: function (res) { },
+							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,
+							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 {  // 非预约
+				} else { // 非预约
 					const isJumpReturn = false
 					uni.navigateTo({
-						url: '/pages/activation/activation?order_sn=' + this.order_sn + '&plate_number=' + this
-							.orderInfo.license_plate_number +'&isJumpReturn=' + isJumpReturn,
+						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,
@@ -512,7 +737,8 @@
 					uni.hideLoading()
 					if (resp.data.code === 200) {
 						const timestamp = Date.now(); // 获取当前时间戳（毫秒）  
-						const isOffline = (Math.floor(timestamp / 1000) - resp.data.data.last_comm_time) > 1800
+						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('此车辆已离线，请选择其他车辆')
@@ -543,26 +769,29 @@
 									common.simpleToast('此车辆正在被使用')
 								}
 							} else {
-								if (me.order_sn&&me.order_sn != '') {
+								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 +
+											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(
+												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,
+											encodeURIComponent(carInfo) + '&plate_number=' +
+											this.plate_number,
 										fail() {}
 									})
 								}
@@ -637,7 +866,8 @@
 					// 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
+					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('.'); //将价格拆分为整数部分和小数部分
@@ -698,11 +928,11 @@
 			loadEnd() {
 				this.bindOrderInfo()
 			},
-			navToExchange(){
+			navToExchange() {
 				console.log('跳转换电记录');
 				uni.navigateTo({
-					url: '/pages/exchangeRecord/exchangeRecord'+
-					'?order_sn=' + this.orderInfo.order_sn
+					url: '/pages/exchangeRecord/exchangeRecord' +
+						'?order_sn=' + this.orderInfo.order_sn
 				})
 			}
 		}
@@ -711,4 +941,17 @@
 
 <style>
 	@import './orderStatus.css';
+	.cancel_btn{
+		width: 702rpx;
+		height: 80rpx;
+		background: #060809;
+		border-radius: 40rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #FFFFFF;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 </style>

pages/package/package.vue

@@ -9,15 +9,15 @@
 			<view class="package-card flex-row flex-between">
 				<view class="flex-row flex-column" style="align-items: flex-start;">
 					<view class="left-first flex-row">
-						<view>小米 Su7</view>
+						<view>{{car_info.car_name}}</view>
 						<img class="left-img" src="https://qiniu.bms16.com/Fpf25Lkkrx05pvLw08mksVQKAQWf" />
 					</view>
 					<view class="left-second flex-row">
 						<view style="margin-right: 32rpx;">适用电池:<text>48v20Ah</text></view>
-						<view>押金:<text>$5.0</text></view>
+						<!-- <view>押金:<text>$5.0</text></view> -->
 					</view>
 					<view class="left-third">
-						<view>卡号:<text>2024110202578</text></view>
+						<view>车辆编号:<text>{{car_info.car_sn}}</text></view>
 					</view>
 				</view>
 				<img class="card-right" src="https://qiniu.bms16.com/FuOJQxzypa-NginyHGdsWlzwnB8z" />
@@ -40,40 +40,68 @@
 				</view>
 				<img class="card-right" src="https://qiniu.bms16.com/FuOJQxzypa-NginyHGdsWlzwnB8z" />
 			</view> -->
-			<view class="package-view" v-for="item in packageList">
+			<view class="package-view" v-for="item in hireOrderList">
 				<view class="top-view flex-row flex-between">
-					<view class="top-title">{{item.total_duration}}<text> 天 </text>{{item.total_times}}<text> 次 </text></view>
-					<view v-if="item.status==1" class="card-text card-b">生效中</view>
-					<view v-if="item.status==2" class="card-text card-o">待生效</view>
+					<view class="top-title" v-if="item.package_type == 1">
+						{{item.total_day}}天
+					</view>
+					<view class="top-title" v-if="item.package_type == 2">
+						{{item.num}}次
+					</view>
+					<view class="top-title" v-if="item.package_type == 3">
+						{{item.total_day}}天{{item.num}}次
+					</view>
+					<view v-if="item.package_status==1" class="card-text card-b">生效中</view>
+					<view v-if="item.package_status==0" class="card-text card-o">待生效</view>
+					<view v-if="item.package_status==2" class="card-text card-o">已结束</view>
 				</view>
 				<view class="package-item" style="margin-bottom: 32rpx;">
 					<view class="item-title">有效期至</view>
-					<view class="item-info">{{item.ctime}}</view>
+					<view class="item-info">{{tools.formatTime(item.expire_time)}}</view>
 				</view>
-				<view class="package-item" style="margin-bottom: 32rpx;">
+				<view v-if="item.package_type != 2" class="package-item" style="margin-bottom: 32rpx;">
 					<view class="item-title">有效时长</view>
-					<view class="item-info">{{item.efficient_day}}<text>/{{item.total_duration}}天</text></view>
+					<view class="item-info">
+						{{calculateRemainingDays(item.expire_time)}}<text style="color: #9FA7B7;">/{{item.total_day}}天</text>
+					</view>
 				</view>
-				<view class="package-item">
+				<view v-if="item.package_type == 1" class="package-item">
 					<view class="item-title">免费换电数</view>
-					<view class="item-info">{{item.change_rate}}<text>/{{item.total_times}}次</text></view>
+					<view style="color: #060809;" class="item-info">{{item.last_num}}次</view>
+				</view>
+				<view v-if="item.package_type == 2" class="package-item">
+					<view class="item-title">免费换电数</view>
+					<view class="item-info">{{item.last_num}} <text style="color: #9FA7B7;">/{{item.num}}次</text></view>
+				</view>
+				<view v-if="item.package_type == 3" class="package-item">
+					<view class="item-title">免费换电数</view>
+					<view style="color: #060809;" class="item-info">{{item.total_day}}天/{{item.last_num}}次</view>
 				</view>
 			</view>
 		</view>
+		<view style="height: 200rpx;"></view>
+		<view @click='srcFn' class="packageBtn">前往购买套餐</view>
 	</view>
 </template>
-
+<script module="tools" lang="wxs" src="@/pages/common/wxs/tools.wxs"></script>
+	<script module="tools" lang="sjs" src="@/pages/common/wxs/tools.sjs"></script>
 <script>
-	var config = require('../../common/config.js');
+	var config = require('../../common/config_gyq.js');
 	var common = require('../../common/common.js');
-	var http = require('../../common/http.js');
+	var http = require('../../common/request.js');
 	var storage = require('../../common/storage.js');
+	const dayjs = require('dayjs');
+	import { getRemainingTime } from '../../utils/util.js';
 	export default {
 		components: {
 			
 		},
 		data() {
 			return {
+				hireOrderList:[],
+				page: 1,
+				limit: 10,
+				car_info:{},
 				statusBarHeight: 0,
 				navabarHeight: 0,
 				packageList: [
@@ -86,6 +114,7 @@
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad: function(options) {
+			this.car_info = uni.getStorageSync('car_info') || {};
 			const clientRect = uni.getMenuButtonBoundingClientRect()
 			const sysinfo = uni.getSystemInfoSync()
 			let GAP = 8
@@ -96,6 +125,7 @@
 			this.navabarHeight = navabarHeight
 			this.statusBarHeight = sysinfo.statusBarHeight
 			this.mapCtx = uni.createMapContext('myMap');
+			this.listFn()
 		},
 		/**
 		 * 生命周期函数--监听页面显示
@@ -104,6 +134,38 @@
 			
 		},
 		methods: {
+			 calculateRemainingDays(expirationDate) {
+			  // 获取当前时间
+			  const now = dayjs();
+			  // 解析到期时间
+			  const endDate = dayjs(expirationDate);
+			  // 计算剩余天数
+			  const remainingDays = endDate.diff(now, 'day');
+			  return remainingDays || 0;
+			},
+			srcFn(){
+				uni.navigateTo({
+					url: `/pages/batteryPackage/batteryPackage`
+				})
+			},
+			validDurationFn(start,end){
+				return getRemainingTime(start,end)
+			},
+			async listFn(){
+				let {
+					data
+				} = await http.postApi(config.API_FLK_EXCHANGE_PACKAGE_ORDER_LIST, {
+					page: this.page,
+					pay_status:2,
+					car_sn:this.car_info.car_sn,
+					limit: this.limit,
+				})
+				if (data.code == 200) {
+					this.hireOrderList.push.apply(this.hireOrderList, data.data.list)
+				} else {
+					common.simpleToast(resp.data.msg)
+				}
+			},
 			bindReturnView() {
 				uni.navigateBack({
 					delta: 1,
@@ -115,4 +177,22 @@
 
 <style>
 	@import './package.css';
+	.packageBtn{
+		width: 686rpx;
+		height: 80rpx;
+		background: #060809;
+		border-radius: 40rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #FFFFFF;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: fixed;
+		left: 0;
+		right: 0;
+		margin: auto;
+		bottom: 60rpx;
+	}
 </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

@@ -4,7 +4,8 @@
 			<view class="flex-row">选择取车时间</view>
 			<view @tap="tapSelectTime" class="flex-row align-center" style="margin-bottom:20rpx ;">
 				<text class="select-time-text">{{takeCar}}</text>
-				<img style="width: 28rpx;height: 28rpx;" src="https://qiniu.bms16.com/FpbKGisSPfL9r8a7QkZCYXolhu1Y" alt="">
+				<img style="width: 28rpx;height: 28rpx;" src="https://qiniu.bms16.com/FpbKGisSPfL9r8a7QkZCYXolhu1Y"
+					alt="">
 			</view>
 		</view>
 		<view class="car-info-view">
@@ -13,10 +14,13 @@
 				<view class="flex-row car-info-grow">
 					<view class="flex-row align-center">
 						<view class="car-name">{{modelInfo.car_model_name}}</view>
-						<img style="width: 28rpx;height: 28rpx;" src="https://qiniu.bms16.com/FlMiRsUF-KZyevFCZDP9DwffOlag" alt="">
+						<img style="width: 28rpx;height: 28rpx;"
+							src="https://qiniu.bms16.com/FlMiRsUF-KZyevFCZDP9DwffOlag" alt="">
 					</view>
-					<view class="car-information">{{leaseUnitsResult}}  共计{{tools.countToDay(modelInfo.count,modelInfo.selectType)}}天</view>
-					<allPrice :amount="price"></allPrice>
+					<view class="car-information">{{leaseUnitsResult}}
+						共计{{tools.countToDay(modelInfo.count,modelInfo.selectType)}}天</view>
+					<allPrice v-if="modelInfo.selectType == 100" :amount="modelInfo.sell_price / 100"></allPrice>
+					<allPrice v-else :amount="price"></allPrice>
 				</view>
 			</view>
 			<view class="config-list-view">
@@ -27,8 +31,8 @@
 				</view>
 			</view>
 		</view>
-		
-		<view  class="deposit-info">
+
+		<view v-if="modelInfo.selectType != 100" class="deposit-info">
 			<view class="deposit-info-title flex-row flex-between">
 				<text>车辆押金</text>
 				<text>${{modelInfo.deposit/100}}</text>
@@ -56,14 +60,14 @@
 			</view>
 		</view>
 
-	
+
 
 		<view style="height: 224rpx;"></view>
 		<view v-if="!isShowDetail" class="payment-info">
 			<view class="payment-bottom flex-row flex-between">
-				<view class="bottom-left flex-row">
+				<view style="margin-right: 20rpx;" class="bottom-left flex-row">
 					<allPrice :amount="totalPrice"></allPrice>
-					<view @tap="bindDetail" class="all-money">明细<img
+					<view v-if="modelInfo.selectType != 100" @tap="bindDetail" class="all-money">明细<img
 							src="https://qiniu.bms16.com/Fvl1d-AWRvwY_ehNrw7bMZOK6LBZ" /></view>
 				</view>
 				<view @tap="navToPage">确认下单</view>
@@ -84,15 +88,14 @@
 						<view>
 							<!-- ￥{{(leaseTime * price_list[0].hire_price) /100}} -->
 							￥{{price+'x'+modelInfo.count}}
-							<text >{{leaseUnits}}</text>
+							<text>{{leaseUnits}}</text>
 						</view>
 					</view>
-					<view class="flex-row flex-between"
-						style="margin-bottom: 44rpx;">
+					<view class="flex-row flex-between" style="margin-bottom: 44rpx;">
 						<view>车辆押金</view>
 						<view>￥{{modelInfo.deposit /100}}</view>
 					</view>
-					
+
 					<view class="detail-money flex-row" style="padding-bottom: 44rpx;">
 						<view>支付金额</view>
 						<allPrice :amount="totalPrice"></allPrice>
@@ -116,7 +119,8 @@
 			<view class="return-item">
 				<view class="return-title flex-row flex-between">
 					<view>还车到门店</view>
-					<view @tap="isShowReturnCar = false" class="close-view"><img style="width: 24rpx;height: 24rpx;" src="https://qiniu.bms16.com/FoWVlo-Nmx6wTDpsL2Rf9_BamU7L" alt=""></view>
+					<view @tap="isShowReturnCar = false" class="close-view"><img style="width: 24rpx;height: 24rpx;"
+							src="https://qiniu.bms16.com/FoWVlo-Nmx6wTDpsL2Rf9_BamU7L" alt=""></view>
 				</view>
 				<view class="return-text">系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。</view>
 				<view class="return-btn flex-row">
@@ -128,9 +132,11 @@
 		<view v-if="isShowCheckOrder" class="return-box">
 			<view class="return-item">
 				<view style="text-align: center;margin-bottom: 120rpx;">
-					<img style="width: 88rpx;height: 88rpx;" src="https://qiniu.bms16.com/Fqb-i2uJWlZOg8EvUXHr_1qhlndf" alt="">
+					<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>
@@ -138,22 +144,26 @@
 				</view>
 			</view>
 		</view>
-		<PayTypeModel @closeShow="closeShow" @payToOrder="payToOrder" :free_price="totalPrice" :isShowToBuy="isShowToBuy"/>
+		<PayTypeModel @closeShow="closeShow" @payToOrder="payToOrder" :free_price="totalPrice"
+			:isShowToBuy="isShowToBuy" />
 	</view>
 </template>
 <script module="tools" lang="wxs" src="@/pages/common/wxs/tools.wxs"></script>
 <script module="tools" lang="sjs" src="@/pages/common/wxs/tools.sjs"></script>
 <script>
 	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 request = require('../../common/request.js');
 	var storage = require('../../common/storage.js');
 	var user = require('../../common/user.js');
 	import allPrice from '@/component/allPrice/allPrice';
 	import calendar from '@/component/smartCalendar';
 	import PayTypeModel from '@/component/payTypeModel/payTypeModel';
 	import {
-		MAX_LIMITS,LEASE_TYPE_ARR
+		MAX_LIMITS,
+		LEASE_TYPE_ARR
 	} from '@/common/constant.js';
 	export default {
 		components: {
@@ -163,15 +173,16 @@
 		},
 		data() {
 			return {
-				service_list:[],
+				sub_sn: "",
+				service_list: [],
 				isShowCalendar: false, //选择预约订单时间
-				price:0,
-				modelInfo:{},
-				isShowDetail:false,
-				unitPrice:0, //单价
-				isShowToBuy:false,
-				order_sn:'', //租赁订单号
-				totalPrice:0,//结算总金额
+				price: 0,
+				modelInfo: {},
+				isShowDetail: false,
+				unitPrice: 0, //单价
+				isShowToBuy: false,
+				order_sn: '', //租赁订单号
+				totalPrice: 0, //结算总金额
 			};
 		}
 		/**
@@ -179,20 +190,21 @@
 		 */
 		,
 		onLoad: function(options) {
-			if(options && options.params){
-				const model_info=JSON.parse(decodeURIComponent(options.params))||{}
-				console.log(model_info,'model_info');
+			if (options && options.params) {
+				const model_info = JSON.parse(decodeURIComponent(options.params)) || {}
+				console.log(model_info, 'model_info');
 				this.setData({
-					modelInfo:model_info,
-					unitPrice:model_info.rental_setting.find(v => v.hire_duration_unit == model_info.selectType)?.hire_price,
-					service_list:model_info.service_list||[],
-					price:model_info.totalPrice/100,
-					totalPrice:((model_info.totalPrice+model_info.deposit)/100).toFixed(2)
+					modelInfo: model_info,
+					unitPrice: model_info.rental_setting.find(v => v.hire_duration_unit == model_info
+						.selectType)?.hire_price,
+					service_list: model_info.service_list || [],
+					price: model_info.totalPrice / 100,
+					totalPrice: model_info.select_type != 100 ? ((model_info.totalPrice + model_info.deposit) / 100).toFixed(2) : ((model_info.sell_price) / 100).toFixed(2)
 				})
 			}
 			this.pick_up_time = Math.floor(new Date().getTime() / 1000)
 			this.setData({
-				takeCar:common.getFormattedTime()
+				takeCar: common.getFormattedTime()
 			})
 		},
 		/**
@@ -202,30 +214,30 @@
 		computed: {
 			leaseUnitsResult() {
 				const result = LEASE_TYPE_ARR.find(v => v.value == this.modelInfo.selectType);
-      			return result ? result.label : '';
+				return result ? result.label : '';
 			},
 			leaseUnits() {
 				const result = LEASE_TYPE_ARR.find(v => v.value == this.modelInfo.selectType);
-      			return result ? result.unit : '';
+				return result ? result.unit : '';
 			},
 
 		},
 		methods: {
 			handleValuesUpdated(e) {
 				this.isShowCalendar = false;
-				const timeStr=new Date(e.startDate)
-				this.pick_up_time=Math.floor(new Date(e.startDate).getTime()/1000)
+				const timeStr = new Date(e.startDate)
+				this.pick_up_time = Math.floor(new Date(e.startDate).getTime() / 1000)
 				this.setData({
-					takeCar:common.getFormattedTime(timeStr)
+					takeCar: common.getFormattedTime(timeStr)
 				})
-				console.log(e,'eeee');
+				console.log(e, 'eeee');
 			},
 			tapSelectTime() {
 				this.setData({
 					isShowCalendar: true
 				})
 			},
-			navAddress(){
+			navAddress() {
 				const {
 					address,
 					latitude,
@@ -238,73 +250,107 @@
 					scale: 15,
 					name: shop_name,
 					address: address,
-					success: function (res) {},
+					success: function(res) {},
 				})
 			},
 			bindDetail() {
 				this.isShowDetail = true
 			},
-			navToPage(){
+			navToPage() {
 				this.setData({
-					isShowToBuy:true
+					isShowToBuy: true
 				})
 			},
-			closeShow(){
+			closeShow() {
 				this.setData({
-					isShowToBuy:false
+					isShowToBuy: false
 				})
 			},
-			payToOrder(type){
+			payToOrder(type) {
 				const pay_type = type
-				var from=''
-				if(pay_type == 1){
+				var from = ''
+				if (pay_type == 1) {
 					from = 'wx'
-				}else if(pay_type == 2){
+				} else if (pay_type == 2) {
 					from = 'ali'
 				}
-				const hire_duration=this.modelInfo.rental_setting.find(v => v.hire_duration_unit == this.modelInfo.selectType)?.hire_duration
-				console.log(this.modelInfo,'test');
-				const pData={
+				const hire_duration = this.modelInfo.rental_setting.find(v => v.hire_duration_unit == this.modelInfo
+					.selectType)?.hire_duration
+				console.log(this.modelInfo, 'test');
+				const pData = {
 					pay_type,
-					car_model_id:this.modelInfo.model_id,
-					hire_cycle:this.modelInfo.count,
-					hire_duration_unit:this.modelInfo.selectType,
+					car_model_id: this.modelInfo.model_id,
+					hire_cycle: this.modelInfo.count,
+					hire_duration_unit: this.modelInfo.selectType,
 					hire_duration,
-					price: this.totalPrice*100,
-					pick_up_time:this.pick_up_time,
+					price: this.totalPrice * 100,
+					pick_up_time: this.pick_up_time,
 					address: this.modelInfo.address,
-					currency_code:'CNY'
+					currency_code: 'CNY'
+				}
+				common.loading();
+				if (this.modelInfo.selectType == 100) {
+					this.loadPayBuy(pData)
+					return
 				}
 				this.loadPayMethod(pData)
-				
+
 			},
-			loadPayMethod(pData){
+			async loadPayBuy(pData) {
+				let {
+					data
+				} = await request.postApi(config_gyq.API_FLK_ORDER_RESERVE, {
+					pay_type: pData.pay_type,
+					car_model_id: pData.car_model_id,
+					price: this.modelInfo.sell_price,
+					pick_up_time: pData.pick_up_time,
+					currency_code: 'CNY',
+				})
+				uni.hideLoading();
+				if (data.code == 200) {
+					if (!data.data.need_pay) {
+						common.simpleToast(this.$t('支付成功'));
+						this.order_sn = data.data.order_sn;
+						this.sub_sn = data.data.sub_sn;
+						this.setData({
+							isShowToBuy: false,
+							isShowCheckOrder: true
+						})
+					}
+				} else {
+					common.simpleToast(data.msg);
+
+				}
+			},
+			loadPayMethod(pData) {
 				const me = this;
-				common.loading();
-				http.postApi(config.API_FLK_ORDER_HIRE_MODEL, pData, function (resp) {
+				http.postApi(config.API_FLK_ORDER_HIRE_MODEL, pData, function(resp) {
 					uni.hideLoading();
 					if (resp.data.code === 200) {
-						if(!resp.data.data.need_pay){
-							common.simpleToast(me,me.$t('支付成功'));
+						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
+								isShowToBuy: false,
+								isShowCheckOrder: true
 							})
 						}
-					}  else {
-						common.simpleToast(me,resp.data.msg);
-						
+					} else {
+						common.simpleToast(me, resp.data.msg);
+
 					}
 				});
 			},
-			toIndexPage(){
+			toIndexPage() {
 				uni.switchTab({
 					url: '/pages/index/index'
 				})
 			},
-			toOrderInfo(){
-				uni.navToPage({ url: '/pages/orderStatus/orderStatus?order_sn=' + this.order_sn })
+			toOrderInfo() {
+				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,162 @@
 		},
 		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
+			modelListsFn() {
+				let obj = []
+				for (let index = 0; index < this.storeInfo.model_list.length; index++) {
+					let item = this.storeInfo.model_list[index];
+					if(item.sell_price){
+						obj.push({
+							...item,
+							money:(item.sell_price / 100).toFixed(2)
 						})
-					}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() {}
+					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 (!item.sell_price && 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 (!item.sell_price && 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>

pages/travelingTrack/travelingTrack.vue

@@ -159,9 +159,9 @@
 						console.log(me.markers,'me.markers');
 					}else{
 						// 默认返回上一个页面再提示报错
-						uni.navigateBack({
-							delta: 1
-						})
+						// uni.navigateBack({
+						// 	delta: 1
+						// })
 						common.simpleToast(resp.data.msg)
 					}
 				})

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
+	}
+}