提交

pages.json

@@ -1845,7 +1845,7 @@
 			"root": "subpackage/carPark",
 			"plugins": {
 			  "issuer-plugin": {
-			   "version": "dev-9515c32c2c4238a7c97828c8021cc805",
+			   "version": "dev-96c993265938f3d82316b4a8d8941a4b",
 			   // "version": "1.0.2",
 			   "provider": "wxa2d9acdd1054e69b"
 			  }

pages/order/components/order-list-item-new.vue

@@ -9,7 +9,7 @@
 				<text class="title">{{item.productName ?item.productName: ''}}</text>
 			</view>
 
-			<view class="status text-orange" v-if="item.orderStatus == OrderStatus.已取消 && item.deviceType != deviceType">已取消</view>
+			<view class="status text-orange" v-if="item.orderStatus == OrderStatus.已取消">已取消</view>
 			<!--异地 orderStatus=-1，你判断这个remoteStatus 是字符串7，就显示审核未通过 -->
 			<view class="status text-orange" v-else-if="item.orderStatus == OrderStatus.已取消 && item.remoteStatus=='7' && item.deviceType == deviceType">审核不通过</view>
 			<view class="status text-green" v-else

subpackage/carPark/channelSing/select-car.vue

@@ -1,37 +1,50 @@
 <template>
 	<view class="selectCar-box">
-		<view v-if="state.list.length > 0" @click="choose(item)" class="item" v-for="(item, i) in state.list" :key="i">
+		<view v-if="state.list.length > 0" @click="choose(i, item)" class="item" v-for="(item, i) in state.list"
+			:key="i">
 			<view class="iten-left">
 				<image :src="`${$imgUrl}che.png`" mode="aspectFill"></image>
-				<text>{{ item.vehiclePlate }}</text>
+				<view class="message">
+					<view>车牌号：{{ item.vehiclePlate }}</view>
+					<view>车牌颜色：{{ getVehiclePlateColor(item.vehiclePlateColor) }}</view>
+					<view v-if="item.cardId">卡号：{{ item.cardId }}</view>
+					<view v-if="item.cardStatus">卡状态：{{getCodeName('CARD_STATE_TYPE',item.cardStatus)}}</view>
+					<view v-if="item.obuId">签号：{{ item.obuId }}</view>
+					<view v-if="item.obuStatus">签状态：{{ getCodeName('OBU_STATE_TYPE',item.obuStatus) }}</view>
+				</view>
 			</view>
 			<view class="choose-item">
 				<view class="active" v-if="flag == i"> </view>
 			</view>
 		</view>
 		<view v-else class="flex"> 暂无车辆订单信息 </view>
+		<view style="text-align: center;margin: 20rpx;font-size: 30rpx;" v-if="state.flags">我是有底线的~</view>
+		
 	</view>
 </template>
 
 <script lang="ts" setup>
 	import { reactive, ref } from "vue";
-	import { navTo } from "@/utils/utils";
-	import { onLoad } from "@dcloudio/uni-app";
+	import { onLoad,onReachBottom } from "@dcloudio/uni-app";
 	import { orderList } from "@/utils/network/api.js";
 	import { request } from "@/utils/network/request.js";
-	import { msg } from "@/utils/utils";
 	import { getItem, StorageKeys } from "@/utils/storage";
 	import { stringToJson } from "@/utils/network/encryption";
-
+	import {
+		getCodeName
+	} from "@/datas/queryKey.js";
+	import {
+		getVehiclePlateColor
+	} from "@/datas/vehiclePlateColor";
 	const state = reactive({
 		list: [],
-		starts: false
+		starts: false,
+		pageSize: 10,
+		pageNo: 1,
+		flags: false,
 	});
 	onLoad(() => {
-		quanCheckActionTrue().then((item : any) => {
-			state.list = item.data;
-			console.log(item);
-		});
+		quanCheckActionTrue()
 	});
 
 
@@ -48,6 +61,8 @@
 			source: source,
 			tabIndex: "0",
 			isValueCard: "",
+			pageNo: state.pageNo,
+			pageSize: state.pageSize,
 		};
 		const options = {
 			type: 2,
@@ -55,18 +70,14 @@
 			method: "POST",
 			showLoading: true,
 		};
-		return new Promise(async (resolve, reject) => {
-			const res = await request(orderList, options);
-			const data = stringToJson(res.bizContent);
-
-			resolve(data);
-		}).catch((error) => {
-			reject(error);
-		});
+		request(orderList, options).then((res) => {
+			let dataAll = [...state.list, ...stringToJson(res.bizContent).data]
+			state.list =dataAll;
+		})
 	};
 
 	const flag = ref("0");
-	const choose = (item) => {
+	const choose = (i,item) => {
 		console.log("item", item);
 		// #ifdef MP-ALIPAY
 		uni.navigateTo({
@@ -79,6 +90,12 @@
 		});
 		// #endif
 	};
+	onReachBottom(() => {
+		if (state.list.length < state.pageNo * 10) return state.flags = true
+		console.log("触底了")
+		state.pageNo++
+		quanCheckActionTrue();
+	});
 </script>
 
 <style>
@@ -103,7 +120,7 @@
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
-			height: 130rpx;
+			// height: 130rpx;
 			background: #ffffff;
 			box-shadow: 0rpx 2rpx 6rpx 0rpx rgba(223, 223, 223, 0.8);
 			border-radius: 20rpx;
@@ -148,4 +165,8 @@
 			}
 		}
 	}
+	.message{
+		font-size: 26rpx;
+		margin-left: 6rpx;
+	}
 </style>