From 55147163b968b2564d2b19335ed1caf2cf2e3fdc Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Thu, 22 Feb 2024 18:31:43 +0800
Subject: [PATCH] 更新
---
subPackage/label/formList.vue | 2 +-
subPackage/user/event/event.vue | 2 +-
subPackage/label/hotelList.vue | 2 +-
subPackage/label/schoolList.vue | 2 +-
subPackage/workbench/views/cscj.vue | 2 +-
subPackage/workbench/views/reformList.vue | 4 ++--
subPackage/article/detail.vue | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/subPackage/article/detail.vue b/subPackage/article/detail.vue
index fdfbef8..94e48fc 100644
--- a/subPackage/article/detail.vue
+++ b/subPackage/article/detail.vue
@@ -119,7 +119,7 @@
</view>
</view>
- <view class="comment bgc-ff mt-20" v-if="commentList.length">
+ <view class="comment bgc-ff mt-20" v-if="commentList.length && detailInfo.iscomment == 1">
<caption-row title="用户评论" />
<view class="comment-list ">
<view class="comment-item flex " v-for="(item,index) in commentList" :key="index">
diff --git a/subPackage/label/formList.vue b/subPackage/label/formList.vue
index e7a3057..40b9719 100644
--- a/subPackage/label/formList.vue
+++ b/subPackage/label/formList.vue
@@ -6,7 +6,7 @@
<text class="f-32 fw">{{i.transactionObject}}</text>
<!-- <text class="f-32 fw" v-if="i.eventType == 3">二手车交易</text>
<text class="f-32 fw" v-if="i.eventType == 2">二手手机维修</text> -->
- <u-tag v-if="i.confirmFlag == 4" text="待接收" type="warning" plain plainFill></u-tag>
+ <u-tag v-if="i.confirmFlag == 4" text="待完成" type="warning" plain plainFill></u-tag>
<u-tag v-if="i.confirmFlag == 1" text="待审批" type="warning" plain plainFill></u-tag>
<u-tag v-if="i.confirmFlag == 2" text="审核通过" type="success" plain plainFill></u-tag>
<u-tag v-if="i.confirmFlag == 3" text="审核拒绝" type="error" plain plainFill></u-tag>
diff --git a/subPackage/label/hotelList.vue b/subPackage/label/hotelList.vue
index 30999f7..5914511 100644
--- a/subPackage/label/hotelList.vue
+++ b/subPackage/label/hotelList.vue
@@ -5,7 +5,7 @@
<view class="item-title flex a-i-c j-c-s-b mb-20">
<text class="f-32 fw" v-if="i.type == 7">消防检查</text>
<text class="f-32 fw" v-else>{{i.hotelName}}</text>
- <u-tag v-if="i.confirmFlag == 4" text="待接收" type="warning" plain plainFill></u-tag>
+ <u-tag v-if="i.confirmFlag == 4" text="待完成" type="warning" plain plainFill></u-tag>
<u-tag v-if="i.confirmFlag == 1" text="待审批" type="warning" plain plainFill></u-tag>
<u-tag v-if="i.confirmFlag == 2" text="审核通过" type="success" plain plainFill></u-tag>
<u-tag v-if="i.confirmFlag == 3" text="审核拒绝" type="error" plain plainFill></u-tag>
diff --git a/subPackage/label/schoolList.vue b/subPackage/label/schoolList.vue
index ff84204..dfd9a71 100644
--- a/subPackage/label/schoolList.vue
+++ b/subPackage/label/schoolList.vue
@@ -4,7 +4,7 @@
<view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k" @click="navTo(i.taskId)">
<view class="item-title flex a-i-c j-c-s-b mb-20">
<text class="f-32 fw">{{i.campusName}}</text>
- <u-tag v-if="i.confirmFlag == 4" text="待接收" type="warning" plain plainFill></u-tag>
+ <u-tag v-if="i.confirmFlag == 4" text="待完成" type="warning" plain plainFill></u-tag>
<u-tag v-if="i.confirmFlag == 1" text="待审批" type="warning" plain plainFill></u-tag>
<u-tag v-if="i.confirmFlag == 2" text="审核通过" type="success" plain plainFill></u-tag>
<u-tag v-if="i.confirmFlag == 3" text="审核拒绝" type="error" plain plainFill></u-tag>
diff --git a/subPackage/user/event/event.vue b/subPackage/user/event/event.vue
index 1666cb1..ec5f227 100644
--- a/subPackage/user/event/event.vue
+++ b/subPackage/user/event/event.vue
@@ -35,7 +35,7 @@
@click="navTo(i.id,i.reportType,i.status)">
<view class="item-title flex a-i-c j-c-s-b mb-20">
<text class="f-32 fw">{{i.name}}</text>
- <u-tag v-if="i.status == 4" text="待接收" type="warning" plain plainFill></u-tag>
+ <u-tag v-if="i.status == 4" text="待完成" type="warning" plain plainFill></u-tag>
<u-tag v-if="i.status == 1" text="待审批" type="warning" plain plainFill></u-tag>
<u-tag v-if="i.status == 2" text="审核通过" type="success" plain plainFill></u-tag>
<u-tag v-if="i.status == 3" text="审核拒绝" type="error" plain plainFill></u-tag>
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index cdd01bc..02a6912 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -801,7 +801,7 @@
}, 200)
}
- if (key == "isFront") {
+ if (key == "isFront" && data.isFront != null) {
let {
index,
name
diff --git a/subPackage/workbench/views/reformList.vue b/subPackage/workbench/views/reformList.vue
index fc9ba29..1fd6465 100644
--- a/subPackage/workbench/views/reformList.vue
+++ b/subPackage/workbench/views/reformList.vue
@@ -23,7 +23,7 @@
@click="navTo(i.id,i.reportType,i.status,i.type)">
<view class="item-title flex a-i-c j-c-s-b mb-20">
<text class="f-32 fw">{{i.name}}</text>
- <u-tag v-if="i.status == 4" text="待接收" type="warning" plain plainFill></u-tag>
+ <u-tag v-if="i.status == 4" text="待完成" type="warning" plain plainFill></u-tag>
<u-tag v-if="i.status == 1" text="待审批" type="warning" plain plainFill></u-tag>
<u-tag v-if="i.status == 2" text="审核通过" type="success" plain plainFill></u-tag>
<u-tag v-if="i.status == 3" text="审核拒绝" type="error" plain plainFill></u-tag>
@@ -63,7 +63,7 @@
status: "",
},
{
- name: "待接收",
+ name: "待完成",
status: 4,
},
{
--
Gitblit v1.9.3