From fc38ef283d254bc4c6b700cfefcb0a6e65f19ba7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 六月 2024 17:57:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/task/index.vue | 2 +-
h5/pages/staff/meetingCalendar.vue | 3 ++-
h5/pages/staff/meetingDetail.vue | 2 +-
h5/pages/staff/vehicle/sendACar.vue | 30 ++++++++++++++++--------------
h5/pages/staff/meetingManager.vue | 3 ++-
5 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index 346a6b3..d290617 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -234,7 +234,7 @@
return {
time: j.monthDate,
pointText: j.meetingNum,
- pointTextColor: 'red'
+ pointTextColor: '#fff'
}
})
})
@@ -264,6 +264,7 @@
this.myMeetingList = []
this.activeRoom = { ...e.value[0] }
this.isShowStatus = false
+ this.myPage = 1
this.getDayMeeting()
},
handleDetail(id) {
diff --git a/h5/pages/staff/meetingDetail.vue b/h5/pages/staff/meetingDetail.vue
index d5a05e9..0222759 100644
--- a/h5/pages/staff/meetingDetail.vue
+++ b/h5/pages/staff/meetingDetail.vue
@@ -33,7 +33,7 @@
v-for="mem in detail.userResponseList"
:key="mem.id"
>
- <image :src="mem.avatar" class="avatar" mode=""></image>
+ <image :src="mem.avatar ? mem.avatar : require('@/static/meeting/common/default_user@2x.png')" class="avatar" mode=""></image>
<view class="name">{{ mem.realname }}</view>
</view>
</view>
diff --git a/h5/pages/staff/meetingManager.vue b/h5/pages/staff/meetingManager.vue
index 3a75d64..513f25d 100644
--- a/h5/pages/staff/meetingManager.vue
+++ b/h5/pages/staff/meetingManager.vue
@@ -163,7 +163,7 @@
return {
time: j.monthDate,
pointText: j.meetingNum,
- pointTextColor: 'red'
+ pointTextColor: '#fff'
}
})
})
@@ -177,6 +177,7 @@
seletedStatus(e) {
this.myMeetingList = []
this.activeRoom = { ...e.value[0] }
+ this.recordPage = 1
this.isShowStatus = false
this.getDayMeeting()
},
diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index 39d32d6..f9d7c2f 100644
--- a/h5/pages/staff/task/index.vue
+++ b/h5/pages/staff/task/index.vue
@@ -114,7 +114,7 @@
<view class="box_list_item_nr_x"></view>
<view class="box_list_item_nr_text">
<text class="time">{{ item.createDate }}鎻愪氦</text>
- <text class="btn" @click="handleAppr(item)">鍘诲鐞�</text>
+ <text v-if="item.status == '0'" class="btn" @click="handleAppr(item)">鍘诲鐞�</text>
</view>
</view>
</view>
diff --git a/h5/pages/staff/vehicle/sendACar.vue b/h5/pages/staff/vehicle/sendACar.vue
index 3df0a80..b243345 100644
--- a/h5/pages/staff/vehicle/sendACar.vue
+++ b/h5/pages/staff/vehicle/sendACar.vue
@@ -18,7 +18,7 @@
class="box_list_item"
v-for="(item, index) in dataList"
:key="index"
- @click="itemDetail(item)"
+ @click="itemDetail(item)"
>
<view class="box_list_item_head">
<text>{{ item.carCode }}</text>
@@ -109,7 +109,7 @@
getList() {
const { param, pagination } = this
pagination.page = pagination.page + 1
- if(param.queryDate){
+ if (param.queryDate) {
param.queryStartTime = param.queryDate + ' 00:00:00'
param.queryEndTime = param.queryDate + ' 23:59:59'
}
@@ -125,11 +125,11 @@
this.total = res.data.total
})
},
- itemDetail(item) {
- uni.navigateTo({
- url: "/pages/staff/vehicle/sendACarDetail?id=" + item.id
- })
- },
+ itemDetail(item) {
+ uni.navigateTo({
+ url: "/pages/staff/vehicle/sendACarDetail?id=" + item.id
+ })
+ },
seletedCar(e) {
const item = e.value[0]
this.pagination.page = 0
@@ -139,10 +139,12 @@
this.getList()
},
seletedDate(e) {
- this.param.queryDate = dayjs(e.value).format('YYYY-MM-DD')
- this.pagination.page = 0
- this.isShowDate = false
- this.getList()
+ setTimeout(() => {
+ this.param.queryDate = dayjs(e.value).format('YYYY-MM-DD')
+ this.pagination.page = 0
+ this.isShowDate = false
+ this.getList()
+ })
},
endtimeClose() {
this.param.endTime = ''
@@ -216,9 +218,9 @@
.error {
color: #e0312a;
}
- .grr{
- color: #999999;
- }
+ .grr {
+ color: #999999;
+ }
text {
&:nth-child(1) {
font-size: 32rpx;
--
Gitblit v1.9.3