Merge branch 'gyq_test' of http://git.bms16.com/liuwei/zx_flk_app into gyq_test

common/common.js

@@ -847,7 +847,7 @@ async function callPhone(phone) {
 		content: text,
 		confirmText: '确定',
 	})
-	if(res[1].confirm){
+	if (res[1].confirm) {
 		uni.makePhoneCall({
 			phoneNumber: phone,
 		})
@@ -855,17 +855,53 @@ async function callPhone(phone) {
 }
 
 function timestampToDays(timestamp) {
-	if(!timestamp) return
-    // 1秒 = 1000毫秒，1分钟 = 60秒，1小时 = 60分钟，1天 = 24小时
-    const millisecondsInADay = 24 * 60 * 60 * 1000;
-
-    // 计算天数
-    const days = timestamp / millisecondsInADay;
-
-    // 保留一位小数
-    return days.toFixed(1);
+	if (!timestamp) return
+	// 1秒 = 1000毫秒，1分钟 = 60秒，1小时 = 60分钟，1天 = 24小时
+	const millisecondsInADay = 24 * 60 * 60 * 1000;
+
+	// 计算天数
+	const days = timestamp / millisecondsInADay;
+
+	// 保留一位小数
+	return days.toFixed(1);
+}
+
+//计算相差时间
+function formatTimeDifference(timestamp) {
+	const current = Date.now();
+	const diff = Math.abs(current - timestamp);
+	const totalHours = diff / (1000 * 60 * 60)
+	let days = 0;
+	let hours;
+	
+	if (totalHours >= 24) {
+		days = Math.floor(totalHours / 24); // 计算完整天数
+		hours = Math.round(totalHours % 24); // 剩余小时四舍五入
+		
+		const result = [];
+		if (days > 0) result.push(`${days}天`);
+		if (hours > 0 || result.length === 0) result.push(`${hours}小时`);
+		return result.join("");
+		
+	} else {
+		// 提取整数小时部分
+		hours = Math.floor(totalHours);
+		// 计算剩余的小数小时并转换为分钟
+		let remaining = totalHours - hours;
+		let minutes = Math.round(remaining * 60);
+
+		// 处理分钟进位（例如 59.6分钟 → 60分钟 → 进位到小时）
+		if (minutes >= 60) {
+			hours += 1;
+			minutes = 0;
+		}
+		days = 0;
+		return `${hours}小时 ${minutes}分钟`;
+	}
+	
 }
 
+
 module.exports = {
 	formatTime: formatTime,
 	obj2UrlQuery: obj2UrlQuery,
@@ -914,5 +950,6 @@ module.exports = {
 	countToDay: countToDay,
 	getFormattedTime: getFormattedTime,
 	callPhone: callPhone,
-	timestampToDays: timestampToDays
+	timestampToDays: timestampToDays,
+	formatTimeDifference: formatTimeDifference
 };

pages.json

@@ -66,6 +66,11 @@
 			"style": {
 			}
 		},
+		{
+			"path": "pages/message/detail",
+			"style": {
+			}
+		},
 		{
 			"path": "pages/message/deviceInfo",
 			"style": {

pages/dashboard/dashboard.vue

@@ -19,8 +19,11 @@
 				<view :style="{width:((infoList.remain_mail || 0 / infoList.endurance || 0) * 100) + '%'}"
 					class="is_progress"></view>
 				<view class="text">
-					<text>续航</text>
-					<text style="margin-left: 20rpx;"> {{(infoList.remain_mail || 0/1000).toFixed(0) || 0}}km </text>
+					<text style="margin-left: 20rpx;">续航</text>
+					<!-- <text style="margin-left: 16rpx;"> {{(infoList.remain_mail || 0/1000).toFixed(0) || 0}}km </text> -->
+					
+					<text style="margin-left: 16rpx;"> {{ infoList.remain_mail > 0 ? infoList.remain_mail : 0 }}km </text>
+					
 				</view>
 			</view>
 			<view style="font-weight: 600;font-size: 36rpx;">

pages/message/detail.vue

@@ -0,0 +1,60 @@
+<template>
+	<view class="container">
+		<navBar name="信息详情"></navBar>
+		<view class="title">{{info.title}}</view>
+		<view >{{info.overview}}</view>
+		<image v-if="info.cover" :src="info.cover" class="img" mode="scaleToFill" />
+		
+		
+		
+		<rich-text :nodes="info.content"></rich-text>
+	</view>
+</template>
+
+<script>
+	const config = require('@/common/config.js');
+	const http = require('@/common/http.js');
+	const request = require('@/common/request.js');
+	const common = require('@/common/common.js');
+	export default {
+		data() {
+			return {
+				id: '',
+				info: {}
+			}
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.queryMsgDetail()
+		},
+		methods: {
+			queryMsgDetail() {
+				const req = { type:'PLAT',id : Number(this.id) }
+				http.postApi(config.API_MESSAGE_DTL, req, res => {
+					if (res.succeed) {
+						this.info = res.data.data
+						console.log(this.info)
+					}
+				})
+
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container{
+		display: flex;
+		flex-direction: column;
+		
+		.title{
+			font-size: 36rpx;
+			font-weight: bold;
+			margin: 20rpx;
+		}
+		
+		.img{
+			width: 750rpx;
+		}
+	}
+</style>

pages/message/index.vue

@@ -1,257 +1,340 @@
 <template>
-    <view class="message-page">
+	<view class="message-page">
 		<navBar :name="isSys === '0' ? '设备信息' : '我的消息'"></navBar>
-        <view v-if="isSys==='0' && deviceList.length>0">
-			<view class="device-msg-wrap base-wrap" v-for="(item, index) in deviceList" :key="index"  @tap="toDeviceMsgPage(item)">
-			    <view class="row">
-			        <view class="title">
-			            <view>{{ $t('设备消息') }}</view>
-			            <view v-if="item.unread > 0" class="bage">{{ item.unread }}</view>
-			        </view>
-			        <view class="time">{{item.message_date}}</view>
-			    </view>
-			    <view class="device-info">
-			        <image class="img" :src="item.image" />
-			        <view class="info">
-			            <view class="name">{{ item.car_name }}</view>
-			            <view v-if="item.message_overview!==''" class="status">{{item.message_overview}}</view>
-			        </view>
-			    </view>
+		<view v-if="isSys==='0' && deviceList.length>0">
+			<view class="device-msg-wrap base-wrap" v-for="(item, index) in deviceList" :key="index"
+				@tap="toDeviceMsgPage(item)">
+				<view class="row">
+					<view class="title">
+						<view>{{ $t('设备消息') }}</view>
+						<view v-if="item.unread > 0" class="bage">{{ item.unread }}</view>
+					</view>
+					<view class="time">{{item.message_date}}</view>
+				</view>
+				<view class="device-info">
+					<image class="img" :src="item.image" />
+					<view class="info">
+						<view class="name">{{ item.car_name }}</view>
+						<view v-if="item.message_overview!==''" class="status">{{item.message_overview}}</view>
+					</view>
+				</view>
 			</view>
 		</view>
-		<view v-if="isSys==='0' && deviceList.length === 0" style="display: flex;align-items: center;justify-content: center;height: 80vh;">
+		<view v-if="isSys==='0' && deviceList.length === 0"
+			style="display: flex;align-items: center;justify-content: center;height: 80vh;">
 			您还没有设备消息
 		</view>
-        
-        <view v-if="isSys==='1' && sysMsgList.length > 0 " style="margin-top: 20rpx;" class="sys-msg-wrap base-wrap">
-            <view class="title">{{ $t('系统消息') }}</view>
-			
-            <view class="msg-item" v-for="(item, index) in sysMsgList" :key="index">
-                <view class="msg">
-                    {{ item.title }}
-                    <view v-if="item.type === 1" class="btn">绑定设备</view>
-                </view>
-                <view class="time">{{ item.ctime }}</view>
-                <view class="dtl">{{ item.overview }}</view>
-            </view>
-        </view>
-		
-		<view v-if="isSys==='1' && sysMsgList.length === 0 " style="display: flex;align-items: center;justify-content: center;height: 80vh;">
+
+		<view v-if="isSys==='1' && sysMsgList.length > 0 " style="margin-top: 20rpx;" class="sys-msg-wrap base-wrap">
+
+			<view class="row">
+				<view class="title" style="display: flex;">
+					<view>{{ $t('系统消息') }}</view>
+					<view v-if="unreadCount > 0" class="bage">{{ unreadCount }}</view>
+				</view>
+			</view>
+			<view @click="gotoDetail(item)" class="msg-item" v-for="(item, index) in sysMsgList" :key="index">
+				<view class="msg">
+					<view class="flex">
+						<view v-if="item.read === '0'" class="dot"></view>
+						{{ item.title }}
+					</view>
+					<view v-if="item.type === 1" class="btn">绑定设备</view>
+				</view>
+				<view class="time">{{ item.ctime }}</view>
+				<view class="dtl">{{ item.overview }}</view>
+			</view>
+		</view>
+
+		<view v-if="isSys==='1' && sysMsgList.length === 0 "
+			style="display: flex;align-items: center;justify-content: center;height: 80vh;">
 			您还没有系统消息
 		</view>
-    </view>
+	</view>
 </template>
 
 <script>
-const config = require('@/common/config.js');
-const http = require('@/common/http.js');
-const request = require('@/common/request.js');
-const common = require('@/common/common.js');
-export default {
-    data() {
-        return {
-            value: 10,
-            sysMsgList: [],
-            deviceList: [],
-            deviceInfo: {},
-			isSys:'1'
-        }
-    },
-	onLoad(options){
-		this.isSys = options.isSys || '0'
-	},
-    created() {
-        this.querySysMsgList()
-        this.queryDeviceMsg()
-		this.readMessage()
-    },
-    methods: {
-		async readMessage(){
-			await request.postApi(config.API_MESSAGE_READ_MESSAGE,{msg_type:2,car_id:0})
+	const config = require('@/common/config.js');
+	const http = require('@/common/http.js');
+	const request = require('@/common/request.js');
+	const common = require('@/common/common.js');
+	export default {
+		data() {
+			return {
+				value: 10,
+				sysMsgList: [],
+				deviceList: [],
+				deviceInfo: {},
+				isSys: '1',
+				unreadCount: 0
+			}
+		},
+		onLoad(options) {
+			this.isSys = options.isSys
+		},
+		created() {
+			this.querySysMsgList()
+			this.queryDeviceMsg()
+			// this.readMessage()
 		},
-        toDeviceMsgPage(itemData) {
-            const { car_id } = itemData
-            uni.navigateTo({ url: `/pages/message/deviceInfo?car_id=${car_id}` })
-        },
-        queryDeviceMsg() {
-            http.postApi(config.API_DEVICE_MSG, {}, res => {
-                if (res.succeed) {
-                    this.deviceList = res.body.data
-                    this.deviceList.map(item => {
-                        item.message_date = common.formatTime(item.message_date)
-						item.image = item.image.split(',')[0]
-                    })
-                }
-            })
-        },
-        querySysMsgList() {
-            http.postApi(config.API_MESSAGE_LIST, { msg_type: 'PLAT' }, res => {
-                if (res.succeed) {
-                    this.sysMsgList= res.body.data.list
-                    this.sysMsgList.map(item => {
-                        item.ctime = common.formatTime(item.ctime)
-                    })
-                }
-            })
-        }
-    }
-}
+		methods: {
+			async readMessage() {
+				await request.postApi(config.API_MESSAGE_READ_MESSAGE, {
+					msg_type: 2,
+					car_id: 0
+				})
+			},
+			gotoDetail(item) {
+				request.postApi(config.API_MESSAGE_READ_MESSAGE, {
+					msg_type: 2,
+					msg_id: item.plat_msg_id,
+					car_id: ''
+				})
+
+				uni.navigateTo({
+					url: `/pages/message/detail?id=${item.plat_msg_id}`
+				})
+			},
+			toDeviceMsgPage(item) {
+				equest.postApi(config.API_MESSAGE_READ_MESSAGE, {
+					msg_type: 1,
+					car_id: item.car_id
+				})
+
+				uni.navigateTo({
+					url: `/pages/message/detail?id=${item.car_id}`
+				})
+			},
+			queryDeviceMsg() {
+				http.postApi(config.API_DEVICE_MSG, {}, res => {
+					if (res.succeed) {
+						this.deviceList = res.body.data
+						this.deviceList.map(item => {
+							item.message_date = common.formatTime(item.message_date)
+						})
+					}
+				})
+			},
+			querySysMsgList() {
+				http.postApi(config.API_MESSAGE_LIST, {
+					msg_type: 'PLAT'
+				}, res => {
+					if (res.succeed) {
+						this.sysMsgList = res.body.data.list
+						this.sysMsgList.map(item => {
+							item.ctime = common.formatTime(item.ctime)
+						})
+						this.unreadCount = this.sysMsgList.filter(item => item.read === "0").length;
+					}
+				})
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-.message-page {
-    width: 100%;
-    min-height: 100vh;
-    overflow: auto;
-    background: #F1F3F4;
-    padding: 0 24rpx;
-
-    .base-wrap {
-        background: #FFFFFF;
-        border-radius: 40rpx;
-        padding: 40rpx 32rpx 32rpx 32rpx;
-        width: 100%;
-    }
-
-    .device-msg-wrap {
-        margin: 24rpx 0;
-
-        .row {
-            margin-bottom: 40rpx;
-            display: flex;
-            justify-content: space-between;
-
-            .title {
-                font-family: PingFangSC, PingFang SC;
-                font-weight: 400;
-                font-size: 36rpx;
-                color: #060809;
-                position: relative;
-
-                .bage {
-                    position: absolute;
-                    left: 96%;
-                    top: -12rpx;
-                    background: #FA2918;
-                    font-family: Futura, Futura;
-                    font-weight: 500;
-                    font-size: 24rpx;
-                    color: #FFFFFF;
-                    display: inline-flex;
-                    justify-content: center;
-                    align-items: center;
-                    line-height: 16px;
-                    padding: 0 5px;
-                    border-radius: 68rpx;
-                    z-index: 9;
-                }
-            }
-
-            .time {
-                font-family: Futura, Futura;
-                font-weight: 500;
-                font-size: 32rpx;
-                color: #060809;
-            }
-        }
-
-        .device-info {
-            display: flex;
-            align-items: center;
-
-            .img {
-                width: 128rpx;
-                height: 128rpx;
-                background: #f2f2f2;
-                margin-right: 24rpx;
-            }
-
-            .info {
-                .name {
-                    font-family: PingFangSC, PingFang SC;
-                    font-weight: bold;
-                    font-size: 40rpx;
-                    color: #060809;
-                    margin-bottom: 32rpx;
-                }
-
-                .status {
-                    font-family: PingFangSC, PingFang SC;
-                    font-size: 32rpx;
-                    color: #426BF2;
-                    display: flex;
-
-                    &::before {
-                        content: "";
-                        width: 40rpx;
-                        height: 40rpx;
-                        margin-right: 16rpx;
-                        border-radius: 50%;
-                        background: url('https://qiniu.bms16.com/Foxu2x1lQKqT5K4LqrUtWIA6Lbw8');
-                        background-size: 100%;
-                    }
-                }
-            }
-        }
-    }
-
-    .sys-msg-wrap {
-        .title {
-            font-family: PingFangSC, PingFang SC;
-            font-weight: 400;
-            font-size: 36rpx;
-            color: #060809;
-        }
-
-        .msg-item {
-            padding: 40rpx 0;
-            border-bottom: 1px solid #F1F4F5;
-            &:last-child {
-                border-bottom: none;
-            }
-
-            .msg {
-                font-family: PingFangSC, PingFang SC;
-                font-weight: bold;
-                font-size: 36rpx;
-                color: #060809;
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-
-                .btn {
-                    width: 192rpx;
-                    height: 64rpx;
-                    background: #060809;
-                    border-radius: 32rpx;
-                    color: #fff;
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-                    font-family: AlibabaPuHuiTiM;
-                    font-size: 32rpx;
-
-                    &:active {
-                        opacity: 0.8;
-                    }
-                }
-            }
-
-            .time {
-                font-family: Futura, Futura;
-                font-weight: 500;
-                font-size: 24rpx;
-                color: #060809;
-                margin: 16rpx 0 24rpx;
-            }
-
-            .dtl {
-                font-family: PingFangSC, PingFang SC;
-                font-weight: 400;
-                font-size: 24rpx;
-                color: #060809;
-            }
-        }
-    }
-}
+	.message-page {
+		width: 100%;
+		min-height: 100vh;
+		overflow: auto;
+		background: #F1F3F4;
+		padding: 0 24rpx;
+
+		.base-wrap {
+			background: #FFFFFF;
+			border-radius: 40rpx;
+			padding: 40rpx 32rpx 32rpx 32rpx;
+			width: 100%;
+		}
+
+		.device-msg-wrap {
+			margin: 24rpx 0;
+
+			.row {
+				margin-bottom: 40rpx;
+				display: flex;
+				justify-content: space-between;
+
+				.title {
+					font-family: PingFangSC, PingFang SC;
+					font-weight: 400;
+					font-size: 36rpx;
+					color: #060809;
+					position: relative;
+
+					.bage {
+						position: absolute;
+						left: 96%;
+						top: -12rpx;
+						background: #FA2918;
+						font-family: Futura, Futura;
+						font-weight: 500;
+						font-size: 24rpx;
+						color: #FFFFFF;
+						display: inline-flex;
+						justify-content: center;
+						align-items: center;
+						line-height: 16px;
+						padding: 0 5px;
+						border-radius: 68rpx;
+						z-index: 9;
+					}
+				}
+
+				.time {
+					font-family: Futura, Futura;
+					font-weight: 500;
+					font-size: 32rpx;
+					color: #060809;
+				}
+			}
+
+			.device-info {
+				display: flex;
+				align-items: center;
+
+				.img {
+					width: 128rpx;
+					height: 128rpx;
+					background: #f2f2f2;
+					margin-right: 24rpx;
+				}
+
+				.info {
+					.name {
+						font-family: PingFangSC, PingFang SC;
+						font-weight: bold;
+						font-size: 40rpx;
+						color: #060809;
+						margin-bottom: 32rpx;
+					}
+
+					.status {
+						font-family: PingFangSC, PingFang SC;
+						font-size: 32rpx;
+						color: #426BF2;
+						display: flex;
+
+						&::before {
+							content: "";
+							width: 40rpx;
+							height: 40rpx;
+							margin-right: 16rpx;
+							border-radius: 50%;
+							background: url('https://qiniu.bms16.com/Foxu2x1lQKqT5K4LqrUtWIA6Lbw8');
+							background-size: 100%;
+						}
+					}
+				}
+			}
+		}
+
+		.sys-msg-wrap {
+
+			.row {
+				margin-bottom: 40rpx;
+				display: flex;
+				justify-content: space-between;
+
+				.title {
+					font-family: PingFangSC, PingFang SC;
+					font-weight: 400;
+					font-size: 36rpx;
+					color: #060809;
+					position: relative;
+
+
+				}
+
+				.time {
+					font-family: Futura, Futura;
+					font-weight: 500;
+					font-size: 32rpx;
+					color: #060809;
+				}
+			}
+
+			.bage {
+				position: absolute;
+				left: 96%;
+				top: -12rpx;
+				background: #FA2918;
+				font-family: Futura, Futura;
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #FFFFFF;
+				display: inline-flex;
+				justify-content: center;
+				align-items: center;
+				line-height: 16px;
+				padding: 0 5px;
+				border-radius: 68rpx;
+				z-index: 9;
+			}
+
+			.msg-item {
+				padding: 40rpx 0;
+				border-bottom: 1px solid #F1F4F5;
+
+				&:last-child {
+					border-bottom: none;
+				}
+
+				.flex {
+					display: flex;
+				}
+
+				.dot {
+					background: #FA2918;
+					width: 20rpx;
+					height: 20rpx;
+					border-radius: 50%;
+					margin-right: 5rpx;
+					margin-top: 10rpx;
+				}
+
+				.msg {
+					font-family: PingFangSC, PingFang SC;
+					font-weight: bold;
+					font-size: 36rpx;
+					color: #060809;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					.btn {
+						width: 192rpx;
+						height: 64rpx;
+						background: #060809;
+						border-radius: 32rpx;
+						color: #fff;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-family: AlibabaPuHuiTiM;
+						font-size: 32rpx;
+
+						&:active {
+							opacity: 0.8;
+						}
+					}
+				}
+
+				.time {
+					font-family: Futura, Futura;
+					font-weight: 500;
+					font-size: 24rpx;
+					color: #060809;
+					margin: 16rpx 0 24rpx;
+				}
+
+				.dtl {
+					font-family: PingFangSC, PingFang SC;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #060809;
+				}
+			}
+		}
+	}
 </style>

pages/my/set.vue

@@ -30,6 +30,8 @@
 	var config = require('../../common/config_gyq.js');
 	var http = require('../../common/request');
 	const common = require('../../common/common.js');
+	import dayjs from 'dayjs'
+	import 'dayjs/locale/zh-cn';
 	export default {
 		data() {
 			return {
@@ -72,18 +74,18 @@
 			user_token && this.loadUserInfo()
 		},
 		methods: {
-		 // 输入处理
-		    handleInput(e) {
-		      // 延迟处理输入法组合输入
-		      setTimeout(() => {
-		        const value = e.detail.value;
-		        const truncated = this.truncateToMaxBytes(value, 22);
-		        // 更新值（避免无限触发，需判断）
-		        if (truncated !== value) {
-		         this.userInfo.nickname = truncated;
-		        }
-		      }, 0);
-		    },
+			// 输入处理
+			handleInput(e) {
+				// 延迟处理输入法组合输入
+				setTimeout(() => {
+					const value = e.detail.value;
+					const truncated = this.truncateToMaxBytes(value, 22);
+					// 更新值（避免无限触发，需判断）
+					if (truncated !== value) {
+						this.userInfo.nickname = truncated;
+					}
+				}, 0);
+			},
 			// 截断字符串至指定字节
 			truncateToMaxBytes(str, maxBytes) {
 				let totalBytes = 0;
@@ -102,8 +104,8 @@
 			},
 
 			formatTimestamp(timestamp) {
-				const date = new Date(timestamp * 1000);
-				return date.toLocaleDateString('zh-CN'); // 本地化格式（如：2021/5/3）
+				dayjs.locale('zh-cn');
+				return dayjs.unix(timestamp).format('YYYY/M/D'); // 严格中文格式
 			},
 			inpfn(e) {
 				console.log(e.detail.value)

pages/orderStatus/orderStatus.vue

@@ -14,17 +14,22 @@
 					<view class="get-time-view flex-row" v-else-if="orderInfo.pay_status == 6">线下审核拒绝</view>
 				</view>
 				<block v-if="orderInfo.pay_status == 2">
-					<view :class="['get-time-view', 'flex-row', 'blue-text']" v-if="orderInfo.order_status == 3">使用中...</view>
-					<view :class="['get-time-view', 'flex-row', 'red-text']" v-if="orderInfo.order_status == 4">已逾期</view>
+					<view :class="['get-time-view', 'flex-row', 'blue-text']" v-if="orderInfo.order_status == 3">使用中...
+					</view>
+					<view :class="['get-time-view', 'flex-row', 'red-text']" v-if="orderInfo.order_status == 4">已逾期
+					</view>
 					<view class="get-time-view flex-row" v-if="orderInfo.order_status == 2">请上传车辆图片激活车辆</view>
 					<view class="get-time-view flex-row" v-if="orderInfo.order_status == 5">待门店确认</view>
 					<view class="get-time-view flex-row" v-if="orderInfo.order_status == 6">还车中,等待门店取车</view>
 					<view class="get-time-view flex-row" v-if="orderInfo.order_status == 7">已完成</view>
-					<view class="get-time-view flex-row" v-if="orderInfo.order_status == 8||orderInfo.order_status == 9">已取消</view>
-					<view class="get-time-view flex-row" v-if="orderInfo.order_status == 1 "><text>请于</text><text class="get-car-time">{{tools.formatTimeSecond( orderInfo.pick_up_time)}}</text><text>到门店取车</text></view>
+					<view class="get-time-view flex-row"
+						v-if="orderInfo.order_status == 8||orderInfo.order_status == 9">已取消</view>
+					<view class="get-time-view flex-row" v-if="orderInfo.order_status == 1 "><text>请于</text><text
+							class="get-car-time">{{tools.formatTimeSecond( orderInfo.pick_up_time)}}</text><text>到门店取车</text>
+					</view>
 					<view v-if="orderInfo.order_status == 10">已完结</view>
 				</block>
-				
+
 			</view>
 
 			<view class="time-money">
@@ -147,7 +152,9 @@
 				<view>
 					<view class="top-flex">
 						<view>{{orderInfo.model_name}}</view>
-						<view>续航{{(orderInfo.endurance /1000).toFixed(0)}}km｜重量{{(orderInfo.weight / 1000).toFixed(0)}}kg</view>
+						<view>
+							续航{{(orderInfo.endurance /1000).toFixed(0)}}km｜重量{{(orderInfo.weight / 1000).toFixed(0)}}kg
+						</view>
 					</view>
 					<!-- //配套服务 -->
 					<view class="serviceList">
@@ -219,17 +226,23 @@
 		<view class="inset-bottom"></view>
 		<view class="payment-info flex-row flex-between">
 			<view>
-				<view v-if="(orderInfo.order_status == 0 ||orderInfo.order_status == 1 || orderInfo.pay_status == 5 || orderInfo.pay_status == 0) && orderInfo.order_type != 3" class="cancel" @tap="clickCancel">结束订单</view>
+				<view
+					v-if="(orderInfo.order_status == 0 ||orderInfo.order_status == 1 || orderInfo.pay_status == 5 || orderInfo.pay_status == 0) && orderInfo.order_type != 3"
+					class="cancel" @tap="clickCancel">结束订单</view>
 			</view>
 			<view class="flex-row">
 				<view v-if="orderInfo.order_status == 1" @tap="navToScan" class="sesame-btn ">扫码绑定</view>
 				<view v-if="orderInfo.order_status == 2" @tap="navToScan" class="sesame-btn ">去上传</view>
-				<view v-if="(orderInfo.order_status == 3||orderInfo.order_status == 4) && orderInfo.order_type != 3 && orderInfo.pay_status != 5" @tap="tapReturnCar" class="deposit-btn">到店还车</view>
-				<view v-if="(orderInfo.order_status == 3||orderInfo.order_status == 4) && orderInfo.order_type != 3 && orderInfo.pay_status != 5"  @tap="bindRenew" class="sesame-btn">续租</view>
+				<view
+					v-if="(orderInfo.order_status == 3||orderInfo.order_status == 4) && orderInfo.order_type != 3 && orderInfo.pay_status != 5"
+					@tap="tapReturnCar" class="deposit-btn">到店还车</view>
+				<view
+					v-if="(orderInfo.order_status == 3||orderInfo.order_status == 4) && orderInfo.order_type != 3 && orderInfo.pay_status != 5"
+					@tap="bindRenew" class="sesame-btn">续租</view>
 				<view @tap="callStorePhone" class="deposit-btn ">联系门店</view>
 			</view>
 		</view>
-		
+
 		<!-- <view class="payment-info flex-row flex-between">
 			<view v-if="orderInfo.order_status == 1 || orderInfo.pay_status == 5" class="flex-row"> 
 				<view v-if="orderInfo.order_type != 3"
@@ -376,7 +389,7 @@
 				this.bindOrderInfo()
 			}
 		},
-		
+
 		onUnload: function() {},
 
 		computed: {},
@@ -415,7 +428,7 @@
 							...this.car_detail,
 							price: this.price
 						}
-						
+
 						me.setData({
 							car_detail: resp.data.data,
 							params: {
@@ -436,26 +449,30 @@
 					price: (price / 100).toFixed(2)
 				})
 			},
-			
-			async carDetFn(car_sn){
-				let {data} = await request.postApi(config.API_FLK_CAR_DETAIL, {car_sn})
+
+			async carDetFn(car_sn) {
+				let {
+					data
+				} = await request.postApi(config.API_FLK_CAR_DETAIL, {
+					car_sn
+				})
 				if (data.code === 200) {
-					if(data.data.model_id == this.orderInfo.model_id){
+					if (data.data.model_id == this.orderInfo.model_id) {
 						return true
-					}else{
+					} else {
 						common.simpleToast('车型不匹配！')
 						return false
 					}
-					
-					if(data.data.is_hire == 1){
+
+					if (data.data.is_hire == 1) {
 						return true
-					}else{
+					} else {
 						common.simpleToast('车辆已被租售！')
 						return false
 					}
-					if(data.data.is_display == 1){
+					if (data.data.is_display == 1) {
 						return true
-					}else{
+					} else {
 						common.simpleToast('车辆未展示！')
 						return false
 					}
@@ -474,19 +491,19 @@
 					});
 					if (res[0]) return
 					car_sn = res[1].result
-					if(!await this.carDetFn(car_sn)) return
+					if (!await this.carDetFn(car_sn)) return
 				}
 				uni.showLoading({
 					title: '识别中....',
 					mask: true
 				})
-				setTimeout(()=> {
+				setTimeout(() => {
 					uni.hideLoading();
 					uni.navigateTo({
 						url: `/pages/activation/activation?model_id=${this.orderInfo.model_id}&sub_sn=${this.sub_sn}&car_sn=${car_sn}`
 					})
 				}, 1000);
-				
+
 			},
 
 			navToCabinet() {
@@ -556,18 +573,19 @@
 				}, (resp) => {
 					if (resp.data.code === 200) {
 						me.orderInfo = resp.data.data.order_info
-				me.orderInfo.model_images = me.orderInfo.model_images.split(',')[0]
+						me.orderInfo.model_images = me.orderInfo.model_images.split(',')[0]
 						// 
 						if (resp.data.data.order_info.model_id) {
 							me.loadCarInfo(resp.data.data.order_info.model_id)
 						}
-						let distance = common.getFlatternDistance(locationStr.longitude, locationStr.latitude, me
+						let distance = common.getFlatternDistance(locationStr.longitude, locationStr.latitude,
+							me
 							.orderInfo.longitude, me.orderInfo.latitude)
 						resp.data.data.order_info.distance = distance
 						// 取还时间展示
 						// me.orderInfo.hire_return_time = common.getTimeToDay(Math.ceil(me.orderInfo
 						// 	.hire_end_time - me.orderInfo.hire_begin_time) / 60)
-				
+
 						me.orderInfo.hire_return_time = getRemainingTime(me.orderInfo
 							.hire_begin_time, me
 							.orderInfo.hire_end_time)
@@ -579,23 +597,33 @@
 							.orderInfo
 							.hire_end_time * 1000).format(
 							'YY-MM-DD') : 0
-							console.log(me.orderInfo.order_status == 1);
-							let other_time=0
+						console.log(me.orderInfo.order_status == 1);
+						let other_time = 0
 						// 剩余租期判断
-						if (me.orderInfo.order_status == 1){
-							me.orderInfo.hire_duration_time=common.countToDay(me.orderInfo.hire_cycle*me.orderInfo.hire_duration,me.orderInfo.hire_duration_unit)
-						;
-						}else if((me.orderInfo.order_status == 2) ||me.orderInfo.order_status == 3) {
-
-							me.orderInfo.hire_duration_time = common.timestampToDays(Math.ceil(me.orderInfo.hire_end_time - Math.floor(new Date()) /1000))
-							console.log(me.orderInfo.hire_duration_time,'me.orderInfo.hire_duration_time')
+						//订单状态 0 默认 1 待取车 2 待激活 3 使用中 4 已逾期 5 还车申请中 6 还车中 7 车辆已归还 8 订单已支付,已取消 9 订单未支付已取消
+						if (me.orderInfo.order_status == 1) {
+							me.orderInfo.hire_duration_time = common.countToDay(me.orderInfo.hire_cycle * me
+								.orderInfo.hire_duration, me.orderInfo.hire_duration_unit)
+							console.log(me.orderInfo.hire_duration_time, 'me.orderInfo.hire_duration_time');
+						} else if ((me.orderInfo.hire_type == 2 && me.orderInfo.order_status == 2) || me
+							.orderInfo.order_status == 3) {
+							// me.orderInfo.hire_duration_time = common.timestampToDays(Math.ceil(me.orderInfo
+							// 	.hire_end_time - Math.floor(new Date()) / 1000))
+							
+							me.orderInfo.hire_duration_time = common.formatTimeDifference(me.orderInfo
+									.hire_end_time * 1000)
 						} else {
 							if (me.orderInfo.order_status == 4) {
 								me.overdueMoneyFn(me.orderInfo.car_sn)
-								
-								me.orderInfo.hire_duration_time = common.timestampToDays(Math.ceil(Math.floor(new Date()) / 1000 - me.orderInfo.hire_end_time))
+
+								// me.orderInfo.hire_duration_time = common.timestampToDays(Math.ceil(Math.floor(
+								// 	new Date()) / 1000 - me.orderInfo.hire_end_time))
+								me.orderInfo.hire_duration_time = common.formatTimeDifference(me.orderInfo
+									.hire_end_time * 1000)
+
 							} else {
-								me.orderInfo.hire_duration_time = common.timestampToDays(Math.ceil(me.orderInfo.hire_begin_time - me.orderInfo.hire_end_time))
+								me.orderInfo.hire_duration_time = common.timestampToDays(Math.ceil(me.orderInfo
+									.hire_begin_time - me.orderInfo.hire_end_time))
 							}
 						}
 					} else {

pages/package/package.vue

@@ -37,19 +37,20 @@
 					<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 v-if="item.expire_time != 0" class="item-title">有效期至</view>
 					<view class="item-info">{{tools.formatTime(item.expire_time)}}</view>
 				</view>
 				<view v-if="item.package_type != 2" class="package-item" style="margin-bottom: 32rpx;">
 					<view class="item-title">有效时长</view>
 					<view class="item-info">
-						{{calculateRemainingDays(item.expire_time)}}<text
+						{{ item.expire_time != 0 ? calculateRemainingDays(item.expire_time) : item.total_day }}<text
 							style="color: #9FA7B7;">/{{item.total_day}}天</text>
 					</view>
 				</view>
 				<view v-if="item.package_type == 1" class="package-item">
 					<view class="item-title">免费换电数</view>
-					<view style="color: #060809;" class="item-info">{{item.last_num}}次</view>
+					<!-- <view style="color: #060809;" class="item-info">{{item.last_num}}次</view> -->
+					<view style="color: #060809;" class="item-info">不限次数</view>
 				</view>
 				<view v-if="item.package_type == 2" class="package-item">
 					<view class="item-title">免费换电数</view>
@@ -109,13 +110,16 @@
 		},
 		methods: {
 			calculateRemainingDays(expirationDate) {
-				// 获取当前时间
-				const now = dayjs();
-				// 解析到期时间
-				const endDate = dayjs(expirationDate * 1000);
-				// 计算剩余天数
-				const remainingDays = endDate.diff(now, 'day');
-				return remainingDays || 1;
+				
+				// // 获取当前时间
+				// const now = dayjs();
+				// // 解析到期时间
+				// const endDate = dayjs(expirationDate * 1000);
+				// // 计算剩余天数
+				// const remainingDays = endDate.diff(now, 'day');
+				// return remainingDays || 1;
+				
+				return  common.formatTimeDifference(expirationDate * 1000)
 			},
 			srcFn() {
 				uni.navigateTo({