From 43942a545271345ce26e40d82bb97138c5ea7611 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/vehicle/shiwai.vue | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/h5/pages/staff/vehicle/shiwai.vue b/h5/pages/staff/vehicle/shiwai.vue
index bf13087..6f7b9e9 100644
--- a/h5/pages/staff/vehicle/shiwai.vue
+++ b/h5/pages/staff/vehicle/shiwai.vue
@@ -24,7 +24,7 @@
<view class="value" @click="isShowDate = true">
<text
class="mr6"
- :style="{ color: param.startTime ? '#999999' : '#999999' }"
+ :style="{ color: param.startTime ? '#000000' : '#999999' }"
>
<template v-if="param.startTime">
{{ param.startHours }}鑷硔{ param.endHours }}
@@ -36,8 +36,8 @@
</view>
</view>
<view class="have_info" v-if="info && info.length > 0">
- <view class="tit">鎮ㄧ敵璇风殑鐢ㄨ溅鏃舵宸叉湁杞﹁締棰勭害</view>
- <view class="content" v-for="item,i in info" :key="i">
+ <view class="tit">鎮ㄧ敵璇风殑鐢ㄨ溅鏃舵瀛樺湪浠ヤ笅棰勭害淇℃伅锛屾棤娉曢绾�</view>
+ <view class="content" v-for="(item, i) in info" :key="i">
<view class="card">{{ item.carCode }}</view>
<view class="line">
<text>鐢ㄨ溅鏃舵</text>
@@ -61,7 +61,7 @@
</view>
<view class="line">
<text>鐢宠浜�</text>
- <text>{{ item.memberName }} {{ item.memberMobile}}</text>
+ <text>{{ item.memberName }} {{ item.memberMobile }}</text>
</view>
</view>
</view>
@@ -70,7 +70,7 @@
<text class="sel" v-if="param.startTime"
>{{ param.startHours }}鑷硔{ param.endHours }}</text
>
- <text class="btn" @click="onSubmit">纭棰勭害</text>
+ <text class="btn" :class="{disable: info && info.length > 0}" @click="onSubmit">纭棰勭害</text>
</view>
<!-- -->
<!-- 閫夋嫨杞﹁締 -->
@@ -131,10 +131,7 @@
methods: {
onSubmit() {
const { param, info } = this
- if (info.length > 0) return uni.showToast({
- title: '璇烽噸鏂伴�夋嫨鏃堕棿娈�',
- icon: 'none'
- })
+ if (info.length > 0) return
if (!param.startTime) return uni.showToast({
title: '璇峰厛閫夋嫨鐢ㄨ溅鏃堕棿娈�',
icon: 'none'
@@ -217,7 +214,7 @@
<style lang="scss">
.have_info {
- padding: 0 0 200rpx;
+ padding: 0 0 200rpx;
.tit {
color: #ed4545;
margin: 40rpx 0 24rpx;
@@ -226,10 +223,10 @@
background: #f7f7f7;
border-radius: 16rpx;
padding: 30rpx 30rpx 10rpx;
- margin-bottom: 20rpx;
+ margin-bottom: 20rpx;
.card {
margin-bottom: 30rpx;
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #222222;
background: #f7f7f7;
@@ -317,7 +314,7 @@
position: fixed;
width: 100%;
left: 0;
- background-color: #fff;
+ background-color: #fff;
bottom: 0;
padding: 20rpx 30rpx 84rpx;
box-shadow: 0rpx -3rpx 6rpx 0rpx #eeeeee;
@@ -339,5 +336,8 @@
color: $uni-color-primary;
flex: 1;
}
+ .disable{
+ background: #CCCCCC;
+ }
}
</style>
--
Gitblit v1.9.3