From ccf28d1fed1aa2e5437dbe64b5133ba1cbde6ec7 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 03 一月 2025 15:30:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/workOrder/list.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/h5/pages/workOrder/list.vue b/h5/pages/workOrder/list.vue
index 6336405..7d8e1d2 100644
--- a/h5/pages/workOrder/list.vue
+++ b/h5/pages/workOrder/list.vue
@@ -32,7 +32,7 @@
<scroll-view scroll-y="true" class="scroll_Y" @scrolltolower="scrolltolower">
<view class="list">
<view class="item" v-for="item in list" @click="itemClick(item)">
- <image v-if="item.dealStatus == 0" src="@/static/side/workordered.png" class="icon"></image>
+ <image v-if="item.dealStatus == 0 || item.dealStatus == 1" src="@/static/side/workordered.png" class="icon"></image>
<image v-else src="@/static/side/workorder.png" class="icon"></image>
<view class="content">
<view class="name_wrap line">
@@ -44,7 +44,7 @@
<view class="line">浣嶇疆绫诲瀷锛歿{item.areaType == '0' ? '瀹ゅ唴瑁呬慨' : '鍏叡鍖哄煙'}}</view>
<view class="line">宸ュ崟鍒嗙被锛歿{item.categoryName}}</view>
<view class="line">涓婃姤鏃堕棿锛歿{item.createDate}}</view>
- <view class="line">涓婇棬鏃堕棿锛歿{item.getDate}}</view>
+ <view class="line" v-if="item.getDate">涓婇棬鏃堕棿锛歿{item.getDate}}</view>
</view>
</view>
<view v-if="list.length == 0" class="empty_wrap">
@@ -73,7 +73,7 @@
page: 1,
};
},
- onShow() {
+ onLoad() {
this.getList()
},
methods: {
@@ -126,7 +126,7 @@
model: {
...param,
queryStatus: activeTab,
- dispatchUserId: selectAll ? '' : uni.getStorageSync('userInfo').id,
+ dealUserId: selectAll ? '' : uni.getStorageSync('userInfo').id,
}
}).then(res => {
this.list = [...this.list, ...res.data.records]
@@ -139,7 +139,7 @@
<style lang="scss" scoped>
.main_app {
- padding: 0 30rpx;
+ padding: 30rpx;
}
.tabs {
@@ -216,7 +216,7 @@
}
.scroll_Y{
- height: calc(100vh - 320rpx);
+ height: calc(100vh - 250rpx);
}
.list {
.item {
@@ -224,7 +224,7 @@
// height: 290rpx;
padding: 30rpx 0;
border-bottom: 2rpx solid #E5E5E5;
-
+
.icon {
width: 80rpx;
height: 80rpx;
--
Gitblit v1.9.3