From d15b33c27ec6b20281ba4764361aee0b44d596ea Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 26 六月 2024 16:39:19 +0800
Subject: [PATCH] bug
---
h5/pages/staff/vehicle/shiwai.vue | 14 +++++++-------
h5/pages/staff/snapshot.vue | 12 ++++++++----
h5/pages/staff/memberSel.vue | 8 +++++---
h5/pages/staff/vehicle/applePeo.vue | 2 +-
h5/pages/staff/vehicle/apply.vue | 10 ++++++++--
5 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/h5/pages/staff/memberSel.vue b/h5/pages/staff/memberSel.vue
index 2e2dc60..fdae06f 100644
--- a/h5/pages/staff/memberSel.vue
+++ b/h5/pages/staff/memberSel.vue
@@ -10,7 +10,7 @@
v-model="param.name"
@blur="initData()"
type="text"
- placeholder="鎼滅储"
+ placeholder="璇疯緭鍏ュ鍚嶈繘琛屾悳绱�"
placeholder-style="color: #999999;"
/>
</view>
@@ -105,7 +105,8 @@
isShowSelMem: false
}
},
- onLoad() {
+ onLoad(option) {
+ this.$set(this.param, 'id', option.areaId || '')
this.initData()
},
methods: {
@@ -122,7 +123,8 @@
initData() {
const { param } = this
findHiddenAreaMemberList({
- name: param.name
+ name: param.name,
+ id: param.id
}).then(res => {
this.memberList = res.data || []
})
diff --git a/h5/pages/staff/snapshot.vue b/h5/pages/staff/snapshot.vue
index aaaddd2..96add46 100644
--- a/h5/pages/staff/snapshot.vue
+++ b/h5/pages/staff/snapshot.vue
@@ -19,7 +19,7 @@
<view class="line">
<view class="label">
<text>*</text>
- <text>鎺ュ彈浜�</text>
+ <text>鎺ユ敹浜�</text>
</view>
<view class="value" @click="selMember">
<text
@@ -125,7 +125,7 @@
<text
class="mr6"
:style="{ color: param.submitTime ? '#000000' : '#999999' }"
- >{{ param.submitTime ? param.submitTime.slice(0, 16) : "璇烽�夋嫨" }}</text
+ >{{ param.submitTime ? param.submitTime : "璇烽�夋嫨" }}</text
>
<u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
</view>
@@ -267,8 +267,12 @@
})
},
selMember() {
+ if(!this.param.areaId) return uni.showToast({
+ title: '璇峰厛閫夋嫨闅愭偅鍖哄煙',
+ icon: 'none'
+ })
uni.navigateTo({
- url: '/pages/staff/memberSel'
+ url: '/pages/staff/memberSel?areaId=' + this.param.areaId
})
},
fileDel(i) {
@@ -432,7 +436,7 @@
}
video {
width: 100%;
- max-height: 160rpx;
+ max-height: 120rpx;
}
}
}
diff --git a/h5/pages/staff/vehicle/applePeo.vue b/h5/pages/staff/vehicle/applePeo.vue
index 52d13c5..a39eada 100644
--- a/h5/pages/staff/vehicle/applePeo.vue
+++ b/h5/pages/staff/vehicle/applePeo.vue
@@ -35,7 +35,7 @@
<image
@click="changeMem(item, index)"
v-if="item.checked"
- src="@/static/meeting/icon/ic_choose_sel@2x.png"
+ src="@/static/checkbox_sel@2x.png"
mode="widthFix"
class="checked"
></image>
diff --git a/h5/pages/staff/vehicle/apply.vue b/h5/pages/staff/vehicle/apply.vue
index fa6f395..c2e224f 100644
--- a/h5/pages/staff/vehicle/apply.vue
+++ b/h5/pages/staff/vehicle/apply.vue
@@ -14,7 +14,7 @@
>
<text v-if="param.startTime">
{{ param.startTime.slice(5, 16) }}鑷硔{
- param.endTime.slice(11, 16)
+ param.endTime.slice(5, 16)
}}
</text>
<text v-else>璇烽�夋嫨</text>
@@ -91,7 +91,13 @@
}"
>
<text v-if="param.memberNames">
- {{ param.memberNames }}
+ <text v-for="mem,i in param.memberList" :key="mem.id">
+ <template v-if="i < 2">
+ <text>{{ mem.name }}</text>
+ <text v-if="i < 1 && param.memberList.length > 1">,</text>
+ </template>
+ </text>
+ <text v-if="param.memberList.length > 2">绛墈{ param.memberList.length }}浜�</text>
</text>
<text v-else>璇烽�夋嫨</text>
</text>
diff --git a/h5/pages/staff/vehicle/shiwai.vue b/h5/pages/staff/vehicle/shiwai.vue
index 54bc0f3..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,7 +36,7 @@
</view>
</view>
<view class="have_info" v-if="info && info.length > 0">
- <view class="tit">鎮ㄧ敵璇风殑鐢ㄨ溅鏃舵宸叉湁杞﹁締棰勭害</view>
+ <view class="tit">鎮ㄧ敵璇风殑鐢ㄨ溅鏃舵瀛樺湪浠ヤ笅棰勭害淇℃伅锛屾棤娉曢绾�</view>
<view class="content" v-for="(item, i) in info" :key="i">
<view class="card">{{ item.carCode }}</view>
<view class="line">
@@ -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'
@@ -339,5 +336,8 @@
color: $uni-color-primary;
flex: 1;
}
+ .disable{
+ background: #CCCCCC;
+ }
}
</style>
--
Gitblit v1.9.3