From 73af3ed9fbcc616cdecc739fc4307163c19c5764 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 07 六月 2024 14:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/driver/reservedRecord.vue | 311 +++++++++++++++++++++++++++------------------------
1 files changed, 165 insertions(+), 146 deletions(-)
diff --git a/h5/pages/driver/reservedRecord.vue b/h5/pages/driver/reservedRecord.vue
index 5fcf708..befa0a5 100644
--- a/h5/pages/driver/reservedRecord.vue
+++ b/h5/pages/driver/reservedRecord.vue
@@ -1,160 +1,179 @@
<template>
- <view class="main_app">
- <!-- -->
- <view class="box_list">
- <view class="box_list_item" v-for="(item, index) in 3" :key="index" @click="handleDetail()">
- <view class="box_list_item_head">
- <text>涓佹仼鍑殑鍔冲姟鍏ュ巶鐢宠</text>
- <text class="loading">寰呭鏍�</text>
- </view>
- <view class="box_list_item_nr">
- <view class="box_list_item_nr_item">
- <text>琚闂汉锛�</text>
- <text>浜轰簨閮�-鐜嬩簹钃�</text>
- </view>
- <view class="box_list_item_nr_item">
- <text>杩涘巶鏃堕棿锛�</text>
- <text>12-12 09:00</text>
- </view>
- <view class="box_list_item_nr_item">
- <text>绂诲巶鏃堕棿锛�</text>
- <text>12-12 12:00</text>
- </view>
- <view class="box_list_item_nr_item">
- <text>鏉ヨ浜嬬敱锛�</text>
- <text>涓氬姟鏉ュ線</text>
- </view>
- <view class="box_list_item_nr_item">
- <text>闅忚杞﹁締锛�</text>
- <text>鐨朅88888</text>
- </view>
- </view>
- </view>
- </view>
- <!-- 閫夋嫨杞﹁締 -->
- <u-picker keyName="name" closeOnClickOverlay @close="isShowCar = false" :show="isShowCar" :columns="carList" @confirm="seletedCar" @cancel="isShowCar = false"></u-picker>
- <!-- 鏃ユ湡 -->
- <u-datetime-picker :show="isShowDate" :minDate="minDate" @confirm="confirmDate" @cancel="isShowDate = false" mode="date"></u-datetime-picker>
- </view>
+ <view class="main_app">
+ <!-- -->
+ <view class="box_list">
+ <view
+ class="box_list_item"
+ v-for="(item, index) in 3"
+ :key="index"
+ @click="handleDetail()"
+ >
+ <view class="box_list_item_head">
+ <text>涓佹仼鍑殑鍔冲姟鍏ュ洯鐢宠</text>
+ <text class="loading">寰呭鏍�</text>
+ </view>
+ <view class="box_list_item_nr">
+ <view class="box_list_item_nr_item">
+ <text>琚闂汉锛�</text>
+ <text>浜轰簨閮�-鐜嬩簹钃�</text>
+ </view>
+ <view class="box_list_item_nr_item">
+ <text>杩涘巶鏃堕棿锛�</text>
+ <text>12-12 09:00</text>
+ </view>
+ <view class="box_list_item_nr_item">
+ <text>绂诲洯鏃堕棿锛�</text>
+ <text>12-12 12:00</text>
+ </view>
+ <view class="box_list_item_nr_item">
+ <text>鏉ヨ浜嬬敱锛�</text>
+ <text>涓氬姟鏉ュ線</text>
+ </view>
+ <view class="box_list_item_nr_item">
+ <text>闅忚杞﹁締锛�</text>
+ <text>鐨朅88888</text>
+ </view>
+ </view>
+ </view>
+ </view>
+ <!-- 閫夋嫨杞﹁締 -->
+ <u-picker
+ keyName="name"
+ closeOnClickOverlay
+ @close="isShowCar = false"
+ :show="isShowCar"
+ :columns="carList"
+ @confirm="seletedCar"
+ @cancel="isShowCar = false"
+ ></u-picker>
+ <!-- 鏃ユ湡 -->
+ <u-datetime-picker
+ :show="isShowDate"
+ :minDate="minDate"
+ @confirm="confirmDate"
+ @cancel="isShowDate = false"
+ mode="date"
+ ></u-datetime-picker>
+ </view>
</template>
<script>
export default {
- data() {
- return {
- isShowCar: false,
- isShowDate: false,
- param: {},
- carList: [[{ name: 'aa', value: '11' }]],
- timeList: [{ time: '08:30-09:00' }, { time: '08:30-09:00' }, { time: '08:30-09:00' }, { time: '08:30-09:00' }]
- };
- },
- methods: {
- handleDetail() {
- uni.navigateTo({
- url: "/pages/driver/reservedDetail"
- })
- },
- 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;
- }
- }
+ data() {
+ return {
+ isShowCar: false,
+ isShowDate: false,
+ param: {},
+ carList: [[{ name: 'aa', value: '11' }]],
+ timeList: [{ time: '08:30-09:00' }, { time: '08:30-09:00' }, { time: '08:30-09:00' }, { time: '08:30-09:00' }]
+ }
+ },
+ methods: {
+ handleDetail() {
+ uni.navigateTo({
+ url: "/pages/driver/reservedDetail"
+ })
+ },
+ 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">
- .main_app{
- background: #F7F7F7;
- padding: 0;
- }
+.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;
- }
+ 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: 500;
- color: #222222;
- }
- &:nth-child(2) {
- font-size: 26rpx;
- font-weight: 400;
- }
- }
- }
- .box_list_item_nr {
- padding: 30rpx;
- width: 100%;
- box-sizing: border-box;
- background-color: #ffffff;
- .box_list_item_nr_item {
- width: 100%;
- display: flex;
- align-items: center;
- margin-bottom: 20rpx;
- text {
- &:nth-child(1) {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- }
- &:nth-child(2) {
- font-size: 26rpx;
- font-weight: 400;
- color: #333333;
- }
- }
- }
- }
- }
+ 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: 500;
+ color: #222222;
+ }
+ &:nth-child(2) {
+ font-size: 26rpx;
+ font-weight: 400;
+ }
+ }
+ }
+ .box_list_item_nr {
+ padding: 30rpx;
+ width: 100%;
+ box-sizing: border-box;
+ background-color: #ffffff;
+ .box_list_item_nr_item {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ margin-bottom: 20rpx;
+ text {
+ &:nth-child(1) {
+ font-size: 26rpx;
+ font-weight: 400;
+ color: #666666;
+ }
+ &:nth-child(2) {
+ font-size: 26rpx;
+ font-weight: 400;
+ color: #333333;
+ }
+ }
+ }
+ }
+ }
}
</style>
--
Gitblit v1.9.3