From 403da33c30fc628c1608b96d95efdc12e70c3b06 Mon Sep 17 00:00:00 2001
From: pyt <626651354@qq.com>
Date: 星期三, 26 二月 2025 15:40:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide
---
H5/pages/progress/progress.vue | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/H5/pages/progress/progress.vue b/H5/pages/progress/progress.vue
index f7ea8cf..0fb7746 100644
--- a/H5/pages/progress/progress.vue
+++ b/H5/pages/progress/progress.vue
@@ -6,7 +6,7 @@
<view class="color1">{{ ["正在办理", "延期办理", "超时办理", "已办结", "群众撤销", "上报待审核", "上级驳回"][info.status] }}</view>
</view>
<view class="mx-13 mt-33 pt-35 pb-33 px-27 br-19 flex a-center j-between bgcolor1">
- <view class="fs-27 lh-38 color2">{{ info.detailedAddress }}</view>
+ <view class="fs-27 lh-38 color2">{{ info.location }}</view>
<image src="@/static/detailImg/dwei.png" class="w-31 h-31 shrink0" />
</view>
<view class="flex a-center j-between mt-31 mx-13">
@@ -40,7 +40,7 @@
<view class="flex1">
<view class="flex a-center j-between mb-10">
<view class="name">{{ item.createByName }}</view>
- <view class="time">{{ item.createTime }}</view>
+ <view class="time">{{ item.createTime | formatTime }}</view>
</view>
<view class="context">{{ item.describe }}</view>
<view class="proImg">
@@ -85,6 +85,7 @@
</template>
<script>
+ import dayjs from '../../uni_modules/uview-ui/libs/util/dayjs'
import {
getComplaintDetail
} from './service'
@@ -96,6 +97,12 @@
type: true,
}
},
+ filters: {
+ formatTime(val) {
+ if (!val) return ''
+ return dayjs(val).format('YYYY-MM-DD HH:mm:ss')
+ }
+ },
onLoad(params) {
this.id = params.id
if (params.type) {
--
Gitblit v1.7.1