From fc38d1c92f01a224e8373c4425481bb1d85e2bf3 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 21 七月 2023 15:36:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pages/tabBar/notice/detail.vue | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/pages/tabBar/notice/detail.vue b/pages/tabBar/notice/detail.vue
index 2cda4c5..5736c67 100644
--- a/pages/tabBar/notice/detail.vue
+++ b/pages/tabBar/notice/detail.vue
@@ -41,6 +41,7 @@
</view>
</view>
</view>
+
<view class="attache_img" v-else>
<view v-for="(item, index) in detailData.attachments" :key="index" >
<view style="display: flex;margin-top: 10px;" v-if="item.suffix == 'jpg'|| item.suffix =='jpeg' || item.suffix =='png'">
@@ -51,6 +52,11 @@
</view>
</view>
</view>
+
+<!-- <view style="width: 100%; height: 100px;">
+ <web-view src="http://192.168.0.38:8086/uploadtest/2023/naturalDisaster/Warninginfo/0619/79e33942cb9548788f1f3196a2058c37.doc"></web-view>
+ </view> -->
+
</view>
<text class="textTop" v-if="detailData.role == 'leader'"><b>信息提交人：</b>{{detailData.infoSubmitterRealName}}</text>
<view class="textTop" v-if="detailData.role == 'leader'">
@@ -95,6 +101,10 @@
style="background-color:rgb(6, 202, 23);color: white;width: 180px;"
@click="infoSend"
>确认发布</u-button>
+ </view>
+ <!-- //村级显示 -->
+ <view class="measures">
+ <u-button type="primary" @click="goMeasures">响应措施反馈</u-button>
</view>
</view>
</view>
@@ -167,6 +177,11 @@
uni.navigateBack({
url:'./notice/notice'
});
+ },
+ goMeasures() {
+ uni.navigateTo({
+ url: `/pages/tabBar/notice/measures?data=` + encodeURIComponent("2")
+ })
},
//审核通过
approved() {
@@ -315,5 +330,8 @@
justify-content: space-around;
width: 100%;
}
+.measures{
+ margin-top: 50px;
+}
</style>
--
Gitblit v1.9.2