jczz_app.git - Gitblit

parent: 48f15f39 | patch | commit | ignore whitespace

Lou

2024-03-27 e86c50b65d956950ef9f0ee69372cf0e680f261d

更新

7 files modified

	common/common.js	48 ●●●●● patch \| view \| raw \| blame \| history
	pages/home/index.vue	101 ●●●●● patch \| view \| raw \| blame \| history
	pages/statistics/index.vue	10 ●●●●● patch \| view \| raw \| blame \| history
	pages/user/center.vue	16 ●●●●● patch \| view \| raw \| blame \| history
	subPackage/article/detail.vue	5 ●●●●● patch \| view \| raw \| blame \| history
	subPackage/contradiction/add.vue	2 ●●●●● patch \| view \| raw \| blame \| history
	subPackage/workbench/views/rental.vue	2 ●●●●● patch \| view \| raw \| blame \| history

 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',

 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: [],


 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();

 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;
        },

 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()

 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"

 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 ">

			@@ -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',

			@@ -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: [],

			@@ -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();

			@@ -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;
			},

			@@ -256,6 +256,11 @@
			}
			}
			this.getDetailInfo()

			if (this.curSite.relationship == 18) { //租客隐藏投票、报名信息
			this.isLoad = false;
			}

			this.getAritcleComment();
			uni.$on('refreshComment', () => {
			this.getAritcleComment()

			@@ -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"

			@@ -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 ">