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

pages/carList/carList.vue

@@ -19,7 +19,7 @@
 		<Confirm
         v-model="showConfirm"
         :dialog-info="{
-          text: $t('是否确定'),
+          text: $t('是否切换到车辆' + clickItemData.car_name ),
           showCancelButton: true
         }"
         @confirm="unbindSubmit"

pages/package/package.css

@@ -99,6 +99,10 @@
 	margin-bottom: 20rpx;
 }
 
+.top-view{
+	margin-bottom: 30rpx;
+}
+
 
 .top-title {
 	color: #060809;

pages/package/package.vue

@@ -138,10 +138,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;
 			},
 			srcFn() {
 				uni.navigateTo({