From 856e7ac04edd98e79cc969af262db0b508b76139 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期五, 04 八月 2023 15:50:48 +0800
Subject: [PATCH] 文件预览
---
pages/tabBar/current/current.vue | 11 ++++++++---
pages/tabBar/information/information.vue | 2 +-
pages/tabBar/notice/detail.vue | 5 ++++-
pages/tabBar/firstPage/firstPage.vue | 6 ++++--
pages/tabBar/notice/notice.vue | 1 +
pages/tabBar/response/response.vue | 5 ++---
6 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/pages/tabBar/current/current.vue b/pages/tabBar/current/current.vue
index 89b25b7..9cde2da 100644
--- a/pages/tabBar/current/current.vue
+++ b/pages/tabBar/current/current.vue
@@ -6,7 +6,7 @@
<view class="statusBar" :style="{ paddingTop: statusBarHeight + 'px' }"></view>
<!-- 真正的导航栏内容 -->
<view class="navBar">
- <u-icon style=" margin-left: -25px;" name="arrow-left" color="black" size="17" @click="goBack" />
+ <u-icon style=" margin-left: -25px;" name="arrow-left" color="black" size="17" @click="goBack" v-if="role!='工作人员'" />
<view class="barText">信息查看</view>
</view>
</view>
@@ -60,9 +60,9 @@
<u-button
size="mini"
style="background-color:rgb(17, 204, 33);color: white;width: 100px;margin: 0;font-size: 13px"
- @click="toResponsivity(item)"
+ @click.native.stop="toResponsivity(item)"
>
- 查看叫应率
+ 叫应率 {{item.responsesRate}}
</u-button>
</view>
@@ -125,6 +125,7 @@
selectedSaleAnalysis: 'all',
InfoList: [],
unitType: null,
+ role:'',
}
},
onLoad() {
@@ -135,6 +136,7 @@
uni.hideTabBar();
},
onShow() {
+ this.role = uni.getStorageSync('roleName');
this.data.pageIndex = 1
this.getInfoList();
},
@@ -200,6 +202,8 @@
uni.navigateTo({
url: `/pages/tabBar/responsivity/countyResponsivity?data=` + encodeURIComponent(JSON.stringify(res.data))
})
+ }else{
+ uni.$u.toast(res.msg)
}
})
},
@@ -387,6 +391,7 @@
flex-direction: column;
width: calc(100% - 24px);
margin: 0 12px;
+ margin-bottom: 30px;
background: #fff;
border-radius: 5px;
box-shadow: 0 3px 12px rgba(0,0,0,0.05);
diff --git a/pages/tabBar/firstPage/firstPage.vue b/pages/tabBar/firstPage/firstPage.vue
index 8bc7e1a..5bc44b0 100644
--- a/pages/tabBar/firstPage/firstPage.vue
+++ b/pages/tabBar/firstPage/firstPage.vue
@@ -71,6 +71,7 @@
reviewStatus: null//1：未审核，2：已审核，3：审核已驳回
}
},
+ role: ''
}
},
@@ -78,11 +79,12 @@
//获取手机状态栏高度
this.statusBarHeight = uni.getSystemInfoSync()['statusBarHeight'];
uni.hideTabBar();
- this.role = uni.getStorageSync('roleName');
- console.log("role",this.role)
+
},
onShow(){
+ this.role = uni.getStorageSync('roleName');
+ console.log("role",this.role)
this.getNum();
},
methods: {
diff --git a/pages/tabBar/information/information.vue b/pages/tabBar/information/information.vue
index 3c3e937..da2d350 100644
--- a/pages/tabBar/information/information.vue
+++ b/pages/tabBar/information/information.vue
@@ -69,7 +69,7 @@
return {
data: {
pageIndex: 1,
- pageSize: 10,
+ pageSize: 12,
searchParams: {
reviewStatus: null//2：已审核,null:全部
}
diff --git a/pages/tabBar/notice/detail.vue b/pages/tabBar/notice/detail.vue
index f4d8cbf..61adef8 100644
--- a/pages/tabBar/notice/detail.vue
+++ b/pages/tabBar/notice/detail.vue
@@ -182,7 +182,10 @@
console.log("this.isAllImg",this.isAllImg)
console.log("detailData",this.detailData)
this.detailData.disaster = test.disasterType == 1 ? '地震': test.disasterType == 2 ? '洪涝' : test.disasterType == 3 ? '气象' : test.disasterType == 4 ? '地质灾害': test.disasterType == 5 ? '水旱': '森林草原火灾';
- this.getMeasures();
+ if(this.unitType == 4 && this.role == '工作人员'){
+ this.getMeasures();
+ }
+
},
methods: {
goBack() {
diff --git a/pages/tabBar/notice/notice.vue b/pages/tabBar/notice/notice.vue
index bf78dc1..d1b723f 100644
--- a/pages/tabBar/notice/notice.vue
+++ b/pages/tabBar/notice/notice.vue
@@ -436,6 +436,7 @@
border-radius: 5px;
box-shadow: 0 3px 12px rgba(0,0,0,0.05);
height: 100%;
+ margin-bottom: 30px;
}
.itemContent{
font-size: 16px;
diff --git a/pages/tabBar/response/response.vue b/pages/tabBar/response/response.vue
index cd8a87f..7d70cf9 100644
--- a/pages/tabBar/response/response.vue
+++ b/pages/tabBar/response/response.vue
@@ -13,7 +13,7 @@
<u-loading-icon></u-loading-icon>
</div>
<!-- 页面内容 -->
-<!-- <view class="responseList" v-if="responseList.length > 0">-->
+
<scroll-view :scroll-top="scrollTop" scroll-y="true" class="responseList" @scrolltoupper="upper" v-if="responseList.length > 0"
@scrolltolower="lower" @scroll="scroll" lower-threshold="50">
<view v-for="(item, index) in responseList" :key="index" class="itemContent" @click="toDetail(item)">
@@ -27,8 +27,6 @@
</view>
</view>
</scroll-view>
-<!-- </view>-->
-
<view v-else>
<u-empty
mode="data"
@@ -175,6 +173,7 @@
background: #fff;
border-radius: 5px;
box-shadow: 0 3px 12px rgba(0,0,0,0.05);
+
}
.itemContent{
color: #333;
--
Gitblit v1.9.2