From 45ff8bf8bb28eaab39c6cc7e13730fbaeb2e44fc Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 13 Apr 2024 17:24:18 +0800
Subject: [PATCH] 更新
---
pages/user/center.vue | 8 +++-
subPackage/workbench/views/counterfraudReportDetail.vue | 6 +-
pages/home/index.vue | 6 +-
subPackage/counterfraud/addReport.vue | 44 +++++++++++-----------
4 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/pages/home/index.vue b/pages/home/index.vue
index a86ff55..0e10430 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -11,9 +11,9 @@
<view class="search-bar" :style="{background:background.top}">
<u-search placeholder="请输入关键字" v-model="keyword" :showAction="true" actionText="搜索" :animation="true"
- :actionStyle="{color:'#fff'}" bgColor="#fff" @change="changeKeyword" @custom="navToSearchList"
+ :actionStyle="{color:'#fff'}" bgColor="#fff" @custom="navToSearchList"
@search="navToSearchList"></u-search>
- <view class="mask" v-if="searchList.length"></view>
+ <!-- <view class="mask" v-if="searchList.length"></view>
<view class="search-content bgc-ff" v-if="searchList.length">
<scroll-view class="search-scroll" :scroll-y="true">
<view class="search-content-row flex j-c-s-b a-i-c" v-for="(i,k) in searchList" :key="k"
@@ -22,7 +22,7 @@
<view class="search-tag f-26 c-main">{{i.typeName}}</view>
</view>
</scroll-view>
- </view>
+ </view> -->
</view>
<view class="swiper" :style="{background:background.banner}">
diff --git a/pages/user/center.vue b/pages/user/center.vue
index e37ae06..278430a 100644
--- a/pages/user/center.vue
+++ b/pages/user/center.vue
@@ -35,6 +35,10 @@
<u-icon name="file-text" color="#fff" size="28"></u-icon>
<view class="name">出租信息</view>
</navigator>
+ <navigator url="/subPackage/grid/comprehensive?from=center" hover-class="none" class="nav-item">
+ <u-icon name="grid" color="#fff" size="28"></u-icon>
+ <view class="name">我的网格</view>
+ </navigator>
</view>
</view>
<view class="cell-box" v-if="isLogin">
@@ -45,10 +49,10 @@
<u-cell v-if="roleType == 2" title="切换角色" isLink url="/subPackage/user/role/index">
<image slot="icon" src="/static/icon/menu-center-05.png" class="icon" mode=""></image>
</u-cell>
- <u-cell v-if="siteInfo.addressType == 1" title="我的网格" isLink
+ <!-- <u-cell v-if="siteInfo.addressType == 1" title="我的网格" isLink
url="/subPackage/grid/comprehensive?from=center">
<image slot="icon" src="/static/icon/menu-center-01.png" class="icon" mode=""></image>
- </u-cell>
+ </u-cell> -->
<u-cell v-if="siteInfo.addressType == 1" title="我的事件" isLink
url="/subPackage/bs/views/repairList?from=center">
<image slot="icon" src="/static/icon/menu-center-01.png" class="icon" mode=""></image>
diff --git a/subPackage/counterfraud/addReport.vue b/subPackage/counterfraud/addReport.vue
index a27050a..b9ab171 100644
--- a/subPackage/counterfraud/addReport.vue
+++ b/subPackage/counterfraud/addReport.vue
@@ -48,7 +48,7 @@
<!-- <footer-btn @click="sumitInfo"></footer-btn> -->
<button class="submit-btn" @click="sumitInfo">提交</button>
- <button class="list-btn mb-20" @click="navTo">我上报的事件</button>
+ <button class="list-btn mb-20" @click="navTo">上报记录</button>
@@ -230,22 +230,19 @@
for (let k = 0, kk = this.questionList[i].children.length; k < kk; k++) {
// if (this.questionList[i].children[k].state != null) {
- if (this.questionList[i].children[k].urls.length) {
- // files.push(this.questionList[i].children[k].id)
- arr.push({
- itemId: this.questionList[i].children[k].id,
- // state: this.questionList[i].children[k].state,
- imageUrls: this.setImages(this.questionList[i].children[k].urls),
- // remark: this.questionList[i].children[k].remark || ""
- })
- }
+ // if (this.questionList[i].children[k].urls.length) {
+ // arr.push({
+ // itemId: this.questionList[i].children[k].id,
+ // state: this.questionList[i].children[k].state,
+ // imageUrls: this.setImages(this.questionList[i].children[k].urls),
+ // remark: this.questionList[i].children[k].remark || ""
+ // })
+ // }
- // arr.push({
- // itemId: this.questionList[i].children[k].id,
-
- // imageUrls: this.setImages(this.questionList[i].children[k].urls),
-
- // })
+ arr.push({
+ itemId: this.questionList[i].children[k].id,
+ imageUrls: this.setImages(this.questionList[i].children[k].urls),
+ })
// if (this.questionList[i].children[k].state == 0) {
// count += 1;
// }
@@ -318,12 +315,15 @@
// this.info.imageUrls = urls.join(",")
// }
- if (!this.getSelected().length) {
- this.$showTips("您还没有上传附件");
- return;
- } else {
- this.info.taskPlaceRecordVOList = this.getSelected()
- }
+ // if (!this.getSelected().length) {
+ // this.$showTips("您还没有上传附件");
+ // return;
+ // } else {
+ // this.info.taskPlaceRecordVOList = this.getSelected()
+ // }
+
+ this.info.taskPlaceRecordVOList = this.getSelected()
+
if (this.isEdit) {
this.info.status = 1;
updateCounterfraudReport(this.info).then(res => {
diff --git a/subPackage/workbench/views/counterfraudReportDetail.vue b/subPackage/workbench/views/counterfraudReportDetail.vue
index 756bac9..9b76fe5 100644
--- a/subPackage/workbench/views/counterfraudReportDetail.vue
+++ b/subPackage/workbench/views/counterfraudReportDetail.vue
@@ -35,9 +35,9 @@
<text v-if="info.status == 3">审核驳回</text>
<text v-if="info.status == 4">待完成</text>
</view>
- <view class="item-row flex j-c-s-b a-i-c" v-if="info.status == 3 && info.remark">
+ <view class="item-row flex j-c-s-b a-i-c" v-if="info.status == 3 && info.reasonFailure">
<text>驳回原因</text>
- <text class="item-content">{{info.remark}}</text>
+ <text class="item-content">{{info.reasonFailure}}</text>
</view>
<view class="mt-20 bgc-ff">
@@ -308,7 +308,7 @@
reportType: 6
}
if (val.type == 3) {
- data.remark = val.remark;
+ data.reasonFailure = val.remark;
}
auditCounterfraudReport(data).then(res => {
--
Gitblit v1.9.3