From ee4c78feff3e03dec51c4a2bd13c6c36aed9b1dd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 一月 2025 14:46:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/driver/reservedRecord.vue | 404 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 216 insertions(+), 188 deletions(-)
diff --git a/h5/pages/driver/reservedRecord.vue b/h5/pages/driver/reservedRecord.vue
index 6876112..d0258c6 100644
--- a/h5/pages/driver/reservedRecord.vue
+++ b/h5/pages/driver/reservedRecord.vue
@@ -1,188 +1,216 @@
-<template>
- <view class="main_app">
- <!-- -->
- <view class="box_list">
- <view
- class="box_list_item"
- v-for="(item, index) in datalist"
- :key="index"
- @click="handleDetail(item.id)"
- >
- <view class="box_list_item_head">
- <text>{{item.driverName}}鐨勫叆鍥绾�</text>
- <text class="loading" :class="{red: item.status == 3}">{{ statusMap[item.status] }}</text>
- </view>
- <view class="box_list_item_nr">
- <view class="box_list_item_nr_item">
- <text>鍚堝悓缂栧彿锛�</text>
- <text>{{item.contractNum}}</text>
- </view>
- <view class="box_list_item_nr_item">
- <text>鍒板満鏃堕棿锛�</text>
- <text>{{item.arriveDate.slice(5,16)}}</text>
- </view>
- <view class="box_list_item_nr_item">
- <text>鍙告満濮撳悕锛�</text>
- <text>{{item.driverName}} {{item.driverPhone}}</text>
- </view>
- <view class="box_list_item_nr_item">
- <text>杞﹁締淇℃伅锛�</text>
- <text>{{item.carCodeFront}}</text>
- </view>
- <view class="box_list_item_nr_item">
- <text class="placeholder9">{{item.createDate.slice(0,16)}}鎻愪氦</text>
- </view>
- </view>
- </view>
- </view>
- </view>
-</template>
-
-<script>
- import { driverApplyRecord } from "@/api"
-export default {
- data() {
- return {
- isShowCar: false,
- isShowDate: false,
- param: {},
- page: 1,
- capacity: 20,
- total: 0,
- datalist: [],
- statusMap: {
- 0: '寰呭鎵�',
- 1: '瀹℃壒涓�',
- 2: '宸查�氳繃',
- 3: '宸叉嫆缁�',
- 4: '宸插彇娑�',
- }
- }
- },
- onShow() {
- this.page = 1
- this.getList()
- },
- onReachBottom() {
- const { total, datalist} = this
- if(datalist.length < total){
- this.page = this.page + 1
- this.getList()
- } else {
- this.showToast('鏆傛棤鏇村鏁版嵁')
- }
- },
- methods: {
- getList() {
- const { page, capacity } = this
- driverApplyRecord({
- page, capacity,model: {}
- }).then(res => {
- this.datalist = [...this.datalist, ...res.data.records]
- this.total = res.data.total
- })
- },
- handleDetail(id) {
- uni.navigateTo({
- url: `/pages/driver/reservedDetail?id=${id}`
- })
- },
- confirmDate(e) {
- console.log(e.value)
- this.param.aa = dayjs(e.value).format('YYYY-MM-DD')
- this.isShowDate = false
- },
- seletedCar(e) {
- console.log(e.value)
- this.param.aa = dayjs(e.value).format('YYYY-MM-DD')
- this.isShowDate = false
- }
- }
-};
-</script>
-
-<style lang="scss">
- page{
- background: #f7f7f7;
- }
-.main_app {
- background: #f7f7f7;
- padding: 0;
-}
-.app_header {
- display: flex;
- align-items: center;
- margin: 0 -15rpx;
- background-color: #fff;
- .item {
- width: 360rpx;
- height: 72rpx;
- margin: 15rpx;
- padding: 0 30rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- align-items: center;
- }
-}
-.box_list {
- width: 100%;
- padding: 30rpx;
- box-sizing: border-box;
- .box_list_item {
- width: 100%;
- margin-bottom: 20rpx;
- &:last-child {
- margin: 0 !important;
- }
- .box_list_item_head {
- width: 100%;
- height: 100rpx;
- padding: 0 30rpx;
- box-sizing: border-box;
- background: linear-gradient(270deg, #fefeff 0%, #e1f7fe 100%);
- border-radius: 8rpx 8rpx 0rpx 0rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- .loading {
- color: #4c99a8;
- }
- .success {
- color: #03c68f;
- }
- .error {
- color: #e0312a;
- }
- text {
- &:nth-child(1) {
- font-size: 32rpx;
- font-weight: 600;
- color: #222222;
- }
- &:nth-child(2) {
- font-size: 26rpx;
- font-weight: 400;
- }
- }
- }
- .box_list_item_nr {
- padding: 30rpx 30rpx 10rpx;
- width: 100%;
- box-sizing: border-box;
- background-color: #ffffff;
- .box_list_item_nr_item {
- width: 100%;
- display: flex;
- align-items: center;
- margin-bottom: 16rpx;
- text {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- }
- }
- }
- }
-}
-</style>
+<template>
+ <view class="main_app">
+ <!-- -->
+ <view class="box_list">
+ <view class="box_list_item" v-for="(item, index) in datalist" :key="index" @click="handleDetail(item.id)">
+ <view class="box_list_item_head">
+ <text>{{item.driverName}}鐨勫叆鍥绾�</text>
+ <text class="loading" :class="{red: item.status == 3}">{{ statusMap[item.status] }}</text>
+ </view>
+ <view class="box_list_item_nr">
+ <view class="box_list_item_nr_item">
+ <text>鍚堝悓缂栧彿锛�</text>
+ <text>{{item.contractNum}}</text>
+ </view>
+ <view class="box_list_item_nr_item">
+ <text>鍒板満鏃堕棿锛�</text>
+ <text>{{item.arriveDate.slice(5,16)}}</text>
+ </view>
+ <view class="box_list_item_nr_item">
+ <text>鍙告満濮撳悕锛�</text>
+ <text>{{item.driverName}} {{item.driverPhone}}</text>
+ </view>
+ <view class="box_list_item_nr_item">
+ <text>杞﹁締淇℃伅锛�</text>
+ <text>{{item.carCodeFront}}</text>
+ </view>
+ <view class="box_list_item_nr_item">
+ <text class="placeholder9">{{item.createDate.slice(0,16)}}鎻愪氦</text>
+ </view>
+ </view>
+ </view>
+ <view v-if="datalist.length === 0" style="text-align: center">
+ <image
+ src="@/static/empty.png"
+ style="width: 320rpx; margin: 120px auto 0"
+ mode="widthFix"
+ />
+ <view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+ import {
+ driverApplyRecord
+ } from "@/api"
+ export default {
+ data() {
+ return {
+ isShowCar: false,
+ isShowDate: false,
+ param: {},
+ page: 1,
+ capacity: 20,
+ total: 0,
+ datalist: [],
+ statusMap: {
+ 0: '寰呭鎵�',
+ 1: '瀹℃壒涓�',
+ 2: '宸查�氳繃',
+ 3: '宸叉嫆缁�',
+ 4: '宸插彇娑�',
+ }
+ }
+ },
+ onShow() {
+ this.page = 1
+ this.getList()
+ },
+ onReachBottom() {
+ const {
+ total,
+ datalist
+ } = this
+ if (datalist.length < total) {
+ this.page = this.page + 1
+ this.getList()
+ } else {
+ this.showToast('鏆傛棤鏇村鏁版嵁')
+ }
+ },
+ methods: {
+ getList() {
+ const {
+ page,
+ capacity
+ } = this
+ driverApplyRecord({
+ page,
+ capacity,
+ model: {}
+ }).then(res => {
+ this.datalist = [...this.datalist, ...res.data.records]
+ this.total = res.data.total
+ })
+ },
+ handleDetail(id) {
+ uni.navigateTo({
+ url: `/pages/driver/reservedDetail?id=${id}`
+ })
+ },
+ confirmDate(e) {
+ console.log(e.value)
+ this.param.aa = dayjs(e.value).format('YYYY-MM-DD')
+ this.isShowDate = false
+ },
+ seletedCar(e) {
+ console.log(e.value)
+ this.param.aa = dayjs(e.value).format('YYYY-MM-DD')
+ this.isShowDate = false
+ }
+ }
+ };
+</script>
+
+<style lang="scss">
+ page {
+ background: #f7f7f7;
+ }
+
+ .main_app {
+ background: #f7f7f7;
+ padding: 0;
+ }
+
+ .app_header {
+ display: flex;
+ align-items: center;
+ margin: 0 -15rpx;
+ background-color: #fff;
+
+ .item {
+ width: 360rpx;
+ height: 72rpx;
+ margin: 15rpx;
+ padding: 0 30rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ align-items: center;
+ }
+ }
+
+ .box_list {
+ width: 100%;
+ padding: 30rpx;
+ box-sizing: border-box;
+
+ .box_list_item {
+ width: 100%;
+ margin-bottom: 20rpx;
+
+ &:last-child {
+ margin: 0 !important;
+ }
+
+ .box_list_item_head {
+ width: 100%;
+ height: 100rpx;
+ padding: 0 30rpx;
+ box-sizing: border-box;
+ background: linear-gradient(270deg, #fefeff 0%, #e1f7fe 100%);
+ border-radius: 8rpx 8rpx 0rpx 0rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .loading {
+ color: #4c99a8;
+ }
+
+ .success {
+ color: #03c68f;
+ }
+
+ .error {
+ color: #e0312a;
+ }
+
+ text {
+ &:nth-child(1) {
+ font-size: 32rpx;
+ font-weight: 600;
+ color: #222222;
+ }
+
+ &:nth-child(2) {
+ font-size: 26rpx;
+ font-weight: 400;
+ }
+ }
+ }
+
+ .box_list_item_nr {
+ padding: 30rpx 30rpx 10rpx;
+ width: 100%;
+ box-sizing: border-box;
+ background-color: #ffffff;
+
+ .box_list_item_nr_item {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ margin-bottom: 16rpx;
+
+ text {
+ font-size: 26rpx;
+ font-weight: 400;
+ color: #666666;
+ }
+ }
+ }
+ }
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.3