bug修复

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>
@@ -236,14 +236,7 @@
 					common.simpleToast('未找到可更换的电池！')
 					return
 				}
-				if((this.listData.user_battery_list.length - this.listData.can_exchange_num) >= 0 && this.listData.can_exchange_num != -1){
-					
-					// if(showModal[1].confirm){
-					// 	uni.navigateTo({
-					// 		url:`/pages/batteryPackage/batteryPackage`
-					// 	})
-					// 	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

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

pages/cabinetDetail/cabinetDetail.vue

@@ -5,7 +5,7 @@
 			<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" />
+					<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="">

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>
@@ -200,9 +203,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/order/order.vue

@@ -269,10 +269,10 @@
 				// 获取当前时间
 				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) {

pages/orderStatus/orderStatus.vue

@@ -428,6 +428,13 @@
 						common.simpleToast('车型不匹配！')
 						return false
 					}
+					
+					if(data.data.is_hire == 1){
+						return true
+					}else{
+						common.simpleToast('车辆已被租售！')
+						return false
+					}
 					if(data.data.is_display == 1){
 						return true
 					}else{

pages/package/package.css

@@ -89,7 +89,7 @@
 .box-view {
 	padding-left: 24rpx;
 	padding-right: 24rpx;
-	margin-top: 68rpx;
+	margin-top: 210rpx;
 }
 
 .package-view {

pages/package/package.vue

@@ -5,7 +5,7 @@
 			<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>
@@ -87,51 +87,25 @@
 			return {
 				hireOrderList: [],
 				page: 1,
-				limit: 10,
+				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) {

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