提交代码

common/bluetooth.js

@@ -18,7 +18,8 @@ const bluetoothDevices = {
     AD3BTS: require('./bluetooth/AD3BTS.js'),
     BWJT: require('./bluetooth/ZXBT_JL.js'),
     JTBMS: require('./bluetooth/ZXBT_JL.js'),
-	ZXCAR: require('./bluetooth/ZXCar.js')
+	ZXZK: require('./bluetooth/ZXCar.js') //flk中控
+	// ZXCAR: require('./bluetooth/ZXCar.js') //flk中控
 };
 //初始化蓝牙
 function initBluetooth() {
@@ -50,24 +51,26 @@ function initBluetooth() {
     //监听低功耗蓝牙设备的特征值变化事件。必须先启用 notifyBLECharacteristicValueChange 接口才能接收到设备推送的 notification
     uni.onBLECharacteristicValueChange((res) => {
 		console.log(res,'restest1111');
-        if (app.globalData.connectionState[res.deviceId]) {
-            const device = app.globalData.connectionState[res.deviceId].device;
+		const car_sn=uni.getStorageSync('car_info').car_sn;
+        if (app.globalData.connectionState[car_sn]) {
+            const device = app.globalData.connectionState[car_sn].device;
 			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()
             ) {
-                var data = bluetoothDeviceConfig(device).readData(device, res.value, app.globalData.connectionState[res.deviceId].data);
-				// console.log(data,'data--------');
+				console.log(app.globalData.connectionState[car_sn],bluetoothDeviceConfig(device),'data--------');
+                var data = bluetoothDeviceConfig(device).readData(device, res.value, app.globalData.connectionState[car_sn].data);
+				
 				if (data) {
 					const app = getApp();
-                    app.globalData.connectionState[res.deviceId].data = data;
+                    app.globalData.connectionState[car_sn].data = data;
                     if (app.globalData.characteristicStateChangeFunc[device.mac_id]) {
                         Object.keys(app.globalData.characteristicStateChangeFunc[device.mac_id]).forEach((p) =>
                             app.globalData.characteristicStateChangeFunc[device.mac_id][p](data)
                         );
-						// common.simpleToast(app.globalData.connectionState[res.deviceId].data)
-                        console.log(app.globalData.connectionState[res.deviceId].data);
+						// common.simpleToast(app.globalData.connectionState[car_sn].data)
+                        console.log(app.globalData.connectionState[car_sn].data);
                     }
                 }
             }
@@ -243,18 +246,22 @@ function findDevice(device, callback = () => {}, fail = () => {}) {
 						res.devices.forEach((data) => {
 							// console.log(data,'data***************');
 							// 判断设备是否为指定设备
+							console.log('------',bluetoothDeviceConfig(device).isDevice(device, data));
 							if (bluetoothDeviceConfig(device).isDevice(device, data)) {
 								const app = getApp();
 								// uni.offBluetoothDeviceFound();
 								uni.stopBluetoothDevicesDiscovery(); //查找到蓝牙设备停止搜索
-								deviceId = data.deviceId;
+								const car_info= uni.getStorageSync('car_info')
+								const deviceIds = data.deviceId;
+								console.log(deviceIds,'deviceIds123');
+								const deviceId = car_info.car_sn;
 								if (app.globalData.connectionState[deviceId]) {
 									app.globalData.connectionState[deviceId].device = device;
 								} else {
 									app.globalData.connectionState[deviceId] = {
 										device: device,
 										deviceName:data.name,
-										deviceId: deviceId,
+										deviceId: deviceIds,
 										connected: false,
 										data: {}
 									};
@@ -294,7 +301,10 @@ function findDevice(device, callback = () => {}, fail = () => {}) {
                         // uni.offBluetoothDeviceFound();
                         // 停止蓝牙设备搜索
                         uni.stopBluetoothDevicesDiscovery();
-                        deviceId = data.deviceId;
+						const car_info= uni.getStorageSync('car_info')
+                        const deviceIds = data.deviceId;
+						console.log(deviceIds,'deviceIds456');
+						const deviceId = car_info.car_sn;
 						const app = getApp();
                          // 检查全局状态中是否已经存在该设备
                         if (app.globalData.connectionState[deviceId]) {
@@ -305,7 +315,7 @@ function findDevice(device, callback = () => {}, fail = () => {}) {
                             app.globalData.connectionState[deviceId] = {
                                 device: device,
 								deviceName:data.name,
-                                deviceId: deviceId,
+                                deviceId: deviceIds,
                                 connected: false,
                                 data: {}
                             };
@@ -360,10 +370,13 @@ function connectDevice(device, callback = () => {}, fail = () => {}) {
             return;
         }
     }
-	const device_name=app.globalData.connectionState[deviceId].deviceName
+	const car_sn=uni.getStorageSync('car_info').car_sn
+	const deviceIds = app.globalData.connectionState[car_sn].deviceId
+	console.log(deviceIds,'deviceIds');
+	const device_name=app.globalData.connectionState[car_sn].deviceName
     // 创建蓝牙连接
     uni.createBLEConnection({
-        deviceId: deviceId,
+        deviceId: deviceIds,
         success: (res) => {
 			console.log(res,'蓝牙连接成功');
 			const app = getApp();
@@ -371,14 +384,14 @@ function connectDevice(device, callback = () => {}, fail = () => {}) {
             app.globalData.connectionState[deviceId] = {
                 device: device,
 				deviceName: device_name,
-                deviceId: deviceId,
+                deviceId: deviceIds,
                 connected: true,
                 data: {}
             };
             // 调用连接成功回调
             alterConnect(
                 device,
-                deviceId,
+                deviceIds,
                 (res) => {
                     console.log('uni.createBLEConnection');
                     callback(res);
@@ -421,127 +434,131 @@ function alterConnect(device, deviceId, callback = () => {}, fail = () => {}) {
     }
 	console.log("xxxx2")
 	console.log(deviceId)
-    // 获取蓝牙设备的服务列表
+	var data = bluetoothDeviceConfig(device).alterConnect(device, 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,
-                success(res) {
-                    console.log(res,'res22222');
-                    // 获取蓝牙设备的读特征值
-                    uni.getBLEDeviceCharacteristics({
-                        deviceId: deviceId,
-                        serviceId: bluetoothDeviceConfig(device).readServiceID,
-                        success(res) {
-                            console.log(res,'res3333');
-                            // 监听蓝牙设备的读特征值变化
-                            uni.notifyBLECharacteristicValueChange({
-                                state: true,
-                                deviceId: deviceId,
-                                serviceId: bluetoothDeviceConfig(device).readServiceID,
-                                characteristicId: bluetoothDeviceConfig(device).readID,
-                                success(res) {
-                                    console.log(res);
-                                    // 判断设备是否支持  ，并且当前平台是否为安卓
-                                    if (bluetoothDeviceConfig(device).MTU && SystemInfoUtil.platform == SystemInfoUtil.ANDROID) {
-                                        // 设置蓝牙设备的MTU
-                                        uni.setBLEMTU({
-                                            deviceId: deviceId,
-                                            mtu: bluetoothDeviceConfig(device).MTU,
-                                            success: (res) => {
-                                                console.log('setBLEMTU success>>', res);
-                                                // 判断设备是否有alterConnect方法
-                                                if (bluetoothDeviceConfig(device).alterConnect) {
-                                                    var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
-													console.log(data[0],'data111111');
-                                                    // 判断alterConnect方法是否返回数据
-                                                    if (data) {
-                                                        // 写入数据
-														setTimeout(()=>{
-															writeData(device, deviceId, data, callback, fail);
-														},500)
+		writeData(device, deviceId, data, callback, fail);
+	},3000)
+    // 获取蓝牙设备的服务列表
+	// 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,
+ //                success(res) {
+ //                    console.log(res,'res22222');
+ //                    // 获取蓝牙设备的读特征值
+ //                    uni.getBLEDeviceCharacteristics({
+ //                        deviceId: deviceId,
+ //                        serviceId: bluetoothDeviceConfig(device).readServiceID,
+ //                        success(res) {
+ //                            console.log(res,'res3333');
+ //                            // 监听蓝牙设备的读特征值变化
+ //                            uni.notifyBLECharacteristicValueChange({
+ //                                state: true,
+ //                                deviceId: deviceId,
+ //                                serviceId: bluetoothDeviceConfig(device).readServiceID,
+ //                                characteristicId: bluetoothDeviceConfig(device).readID,
+ //                                success(res) {
+ //                                    console.log(res);
+ //                                    // 判断设备是否支持  ，并且当前平台是否为安卓
+ //                                    if (bluetoothDeviceConfig(device).MTU && SystemInfoUtil.platform == SystemInfoUtil.ANDROID) {
+ //                                        // 设置蓝牙设备的MTU
+ //                                        uni.setBLEMTU({
+ //                                            deviceId: deviceId,
+ //                                            mtu: bluetoothDeviceConfig(device).MTU,
+ //                                            success: (res) => {
+ //                                                console.log('setBLEMTU success>>', res);
+ //                                                // 判断设备是否有alterConnect方法
+ //                                                if (bluetoothDeviceConfig(device).alterConnect) {
+ //                                                    var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
+	// 												console.log(data[0],'data111111');
+ //                                                    // 判断alterConnect方法是否返回数据
+ //                                                    if (data) {
+ //                                                        // 写入数据
+	// 													setTimeout(()=>{
+	// 														writeData(device, deviceId, data, callback, fail);
+	// 													},3000)
                                                         
-                                                    } else {
-                                                        // 调用回调函数
-                                                        callback(res);
-                                                    }
-                                                } else {
-                                                    // 调用回调函数
-                                                    callback(res);
-                                                }
-                                            },
-                                            fail: (res) => {
-                                                console.log('setBLEMTU fail>>', res);
-                                                // 判断设备是否有alterConnect方法
-                                                if (bluetoothDeviceConfig(device).alterConnect) {
-                                                    var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
-                                                    // 判断alterConnect方法是否返回数据
-                                                    if (data) {
-                                                        // 写入数据
-                                                        writeData(device, deviceId, data, callback, fail);
-                                                    } else {
-                                                        // 调用回调函数
-                                                        callback(res);
-                                                    }
-                                                } else {
-                                                    // 调用回调函数
-                                                    callback(res);
-                                                }
-                                            }
-                                        });
-                                    } else {
-                                        // 判断设备是否有alterConnect方法
-                                        if (bluetoothDeviceConfig(device).alterConnect) {
-                                            var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
-                                            // 判断alterConnect方法是否返回数据
-                                            if (data) {
-                                                // 写入数据
-                                                writeData(device, deviceId, data, callback, fail);
-                                            } else {
-                                                // 调用回调函数
-                                                callback(res);
-                                            }
-                                        } else {
-                                            // 调用回调函数
-                                            callback(res);
-                                        }
-                                    }
-                                },
-                                fail(res) {
-                                    // 调用失败回调函数
-                                    fail(res);
-                                }
-                            });
-                        },
-                        fail(res) {
-                            // 调用失败回调函数
-                            fail(res);
-                        }
-                    });
-                },
-                fail(res) {
-					console.log('getBLEDeviceServices fail',res);
-                    // 调用失败回调函数
-                    fail(res);
-                }
-            });	
-			},800)
+ //                                                    } else {
+ //                                                        // 调用回调函数
+ //                                                        callback(res);
+ //                                                    }
+ //                                                } else {
+ //                                                    // 调用回调函数
+ //                                                    callback(res);
+ //                                                }
+ //                                            },
+ //                                            fail: (res) => {
+ //                                                console.log('setBLEMTU fail>>', res);
+ //                                                // 判断设备是否有alterConnect方法
+ //                                                if (bluetoothDeviceConfig(device).alterConnect) {
+ //                                                    var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
+ //                                                    // 判断alterConnect方法是否返回数据
+ //                                                    if (data) {
+ //                                                        // 写入数据
+ //                                                        writeData(device, deviceId, data, callback, fail);
+ //                                                    } else {
+ //                                                        // 调用回调函数
+ //                                                        callback(res);
+ //                                                    }
+ //                                                } else {
+ //                                                    // 调用回调函数
+ //                                                    callback(res);
+ //                                                }
+ //                                            }
+ //                                        });
+ //                                    } else {
+ //                                        // 判断设备是否有alterConnect方法
+ //                                        if (bluetoothDeviceConfig(device).alterConnect) {
+ //                                            var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
+ //                                            // 判断alterConnect方法是否返回数据
+ //                                            if (data) {
+ //                                                // 写入数据
+ //                                                writeData(device, deviceId, data, callback, fail);
+ //                                            } else {
+ //                                                // 调用回调函数
+ //                                                callback(res);
+ //                                            }
+ //                                        } else {
+ //                                            // 调用回调函数
+ //                                            callback(res);
+ //                                        }
+ //                                    }
+ //                                },
+ //                                fail(res) {
+ //                                    // 调用失败回调函数
+ //                                    fail(res);
+ //                                }
+ //                            });
+ //                        },
+ //                        fail(res) {
+ //                            // 调用失败回调函数
+ //                            fail(res);
+ //                        }
+ //                    });
+	// 			},
+ //                fail(res) {
+	// 				console.log('getBLEDeviceServices fail',res);
+ //                    // 调用失败回调函数
+ //                    fail(res);
+ //                }
+ //            });	
+	// 		},500)
             
-        },
-        fail(res) {
+ //        },
+ //        fail(res) {
 			
-            // 调用失败回调函数
-            fail(res);
-        }
-    });
-	},500)
+ //            // 调用失败回调函数
+ //            fail(res);
+ //        }
+ //    });
+	// },500)
 }
 // 关闭设备连接
 function closeDevice(macid, callback = () => {}, fail = () => {}) {
@@ -625,7 +642,6 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
     // buffer = common.toArrayBuffer(data.shift());
 	
     //buffer = common.toArrayBuffer(data.shift());
-	console.log()
 	var byteArray = data.shift()
 	const buffer = new ArrayBuffer(byteArray.length);
 	const dataView = new DataView(buffer);
@@ -638,7 +654,8 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
 	// console.log(buffer,'buffer111');
     // 调用uni.writeBLECharacteristicValue方法，向蓝牙设备写入数据
 	// setTimeout(() => {
-    uni.writeBLECharacteristicValue({
+		plus.bluetooth.writeBLECharacteristicValue({
+    // uni.writeBLECharacteristicValue({
         deviceId: deviceId,
         serviceId: bluetoothDeviceConfig(device).writeServiceID,
         characteristicId: bluetoothDeviceConfig(device).writeID,
@@ -656,7 +673,7 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
                 // // 否则，延时500毫秒后再次调用writeData函数
                 setTimeout(() => {
                     writeData(device, deviceId, data, callback, fail);
-                }, 50);
+                }, 150);
             }
         },
         // 失败回调函数
@@ -1063,12 +1080,12 @@ function sendOTACommand(macid, callback = () => {}, fail = () => {}) {
 function executeDeviceCommand(macid, commandName, callback = () => {}, fail = () => {}) {
     console.log('test');
 	const app = getApp();
-	const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
+	const deviceId =  app.globalData.connectionState[macid].deviceId
     if (deviceId == undefined) {
         fail();
         return false;
     }
-    const device = app.globalData.connectionState[deviceId].device;
+    const device = app.globalData.connectionState[macid].device;
     if (!bluetoothDeviceConfig(device)[commandName]) {
         fail();
         return false;
@@ -1077,7 +1094,7 @@ function executeDeviceCommand(macid, commandName, callback = () => {}, fail = ()
     if (data) {
 		setTimeout(()=>{
 			writeData(device, deviceId, data, callback, fail);
-		},200)
+		},100)
         return true;
     }
     fail();
@@ -1122,12 +1139,12 @@ function getSensitivity(macid, callback = () => {}, fail = () => {}) {
 //设置灵敏度
 function setSensitivity(macid,type, callback = () => {}, fail = () => {}) {
 	const app = getApp();
-	const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
+	const deviceId = app.globalData.connectionState[macid].deviceId
 	if (deviceId == undefined) {
 	    fail();
 	    return false;
 	}
-	const device = app.globalData.connectionState[deviceId].device;
+	const device = app.globalData.connectionState[macid].device;
 	if (!bluetoothDeviceConfig(device)[setSensitivity]) {
 	    fail();
 	    return false;

common/bluetooth/ZXCar.js

@@ -46,7 +46,7 @@ function isDevice(device, data) {
 	// if ( advertisData.slice(4, 10).toString() == "095A5832") {
 	//     return true;
 	// }
-		//判断是否是智寻的蓝牙
+	//判断是否是智寻的蓝牙
 	const result = data.name.startsWith("ZX");
 	// const result = data.name.startsWith("ZN");
 	// if (data.name === "865416038002201") {
@@ -72,8 +72,8 @@ function alterConnect(device, deviceId) {
 	// const data = [0x1F, 0x0F, ,0x5A,0x58, 0x35, 0x32, 0x30, 0x32, 0x32, 0x32, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
 	console.log("校检---》")
 	let data=[ 0x1F, 0x0F]
-	const device_name=app.globalData.connectionState[deviceId].deviceName
-	const device_sn=stringToHexArray(device_name)
+	// const device_name=app.globalData.connectionState[device.mac_id].deviceName
+	const device_sn=stringToHexArray(device.mac_id)
 	
 	// const car_info = uni.getStorageSync('car_info')
 	// const device_sn=stringToHexArray(car_info.car_sn)
@@ -95,7 +95,7 @@ function alterConnect(device, deviceId) {
 	// const threePart = data;
 	// return [data]
 	return [firstPart,secondPart]
-	// return [[0x22,0x22,0x02,0x01,0x02,0x1B,0xAA,0xAA]]
+	// return [[0x22]]
 }
 
 function crc8IEEE8023(data) {
@@ -443,54 +443,49 @@ function getNearCarCmdInfo(macid,data){
 		
 }
 function checkUnlock(macid,type='get'){
-	const app = getApp();
-	let deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
-	let device = app.globalData.connectionState[deviceId]
-	console.log(app.globalData.connectionState,'app.globalData.connectionState1111');
-	console.log(device,'device------------');
-	permision.getBondedDevices(deviceId).then(res=>{
-		if(res){
+	
+	const res=permision.getBondedDevices()
+	console.log(res,'test0000000000000');
+	let app=getApp()
+	if(res){
 			app.globalData.nearLockCheck=true
 			common.simpleToast('感应解锁已开启,前往设置灵敏度页面')
-			uni.navigateTo({ url: '/pages/bluetoothUnlock/unlockSet' })
+			uni.redirectTo({ url: '/pages/bluetoothUnlock/unlockSet' })
 			console.log('test');
 			//redirectTo 关闭当前页面 防止用户重复操作
-			
 		}else{
-				if(type==='login'){
-							//下发接近解锁指令
-							// const nearUnlockCmd=nearUnlock()
-							// console.log(nearUnlockCmd,'nearUnlockCmd');
-							// setTimeout(() => {
-							//     writeData(macid,nearUnlockCmd)
-							// }, 500);
-							
-							// 获取接近解锁指令信息
-							const getNearUnlockSetCmd=getNearUnlockSet()
-							console.log(getNearUnlockSetCmd,'getNearUnlockSetCmd');
-							setTimeout(() => {
-							    writeData(macid,getNearUnlockSetCmd)
-							}, 500);
-				}else{
-					uni.showModal({
-						title: '蓝牙配对确认',
-						content: '请在系统通知栏前往同意与'+device.deviceName+'设备配对',
-						cancelText: '取消',
-						confirmText: '已同意',
-						success: function(res) {
-							if (res.confirm) {
-								checkUnlock(macid)
-							}else{
-								// uni.redirectTo({ url: '/pages/index/index' })
-							}
-						},
-						fail: function(res) {},
-						complete: function(res) {},
-					})
-				}
-				
-		}
-	})
+			if(type==='login'){
+						//下发接近解锁指令
+						// const nearUnlockCmd=nearUnlock()
+						// console.log(nearUnlockCmd,'nearUnlockCmd');
+						// setTimeout(() => {
+						//     writeData(macid,nearUnlockCmd)
+						// }, 500);
+						
+						// 获取接近解锁指令信息
+						const getNearUnlockSetCmd=getNearUnlockSet()
+						console.log(getNearUnlockSetCmd,'getNearUnlockSetCmd');
+						setTimeout(() => {
+							writeData(macid,getNearUnlockSetCmd)
+						}, 200);
+			}else{
+				uni.showModal({
+					title: '蓝牙配对确认',
+					content: '请在系统通知栏前往同意与'+macid+'设备配对',
+					cancelText: '取消',
+					confirmText: '已同意',
+					success: function(res) {
+						if (res.confirm) {
+							checkUnlock(macid)
+						}else{
+							// uni.switchTab({ url: '/pages/index/index' })
+						}
+					},
+					fail: function(res) {},
+					complete: function(res) {},
+				})
+			}
+	}
 }
 
 
@@ -633,8 +628,9 @@ function splitNumber(num) {
 // 定义一个函数，用于向蓝牙设备写入数据
 function writeData(mac_id, data, callback = () => {}, fail = () => {}) {
 	const app = getApp();
-    const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == mac_id);
-    if (deviceId == undefined) {
+	const deviceIds = app.globalData.connectionState[mac_id].deviceId
+	console.log(deviceIds,'deviceIds');
+    if (deviceIds == undefined) {
         return ;
     }
 	// 如果数据长度为0，则直接返回
@@ -646,7 +642,7 @@ function writeData(mac_id, data, callback = () => {}, fail = () => {}) {
     buffer = common.toArrayBuffer(data.shift());
     // 调用uni.writeBLECharacteristicValue方法，向蓝牙设备写入数据
     uni.writeBLECharacteristicValue({
-        deviceId: deviceId,
+        deviceId: deviceIds,
         serviceId: writeServiceID,
         characteristicId: writeID,
         value: buffer,
@@ -658,7 +654,7 @@ function writeData(mac_id, data, callback = () => {}, fail = () => {}) {
             } else {
                 // 否则，延时500毫秒后再次调用writeData函数
                 setTimeout(() => {
-                    writeData(device, deviceId, data, callback, fail);
+                    writeData(device,  data, callback, fail);
                 }, 500);
             }
         },

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

component/carPlan/carPlan.css

@@ -66,11 +66,10 @@
 	justify-content: center;
 	background: #F3F8FF;
 	border-radius: 16rpx;
-	min-width: 158rpx;
-	padding: 0 20rpx;
 	border: 4rpx solid transparent;
 	margin-right: 18rpx;
 	box-sizing: border-box;
+	min-width: 158rpx;
 }
 .car-plan-list-i{
 	height: 158rpx;
@@ -78,11 +77,10 @@
 	justify-content: center;
 	background: #FFF;
 	border-radius: 16rpx;
-	min-width: 158rpx;
-	padding: 0 20rpx;
 	border: 4rpx solid #0A59F7;
 	margin-right: 18rpx;
 	box-sizing: border-box;
+	min-width: 158rpx;
 }
 .car-plan-unit{
 	font-weight: 400;
@@ -93,11 +91,13 @@
 	font-weight: 600;
 	font-size: 32rpx;
 	color: #060809;
+
 }
 .car-plan-unit-i{
 	font-weight: 400;
 	font-size: 32rpx;
 	color: #0A59F7;
+
 }
 .car-plan-price-i{
 	font-weight: 600;

component/carPlan/carPlan.vue

@@ -46,7 +46,7 @@
 						<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 v-if="params.sell_price != 0"  @click="tapSelectType({hire_duration_unit:100,hire_price:params.sell_price})" :class="['flex-row' , (type == 100 ? 'car-plan-list-i' : 'car-plan-list') ]" >
+					<view v-if="params.sell_price != 0 && isBuy"  @click="tapSelectType({hire_duration_unit:100,hire_price:params.sell_price})" :class="['flex-row' , (type == 100 ? 'car-plan-list-i' : 'car-plan-list') ]" style="padding:  0rpx 20rpx; min-width: auto; "  >
 						<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>
@@ -138,6 +138,10 @@
 		 * 组件的属性列表
 		 */
 		props: {
+			isBuy:{
+				type: Boolean,
+				default: true
+			},
 			params:{
 				type:Object,
 				default:{}

component/comPopup/Notice.vue

@@ -5,8 +5,8 @@
             <view class="title">{{ title }}</view>
             <view class="tips">
                 <text v-if="type=='bluetoothPail'">{{text}}</text>
-                <text v-else-if="type=='register'">我们向 <span style="color: #0A59F7;">{{email}}</span> 注册邮件，请您登录邮箱点击链接完成注册。</text>
-                <text v-else-if="type=='forgetPassword'">我们向 <span style="color: #0A59F7;">{{email}}</span> 发送了一封密码重置邮件，请您登录邮箱操作处理。</text>
+                <text v-else-if="type=='register'">我们已向 <span style="color: #0A59F7;">{{email}}</span> 发送注册邮件，请您登录邮箱点击链接完成注册。</text>
+                <text v-else-if="type=='forgetPassword'">我们已向 <span style="color: #0A59F7;">{{email}}</span> 发送了一封密码重置邮件，请您登录邮箱操作处理。</text>
             </view>
             <view class="btn" @tap="close">{{ btnText }}</view>
         </view>
@@ -55,7 +55,9 @@ export default {
     },
     methods: {
         close() {
-            this.$emit('input', false)
+            uni.navigateTo({
+            	url: '/pages/loginRegister/login',
+            })
         }
     }
 }

component/customTabbar/index.vue

@@ -25,7 +25,6 @@
 </template>
 
 <script>
-	var app = getApp();
 	const storage = require('@/common/storage.js');
 	const http = require('@/common/http.js');
 	const config = require('@/common/config.js');

component/scanCabBtn/scanBtn.vue

@@ -8,7 +8,7 @@
 			<view v-if="packType==0" class="look_package" @tap="clickLookPackage">查看套餐</view>
 			<view v-if="packType==2" class="look_package" @tap="clickMyPackage">去押金认证</view>
 			<view class="line_view"></view>
-			<image @tap="clickClosePackage" class="close_package"
+			<image @tap="isModelCenter = false" class="close_package"
 				src="https://zxappfile.bms16.com/zx_client/close_package.png"></image>
 		</view>
 	</view>
@@ -26,7 +26,7 @@
 	// var IndexImpl = require('../../pages/index/model/indexImpl.js');
 	const DF_CAB_INFO_DONE = 10000; //机柜信息传输完成
 	var subscribeTimer = null;
-	var app = getApp();
+	let app = getApp();
 	export default {
 		props: {
 			listData:{
@@ -140,8 +140,8 @@
 		},
 		methods: {
 			clickLookPackage() {
-				wx.switchTab({
-					url: '/pages/packageCenter/packageCenter'
+				wx.navigateTo({
+					url: '/pages/batteryPackage/batteryPackage'
 				})
 			},
 			clickMyPackage() {
@@ -224,24 +224,31 @@
 				})
 			},
 			async sacnBtn() {
+				
 				const user_token = storage.getUserToken()
 				if (!user_token) {
 					this.loadIsLogin()
 					return
 				}
 				await this.loadBatteryInfo()
-				if((this.listData.user_battery_list.length - this.listData.can_exchange_num) >= 0 && this.listData.can_exchange_num != -1){
-					common.simpleToast('您的次数不足无法换电！')
-					return
-				}
+				
 				if(this.isTagCodeFn().length < 1){
 					common.simpleToast('未找到可更换的电池！')
 					return
 				}
+				if((this.listData.user_battery_list.length - this.listData.can_exchange_num) <= 0 && this.listData.can_exchange_num === 0 && this.listData.can_exchange_num != -1){
+					this.packType = 0
+					this.isModelCenter = true
+					return
+				}
+				uni.showLoading({
+					title:' 加载中...'
+				})
 				let res = await uni.scanCode({
 					onlyFromCamera: true,
 					scanType: ['qrCode'],
 				});
+				uni.hideLoading()
 				var cabinet_dev_id = '';
 				if(res[0]) return
 				res = res[1]

component/uploaders/uploaders.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container">
+	<view >
 		<view class="list-group">
 			<view class="list-item" @longpress="bindDelImage" :data-idx="index"
 				v-for="(item, index) in imgList" :key="item.unique">
@@ -12,7 +12,6 @@
 				<view class="empity-item">＋</view>
 			</view>
 		</view>
-
 	</view>
 </template>
 
@@ -57,7 +56,7 @@ import upload from './upload.js';
 					const imgList = res[1].tempFilePaths
 					let data = await upload.uploadFile(imgList)
 					this.imgList = this.imgList.concat(data)
-					this.updateImages(data)
+					this.updateImages(this.imgList)
 				}
 			},	
 			

components/navBar/navigation.vue

@@ -0,0 +1,152 @@
+<template>
+		<view class="top-view flex-row"
+			:style="{'padding-top':`${statusBarHeight1}px`,background:`rgba(255,255,255,${opacity})`}">
+			<view class="navHei" :style="{'height':`calc(${navabarHeight}rpx)`,'width':'100%',}">
+				<view v-if="isback" class="left" @tap="bindReturnView">
+					<view class="pos">
+						<view   class="car-detail-style">
+							<image  class="return-view"
+								src="https://qiniu.bms16.com/FnHXbzly7aXi8zLghrTU5BZdwH5_" mode="aspectFill"></image>
+						</view>
+						<view :style="{opacity:1 - opacity,background:`rgba(0,0,0,0.4)`}" class="car-detail-style">
+							<image  class="return-view"
+								src="https://qiniu.bms16.com/Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG" mode="aspectFill"></image>
+						</view>
+					</view>
+				</view>
+				<text class="top-text">{{name}}</text>
+			</view>
+		</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			isback:{
+				type: Boolean,
+				default: true
+			},
+			name: {
+				type: String,
+				default: ''
+			},
+			scroll: {
+				default: 0,
+				type: Number
+			}
+		},
+		watch: {
+			scroll(n) {
+				this.opacity = n / 160
+			}
+		},
+		data() {
+			return {
+				opacity: 0,
+				statusBarHeight1: 0,
+				navabarHeight: 0,
+			}
+		},
+		mounted() {
+			this._getCustomBar()
+			this.opacity = this.scroll
+		},
+		methods: {
+			_getCustomBar() {
+				const sysinfo = uni.getSystemInfoSync()
+				// let GAP = 8
+				// // #ifdef MP-ALIPAY
+				// GAP = 0
+				// // #endif
+				// // #ifdef APP-PLUS
+
+				// // #endif
+				// // #ifdef MP-WEIXIN
+				// const clientRect = uni.getMenuButtonBoundingClientRect()
+				// const navabarHeight = (clientRect.bottom - sysinfo.statusBarHeight) + (clientRect.top - sysinfo.statusBarHeight) + GAP
+				// this.navabarHeight = navabarHeight
+				// // #endif
+
+				this.statusBarHeight1 = sysinfo.statusBarHeight
+				this.navabarHeight = 100
+			},
+
+			bindReturnView() {
+				uni.navigateBack({
+					delta: 1,
+				}) // 返回上一页
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.navHei {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+	}
+
+	.left {
+		width: 40rpx;
+		height: 40rpx;
+		position: absolute;
+		left: 0;
+	}
+
+	.top-view {
+		width: 100%;
+		position: fixed;
+		z-index: 99999;
+		left: 0;
+		top: 0;
+		align-items: center;
+		padding: 0 26rpx;
+		text-align: center;
+
+	}
+
+	.navHei {
+		position: relative;
+		width: 56rpx;
+		height: 56rpx;
+	}
+
+	.return-view {
+		width: 40rpx;
+		height: 40rpx;
+		
+		/* margin-top: 24rpx; */
+		/* 		margin-left: 32rpx; */
+	}
+
+	.top-text {
+		color: #060809;
+		font-size: 36rpx;
+		font-weight: 600;
+		line-height: 36rpx;
+		text-align: center;
+		font-style: normal;
+		font-family: PingFangSC, PingFang SC;
+	}
+
+	.view-height {
+		/* border-bottom:2rpx solid #060809 ; */
+		/* margin-bottom: 32rpx; */
+	}
+
+	.car-detail-style {
+		width: 56rpx;
+		height: 56rpx;
+		
+		border-radius: 16rpx 0rpx 16rpx 0rpx;
+		padding-left: 6rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: absolute;
+		left: 0;
+		top: 0;
+	}
+</style>

js_sdk/wa-permission/permission.js

@@ -444,9 +444,9 @@ function openGeneralSettings() {
     main.startActivity(intent);
 }
 
-async function getBondedDevices(deviceId) {
+function getBondedDevices() {
   // #ifdef APP-PLUS
-  try {
+
 	// 检查蓝牙是否可用
 	const BluetoothAdapter = plus.android.importClass('android.bluetooth.BluetoothAdapter');
 	const bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
@@ -470,11 +470,9 @@ async function getBondedDevices(deviceId) {
 	//   address: plus.android.invoke(device, 'getAddress'),
 	//   type: getDeviceType(plus.android.invoke(device, 'getBluetoothClass'))
 	// }));
-	const car_info = uni.getStorageSync('car_info') ||{}
-	const car_sn=car_info.car_sn
 	const app = getApp();
-	
-	let deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == car_sn);
+	const car_sn=  uni.getStorageSync('car_info').car_sn
+	const deviceId =app.globalData.connectionState[car_sn].deviceId
 	if(!deviceId) return false
 	//配对配对蓝牙设备是否在蓝牙列表里面
 	deviceArray.map(device => {
@@ -483,16 +481,7 @@ async function getBondedDevices(deviceId) {
 		}
 	});
 	return isPaired
-  } catch (e) {
-	console.error('获取蓝牙设备失败:', e);
-	// uni.showToast({ title: '获取设备列表失败', icon: 'none' });
-	return false;
-  }
-  // #endif
-  
-  // #ifndef APP-PLUS
-  console.warn('此方法仅支持APP平台');
-  return false;
+
   // #endif
 }
 
@@ -506,6 +495,14 @@ function getDeviceType(bluetoothClass) {
 //设备蓝牙权限是否开启
 function checkBluetoothPermission() {
     // #ifdef APP-PLUS
+	if (isIos) {
+        // iOS 平台蓝牙权限检查
+        // iOS 平台没有独立的蓝牙权限，但需要检查定位权限是否开启
+        // 因为在 iOS 上，蓝牙扫描需要定位权限
+        return judgeIosPermissionLocation();
+    } else {
+        // 安卓平台蓝牙权限检查
+        // #ifdef APP-PLUS
         // 检查蓝牙是否可用
         const BluetoothAdapter = plus.android.importClass('android.bluetooth.BluetoothAdapter');
         const bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
@@ -523,6 +520,8 @@ function checkBluetoothPermission() {
 
         console.log('蓝牙已启用');
         return true;
+        // #endif
+    }
     // #endif
 }
 

main.js

@@ -15,6 +15,9 @@ Vue.use(uView)
 import gyq_utils from '@/utils/gyq_utils'
 Vue.use(gyq_utils)
 
+import Navigation from '@/components/navBar/navigation.vue'
+Vue.component('Navigation', Navigation);
+
 uni.addInterceptor('request', {
 	fail: (err) => {
 		uni.hideLoading()

manifest.json

@@ -61,7 +61,10 @@
                 "minSdkVersion" : 21
             },
             "ios" : {
-                "dSYMs" : false
+                "dSYMs" : false,
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : ""
+                }
             },
             "sdkConfigs" : {
                 "ad" : {},

mixin/index.js

@@ -1,7 +1,7 @@
 // mixins/countdownMixin.js
 var bluetooth = require('@/common/bluetooth.js');
 import {getFunctionTag,setFunctionTag,getUserCurrentLocation} from '@/common/storage.js';
-var app = getApp();
+
 var config = require('@/common/config.js');
 var common = require('@/common/common.js');
 var http = require('@/common/http.js');
@@ -9,6 +9,7 @@ import i18n from '@/locale/index.js'
 export default {
   data() {
     return {
+		scrollTop: 0,
       carOnline: false, 
 	  statusBarHeight:0,
 	  popText:'',
@@ -19,6 +20,7 @@ export default {
   },
   onLoad(){
 	 this.myLocation = getUserCurrentLocation()
+	 this.locationMiXin()
   },
    mounted(){
   	  this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
@@ -28,7 +30,6 @@ export default {
 		   this.myLocation = await this.$location()
 	  },
 		tapOpenControl(e){
-			console.log(111);
 			const _carOnline=uni.getStorageSync('car_info').online!=0 //在线
 			console.log(this.popupControlShow);
 			const {name,type}=e
@@ -58,8 +59,9 @@ export default {
 		closePopup(){
 			this.popupControlShow=false
 		},
-		tapBlueToothCmd(isCarLocation=false){
+		tapBlueToothCmd(cmd,type){
 			const car_info= uni.getStorageSync('car_info');
+			const isCarLocation = (cmd=='more')?true:type
 			if(this.cmdType=='batteryInfo'){
 				uni.navigateTo({
 					url:`/pages/batteryDetail/batteryDetail`
@@ -85,11 +87,11 @@ export default {
 			}else{
 				// 判断车辆是否在线状态 true 在线调用接口 不在线提示连接蓝牙
 				if (this.carOnline) {
-					if(this.cmdType=='turnOnOrOff'){
-						const switchType=this.contrilList.find(item => item.isTurnOn)
-						const pData={
-							car_sn:car_info.car_sn,
-							switch:switchType
+					if (this.cmdType == 'turnOnOrOff') {
+						const switchType = this.contrilList.find(item => item.isTurnOn).isTurnOn
+						const pData = {
+							car_sn: car_info.car_sn,
+							switch: switchType
 						}
 						const me=this
 						common.loading();
@@ -97,14 +99,19 @@ export default {
 							uni.hideLoading();
 							if (resp.data.code === 200) {
 								common.simpleToast(me.popText + '成功');
-								const activeTag=me.contrilList.map(item=>{
-									item.isTurnOn=(item.isTurnOn==1)?0:1
-									item.name=i18n.t((item.isTurnOn==1)?'关机':'开机')
+								const activeTag = me.contrilList.map(item => {
+									if('isLock' in item){
+										item.isTurnOn = (item.isTurnOn == 1) ? 0 : 1
+										item.name = i18n.t((item.isTurnOn == 1) ? '关机' : '开机')
+									}
 									return item
 								})
-								const tag=getFunctionTag().tag
-								setFunctionTag({activeTag,tag})
-								
+								const tag = getFunctionTag().tag
+								setFunctionTag({
+									activeTag,
+									tag
+								})
+								me.$emit('loadCarDetail',pData,car_sn)
 							} else {
 								common.simpleToast(resp.data.msg);
 							}
@@ -136,8 +143,9 @@ export default {
 		bluetoothCmd(isCarLocation){
 			const me=this
 			const car_info= uni.getStorageSync('car_info');
+			const app = getApp();
 			//蓝牙是否已经连接 未连接提示去连接 已连接下发对应指令
-			const isBluetoothConnect = app.globalData.connectionStateChangeFunc[car_info.car_sn]
+			const isBluetoothConnect = app.globalData.nearLockCheck
 			if(isBluetoothConnect){
 				const isTurnOn=this.contrilList.find(item => item.isTurnOn).isTurnOn==1
 				console.log(isTurnOn,this.cmdType,this.contrilList);

pages.json

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

pages/activation/activation.css

@@ -36,7 +36,6 @@
 	border-radius: 40rpx;
 	padding-top: 12rpx;
 	padding-bottom: 12rpx;
-	width: 208rpx;
 	text-align: center;
 }
 

pages/activation/activation.vue

@@ -1,10 +1,9 @@
 <template>
 	<view class="">
-		<navBar name="我的订单" left="0"></navBar>
+		<navBar name="车辆激活" left="0"></navBar>
 		<view class="container-view">
 			<view class="return-info">
 				<view class="h5">车辆信息</view>
-		
 				<view v-if="overdueMoney" class="return-top  flex-row flex-between">
 					<view style="align-items: baseline;" class="flex-row">逾期费用：
 						<allPrice :amount="(overdueMoney/100)" />
@@ -13,6 +12,12 @@
 				<view class="return-top  flex-row flex-between">
 					<view>车辆编号：{{car_sn}}</view>
 				</view>
+				<!-- <view class="return-top  flex-row flex-between">
+					<view>车辆品牌：{{car_sn}}</view>
+				</view> -->
+				<view v-if="carInfoData.license_plate_number" class="return-top  flex-row flex-between">
+					<view>车牌号：{{carInfoData.license_plate_number}}</view>
+				</view>
 				<view class="return-top  flex-row flex-between">
 					<view>车辆名称：{{carInfoData.car_name}}</view>
 				</view>
@@ -20,14 +25,17 @@
 					<view>车型：{{carInfoData.model_name}}</view>
 				</view>
 				<view class="return-top  flex-row flex-between">
-					<view>续航：{{carInfoData.endurance}}m</view>
+					<view>续航：{{(carInfoData.endurance / 2).toFixed(2)}}km</view>
 				</view>
 				<view class="return-top  flex-row flex-between">
-					<view>重量：{{carInfoData.weight}}kg</view>
+					<view>重量：{{(carInfoData.weight / 100).toFixed(2)}}kg</view>
 				</view>
 				<view class="return-top  flex-row ">
 					<view>照片：</view>
-					<image class="img" :src="carInfoData.model_images" mode="aspectFill"></image>
+					<view style="display: flex;align-items: center;" class="">
+						<image style="margin-right: 10rpx;" v-for="(item,index) of carInfoData.model_images"
+							:key="index" class="img" :src="item" mode="aspectFill"></image>
+					</view>
 				</view>
 			</view>
 			<view v-if="shopInfo.shop_name" class="return-info">
@@ -40,23 +48,27 @@
 				</view>
 			</view>
 			<view class="pictures-info">
-				<view>车辆照片</view>
+				<view>上传照片</view>
 				<!-- <view>这里是关于激活车辆照片的文案描述，这里是关于激活车辆照片的文案描述</view> -->
-				<uploaders :max="Number(shopList.flk_hire_car_img_num)" :car_info="car_imgs"
-					@update-car-images="handleCarImagesUpdate"></uploaders>
+				<!-- <uploaders :max="Number(shopList.flk_hire_car_img_num)" :car_info="car_imgs"
+					@update-car-images="handleCarImagesUpdate"></uploaders> -->
+				<view class="list-group">
+					<view class="list-item" @click="bindUpImg(index)" @longpress="bindDelImage(index)" :data-idx="index" v-for="(item, index) in shopList.flk_hire_return_car_img"
+						:key="item.unique">
+						<image v-if="!item.imgUrl"  class="img-item-demo" :src="item.url"></image>
+						<image v-else class="img-item" :src="item.imgUrl" mode="aspectFill"></image>
+						<view class="img_text">{{ item.title? item.title : '车辆照片'}}</view>
+						<view v-if="!item.imgUrl" class="empity-item">＋</view>
+					</view>
+				</view>
 				<view v-if="isReturnCar" @tap="submitReturn" class="pictures-btn">归还车辆</view>
 				<view v-else @tap="submitEnabled" class="pictures-btn">激活车辆</view>
 			</view>
-		
 			<PayTypeModel @closeShow="()=>isShowToBuy=false" @payToOrder="payToOrder" :free_price="totalPrice"
 				:isShowToBuy="isShowToBuy" />
 		</view>
-		
 	</view>
-	
-
 </template>
-
 <script>
 	import uploaders from '@/component/uploaders/uploaders';
 	const http = require('@/common/http.js');
@@ -66,6 +78,7 @@
 	const common = require('@/common/common.js');
 	import PayTypeModel from '@/component/payTypeModel/payTypeModel';
 	import allPrice from '@/component/allPrice/allPrice';
+	import upload from '@//component/uploaders/upload.js.js';
 	export default {
 		components: {
 			uploaders,
@@ -74,6 +87,7 @@
 		},
 		data() {
 			return {
+				imgList:[],
 				totalPrice: 0,
 				isShowToBuy: false,
 				myLocation: {},
@@ -101,7 +115,6 @@
 		 */
 		onLoad: function(options) {
 			this.locationFn()
-			console.log(options, 'options');
 			this.isReturnCar = options.isReturnCar
 			if (options.isReturnCar) {
 				uni.setNavigationBarTitle({
@@ -136,6 +149,33 @@
 		onShow: function() {},
 		onUnload: function() {},
 		methods: {
+			async bindDelImage(index){
+				let res = await uni.showModal({
+					title: '提示',
+					content: '你确定要删除吗？',
+					showCancel: true,
+				})
+				if (res[1].confirm) {
+					this.shopList.flk_hire_return_car_img[index].imgUrl = ''
+					this.$forceUpdate()
+				}
+			},
+			async bindUpImg(index) {
+				let res = await uni.chooseImage({
+					count: 1,
+				})
+				if(res[1]){
+					const imgList = res[1].tempFilePaths
+					let data = await upload.uploadFile(imgList)
+					this.shopList.flk_hire_return_car_img[index].imgUrl = data[0].url
+					this.$forceUpdate()
+					// this.imgList = this.imgList.concat(data)
+					// this.updateImages(this.imgList)
+				}
+			},	
+			
+			
+			
 			async payToOrder(pay_type) {
 				let milliseconds = new Date().getTime();
 				const current_time = this.overdueTime ? this.overdueTime : parseInt(milliseconds / 1000);
@@ -177,17 +217,20 @@
 			},
 			//还车
 			async submitReturn() {
-				this._image_list = this.car_imgs.map(item => {
-					return item.url
+				let _image_list = this.shopList.flk_hire_return_car_img.map(item => {
+					return item.imgUrl
 				})
-				if (this._image_list.length < 1) return common.simpleToast('请上传车辆照片')
+				 _image_list = _image_list.filter(item=> {
+					if(item){
+						return item
+					}
+				})
+				if (_image_list.length < this.shopList.flk_hire_return_car_img.length) return common.simpleToast('请上传车辆照片')
 				if (this.totalPrice > 0) {
 					this.isShowToBuy = true
 				} else {
 					this.payToOrder(1)
 				}
-
-
 			},
 			async shopInfoFn() {
 				let res = await uni.getLocation()
@@ -216,6 +259,24 @@
 				})
 				if (data.code == 200) {
 					this.shopList = data.data
+					if(this.shopList.flk_hire_return_car_img.length < this.shopList.share_car_max_user_num){
+						let num = this.shopList.share_car_max_user_num - this.shopList.flk_hire_return_car_img.length
+						for (let i = 0; i < num; i++) {
+							this.shopList.flk_hire_return_car_img.push({
+								url:"",
+								imgUrl:'',
+								title:''
+							})
+							
+						}
+					}
+					if(this.shopList.flk_hire_return_car_img.length > this.shopList.share_car_max_user_num){
+						let flk_hire_return_car_img = []
+						for (let i = 0; i < this.shopList.share_car_max_user_num; i++) {
+							let item = this.shopList.flk_hire_return_car_img[i]
+							this.shopList.flk_hire_return_car_img.push(item)
+						}
+					}
 				} else {
 					common.simpleToast(data.msg)
 				}
@@ -227,6 +288,7 @@
 					car_sn: this.car_sn
 				})
 				if (data.code == 200) {
+					data.data.model_images = data.data.model_images.split(',') || []
 					this.carInfoData = data.data
 				} else {
 					common.simpleToast(data.msg)
@@ -239,8 +301,13 @@
 
 			submitEnabled() {
 				const me = this
-				const _image_list = this.car_imgs.map(item => item.url)
-				if (_image_list.length < 1) return common.simpleToast('请上传车辆照片')
+				let _image_list =this.shopList.flk_hire_return_car_img.map(item => item.imgUrl)
+				_image_list = _image_list.filter(item=> {
+					if(item){
+						return item
+					}
+				})
+				if (_image_list.length < this.shopList.flk_hire_return_car_img.length) return common.simpleToast('请上传车辆照片')
 				const pData = {
 					car_sn: this.car_sn,
 					sub_sn: this.sub_sn,
@@ -263,6 +330,73 @@
 	};
 </script>
 
-<style>
+<style scoped>
 	@import './activation.css';
+	.list-group {
+	    display: flex;
+	    flex-direction: row;
+	    justify-content: flex-start;
+	    flex-wrap: wrap;
+	}
+	
+	.list-item {
+		width: 200rpx;
+		height: 200rpx;
+		background-color: #F4F5F6;
+		border-radius: 16rpx;
+		display: flex;
+		flex-direction: column;
+	    margin-right: 9rpx;
+	    margin-bottom: 10rpx;
+		position: relative;
+		align-items: center;
+	}
+	
+	.img-item {
+	    width: 200rpx;
+	    height: 200rpx;
+	    background-color: #fff;
+		border-radius: 16rpx;
+	}
+	.img-item-demo {
+	    width: 200rpx;
+	    height: 200rpx;
+	    background-color: #fff;
+		border-radius: 16rpx;
+		/* 翻转图片的颜色 */
+		filter: invert(30%); 
+		opacity: 0.8;
+	}
+	
+	
+	
+	.empity-item {
+		position: absolute;
+		/* #ifdef MP-ALIPAY */
+		top: 0.7rem;
+		left: 0.5rem;
+		/* #endif */
+		/* #ifdef MP-WEIXIN */
+		top: 10rpx;
+		left: 48rpx;
+		/* #endif */
+	
+	    color: #e6e6e6;
+	    font-size: 120rpx;
+	    text-align: center;
+	}
+	
+	.img_text {
+	    font-family: PingFangSC, PingFang SC;
+	    font-weight: 500;
+	    font-size: 24rpx;
+	    color: #fff;
+	    line-height: 24rpx;
+	    /* text-align: center; */
+	    font-style: normal;
+	    /* text-align: center; */
+	    position: absolute;
+	    bottom: 17rpx;
+	    /* left: 73rpx; */
+	}
 </style>

pages/batteryDetail/batteryDetail.vue

@@ -13,18 +13,17 @@
 					<view class="battery-info-text">剩余电量</view>
 				</view>
 				<view class="battery-device-info">
-					<view class="quantity-info">{{item.voltage || 0}}<text class="quantity-text-1">%</text></view>
+					<view class="quantity-info">{{(item.voltage).toFixed(2) || 0}}<text class="quantity-text-1"></text></view>
 					<view class="battery-info-text">电压</view>
 				</view>
 				<view class="battery-device-info">
-					<view class="quantity-info">{{item.battery_temp || 0}} <text class="quantity-text-1">%</text></view>
+					<view class="quantity-info">{{item.battery_temp[0] || 0}} <text class="quantity-text-1">℃</text></view>
 					<view class="battery-info-text">温度</view>
 				</view>
 			</view>
 		</view>
 	</view>
 </template>
-
 <script>
 	const http = require('../../common/request.js');
 	const config = require('../../common/config_gyq.js');

pages/batteryPackage/batteryPackage.css

@@ -37,8 +37,9 @@
 	
 }
 .package-num{
-	font-size: 46rpx;
+	font-size: 40rpx;
 	margin-right: 2rpx;
+	margin-left: 6rpx;
 }
 .align-center{
 	align-items: center;

pages/batteryPackage/batteryPackage.vue

@@ -1,19 +1,20 @@
 <template>
 	<view class="battery-package-main">
-		<navBar bgColor="transparent" name="换电套餐" />
+		<navBar bgColor="#fff" name="换电套餐" />
+		
 		<view class="package-icon-view flex-row">
 			<img src="https://qiniu.bms16.com/FqF7erLOB8OutmFnre7-mbTkwpZr" alt="">
 			<view class="package-icon-text flex-row">5秒换电，瞬间满电，畅享骑行新体验！</view>
 		</view>
 		<view v-for="(item,index) of list" @click="selectItem(item)" :key="index" class="package-list-view" :class="{'active' : item.package_code == form.package_code }">
 			<view class="package-num-view flex-row"><text class="package-num">{{item.total_day || 0}}</text> 天 <text
-					class="package-num">{{item.total_num || 0}}</text> 次</view>
+					class="package-num">{{(item.total_num || 0)=== 0 ? '不限次数' : item.total_num + '次'}}</text></view>
 			<view class="flex-row flex-between align-baseline">
 				<view v-if="item.tag.child_tag_name" class="apply-battery">适用电池：<text class="apply-battery-num">{{ !!Number(item.tag.main_tag_name) ? item.tag.main_tag_name + "V" : item.tag.main_tag_name}}{{!!Number(item.tag.child_tag_name) ? item.tag.child_tag_name + "Ah" : item.tag.child_tag_name }}</text></view>
 				
 				<view v-else class="apply-battery">适用电池：<text class="apply-battery-num">{{ item.tag.main_tag_name }}</text></view>
 				<view class="flex-row align-baseline">
-					<text class="package-price">${{item.viewShowMoney || '0.00'}}</text>
+					<!-- <text class="package-price">${{item.viewShowMoney || '0.00'}}</text> -->
 					<text class="symbol-style">
 						<text>$</text>
 						<text style="font-size: 48rpx;">{{item.viewMoney || '0.00'}}</text>
@@ -46,7 +47,7 @@
 		<view style="height: 200rpx;">
 			
 		</view>
-		<view @click="isShowToBuy = true"  class="pay-btn">立即购买</view>
+		<view v-if="form.package_code" @click="isShowToBuy = true"  class="pay-btn">立即购买</view>
 		<payTypeModel @closeShow='isShowToBuy = false' :free_price='form.price' :isShowToBuy='isShowToBuy' @payToOrder='submit'></payTypeModel>
 	</view>
 </template>
@@ -94,14 +95,14 @@ import { fenToYuan, msg } from '../../utils/util.js';
 					data
 				} = await http.postApi(config.API_FLK_EXCHANGE_PACKAGE_PAY, this.form)
 				uni.hideLoading()
-				console.log(data)
 				if(data.code == 200){
 					uni.navigateTo({
-						url:`/pages/order/order`
+						url:`/pages/order/order?selectOrderType=0`
 					})
 				}else{
-					msg(res.data.msg)
+					msg(data.msg)
 				}
+				this.isShowToBuy = false
 			},
 			selectItem(item){
 				this.form.package_code = item.package_code
@@ -120,6 +121,10 @@ import { fenToYuan, msg } from '../../utils/util.js';
 						item.viewShowMoney = (item.show_money / 100).toFixed(2)
 						item.viewMoney = (item.money / 100).toFixed(2)
 					})
+					if(data.data.list.length > 0){
+						this.form.package_code = data.data.list[0].package_code
+						this.form.price = data.data.list[0].money
+					}
 					this.list = data.data.list
 					
 				}

pages/batteryRecord/batteryRecord.vue

@@ -1,7 +1,6 @@
 <template>
 	<view class="container-view">
 		<navBar name="换电记录" type="noBottom"></navBar>
-		
 		<view class="order-type-view flex-row flex-between">
 			<view v-if="car_info.car_sn" @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"
@@ -16,7 +15,7 @@
 				<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 class="time">{{dayjsFn(item.ctime)}}</view>
 			</view>
 			<view class="dl">
 				<view class="dt">换电单号</view>
@@ -39,7 +38,7 @@
 				<view class="dt">电柜名称</view>
 				<view class="dd">{{item.dev_name}}</view>
 			</view>
-			<image class="top" src="https://qiniu.bms16.com/FpVjOP5pZY1gXcCcS3TwI0GkywEe" mode=""></image>
+			<!-- <image class="top" src="https://qiniu.bms16.com/FpVjOP5pZY1gXcCcS3TwI0GkywEe" mode=""></image> -->
 		</view>
 	</view>
 </template>
@@ -64,6 +63,9 @@
 			this.listFn()
 		},
 		methods: {
+			dayjsFn(time){
+				return dayjs(time).format('YYYY-MM-DD hh:mm:ss')
+			},
 			srcFn(url){
 				uni.navigateTo({
 					url
@@ -78,8 +80,19 @@
 				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.btn_battery = item.btn_battery.filter(item=>{
+							if(item){
+								return item
+							}
+						})
+						item.bor_battery = item.bor_battery.filter(item=>{
+							if(item){
+								return 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)
 					})
 				}
@@ -91,7 +104,7 @@
 
 <style scoped lang="scss">
 	.car-model-text{
-		width: 260rpx;
+		max-width: 260rpx;
 		text-overflow: ellipsis;
 		overflow: hidden;
 		white-space: nowrap;

pages/bluetoothUnlock/bluetoothPair.vue

@@ -2,7 +2,7 @@
 	<view class="bluetoothPair-page">
 		<navBar name="开启感应解锁"></navBar>
 		<view class="car-wrap">
-			<view class="name">{{model_name}}</view>
+			<view class="name">{{car_info.model_name}}</view>
 			<image :src="QINIU_URL + 'Fi6CPKj4-raA86oizhL3PiXD4DkH'" class="car-img" />
 			<view>
 				<viwe class="pair-title">是否配对改设备</viwe>
@@ -54,16 +54,20 @@
 			return {
 				QINIU_URL,
 				showNotice: false,
-				model_name:'',
+				// model_name:'',
 				car_sn:'',
+				car_info:{},
+				isReconnecting: false // 新增标志位
 			}
 		},
 		onLoad(){
-			const { car_sn , model_name } = uni.getStorageSync('car_info')
-			this.setData({
-				model_name,
-				car_sn
-			})
+			
+			this.car_info= uni.getStorageSync('car_info')
+			this.car_sn=this.car_info.car_sn
+			// this.setData({
+			// 	model_name,
+			// 	car_sn
+			// })
 			 // console.log(app,'app');
 			 // return
 			 // bluetooth.initBluetooth()
@@ -186,12 +190,16 @@
 			},
 			loadBluetooth() {
 				const me = this;
+				const third_device_type = this.car_info.third_device_type
+				console.log(third_device_type,'third_device_type');
 				var device = {
 					mac_id: this.car_sn,
 					btid: this.car_sn,
 					btkey: this.car_sn,
-					bt_type: "ZXCAR",
-					device_type: "ZXCAR"
+					bt_type: third_device_type,
+					device_type: third_device_type,
+					// bt_type: 'ZXCAR',
+					// device_type: 'ZXCAR'
 				};
 				const app=getApp()
 				app.globalData.connectionState={}
@@ -210,8 +218,13 @@
 								if (!res.connected &&!('lockType' in app.globalData.nearLockInfo)) {
 									// 蓝牙连接断开
 									console.log('蓝牙连接断开');
-									me.loadBluetooth()
-									// common.simpleToast('蓝牙连接断开')
+									if (!me.isReconnecting) { // 检查标志位
+										me.isReconnecting = true; // 设置标志位
+										setTimeout(() => {
+											me.loadBluetooth();
+											me.isReconnecting = false; // 重置标志位
+										}, 100);
+									}
 								} else {
 									console.log('蓝牙连接成功');
 									// uni.hideLoading();
@@ -224,27 +237,28 @@
 							(res) => {
 								console.log('观察周围是否有其他骑手连接，请等待对方完成 或 微信是否开启了蓝牙权限',res,res.errCode);
 								uni.hideLoading();
-								var showContent = ""
-								if (res && ("errCode" in res)) {
-									if (res.errCode == 9000001) {
-										var showContent = "观察周围是否有其他骑手连接，请等待对方完成 或 微信是否开启了蓝牙权限！！"
-									} else {
-										var showContent = "连接失败，请尝试重新连接44444"+res.errCode
-									}
-								} else {
-									var showContent = "连接失败，请尝试重新连接55555"
-								}
-								uni.showModal({
-									title: '提示',
-									confirmText: '重新连接',
-									content: showContent,
-									success: function(res) {
-										if (res.confirm) {
-											
-											me.loadBluetooth();
-										} else {}
-									}
-								});
+								// var showContent = ""
+								// if (res && ("errCode" in res)) {
+								// 	if (res.errCode == 9000001) {
+								// 		var showContent = "观察周围是否有其他骑手连接，请等待对方完成 或 微信是否开启了蓝牙权限！！"
+								// 	} else {
+								// 		var showContent = "连接失败，请尝试重新连接44444"+res.errCode
+								// 	}
+								// } else {
+								// 	var showContent = "连接失败，请尝试重新连接55555"
+								// }
+								// uni.showModal({
+								// 	title: '提示',
+								// 	confirmText: '重新连接',
+								// 	content: showContent,
+								// 	success: function(res) {
+								// 		if (res.confirm) {
+								// 			setTimeout(()=>{
+								// 				me.loadBluetooth();
+								// 			},100)
+								// 		} else {}
+								// 	}
+								// });
 							}, 
 							(res) => {
 								// console.log('蓝牙未打开或请在右上角设置授权小程序使用蓝牙66666');

pages/cabinetDetail/cabinetDetail.vue

@@ -1,21 +1,22 @@
 <template>
-	<view v-if="cabinetInfo.dev_id" class="main-view">
-			<view class="content">
-				<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">
-						<img class="swiper-item-img" :src="item" />
-					</swiper-item>
-				</swiper>
-				<img v-else class="bg-img" src="https://qiniu.bms16.com/FhRnr7rADHHsOFfpWO4duD15SgIt" alt="">
+	<view class="main-view">
+		<Navigation :scroll='scrollTop'></Navigation>
+		<view class="content">
+			<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>
+			<img v-else class="bg-img" src="https://qiniu.bms16.com/FhRnr7rADHHsOFfpWO4duD15SgIt" alt="">
+		</view>
+		<view class="cabinet-detail">
+			<view class="cabinet-name-view flex-row flex-between">
+				<view class="cabinet-name">{{cabinetInfo.cabinet_name}}</view>
+				<!-- <view class="distance">{{cabinetInfo.distance}}km</view> -->
 			</view>
-			<view class="cabinet-detail">
-				<view class="cabinet-name-view flex-row flex-between">
-					<view class="cabinet-name">{{cabinetInfo.cabinet_name}}</view>
-					<!-- <view class="distance">{{cabinetInfo.distance}}km</view> -->
-				</view>
-	
-				<!-- <view v-if="tagList.length==0" class="no_battery">
+
+			<view v-if="tagList.length==0" class="no_battery">
 					无可用电池
 				</view>
 				<view class="flex-row" style="justify-content: center;">
@@ -27,42 +28,42 @@
 							<text class="tag_num">{{'x' + item.num}}</text>
 						</view>
 					</view>
-				</view> -->
-	
-				<view class="flex-row flex-between">
-					<view :class="isWorkTimer ? 'left_grid_2' : 'left_grid_1'">
-						<view class="flex-row">
-							<img class="icon_grid"
-								: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>
-						</view>
-						<view class="grid_text_2">
-							{{cabinetInfo.work_begin_time!=null?cabinetInfo.work_begin_time:'00:00'}}-{{cabinetInfo.work_end_time!=null?cabinetInfo.work_end_time:'23:59'}}
+				</view>
+
+			<view class="flex-row flex-between">
+				<view :class="isWorkTimer ? 'left_grid_2' : 'left_grid_1'">
+					<view class="flex-row">
+						<img class="icon_grid"
+							: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>
 					</view>
-					<view  @tap="navToCabinet" class="right_grid flex-between">
-						<view>
-							<view class="cab_distance">
-								直线距您{{cabinetInfo.distance>1?(cabinetInfo.distance+'千米'):(cabinetInfo.distance*1000+'米')}}
-							</view>
-							<view class="cab_address">{{cabinetInfo.address}}</view>
-						</view>
-						<view>
-							<img class="icon_grid_1" src="https://zxappfile.bms16.com/zx_admin/cab_nav.png">
-							<view class="grid_nav">导航</view>
+					<view class="grid_text_2">
+						{{cabinetInfo.work_begin_time!=null?cabinetInfo.work_begin_time:'00:00'}}-{{cabinetInfo.work_end_time!=null?cabinetInfo.work_end_time:'23:59'}}
+					</view>
+				</view>
+				<view @tap="navToCabinet" class="right_grid flex-between">
+					<view>
+						<view class="cab_distance">
+							直线距您{{cabinetInfo.distance>1?(cabinetInfo.distance+'千米'):(cabinetInfo.distance*1000+'米')}}
 						</view>
+						<view class="cab_address">{{cabinetInfo.address}}</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 class="battery-list-view">
-				<view class="battery-title flex-row flex-between">
-					<text class="blod-text">格口详情</text>
-					<text class="cabinet-ref">电柜编号：<text class="cabinet-ref-text"> {{cabinetInfo.dev_id}}</text></text>
-				</view>
-				<view class="battery-list-main flex-row flex-start">
-					<view class="battery-list" v-for="(item, index) in batteryList" :key="item.unique">
-						<!-- <block v-if="item.isReservation">
+		</view>
+		<view class="battery-list-view">
+			<view class="battery-title flex-row flex-between">
+				<text class="blod-text">格口详情</text>
+				<text class="cabinet-ref">电柜编号：<text class="cabinet-ref-text"> {{cabinetInfo.dev_id}}</text></text>
+			</view>
+			<view class="battery-list-main flex-row flex-start">
+				<view class="battery-list" v-for="(item, index) in batteryList" :key="item.unique">
+					<!-- <block v-if="item.isReservation">
 							<view class="battery-list-g">
 								<view class="namber-view flex-row">
 									<view class="namber namber-g">
@@ -77,76 +78,79 @@
 								<view class="tip-text tip-text-g1">已预约</view>
 							</view>
 						</block> -->
-						<!-- 没有预约-->
-						<!-- <block v-else> -->
-							<!-- 空仓或者仓门不可用-->
-							<view v-if="!item.cabinet_battery_sn||(item.fault_reason&&item.fault_reason.length>0)"
-								:class="(item.fault_reason&&item.fault_reason.length>0)?'battery-list-s':'battery-list-g'">
-								<!-- <view class="namber-view flex-row">
+					<!-- 没有预约-->
+					<!-- <block v-else> -->
+					<!-- 空仓或者仓门不可用-->
+					<view v-if="!item.cabinet_battery_sn||(item.fault_reason&&item.fault_reason.length>0)"
+						:class="(item.fault_reason&&item.fault_reason.length>0)?'battery-list-s':'battery-list-g'">
+						<!-- <view class="namber-view flex-row">
 									<view
 										:class="(item.fault_reason&&item.fault_reason.length>0)?'namber namber-s':'namber namber-g'">
 										{{item.box_sn}}
 									</view>
 								</view> -->
-	
-								<view class="namber-view flex-row flex-between">
-									<view
-										:class="(item.fault_reason&&item.fault_reason.length>0)?'namber namber-s':'namber namber-g'">
-										{{item.box_sn}}
-									</view>
-									<view v-if="item.tag_info" class="tag_type_n">
-										{{item.tag_info.main_tag_name ? (item.tag_info.main_tag_name) : ''}}{{item.tag_info.child_tag_name ? '/' + item.tag_info.child_tag_name : ''}}
-									</view>
-								</view>
-	
-								<view class="status-img-view flex-row">
-									<img v-if="!item.cabinet_battery_sn&&!(item.fault_reason&&item.fault_reason.length>0)"
-										class="status-img" src="https://qiniu.bms16.com/FtOgmvwtoUCVzEyxIau6-6i0hjLt"
-										alt="">
-									<img v-if="item.fault_reason&&item.fault_reason.length>0" class="status-img"
-										src="https://qiniu.bms16.com/FmMGYfe7eRSQvM8zeKEVeSmzbArd" alt="">
-								</view>
-								<!-- <view class="battery-ref">124513215</view> -->
-								<view v-if="!item.cabinet_battery_sn&&!(item.fault_reason&&item.fault_reason.length>0)"
-									class="tip-text tip-text-g">空仓</view>
-								<view v-if="item.fault_reason&&item.fault_reason.length>0" class="tip-text tip-text-u">
-									{{item.fault_reason[0]}}
-								</view>
+
+						<view class="namber-view flex-row flex-between">
+							<view
+								:class="(item.fault_reason&&item.fault_reason.length>0)?'namber namber-s':'namber namber-g'">
+								{{item.box_sn}}
 							</view>
-							<!-- 满电或者电量未满 -->
-							<view v-else :class="(item.is_full_soc==1)?'battery-list-b':'battery-list-o'">
-								<view class="namber-view flex-row flex-between">
-									<view :class="(item.is_full_soc==1)?'namber namber-b':'namber namber-o'">{{item.box_sn}}
-									</view>
-									<view v-if="item.tag_info" class="tag_type">
-										{{item.tag_info.main_tag_name ? (item.tag_info.main_tag_name) : ''}}{{item.tag_info.child_tag_name ? '/' + item.tag_info.child_tag_name : ''}}
-									</view>
-								</view>
-								<view class="status-img-view flex-row">
-									<view v-if="item.cabinet_battery_sn" class="progress-bar-view">
-										<progressView :soc="item.soc" :status="item.is_full_soc"></progressView>
-									</view>
-									<view v-if="item.cabinet_battery_sn" class="battery-number">
-										{{item.battery_sn}}
-										<!-- 0168 8256 9608 -->
-									</view>
-								</view>
-								<view v-if="item.is_full_soc==1" class="tip-text tip-text-b">电池可用</view>
-								<view v-else class="tip-text tip-text-o">待充满</view>
+							<view v-if="item.tag_info" class="tag_type_n">
+								{{item.tag_info.main_tag_name ? (item.tag_info.main_tag_name) : ''}}{{item.tag_info.child_tag_name ? '/' + item.tag_info.child_tag_name : ''}}
+							</view>
+						</view>
+
+						<view class="status-img-view flex-row">
+							<img v-if="!item.cabinet_battery_sn&&!(item.fault_reason&&item.fault_reason.length>0)"
+								class="status-img" src="https://qiniu.bms16.com/FtOgmvwtoUCVzEyxIau6-6i0hjLt" alt="">
+							<img v-if="item.fault_reason&&item.fault_reason.length>0" class="status-img"
+								src="https://qiniu.bms16.com/FmMGYfe7eRSQvM8zeKEVeSmzbArd" alt="">
+						</view>
+						<!-- <view class="battery-ref">124513215</view> -->
+						<view v-if="!item.cabinet_battery_sn&&!(item.fault_reason&&item.fault_reason.length>0)"
+							class="tip-text tip-text-g">空仓</view>
+						<view v-if="item.fault_reason&&item.fault_reason.length>0" class="tip-text tip-text-u">
+							{{item.fault_reason[0]}}
+						</view>
+					</view>
+					<!-- 满电或者电量未满 -->
+					<view v-else :class="(item.is_full_soc==1)?'battery-list-b':'battery-list-o'">
+						<view class="namber-view flex-row flex-between">
+							<view :class="(item.is_full_soc==1)?'namber namber-b':'namber namber-o'">{{item.box_sn}}
+							</view>
+							<view v-if="item.tag_info" class="tag_type">
+								{{item.tag_info.main_tag_name ? (item.tag_info.main_tag_name) : ''}}{{item.tag_info.child_tag_name ? '/' + item.tag_info.child_tag_name : ''}}
+							</view>
+						</view>
+						<view class="status-img-view flex-row">
+							<view v-if="item.cabinet_battery_sn" class="progress-bar-view">
+								<progressView :soc="item.soc" :status="item.is_full_soc"></progressView>
+							</view>
+							<view v-if="item.cabinet_battery_sn" class="battery-number">
+								{{item.battery_sn}}
+								<!-- 0168 8256 9608 -->
 							</view>
-						<!-- </block> -->
+						</view>
+						<view v-if="item.is_full_soc==1" class="tip-text tip-text-b">电池可用</view>
+						<view v-else class="tip-text tip-text-o">待充满</view>
 					</view>
+					<!-- </block> -->
 				</view>
-				<scanBtn :dev_id="dev_id" :listData='listData' :cab_info="cabinetInfo" @refreshCabinet="refreshCabinet"
-					@popPackageModel="clickPopPackageModel" ref="scanRef"></scanBtn>
 			</view>
-		
+			<scanBtn :dev_id="dev_id" :listData='listData' :cab_info="cabinetInfo" @refreshCabinet="refreshCabinet"
+				@popPackageModel="clickPopPackageModel" ref="scanRef"></scanBtn>
 		</view>
+
+	</view>
 </template>
 
 <script>
-	import { getLocation, msg,strJoin } from '../../utils/util.js';
-import progressView from '@/component/progressView/progressView';
+	import {
+		getLocation,
+		msg,
+		strJoin
+	} from '../../utils/util.js';
+	import progressView from '@/component/progressView/progressView';
 	const http = require('../../common/request.js');
 	const config = require('../../common/config_gyq.js');
 	const common = require('../../common/common.js');
@@ -161,10 +165,13 @@ import progressView from '@/component/progressView/progressView';
 			progressView,
 			scanBtn
 		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop
+		},
 		data() {
 			return {
 				dev_id: '',
-				listData:{},
+				listData: {},
 				isWorkTimer: true,
 				tagList: [],
 				batteryList: [], //电池列表
@@ -189,17 +196,17 @@ import progressView from '@/component/progressView/progressView';
 				isShowAppoint: false,
 				packType: 0,
 				notShow: 0,
-				car_info:{}
+				car_info: {}
 			};
 		},
 		/**
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad: function(options) {
-			this.notShow = options.notShow?options.notShow:1
+			this.notShow = options.notShow ? options.notShow : 1
 			this.dev_id = options.dev_id
 			const storedLocation = uni.getStorageSync('user_current_location');
-			this.car_info =  uni.getStorageSync('car_info') || {};
+			this.car_info = uni.getStorageSync('car_info') || {};
 			const car_list = uni.getStorageSync('user_car_list') || null
 			this.license_plate_number = car_list ? car_list.plate_number : ''
 			const me = this
@@ -220,7 +227,7 @@ import progressView from '@/component/progressView/progressView';
 				// this.getLocationAndSave();
 			}
 			// bluetooth.initBluetooth()
-			
+
 		},
 		/**
 		 * 生命周期函数--监听页面显示
@@ -234,9 +241,9 @@ import progressView from '@/component/progressView/progressView';
 					isModelCenter: false
 				})
 			},
-			clickPopPackageModel(e,notShow) {
+			clickPopPackageModel(e, notShow) {
 				// console.log(e.packType,notShow,'sadasd');
-				
+
 				// this.notShow = notShow?notShow:this.notShow
 				// if ((e.packType === 0&&this.notShow==1) || e.packType === 2) {
 				// 	this.setData({
@@ -278,13 +285,46 @@ import progressView from '@/component/progressView/progressView';
 				})
 			},
 
+			//计算电池数量
+			deduplicateAndCountByMainAndChild(data) {
+				// 1. 统计次数：根据 main_tag_code 和 child_tag_code（如果存在）
+				const countMap = {};
+
+				data.forEach(item => {
+					// 如果 child_tag_code 为空，则只根据 main_tag_code 统计
+					const key = item.child_tag_code ?
+						`${item.main_tag_code}_${item.child_tag_code}` :
+						item.main_tag_code;
+
+					countMap[key] = (countMap[key] || 0) + 1;
+				});
+
+				// 2. 去重并添加 num 字段
+				const seen = new Set();
+				return data.filter(item => {
+					// 生成去重键（与统计时逻辑一致）
+					const key = item.child_tag_code ?
+						`${item.main_tag_code}_${item.child_tag_code}` :
+						item.main_tag_code;
+
+					// 如果是第一次出现，添加 num 并保留
+					if (!seen.has(key)) {
+						seen.add(key);
+						item.num = countMap[key]; // 直接修改原对象（如需要深拷贝可改用 { ...item, num }）
+						return true;
+					}
+					// 否则过滤掉
+					return false;
+				});
+			},
+
 			async loadCabinetDetail() {
 				//获取机柜信息
 				const that = this
 				var _can_num = 0
 				let resp = await http.postApi(config.API_CABINET_INFO, {
-					car_sn:this.car_info.car_sn,
-					dev_id:this.dev_id,
+					car_sn: this.car_info.car_sn,
+					dev_id: this.dev_id,
 					longitude: this.myLocation.longitude,
 					latitude: this.myLocation.latitude,
 				})
@@ -297,7 +337,7 @@ import progressView from '@/component/progressView/progressView';
 					// 		_can_num = _can_num + 1
 					// 	}
 					// }
-				
+
 					var cabinetInfo = resp.data.data.cabinetInfo
 					cabinetInfo.work_begin_time = cabinetInfo.work_begin_time == null ? '00:00' : cabinetInfo
 						.work_begin_time
@@ -309,13 +349,21 @@ import progressView from '@/component/progressView/progressView';
 					var box_list = resp.data.data.boxList
 					// box_list = cabinetDetailImpl.getBoxReservation(box_list, reservation_List)
 					console.log(box_list, "box_list")
+					let tagList = []
+					box_list.map(item => {
+						if (item.tag_info) {
+							tagList.push(item.tag_info)
+						}
+
+					})
+					tagList = this.deduplicateAndCountByMainAndChild(tagList)
 					that.setData({
 						reservation_info: reservation_List,
 						isWorkTimer: isWorkTimer,
-						tagList: resp.data.data.tagList,
+						tagList,
 						cabinetInfo: cabinetInfo,
 						batteryList: box_list,
-						listData:resp.data.data,
+						listData: resp.data.data,
 						online_status: cabinetInfo.online_status,
 						can_battery_num: resp.data.data.can_exchange_num,
 						shop_image: JSON.parse(cabinetInfo.imgs.split(',')) || []
@@ -415,6 +463,6 @@ import progressView from '@/component/progressView/progressView';
 	};
 </script>
 
-<style  >
+<style>
 	@import './cabinetDetail.css';
 </style>

pages/carDetail/carDetail.vue

@@ -1,11 +1,7 @@
 <template>
 	<view>
 	<view class="car-detail-main">
-		<navBar type="carDetail"/>
-		<!-- <view v-if="car_detail.image" class="flex-row">
-			<img style="width: 600rpx;height: 406rpx; margin: auto; margin-bottom: 20rpx;" :src="car_detail.image"
-				alt="">
-		</view> -->
+		<Navigation :scroll='scrollTop'></Navigation>
 		<view class="store-img-view">
 			<swiper v-if="car_detail.model_images && car_detail.model_images.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>
@@ -107,7 +103,6 @@
 	import {
 		LEASE_TYPE_ARR
 	} from '@/common/constant.js'
-	var app = getApp();
 	var config = require('@/common/config.js');
 	var common = require('@/common/common.js');
 	var http = require('@/common/http.js');
@@ -134,9 +129,19 @@
 				this.model_id = options.model_id
 				this.locationFn()
 			}
+			if (options.shop_type) {
+				const d = {
+					hire_duration_unit:options.shop_type,
+					hire_price:Number(options.hire_price)
+				}
+				this.tapSelectType(d)
+			}
 			// this.loadCarInfo()
 			// getFlatternDistance 获取直线距离
 		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop
+		},
 		methods: {
 			locationFn() {
 				this.loadCarInfo(this.myLocation.longitude, this.myLocation.latitude)
@@ -150,12 +155,13 @@
 				}, (resp) => {
 					if (resp.data.code === 200) {
 						// resp.data.data.desc = resp.data.data.desc.replaceAll('/<img\b/gi, '$& style="1"'')
-						me.tapSelectType(resp.data.data.rental_setting[0])
+						
+						// me.tapSelectType(resp.data.data.rental_setting[0])
 						resp.data.data.distance = common.formatDistance(Number(resp.data.data.distance))
 						resp.data.data.desc = this.$htmlData(resp.data.data.desc)
 						me.setData({
 							car_detail: resp.data.data,
-							price: ((resp.data.data.rental_setting[0]?.hire_price || 0) / 100).toFixed(2)
+							// price: ((resp.data.data.rental_setting[0]?.hire_price || 0) / 100).toFixed(2)
 						})
 					} else {
 						common.simpleToast(resp.data.msg);

pages/carFunctionSet/more.vue

@@ -31,7 +31,7 @@
 			</view>
 		</view>
 		<view class="tips">{{ $t('长按拖动可调整顺序，可增减固定导航栏内容') }}</view>
-		<view class="un-bind-btn" @tap="toUnbind">{{ $t('解除绑定') }}</view>
+		<view v-if="showUnBind" class="un-bind-btn" @tap="toUnbind">{{ $t('解除绑定') }}</view>
 		<view v-if="popupControlShow" class="show-modal">
 			<view class="modal-info">
 				<view class="popup-title">{{($t(popText)==$t('开机'))?$t('开启车辆'):($t(popText)==$t('关机')?$t('关闭车辆'):$t(popText))}}</view>
@@ -77,6 +77,8 @@
 				isActiveEdit: false,
 				activeTabs: [],
 				toBeSelectTabs: [],
+				car_info :{},
+				showUnBind:true
 			}
 		},
 		computed: {
@@ -87,6 +89,10 @@
 				return this.isActiveEdit && this.realActiveTabs.length < this.MAX_TAB_LEN
 			}
 		},
+		onLoad(){
+			this.car_info =  uni.getStorageSync('car_info') || {};
+			this.showUnBind = !!this.car_info.sold_time
+		},
 		created() {
 			this.initializeTabs()
 		},

pages/carList/carList.vue

@@ -3,7 +3,10 @@
 	<navBar name="请选择设备" type="select"/>
 	<view class="car-list">
 		<view v-for="(item,index) of carList" :key="index" @click="clickItem(item)"  :class="['car-list-card',  car_info.car_sn == item.car_sn?'car-list-card-i' :'']">
-		    <view class="car-name" :class="{ 'car-name-i' : car_info.car_sn == item.car_sn}">{{item.car_name}}</view>
+		    <view class="flex-row">
+		    	<view class="car-name" :class="{ 'car-name-i' : car_info.car_sn == item.car_sn}">{{item.car_name}}</view>
+		    	<view class="car-name1">{{item.car_sn}}</view>
+		    </view>
 			<image v-if="car_info.car_sn == item.car_sn && isNearLockCheck" class="icon" src="/static/resource/images/gyq_ly.png" mode=""></image>
 			<!-- https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX -->
 			<image class="img" :src="item.model_images" mode="aspectFit"></image>
@@ -16,14 +19,14 @@
 			<view @click="navCarDetail" class="btn btn-left">{{ $t('租赁设备') }}</view>
 			<view class="btn btn-right">{{ $t('绑定设备') }}</view>
 		</view> -->
-		<Confirm
+		<!-- <Confirm
         v-model="showConfirm"
         :dialog-info="{
-          text: $t('是否确定'),
+          text: $t('是否切换到车辆' + clickItemData.car_name ),
           showCancelButton: true
         }"
         @confirm="unbindSubmit"
-      />
+      /> -->
 	</view>
 </view>
 </template>
@@ -31,11 +34,12 @@
 <script>
  import Confirm from '@/component/comPopup/Confirm'
 	var config = require('../../common/config.js');
-	var app = getApp();
+	let 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');
+		var bluetooth = require('@/common/bluetooth.js');
 	export default {
 		components: {
 			Confirm,
@@ -72,6 +76,7 @@
 				this.showConfirm = true
 				// uni.setStorageSync('car_info',item)
 				// this.car_info = item
+				this.unbindSubmit()
 			},
 			unbindSubmit(){
 				let car_sn = this.clickItemData.car_sn
@@ -107,7 +112,6 @@
 				this.car_info = uni.getStorageSync('car_info') || {};
 				const me = this
 				http.postApi(config.API_FLK_CAR_DEVICE_LIST, {}, (resp) => {
-					
 					if (resp.data.code === 200) {
 						const carList=resp.data.data.list
 						resp.data.data.list.map(item=>{
@@ -200,9 +204,9 @@
 .car-name{
     font-family: PingFangSC, PingFang SC;
     font-weight: 600;
-    font-size: 48rpx;
+    font-size: 36rpx;
     color: #828DA2;
-	width: 500rpx;
+	width: 460rpx;
 	text-overflow: ellipsis;
 	overflow: hidden;
 	white-space: nowrap;

pages/contract/contract.vue

@@ -21,7 +21,7 @@
 	const config = require('../../common/config.js');
 	var common = require('../../common/common.js');
 	var http = require('../../common/http.js');
-	var app = getApp();
+	let app = getApp();
 	export default {
 		data() {
 			return {

pages/dashboard/dashboard.vue

@@ -15,11 +15,21 @@
 		</view>
 
 		<view class="battery_life_progress">
-			<view :style="{width:((infoList.remain_mail || 0 / infoList.endurance || 0) * 100) + '%'}" class="is_progress"></view>
-			<view class="text ">
-				<text>续航</text>
-				<text> {{(infoList.remain_mail || 0/1000).toFixed(0) || 0}}km </text>
+			<view>
+				<view :style="{width:((infoList.remain_mail || 0 / infoList.endurance || 0) * 100) + '%'}"
+					class="is_progress"></view>
+				<view class="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;">
+				{{ ((infoList.remain_mail || 0 / infoList.endurance || 0) * 100) + '%' }}
 			</view>
+
 		</view>
 
 		<view class="info-container">
@@ -51,10 +61,10 @@
 		},
 		created() {
 			let car_sn = uni.getStorageSync('car_info').car_sn
-			if(car_sn){
+			if (car_sn) {
 				this._initInfoList()
 			}
-			
+
 		},
 		methods: {
 			async _initInfoList() {
@@ -177,13 +187,20 @@
 		}
 
 		.battery_life_progress {
+
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
 			width: 100%;
 			margin-bottom: 40rpx;
+			padding-right: 40rpx;
 			background: #FFFFFF;
 			border-radius: 40rpx;
 			overflow: hidden;
 			position: relative;
 			height: 92rpx;
+
 			.is_progress {
 				min-width: 30%;
 				height: 100%;
@@ -194,7 +211,8 @@
 				left: 0;
 				top: 0;
 			}
-			.text{
+
+			.text {
 				position: relative;
 				z-index: 1;
 				font-size: 32rpx;
@@ -203,7 +221,8 @@
 				align-items: center;
 				height: 92rpx;
 				padding-left: 10rpx;
-				text{
+
+				text {
 					line-height: 1;
 				}
 			}
@@ -213,6 +232,7 @@
 			display: flex;
 			flex-wrap: wrap;
 			justify-content: space-between;
+
 			.info-wrap {
 				width: 336rpx;
 				margin-bottom: 14rpx;

pages/index/components/AndroidUnlockAuth.vue

@@ -28,7 +28,7 @@
 </template>
 
 <script>
-	var app = getApp();
+	let app = getApp();
 	var common = require('@/common/common.js');
 	import permision from "@/js_sdk/wa-permission/permission.js"
 	// import mixin from '@/mixin/index.js'; // 引入 mixin

pages/index/components/control/control.vue

@@ -62,7 +62,7 @@
 </template>
 
 <script>
-	var app = getApp();
+	let app = getApp();
 	var bluetooth = require('@/common/bluetooth.js');
 	var config = require('@/common/config.js');
 	var common = require('@/common/common.js');

pages/index/components/mapCard/mapCard.vue

@@ -6,7 +6,7 @@
 				<cover-image class='img' style="width: 36rpx;height: 36rpx;" src="https://qiniu.bms16.com/FrKY7Ex5za22plr39ddIsJcjFVpi" ></cover-image>
 				<cover-view class="text">车辆位置</cover-view>
 			</cover-view>
-			<googleMap keyId="1" width='100%' :height="height?'258rpx':'140rpx'" v-if="car_info.latitude"  :mapData="{type:3}" :myLocation='{
+			<googleMap keyId="1" width='100%' :height="height?'258rpx':'140rpx'" v-if="car_info.latitude"  :mapData="{type:3}" :myLocations='{
 				longitude:car_info.longitude,
 				latitude:car_info.latitude
 			}'></googleMap>

pages/index/index.css

@@ -32,7 +32,7 @@
 	align-items: baseline;
 }
 .car-name-view .text{
-	width: 200rpx;
+	max-width: 200rpx;
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	overflow: hidden;

pages/index/index.vue

@@ -19,9 +19,9 @@
 							<img src="https://qiniu.bms16.com/FoSXDpVGvbdmwbX3CMUBvR7X4IzI"
 								style="width: 14rpx;height: 14rpx;" alt="">
 						</view>
-						<view @click="routerLink('/pages/message/index')" class="news">
-							<view v-if="(newsList.plate_count + newsList.device_count) > 0" class="num">
-								{{newsList.plate_count + newsList.device_count}}
+						<view @click="routerLink('/pages/message/index?isSys=0')" class="news">
+							<view v-if="newsList.device_count > 0" class="num">
+								{{ newsList.device_count}}
 							</view>
 							<image src="https://qiniu.bms16.com/FtlfBtBE5-TeTI5EdrciX_u8u_Sx"
 								style="width: 48rpx;height: 48rpx;" mode=""></image>
@@ -51,21 +51,20 @@
 								:show-percent="false" :percent="car_info.soc"></u-line-progress>
 							<view class="quantity-text flex-row">
 								<view style="font-weight:400;font-size: 22rpx;width: 44rpx;">{{$t("续航")}}</view>
-								<view style="font-size: 36rpx;">{{formatDistance(car_info.endurance) }}<text
-										style="font-size: 30rpx;">{{car_info.endurance>1000?'km':'m'}}</text></view>
+								<view style="font-size: 36rpx;">{{formatDistance(car_info.remain_mail) }}<text style="font-size: 30rpx;">{{car_info.remain_mail ? car_info.remain_mail>1000?'km':'m' :'km'}}</text></view>
 							</view>
 						</view>
 						<!-- <img :src="car_info.model_images||'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'" style="width: 100%;height: 526rpx;" alt=""> -->
 						<img :src="'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'"
 							style="width: 100%;height: 526rpx;" alt="">
 						<view class="flex-row align-center update-time-view">
-							<text  style="margin-right: 10rpx;">{{car_info.acc_state==1?$t("车辆已开机"): $t("车辆已关机")}} </text>
+							<text  style="margin-right: 10rpx;">{{car_info.online==1&&car_info.acc_state==1?$t("车辆已开机"): $t("车辆已关机")}} </text>
 							<text v-if="car_info.heart_time != 0" style="margin-right: 10rpx;">{{$t("更新于")}} {{tools.formatTime( car_info.heart_time|| '')}}</text>
 							<img :src="'https://qiniu.bms16.com/'+(isBluethConnect?'Fk3f9H_o-1Wq2xXx7I_xo7bxK1xJ':'FsL6XWGoIhfsVB7jRg6EGFVsuaTZ')"
 								:style="{width: (isBluethConnect?32:24)+'rpx',height: '32rpx'}" alt="">
 						</view>
 					</view>
-					<Control :contrilList="contrilList" @toBluetooth="inductiveUnlockHandle"/>
+					<Control :contrilList="contrilList" @toBluetooth="inductiveUnlockHandle" @loadCarDetail="loadCarDetail"/>
 			
 			
 					<view :class="['flex-row', 'flex-between', 'map-card-view',car_info.exchange_package_info && car_info.exchange_package_info.activity_time?'height_362':'height_260']">
@@ -158,7 +157,6 @@
 <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 app = getApp();
 	var config = require('@/common/config.js');
 	var config_gyq = require('@/common/config_gyq.js');
 	var common = require('@/common/common.js');
@@ -176,7 +174,7 @@
 		getFunctionTag,
 	} from '@/common/storage.js';
 	import permision from "@/js_sdk/wa-permission/permission.js"
-	var bluetooth = require('@/common/bluetooth.js');
+	let bluetooth = require('@/common/bluetooth.js');
 
 	export default {
 		data() {
@@ -221,7 +219,6 @@
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad: function(options) {
-			this.locationFn()
 			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
 			let _this = this
 			// #ifdef APP
@@ -305,7 +302,7 @@
 				// }
 			},
 			retry() {
-				console.log('115555')
+				
 			},
 			async newsNumFn() {
 				let {
@@ -315,17 +312,7 @@
 					this.newsList = data.data
 				}
 			},
-			locationFn() {
-				uni.getLocation({
-					success(res) {
-						let myLocation = {
-							latitude: res.latitude,
-							longitude: res.longitude,
-						}
-						storage.setUserCurrentLocation(myLocation)
-					}
-				})
-			},
+	
 			changCar(e) {
 				this.car_info = e
 			},
@@ -533,7 +520,12 @@
 					return (distanceMeters / 1000).toFixed(1);
 				} else {
 					// 否则直接返回米  
-					return distanceMeters.toFixed(0);
+					try {
+						return distanceMeters.toFixed(0);
+					} catch (error) {
+						return 0;
+					}
+					
 				}
 			},
 
@@ -563,6 +555,7 @@
 			line-height: 1;
 			background-color: #FA2918;
 			border-radius: 50%;
+			z-index: 99;
 		}
 	}
 </style>

pages/login/login.vue

@@ -44,7 +44,7 @@
 	var http = require('../../common/http.js');
 	var storage = require('../../common/storage.js');
 	var encryption = require('../../common/encryption.js')
-	var app = getApp()
+	let app = getApp()
 	export default {
 		data() {
 			return {

pages/loginRegister/changePassword.vue

@@ -62,10 +62,10 @@ export default {
 			if(res[1].confirm){
 				let {data} = await http.postApi(config.API_FLK_ACCOUNT_IMODIFY_PASSWD,this.form)
 				if(data.code == 200){
-					common.simpleToast(this.$t('修改成功'))
+					common.simpleToast(this.$t('修改成功,请重新登录'))
 					storage.removeUserToken()
 					uni.removeStorageSync('USER_INFO_DATA')
-					uni.redirectTo({
+					uni.reLaunch({
 						url:'/pages/loginRegister/login'
 					})
 				}else{

pages/loginRegister/forgetPassword.vue

@@ -40,7 +40,7 @@ export default {
     },
     computed: {
         noticeText({ email }) {
-            return `我们向 <span style="color: #0A59F7;">${email}</span> 发送了一封密码重置邮件，请您登录邮箱操作处理。`
+            return `我们已向 <span style="color: #0A59F7;">${email}</span> 发送了一封密码重置邮件，请您登录邮箱操作处理。`
         }
     },
     methods: {

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,242 +1,338 @@
 <template>
-    <view class="message-page">
-		<navBar name="我的消息"></navBar>
-        <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 class="status">{{item.message_overview}}</view>
-                </view>
-            </view>
-        </view>
-        
-        <view 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>
+	<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>
+		</view>
+		<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="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>
 </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: {}
-        }
-    },
-    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
 		},
-        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)
-                    })
-                }
-            })
-        },
-        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)
-                    })
-                }
-            })
-        }
-    }
-}
+		created() {
+			this.querySysMsgList()
+			this.queryDeviceMsg()
+			// this.readMessage()
+		},
+		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(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)
+						})
+					}
+				})
+			},
+			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/my.vue

@@ -7,8 +7,8 @@
 		<view :style="{height: `${statusBarHeight}px`}"></view>
 		<!-- #endif -->
 		<view  class="user-switch-row">
-			<view  @click="routerLink({ url: '/pages/message/index',isLogin:1 })" class="news">
-				<view v-if="(newsList.plate_count + newsList.device_count) > 0" class="num">{{newsList.plate_count + newsList.device_count}}</view>
+			<view  @click="routerLink({ url: '/pages/message/index?isSys=1',isLogin:1 })" class="news">
+				<view v-if="newsList.plate_count> 0" class="num">{{newsList.plate_count}}</view>
 				<image :src="QINIU_URL + 'FlL5BtEdMES2-mntjR9D3CX_LWYv'" class="message"
 					 />
 			</view>

pages/openCabinet/openCabinet.css

@@ -96,10 +96,14 @@
 .over-btn-view{
 	padding: 0 32rpx;
 	margin-bottom: 74rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
 }
 .over-btn{
+	margin: 0 20rpx;
 	height: 80rpx;
-	background: #0074FF;
+	background: #060809;
 	border-radius: 40rpx;
 	justify-content: center;
 	font-family: PingFangSC, PingFang SC;

pages/openCabinet/openCabinet.vue

@@ -39,6 +39,7 @@
 				<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 v-if="list.status==4" @click="srcFn(`/pages/carList/carList`)" class="over-btn flex-row">确认</view>
 				</view>
 			</view>
 		</view>
@@ -81,6 +82,11 @@
 			this.clearIntervalTimer()
 		},
 		methods: {
+			srcFn(url){
+				uni.redirectTo({
+					url
+				})
+			},
 			tapToIndex() {
 				this.isOverModal = false
 				uni.reLaunch({

pages/order/order.css

@@ -16,7 +16,7 @@
 	color: #060809;
 }
 .car-model-text{
-	width: 260rpx;
+	max-width: 260rpx;
 	text-overflow: ellipsis;
 	overflow: hidden;
 	white-space: nowrap;

pages/order/order.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="container-view">
-		<navBar name="我的订单" left="0" ></navBar>
-		<view class="order-type-view flex-row flex-between">
-			<view v-if="car_info.car_sn" @click="srcFn(`/pages/carList/carList`)" class="car-model-list flex-row">
+		<navBar name="我的订单" ></navBar>
+		<!-- <view v-if="selectOrderType == 0" class="order-type-view flex-row flex-between">
+			<view v-if="car_info.car_sn && selectOrderType == 0" @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>
@@ -16,6 +16,17 @@
 						src="https://qiniu.bms16.com/FmcoAVgWvyK44iPjK0phkDRU21i0" alt="">
 				</view>
 			</view>
+		</view> -->
+		<view  class="order-type-view flex-row flex-between">
+			<view style="justify-content: space-around;width: 100%;" class="order-package-type-view flex-row">
+				<view style="width: 128rpx;" v-for="(type, index) in orderTypes" :key="index" @tap="checkOrderType" :data-type="type.value"
+					:class="['package-type-list', 'flex-row', {'package-type-list-i': selectOrderType === type.value}]"
+					>
+					<view class="package-type-text">{{ type.text }}</view>
+					<img v-if="selectOrderType === type.value" class="right-button-icon"
+						src="https://qiniu.bms16.com/FmcoAVgWvyK44iPjK0phkDRU21i0" alt="">
+				</view>
+			</view>
 		</view>
 		<view v-for="(item, index) of hireOrderList" :key="index" @tap="loadToNav" :data-sub_sn="item.sub_sn"
 			class="order-card">
@@ -111,7 +122,8 @@
 						</view>
 						<view v-if="item.package_type == 1" class="item-label-view flex-row">
 							<view class="item-label">免费换电数</view>
-							<view class="item-value">{{item.last_num}}次</view>
+							<!-- <view class="item-value">{{item.last_num}}次</view> -->
+							<view class="item-value">不限次数</view>
 						</view>
 						<view v-if="item.package_type == 2" class="item-label-view flex-row">
 							<view class="item-label">免费换电数</view>
@@ -194,6 +206,7 @@
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad: function(options) {
+			this.selectOrderType = options.selectOrderType == 0 ? 0 : 1
 			const locationStr = uni.getStorageSync('user_current_location');
 			if (locationStr) {
 				this.myLocation = locationStr;
@@ -208,11 +221,13 @@
 			this.car_info = uni.getStorageSync('car_info') || {};
 			this.page = 1
 			this.hireOrderList = []
-			if(this.selectOrderType == 1){
-				this.bindHireOrderList()
-			}else{
-				this.bindExchangeOrderFn()
-			}
+			setTimeout(()=> {
+				if(this.selectOrderType == 1){
+					this.bindHireOrderList()
+				}else{
+					this.bindExchangeOrderFn()
+				}
+			}, 300);
 		},
 
 		// 分享给好友
@@ -255,25 +270,21 @@
 				// 获取当前时间
 				const now = dayjs();
 				// 解析到期时间
-				const endDate = dayjs(expirationDate);
+				const endDate = dayjs(expirationDate * 1000);
 				// 计算剩余天数
 				const remainingDays = endDate.diff(now, 'day');
-				return remainingDays || 0;
+				return remainingDays || 1;
 			},
 			//dayjs
 			validDurationFn(start, end) {
 				return getRemainingTime(start, end)
 			},
 			async bindExchangeOrderFn() {
-				if(!this.car_info.car_sn){
-					this.hireOrderList = []
-					return 
-				}
 				let {
 					data
 				} = await request.postApi(config_gyq.API_FLK_EXCHANGE_PACKAGE_ORDER_LIST, {
 					pay_status: -1,
-					car_sn: this.car_info.car_sn,
+					car_sn: '',
 					page: this.page,
 					limit: this.limit,
 				})

pages/orderStatus/orderStatus.css

@@ -952,6 +952,11 @@
 .get-time-view{
 	font-weight: 400;
 	align-items: center;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 600;
+	font-size: 48rpx;
+	color: #060809;
+	margin-bottom: 48rpx;
 }
 .serviceList{
 	display: flex;

pages/orderStatus/orderStatus.vue

@@ -4,25 +4,30 @@
 			<navBar bgColor="transparent" left="0"></navBar>
 			<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 class="get-time-view flex-row" v-if="orderInfo.pay_status == 0">待支付</view>
+					<view class="get-time-view flex-row" v-else-if="orderInfo.pay_status == 1">支付中</view>
+					<view class="get-time-view flex-row" v-else-if="orderInfo.pay_status == 3">支付失败</view>
+					<view class="get-time-view flex-row" v-else-if="orderInfo.pay_status == 4">支付取消</view>
+					<view class="get-time-view flex-row" v-else-if="orderInfo.pay_status == 5">线下待审核</view>
+					<view class="get-time-view flex-row" v-else-if="orderInfo.pay_status == 6">线下审核拒绝</view>
 				</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 == 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>
+					<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 v-if="orderInfo.order_status == 10">已完结</view>
 				</block>
-				<view v-if="orderInfo.order_status == 8||orderInfo.order_status == 9">已取消</view>
+
 			</view>
 
 			<view class="time-money">
@@ -31,7 +36,10 @@
 						<view :class="orderInfo.order_status == 4?'red-status':''">
 							<block v-if="orderInfo.hire_duration_time">{{orderInfo.hire_duration_time}}</block>
 						</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>
+							{{((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>
@@ -103,7 +111,7 @@
 					</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> $
+						<view class="sn-text"><text class="grey-text"></text> $
 							{{tools.toFix(orderInfo.deposit/1000)}}
 						</view>
 					</view>
@@ -140,7 +148,9 @@
 				<view>
 					<view class="top-flex">
 						<view>{{orderInfo.model_name}}</view>
-						<view>续航{{(orderInfo.endurance /100).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">
@@ -212,17 +222,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"
@@ -286,7 +302,7 @@
 		<returnCar :isShowReturnCar="isShowReturnCar" @closeShowReturnCarBtn="()=>isShowReturnCar=false"
 			@navStoreBtn="navStoreBtn" @immediatelyReturnBtn="immediatelyReturnBtn" />
 
-		<carPlan @payToOrder='payReturn' v-if="showCarPlan" @changeSelectType="changeSelectType"
+		<carPlan :isBuy='false' @payToOrder='payReturn' v-if="showCarPlan" @changeSelectType="changeSelectType"
 			@closeShowMore="showCarPlan = false" :params="params" :selectType="selectType" />
 
 		<PayTypeModel @closeShow="()=>isShowToBuy=false" @payToOrder="payToOrder" :free_price="totalPrice"
@@ -365,7 +381,7 @@
 				this.bindOrderInfo()
 			}
 		},
-		
+
 		onUnload: function() {},
 
 		computed: {},
@@ -396,7 +412,7 @@
 							...this.car_detail,
 							price: this.price
 						}
-						
+
 						me.setData({
 							car_detail: resp.data.data,
 							params: {
@@ -417,19 +433,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_display == 1){
+
+					if (data.data.is_hire == 1) {
+						return true
+					} else {
+						common.simpleToast('车辆已被租售！')
+						return false
+					}
+					if (data.data.is_display == 1) {
 						return true
-					}else{
+					} else {
 						common.simpleToast('车辆未展示！')
 						return false
 					}
@@ -448,19 +475,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() {
@@ -530,18 +557,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)
@@ -553,21 +581,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)
-							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))
+						//订单状态 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.css

@@ -8,11 +8,6 @@
 	background-size: cover;
 }
 
-.return-view {
-	width: 40rpx;
-	height: 40rpx;
-	margin-left: 32rpx;
-}
 
 .top-text {
 	margin-left: 230rpx;
@@ -94,7 +89,7 @@
 .box-view {
 	padding-left: 24rpx;
 	padding-right: 24rpx;
-	margin-top: 68rpx;
+	margin-top: 210rpx;
 }
 
 .package-view {
@@ -104,12 +99,11 @@
 	margin-bottom: 20rpx;
 }
 
-.top-view {
-	margin-bottom: 32rpx;
-	padding-bottom: 28rpx;
-	border-bottom: 2rpx solid #F4F5F6;
+.top-view{
+	margin-bottom: 30rpx;
 }
 
+
 .top-title {
 	color: #060809;
 	font-size: 42rpx;

pages/package/package.vue

@@ -1,15 +1,11 @@
 <template>
 	<view class="container-view">
-		<view class="top-bg" >
-			<navBar name="我的套餐" bgColor="transparent"></navBar>
-			<!-- <view class="flex-row" :style="'height:'+navabarHeight+'px;'">
-				<view class="flex-row" @tap="bindReturnView"><img class="return-view" src="https://qiniu.bms16.com/FnHXbzly7aXi8zLghrTU5BZdwH5_" /></view>
-				<text class="top-text">我的套餐</text>
-			</view> -->
-			
+		<view class="top-bg">
+			<Navigation :scroll='scrollTop'></Navigation>
+			<view :style="{height: `calc(${statusBarHeight}px + 100px)`}"></view>
 			<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 @click="$srcFn(`/pages/carList/carList`)" class="left-first flex-row">
 						<view>{{car_info.car_name}}</view>
 						<img class="left-img" src="https://qiniu.bms16.com/Fpf25Lkkrx05pvLw08mksVQKAQWf" />
 					</view>
@@ -25,22 +21,6 @@
 			</view>
 		</view>
 		<view class="box-view">
-			<!-- <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>
-						<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>
-					<view class="left-third">
-						<view>卡号:<text>2024110202578</text></view>
-					</view>
-				</view>
-				<img class="card-right" src="https://qiniu.bms16.com/FuOJQxzypa-NginyHGdsWlzwnB8z" />
-			</view> -->
 			<view class="package-view" v-for="item in hireOrderList">
 				<view class="top-view flex-row flex-between">
 					<view class="top-title" v-if="item.package_type == 1">
@@ -63,7 +43,8 @@
 				<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 style="color: #9FA7B7;">/{{item.total_day}}天</text>
+						{{calculateRemainingDays(item.expire_time)}}<text
+							style="color: #9FA7B7;">/{{item.total_day}}天</text>
 					</view>
 				</view>
 				<view v-if="item.package_type == 1" class="package-item">
@@ -85,84 +66,76 @@
 	</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 module="tools" lang="sjs" src="@/pages/common/wxs/tools.sjs"></script>
 <script>
 	var config = require('../../common/config_gyq.js');
 	var common = require('../../common/common.js');
 	var http = require('../../common/request.js');
 	var storage = require('../../common/storage.js');
 	const dayjs = require('dayjs');
-	import { getRemainingTime } from '../../utils/util.js';
+	import {
+		getRemainingTime
+	} from '../../utils/util.js';
 	export default {
 		components: {
-			
+
+		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop
 		},
 		data() {
 			return {
-				hireOrderList:[],
+				hireOrderList: [],
 				page: 1,
-				limit: 10,
-				car_info:{},
+				limit: 100,
+				car_info: {},
 				// statusBarHeight: 0,
 				// navabarHeight: 0,
-				packageList: [
-					{ctime: '2024-04-04 16:15',total_duration: 30,efficient_day: 24,change_rate: 6,total_times: 10,status:1},
-					{ctime: '2024-04-04 16:15',total_duration: 30,efficient_day: 24,change_rate: 6,total_times: 10,status:2},
-				]
+				packageList: []
 			};
 		},
 		/**
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad: function(options) {
-			this.car_info = uni.getStorageSync('car_info') || {};
-			// const clientRect = uni.getMenuButtonBoundingClientRect()
-			// const sysinfo = uni.getSystemInfoSync()
-			// let GAP = 8
-			// // #ifdef MP-ALIPAY
-			// GAP = 0
-			// // #endif
-			// const navabarHeight = (clientRect.bottom - sysinfo.statusBarHeight) + (clientRect.top - sysinfo.statusBarHeight) + GAP
-			// this.navabarHeight = navabarHeight
-			// this.statusBarHeight = sysinfo.statusBarHeight
-			this.mapCtx = uni.createMapContext('myMap');
-			this.listFn()
+			
 		},
 		/**
 		 * 生命周期函数--监听页面显示
 		 */
 		onShow: function() {
-			
+			this.car_info = uni.getStorageSync('car_info') || {};
+			this.listFn()
 		},
 		methods: {
-			 calculateRemainingDays(expirationDate) {
-			  // 获取当前时间
-			  const now = dayjs();
-			  // 解析到期时间
-			  const endDate = dayjs(expirationDate);
-			  // 计算剩余天数
-			  const remainingDays = endDate.diff(now, 'day');
-			  return remainingDays || 0;
+			calculateRemainingDays(expirationDate) {
+				// 获取当前时间
+				const now = dayjs();
+				// 解析到期时间
+				const endDate = dayjs(expirationDate * 1000);
+				// 计算剩余天数
+				const remainingDays = endDate.diff(now, 'day');
+				return remainingDays || 1;
 			},
-			srcFn(){
+			srcFn() {
 				uni.navigateTo({
 					url: `/pages/batteryPackage/batteryPackage`
 				})
 			},
-			validDurationFn(start,end){
-				return getRemainingTime(start,end)
+			validDurationFn(start, end) {
+				return getRemainingTime(start, end)
 			},
-			async listFn(){
+			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,
+					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)
+					this.hireOrderList = data.data.list
 				} else {
 					common.simpleToast(resp.data.msg)
 				}
@@ -178,7 +151,8 @@
 
 <style>
 	@import './package.css';
-	.packageBtn{
+
+	.packageBtn {
 		width: 686rpx;
 		height: 80rpx;
 		background: #060809;

pages/phoneLogin/phoneLogin.vue

@@ -34,7 +34,7 @@
 	var common = require('../../common/common.js');
 	var http = require('../../common/http.js');
 	var storage = require('../../common/storage.js');
-	var app = getApp()
+	let app = getApp()
 	export default {
 		data() {
 			return {

pages/powerSetting/powerSetting.vue

@@ -2,7 +2,7 @@
 		<view class="power-setting-main">
 			<navBar name="权限设置" bgColor="transparent"></navBar>
 			<view class="flex-row power-setting-head">
-				<img class="head-img" :src="headimg" alt="">
+				<image class="head-img" :src="headimg" mode="aspectFill"></image>
 				<view class="head-name">{{nickname}}</view>
 				<text class="head-email">{{form.email}}</text>
 			</view>
@@ -83,7 +83,7 @@
 				return
 			}
 			this.form.email = options.email;
-			this.form.headimg = options.headimg;
+			this.headimg = options.headimg;
 			this.form.nickname = options.nickname;
 		},
 		methods: {

pages/purchaseOrder/purchaseOrder.vue

@@ -198,7 +198,12 @@
 		,
 		onLoad: function(options) {
 			if (options && options.params) {
+				// #ifdef APP
 				const model_info = JSON.parse(options.params) || {}
+				// #endif
+				// #ifndef APP
+				const model_info = JSON.parse(decodeURIComponent(options.params)) || {}
+				// #endif
 				console.log(model_info, 'model_info');
 				model_info.model_images = model_info.model_images ? model_info.model_images[0] : ''
 				this.setData({

pages/service/components/carRentalList/carRentalList.vue

@@ -20,7 +20,7 @@
 					</view>
 				</view>
 				<view v-if="item.model_list.length===1">
-					<view @click.stop="$srcFn(`/pages/carDetail/carDetail?model_id=${item.model_list[0].model_id}`)"
+					<view @click.stop="$srcFn(`/pages/carDetail/carDetail?model_id=${item.model_list[0].model_id}&shop_type=${shopType}&hire_price=${item.model_list[0].hire_price}`)"
 						class="card-bottom card-first flex-row">
 						<view class="second-view flex-row">
 							<view>
@@ -46,7 +46,7 @@
 
 				<scroll-view v-if="item.model_list.length>1" :scroll-into-view="'into'+into" scroll-x="true" enable-flex
 					class="scrollview-box" scroll-with-animation @scroll="onScroll">
-					<view @click.stop="$srcFn(`/pages/carDetail/carDetail?model_id=${items.model_id}`)"
+					<view @click.stop="$srcFn(`/pages/carDetail/carDetail?model_id=${items.model_id}&shop_type=${shopType}&hire_price=${item.model_list[0].hire_price}`)"
 						v-for="(items,index) in item.model_list" :key="index"
 						:style="{ marginLeft: index > 0 ? '32rpx' : '0' }" class="form-item" :data-item="items">
 						<view class="second-view flex-row">

pages/service/service.vue

@@ -56,7 +56,8 @@
 				</view>
 				<view class="config-view flex-row">
 					<view @click='openSelectType' class="flex-row selectFlex">
-						<text class="text">{{leaseUnitsResult}}{{isBuy ? "+购买" : ''}}</text>
+						<text v-if="selectType === 'store'" class="text">{{leaseUnitsResult}}{{isBuy ? "+购买" : ''}}</text>
+						<text v-if="selectType === 'cabinet'" class="text">{{cabinetType ? cabinetType : '全部'}}</text>
 						<u-icon v-if="showLeaseType" name="arrow-down" color="#9FA7B7" size="26"></u-icon>
 						<u-icon v-else name="arrow-up" color="#9FA7B7" size="26"></u-icon>
 					</view>
@@ -79,7 +80,7 @@
 </template>
 
 <script>
-	var app = getApp();
+	let app = getApp();
 	var config = require("@/common/config.js");
 	var config_gyq = require("@/common/config_gyq.js");
 	var common = require("@/common/common.js");
@@ -285,15 +286,15 @@
 				});
 			},
 			//附近机柜列表
-			async loadNearCabinetList(name = '') {
+			async loadNearCabinetList(cabinet_name = '') {
 				const pData = {
 					limit: 50,
 					longitude: this.myLocation.longitude,
 					latitude: this.myLocation.latitude,
-					name
+					cabinet_name
 				};
 				const me = this;
-				var nearCabinetList = [];
+				let nearCabinetList = [];
 				let {
 					data
 				} = await http_gyq.postApi(config_gyq.API_FLK_CABINET_NEAR_LIST, pData)
@@ -301,15 +302,19 @@
 					this.markers = {}
 					// nearCabinetList = data.data.cabinetList || [];
 					for (let i = 0; i < data.data.cabinetList.length; i++) {
-						let item = nearCabinetList[i];
-						if(this.cabinetType)
-						for (let i = 0; i < item.tag_code.length; i++) {
-							let items = item.tag_code[i];
-							if(items.main_tag_name == this.cabinetType || items.child_tag_name == this.cabinetType){
+						let item = data.data.cabinetList[i];
+						if(this.cabinetType){
+							for (let i = 0; i < item.tag_code.length; i++) {
+								let items = item.tag_code[i];
+								if(items.main_tag_name == this.cabinetType || items.child_tag_name == this.cabinetType){
+									nearCabinetList.push(item)
+								}
 								
 							}
-							
+						}else{
+							nearCabinetList.push(item)
 						}
+						
 					}
 					let markers = {}
 					markers.markers = nearCabinetList.map(item => {
@@ -365,7 +370,7 @@
 				this.isFocused = true;
 			},
 			handleBlur() {
-				this.isFocused = false;
+				// this.isFocused = false;
 			},
 			clearSearch() {
 				this.setData({
@@ -374,6 +379,9 @@
 			},
 			openSearch() {
 				this.isSearch = !this.isSearch;
+				if(this.isSearch == false){
+					this.inputSearchValue = ''
+				}
 				this.isFocused = true;
 			},
 			openSelectType() {
@@ -401,6 +409,7 @@
 					this.loadCarRentalList()
 				}else{
 					this.cabinetType = e.leaseType
+					this.showLeaseType = false
 					this.loadNearCabinetList()
 				}
 				// console.log(e, "e");

pages/storeDetails/storeDetails.css

@@ -37,6 +37,10 @@
 	font-size: 40rpx;
 	color: #060809;
 	margin-bottom: 24rpx;
+	width: 600rpx;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
 }
 .store-type{
 	border-radius: 8rpx;
@@ -341,6 +345,8 @@
 		left: 20rpx;
 		top: 100rpx;
 		z-index: 1000;
+		display: flex;
+		align-items: center;
 	}
 	.return-view {
 		width: 40rpx;

pages/storeDetails/storeDetails.vue

@@ -1,22 +1,18 @@
 <template>
 	<view class="container-view">
-		<!-- <navBar></navBar> -->
-		<!-- <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> -->
+		<Navigation :scroll='scrollTop'></Navigation>
+		
 		<view class="store-img-view">
-			<view  :class="['car-detail-style']" @tap="bindReturnView">
-				<img  class="return-view" :src="'https://qiniu.bms16.com/Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG'" />
-			</view>
-			<swiper v-if="shop_image && 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 v-if="shop_image && 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">
@@ -124,7 +120,9 @@
 				</view>
 			</view>
 			<view class="car-info-list-view">
-				<view v-for="(item,index) of modelListsFn()"  @click="srcFn(`/pages/carDetail/carDetail?model_id=${item.model_id}`)" :key="index" class="car-info-view align-center flex-row">
+				<view v-for="(item,index) of modelListsFn()"
+					@click="srcFn(`/pages/carDetail/carDetail?model_id=${item.model_id}`)" :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[0]" mode="aspectFill"></image>
 					<view class="car-info">
@@ -135,8 +133,7 @@
 								<text style="margin-right: 8rpx;">{{typeArrFn(tagId)}}</text>
 								<priceTool :price="Number(item.money)" :font_size="40" />
 							</view>
-							<view
-								class="lease-btn">购/租</view>
+							<view class="lease-btn">购/租</view>
 						</view>
 					</view>
 				</view>
@@ -176,6 +173,9 @@
 				isWorkTimer: null
 			};
 		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop
+		},
 		computed: {},
 		/**
 		 * 生命周期函数--监听页面加载
@@ -263,14 +263,14 @@
 
 						let arrSet = Array.from(new Set(arr));
 						let tagListArr = []
-						arrSet.map(item=>{
-							LEASE_TYPE_ARR.map(items=>{
-								if(item == items.value){
+						arrSet.map(item => {
+							LEASE_TYPE_ARR.map(items => {
+								if (item == items.value) {
 									tagListArr.push(items)
 								}
 							})
 						})
-						tagListArr.sort((x,y)=>{
+						tagListArr.sort((x, y) => {
 							return x.sort - y.sort
 						})
 						this.tagList = tagListArr