From e86c50b65d956950ef9f0ee69372cf0e680f261d Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Wed, 27 Mar 2024 18:00:32 +0800
Subject: [PATCH] 更新
---
subPackage/contradiction/add.vue | 2
pages/user/center.vue | 16 ++-
common/common.js | 48 ++++++------
subPackage/workbench/views/rental.vue | 2
pages/statistics/index.vue | 10 +-
pages/home/index.vue | 101 ++++++++++++++++++++++++
subPackage/article/detail.vue | 5 +
7 files changed, 145 insertions(+), 39 deletions(-)
diff --git a/common/common.js b/common/common.js
index 4a730f0..8a11828 100644
--- a/common/common.js
+++ b/common/common.js
@@ -104,12 +104,12 @@
iconPath: '/static/img/tabbar-01.png',
url: '/pages/home/index'
},
- {
- name: '圈子',
- iconPathSelected: '/static/img/tabbar-02-selected.png',
- iconPath: '/static/img/tabbar-02.png',
- url: '/pages/circle/index'
- },
+ // {
+ // name: '圈子',
+ // iconPathSelected: '/static/img/tabbar-02-selected.png',
+ // iconPath: '/static/img/tabbar-02.png',
+ // url: '/pages/circle/index'
+ // },
{
name: '我的',
iconPathSelected: '/static/img/tabbar-03-selected.png',
@@ -124,12 +124,12 @@
iconPath: '/static/img/tabbar-04.png',
url: '/pages/home/index'
},
- {
- name: '圈子',
- iconPathSelected: '/static/img/tabbar-08-selected.png',
- iconPath: '/static/img/tabbar-08.png',
- url: '/pages/circle/index'
- },
+ // {
+ // name: '圈子',
+ // iconPathSelected: '/static/img/tabbar-08-selected.png',
+ // iconPath: '/static/img/tabbar-08.png',
+ // url: '/pages/circle/index'
+ // },
{
name: '驾驶舱',
@@ -153,12 +153,12 @@
iconPath: '/static/img/tabbar-01.png',
url: '/pages/home/index'
},
- {
- name: '圈子',
- iconPathSelected: '/static/img/tabbar-02-selected.png',
- iconPath: '/static/img/tabbar-02.png',
- url: '/pages/circle/index'
- },
+ // {
+ // name: '圈子',
+ // iconPathSelected: '/static/img/tabbar-02-selected.png',
+ // iconPath: '/static/img/tabbar-02.png',
+ // url: '/pages/circle/index'
+ // },
{
name: '驾驶舱',
iconPathSelected: '/static/img/tabbar-07-selected.png',
@@ -180,12 +180,12 @@
iconPath: '/static/img/tabbar-01.png',
url: '/pages/home/index'
},
- {
- name: '圈子',
- iconPathSelected: '/static/img/tabbar-02-selected.png',
- iconPath: '/static/img/tabbar-02.png',
- url: '/pages/circle/index'
- },
+ // {
+ // name: '圈子',
+ // iconPathSelected: '/static/img/tabbar-02-selected.png',
+ // iconPath: '/static/img/tabbar-02.png',
+ // url: '/pages/circle/index'
+ // },
{
name: '驾驶舱',
iconPathSelected: '/static/img/tabbar-07-selected.png',
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 2855f65..3f72e54 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -114,8 +114,9 @@
</view> -->
- <view class="" v-if="roleType == 2 && curSelectSite.addressType == 1">
- <view class="tabs flex">
+ <view class=""
+ v-if="roleType == 2 && curSelectSite.addressType == 1 && curSelectSite.relationship != 18">
+ <view class=" tabs flex">
<view class="tabs-item" :class="k == tabIndex?'tabs-active':''" v-for="(i,k) in tabs"
@click="changeTabs(k)">
{{i.name}}
@@ -133,6 +134,30 @@
</u-grid>
</view>
</view>
+
+ <view class=""
+ v-if="roleType == 2 && curSelectSite.addressType == 1 && curSelectSite.relationship == 18">
+ <view class="tabs flex">
+ <view class="tabs-item" :class="k == tabIndex?'tabs-active':''" v-for="(i,k) in tabs3"
+ @click="changeTabs(k)">
+ {{i.name}}
+ </view>
+ </view>
+
+ <view class="nav bgc-ff">
+ <u-grid :border="false" col="4">
+ <u-grid-item @click="navigatorPage(i.path)" v-for="(i,k) in tabs3[tabIndex].list" :key="k">
+ <view class="nav-item flex f-d-c a-i-c">
+ <u-icon :name="i.icon" width="80rpx" height="80rpx"></u-icon>
+ <text class="nav-item-text f-26 mt-10">{{i.text}}</text>
+ </view>
+ </u-grid-item>
+ </u-grid>
+ </view>
+ </view>
+
+
+
<view v-if="roleType == 2 && curSelectSite.addressType == 2">
<view class="tabs flex">
@@ -537,6 +562,78 @@
}
],
+
+
+ tabs3: [{
+ name: '公众服务',
+ list: [{
+ icon: "/static/icon/nav-02.png",
+ text: "公共维修",
+ path: "/subPackage/bs/views/addRepair?title=公共维修&type=1"
+ },
+ {
+ icon: "/static/icon/nav-02.png",
+ text: "居家维修",
+ path: "/subPackage/bs/views/addRepair?title=居家维修&type=2"
+ },
+ {
+ icon: "/static/icon/nav-04.png",
+ text: "矛盾纠纷",
+ path: "/subPackage/bs/views/addRepair?title=矛盾纠纷&type=3"
+ },
+ {
+ icon: "/static/icon/nav-11.png",
+ text: "投诉举报",
+ path: "/subPackage/bs/views/addRepair?title=投诉举报&type=4"
+ },
+ {
+ icon: "/static/icon/nav-03.png",
+ text: "便民热线",
+ path: '/subPackage/hotLine/index'
+ },
+ ]
+ },
+ {
+ name: '生活服务',
+ list: [{
+ text: "居住证申请",
+ path: "/subPackage/reside/edit",
+ icon: "/static/icon/nav-13.png"
+ }]
+ },
+ {
+ name: '社区服务',
+ list: [{
+ text: "选举调查",
+ icon: "/static/icon/nav-14.png",
+ path: "/subPackage/article/communityList?type=1"
+
+ },
+ {
+ text: "公益报名",
+ icon: "/static/icon/nav-13.png",
+ path: "/subPackage/article/signUpList?type=0"
+
+ },
+ {
+ text: "公共收益",
+ icon: "/static/icon/nav-15.png",
+ path: "/subPackage/article/list?type=1"
+
+ },
+ {
+ text: "反诈宣传",
+ icon: "/static/icon/nav-18.png",
+ path: "/subPackage/article/list?type=6"
+
+ }
+ ]
+ }
+ ],
+
+
+
+
tabIndex: 0,
isBailer: false, //是否取保候审人员
sectionList: [],
diff --git a/pages/statistics/index.vue b/pages/statistics/index.vue
index d4fb60c..4c16b60 100644
--- a/pages/statistics/index.vue
+++ b/pages/statistics/index.vue
@@ -303,17 +303,19 @@
} = uni.getStorageSync("activeRole");
if (roleName == "网格员") {
this.tabList = getTabbarList(3);
- // this.tabbarIndex = 1;
- this.tabbarIndex = 2;
+ this.tabbarIndex = 1;
+ // this.tabbarIndex = 2;
}
if (roleName == "民警") {
this.tabList = getTabbarList(2);
- this.tabbarIndex = 2;
+ this.tabbarIndex = 1;
+ // this.tabbarIndex = 2;
}
if (roleName == "系统管理员") {
this.tabList = getTabbarList(4);
- this.tabbarIndex = 2;
+ this.tabbarIndex = 1;
+ // this.tabbarIndex = 2;
}
this.refreshData();
diff --git a/pages/user/center.vue b/pages/user/center.vue
index 8362f63..08bf9be 100644
--- a/pages/user/center.vue
+++ b/pages/user/center.vue
@@ -18,7 +18,7 @@
<view v-if="!isLogin" @click="navToLogin()" class="edit-btn">前往登录 ></view>
</view>
<!-- 操作按钮 -->
- <view class="nav" v-if="roleType == 1 && addressType == 1 && isLogin">
+ <view class="nav" v-if="roleType == 1 && addressType == 1 && isLogin && siteInfo.relationship != 18">
<navigator url="/subPackage/user/family/list" hover-class="none" class="nav-item">
<u-icon name="account" color="#fff" size="28"></u-icon>
<view class="name">我的家人</view>
@@ -129,24 +129,26 @@
this.tabbarList = getTabbarList(1)
this.roleType = 1
this.color = "#017BFC"
- // this.tabbarIndex = 1;
- this.tabbarIndex = 2
+ this.tabbarIndex = 1;
+ // this.tabbarIndex = 2
} else if (role.roleName == "民警") {
this.tabbarList = getTabbarList(2)
this.roleType = 2;
this.color = "#003399"
- this.tabbarIndex = 3;
+ this.tabbarIndex = 2;
+ // this.tabbarIndex = 3;
} else if (role.roleName == "系统管理员") {
this.tabbarList = getTabbarList(4)
this.roleType = 1
this.color = "#017BFC";
- this.tabbarIndex = 3;
+ this.tabbarIndex = 2;
+ // this.tabbarIndex = 3;
} else if (role.roleName == "网格员") {
this.tabbarList = getTabbarList(3)
this.roleType = 1
this.color = "#017BFC";
- // this.tabbarIndex = 2;
- this.tabbarIndex = 3;
+ this.tabbarIndex = 2;
+ // this.tabbarIndex = 3;
}
this.addressType = uni.getStorageSync("siteInfo").addressType;
},
diff --git a/subPackage/article/detail.vue b/subPackage/article/detail.vue
index 61eb325..0ef76c9 100644
--- a/subPackage/article/detail.vue
+++ b/subPackage/article/detail.vue
@@ -256,6 +256,11 @@
}
}
this.getDetailInfo()
+
+ if (this.curSite.relationship == 18) { //租客隐藏投票、报名信息
+ this.isLoad = false;
+ }
+
this.getAritcleComment();
uni.$on('refreshComment', () => {
this.getAritcleComment()
diff --git a/subPackage/contradiction/add.vue b/subPackage/contradiction/add.vue
index b22a7e8..c7a5109 100644
--- a/subPackage/contradiction/add.vue
+++ b/subPackage/contradiction/add.vue
@@ -127,7 +127,7 @@
<button class="submit-btn" @click="sumitInfo">提交</button>
- <button class="list-btn" @click="navigatorPage">纠纷记录</button>
+ <!-- <button class="list-btn" @click="navigatorPage">纠纷记录</button> -->
<u-picker :show="showGenderPicker" :defaultIndex="genderIndex" ref="uPicker" keyName="name"
diff --git a/subPackage/workbench/views/rental.vue b/subPackage/workbench/views/rental.vue
index 13f4925..2c4d165 100644
--- a/subPackage/workbench/views/rental.vue
+++ b/subPackage/workbench/views/rental.vue
@@ -54,7 +54,7 @@
</view>
<u-tag :text="showStatus(records.auditStatus)" type="success" plain plainFill></u-tag>
</view>
- <view class="list-address f-28 c-99">
+ <view class="list-address f-28 c-99" @click="navTo(records)">
{{ records.houseName }}
</view>
<view class="list-action flex ">
--
Gitblit v1.9.3