蓝牙调试

common/bluetooth.js

@@ -41,12 +41,13 @@ function initBluetooth() {
 			// console.log(app.globalData.connectionStateChangeFunc[device.mac_id],'app.globalData.connectionStateChangeFunc');
         }
     });
+	console.log("监听值")
     //监听低功耗蓝牙设备的特征值变化事件。必须先启用 notifyBLECharacteristicValueChange 接口才能接收到设备推送的 notification
     uni.onBLECharacteristicValueChange((res) => {
-		// console.log(res,'restest1111');
+		console.log(res,'restest1111');
         if (app.globalData.connectionState[res.deviceId]) {
             const device = app.globalData.connectionState[res.deviceId].device;
-			// console.log(res.serviceId.toUpperCase() == bluetoothDeviceConfig(device).readServiceID.toUpperCase(),'00000');
+			console.log(res.serviceId.toUpperCase() == bluetoothDeviceConfig(device).readServiceID.toUpperCase(),'00000');
 			if (
                 res.serviceId.toUpperCase() == bluetoothDeviceConfig(device).readServiceID.toUpperCase() &&
                 res.characteristicId.toUpperCase() == bluetoothDeviceConfig(device).readID.toUpperCase()
@@ -402,11 +403,14 @@ function alterConnect(device, deviceId, callback = () => {}, fail = () => {}) {
 	console.log("xxxx2")
 	console.log(deviceId)
     // 获取蓝牙设备的服务列表
+	setTimeout(()=>{
     uni.getBLEDeviceServices({
         deviceId: deviceId,
         success(res) {
             console.log(res,'res1111');
-            // 获取蓝牙设备的写特征值
+			console.log(bluetoothDeviceConfig(device).writeServiceID)
+			// 获取蓝牙设备的写特征值
+			setTimeout(()=>{
             uni.getBLEDeviceCharacteristics({
                 deviceId: deviceId,
                 serviceId: bluetoothDeviceConfig(device).writeServiceID,
@@ -501,16 +505,21 @@ function alterConnect(device, deviceId, callback = () => {}, fail = () => {}) {
                     });
                 },
                 fail(res) {
+					console.log('getBLEDeviceServices fail',res);
                     // 调用失败回调函数
                     fail(res);
                 }
-            });
+            });	
+			},500)
+            
         },
         fail(res) {
+			
             // 调用失败回调函数
             fail(res);
         }
     });
+	},500)
 }
 // 关闭设备连接
 function closeDevice(macid, callback = () => {}, fail = () => {}) {
@@ -586,10 +595,12 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
 	if (data.length == 0) {
         return;
     }
+	console.log(data,data[0].length);
     // 将数据转换为ArrayBuffer类型
-    var buffer;
+    let buffer;
+    // buffer = common.toArrayBuffer(data.shift());
     buffer = common.toArrayBuffer(data.shift());
-	console.log(buffer,'buffer写入---------------------');
+	console.log(data[0],data.shift(),buffer,'buffer写入---------------------');
 	// console.log(buffer,'buffer111');
     // 调用uni.writeBLECharacteristicValue方法，向蓝牙设备写入数据
 	setTimeout(() => {
@@ -597,7 +608,7 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
         deviceId: deviceId,
         serviceId: bluetoothDeviceConfig(device).writeServiceID,
         characteristicId: bluetoothDeviceConfig(device).writeID,
-        // writeType:'write',// 写入方式
+        writeType:'write',// 写入方式
         value: buffer,
         // 成功回调函数
         success(res) {
@@ -620,7 +631,7 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
             fail(res);
         }
     });
-	}, 500);
+	}, 600);
 }
 function stateUpdate(macid, callback = () => {}, fail = () => {}) {
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);

common/bluetooth/ZXCar.js

@@ -80,6 +80,7 @@ function alterConnect(device, deviceId) {
 	data.unshift(0x22,0x22,0x01)
 	
 	return [data]
+	// return [[0x22,0x22,0x02,0x01,0x02,0x1B,0xAA,0xAA]]
 }
 
 function crc8IEEE8023(data) {
@@ -118,6 +119,7 @@ function readData(device, value, data) {
 	console.log('***********************test');
 	var test = new Uint8Array(value);
 	const bmsData=Array.from(test);
+	console.log(bmsData,'bmsData-------------');
 	const normalArray =packBmsData(bmsData) 
 	
 	if(normalArray){

common/common.js

@@ -824,6 +824,9 @@ function countToDay(count, unit) {
 		case 2: //月
 			data = count * 30
 			break;
+		case 3: //年
+			data = count * 365
+			break;
 		case 4: //时
 			data = count
 			break;
@@ -850,6 +853,19 @@ 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);
+}
+
 module.exports = {
 	formatTime: formatTime,
 	obj2UrlQuery: obj2UrlQuery,
@@ -898,4 +914,5 @@ module.exports = {
 	countToDay: countToDay,
 	getFormattedTime: getFormattedTime,
 	callPhone: callPhone,
+	timestampToDays: timestampToDays,
 };

components/navBar/navBar.vue

@@ -38,7 +38,7 @@
 			},
 			bgColor: {
 				type: String,
-				default: 'rgba(255,255,255,0)'
+				default: 'rgba(255,255,255)'
 			},
 			left: {
 				type: String,

pages/order/order.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="container-view">
-		<navBar name="我的订单" left="0"></navBar>
+		<navBar name="我的订单" left="0" ></navBar>
 		<view class="order-type-view flex-row flex-between">
-			<view v-if="selectOrderType == 0" @click="srcFn(`/pages/carList/carList`)" class="car-model-list flex-row">
+			<view v-if="car_info.car_name" @click="srcFn(`/pages/carList/carList`)" class="car-model-list flex-row">
 				<view class="car-model-text">{{car_info.car_name}}</view><img class="right-corner-icon"
 					src="https://qiniu.bms16.com/Fqs6TrEmcdT7QNEdKWs9Hir2cacO" alt="">
 			</view>

pages/orderStatus/orderStatus.css

@@ -28,9 +28,6 @@
 	margin-bottom: 48rpx;
 }
 
-.time-info > view:nth-of-type(1) text {
-	margin-left: 32rpx;
-}
 
 .time-money {
 	background-color: #ffffff;
@@ -58,7 +55,7 @@
 
 .money-item > view:nth-of-type(2),
 .time-money > view:nth-of-type(3) {
-	color: #5E6F90;
+	color: #060809;
 	font-size: 28rpx;
 }
 
@@ -929,4 +926,14 @@
 	color: #060809;
 	opacity: 0.4;
 	margin-right: 16rpx;
+}
+.get-car-time{
+	font-weight: 600;
+	font-size: 54rpx;
+	color: #0A59F7;
+	margin: 0 4rpx;
+}
+.get-time-view{
+	font-weight: 400;
+	align-items: center;
 }

pages/orderStatus/orderStatus.vue

@@ -11,11 +11,7 @@
 					<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.hire_begin_time">
-					{{('请于'+orderInfo.hire_begin_times+'到门店取车')}}
-				</view>
-				<view v-if="orderInfo.order_status == 1 && !orderInfo.hire_begin_time">
-					待取车
+				<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 == 2">请上传车辆图片激活车辆</view>
 				<block v-if="orderInfo.pay_status == 2">
@@ -32,27 +28,19 @@
 				<view v-if="orderInfo.order_type != 3" class="flex-row flex-between">
 					<view class="money-item">
 						<view :class="orderInfo.order_status == 4?'red-status':''">
-							<block v-if="orderInfo.hire_duration_time">
-								{{orderInfo.hire_duration_time.day > 0 ? orderInfo.hire_duration_time.day :'' }}<text
-									v-if="orderInfo.hire_duration_time.day>0">日</text>{{orderInfo.hire_duration_time.hour > 0 ? orderInfo.hire_duration_time.hour :'' }}<text
-									v-if="orderInfo.hire_duration_time.hour>0">小时</text>{{orderInfo.hire_duration_time.minute > 0 ? orderInfo.hire_duration_time.minute :'' }}<text
-									v-if="orderInfo.hire_duration_time.minute>0">分</text>
-							</block>
-
+							<block v-if="orderInfo.hire_duration_time">{{orderInfo.hire_duration_time}}</block>
 						</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>
-							租借周期：{{orderInfo.hire_duration}}{{hireDurationUnitFn(orderInfo.hire_duration_unit)}}</view>
+						<view>{{((orderInfo.order_status == 2&&orderInfo.hire_type==2) || orderInfo.order_status == 3)?'租期剩余':(orderInfo.order_status == 4 ? '逾期时长':'租借周期')}}·<text style="opacity: 0.4;">天</text></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>
 					<view v-if="orderInfo.order_status != 4" class="money-item">
 						<view>
 							{{tools.toFix(orderInfo.hire_money / 100)}}
 						</view>
-						<view>订单金额·$</view>
+						<view>订单金额<text style="opacity: 0.4;">·$</text></view>
 					</view>
 
 					<view v-if="orderInfo.order_status == 4" class="money-item">
@@ -514,26 +502,21 @@
 							.orderInfo
 							.hire_end_time * 1000).format(
 							'YY-MM-DD') : 0
-				
+							console.log(me.orderInfo.order_status == 1);
+							let other_time=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)
+						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))
 						} else {
 							if (me.orderInfo.order_status == 4) {
 								me.overdueMoneyFn(me.orderInfo.car_sn)
 								
-								me.orderInfo.hire_duration_time = common.getTimeToDay(Math
-									.ceil(Math
-										.floor(new Date()) / 1000 - me.orderInfo
-										.hire_end_time) /
-									60)
+								me.orderInfo.hire_duration_time = common.timestampToDays(Math.ceil(Math.floor(new Date()) / 1000 - me.orderInfo.hire_end_time))
 							} else {
-								me.orderInfo.hire_duration_time = me.orderInfo.hire_return_time
+								me.orderInfo.hire_duration_time = common.timestampToDays(Math.ceil(me.orderInfo.hire_begin_time - me.orderInfo.hire_end_time))
 							}
 						}
 					} else {

pages/service/components/cabinetList/cabinetList.vue

@@ -12,7 +12,7 @@
 				</view>
 			</view>
 			<view  class="flex-row flex-end">
-				<view @tap="navBtn" :data-item="item" style="height: 56rpx;"><img style="width: 112rpx;height: 64rpx;" src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" alt=""></view>
+				<view @tap.stop="navBtn" :data-item="item" style="height: 56rpx;"><img style="width: 112rpx;height: 64rpx;" src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" alt=""></view>
 			</view>
 		</view>
 	</view>

pages/service/components/carRentalList/carRentalList.vue

@@ -73,7 +73,7 @@
 								src="https://qiniu.bms16.com/Ft0YA1JYmq66hdoeEN-PgBHy5vLa"  mode=""></image>
 						</view>
 						<view style="margin-left: 20rpx;">
-							<image @click="bindToNav(item)" style="width: 112rpx;height: 64rpx;"
+							<image @click.stop="bindToNav(item)" style="width: 112rpx;height: 64rpx;"
 								src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" mode=""></image>
 								
 						</view>