From e8e7e4e8f9891199009686df6f2a810cd932573b Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 11 Nov 2023 21:49:21 +0800
Subject: [PATCH] 首页修改，公告列表样式修改
---
subPackage/article/list.vue | 5 +++--
pages/home/index.vue | 35 +++++++++++++++++++++--------------
common/setting.js | 3 ++-
subPackage/workbench/views/audit.vue | 12 +++++++++++-
4 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/common/setting.js b/common/setting.js
index 66b71d2..5f5c943 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -12,7 +12,8 @@
// devUrl: 'https://sk.hubeishuiyi.cn',
// devUrl: 'http://192.168.1.156:9528',
// devUrl:'http://192.168.1.50:9528',
- devUrl: 'http://192.168.0.102:9528',
+ // devUrl: 'http://192.168.0.102:9528',
+ devUrl:'http://z4042833u6.wicp.vip',
minioBaseUrl: "http://60.220.177.113:9000/jczz/",
// 数据中台接口url
// dataCenterUrl: 'http://10.10.2.192/services',
diff --git a/pages/home/index.vue b/pages/home/index.vue
index f5c81dd..cd9b4fa 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -13,10 +13,14 @@
<u-swiper :list="swiperList" height="260rpx"></u-swiper>
</view>
<view class="" v-if="roleType != 1">
- <u-grid :border="false" :col="curSelectSite.addressType != 2?4:3">
+ <u-grid :border="false" :col="curSelectSite.addressType != 2?4:2">
<u-grid-item v-for="(i,k) in cellList" :key="k" @click.native="toPage(i)">
<u-icon :name="i.icon" :size="45"></u-icon>
<text class="f-26 mt-20">{{i.text}}</text>
+ </u-grid-item>
+ <u-grid-item @click.native="navigatorPage('subPackage/bs/views/repair')" v-if="curSelectSite.addressType != 2">
+ <u-icon name="/static/icon/nav-02.png" width="90rpx" height="90rpx"></u-icon>
+ <text class="f-26 mt-20">报事报修</text>
</u-grid-item>
<u-grid-item @click.native="navTo()" v-if="curSelectSite.addressType != 2">
<u-icon name="/static/icon/nav-04.png" width="90rpx" height="90rpx"></u-icon>
@@ -115,14 +119,14 @@
</view>
<view class="row flex j-c-s-b">
- <view class="row-item flex_base">
+ <view class="row-item flex_base" @click="navigatorPage(`/subPackage/workbench/views/audit?type=1`)">
<u-icon name="/static/icon/nav-07.png" width="90rpx" height="90rpx"></u-icon>
<view class="flex f-d-c fw ml-20">
<text class="f-28">一次性</text>
<text class="f-36 c-main">{{frequencyNumber.disposable}}</text>
</view>
</view>
- <view class="row-item flex_base">
+ <view class="row-item flex_base" @click="navigatorPage(`/subPackage/workbench/views/audit?type=2`)">
<u-icon name="/static/icon/nav-08.png" width="90rpx" height="90rpx"></u-icon>
<view class="flex f-d-c fw ml-20">
<text class="f-28">周期性</text>
@@ -152,12 +156,13 @@
{{item.title}}
</view>
<view class="flex a-i-c j-c-s-b">
- <view class="f-28 flex a-i-c">
+ <view class="f-28 flex a-i-c ">
+ <u-tag text="标签" plain plainFill> </u-tag>
<!-- <view class="flex a-i-c mr-30">
<u-icon name="thumb-up-fill" size="24" color="#CECECE"></u-icon>
<text class="f-24 c-99 ml-10">{{item.countNumber}}</text>
</view> -->
- <view class="flex a-i-c">
+ <view class="flex a-i-c ml-30" >
<u-icon name="eye-fill" size="20" color="#CECECE"></u-icon>
<text class="f-24 c-99 ml-10">{{item.viewNumber}}</text>
</view>
@@ -168,7 +173,7 @@
</view>
</view>
- <u-picker :title="roleTypeName" :closeOnClickOverlay="true" @close="selectBoxShow = false"
+ <u-picker :title="roleTypeName" :defaultIndex="selectSiteIndex" :closeOnClickOverlay="true" @close="selectBoxShow = false"
:show="selectBoxShow" keyName="name" ref="uPicker" :columns="siteColumns" @confirm="confirmSite"
@change="changeSite" @cancel="selectBoxShow = false"></u-picker>
</view>
@@ -202,11 +207,11 @@
text: "标签报事",
path: '/subPackage/label/index'
},
- {
- icon: "/static/icon/nav-02.png",
- text: "报事报修",
- path: '/subPackage/bs/views/repair'
- },
+ // {
+ // icon: "/static/icon/nav-02.png",
+ // text: "报事报修",
+ // path: '/subPackage/bs/views/repair'
+ // },
{
icon: "/static/icon/nav-03.png",
text: "便民热线",
@@ -332,9 +337,9 @@
curHouseCode: '',
notice: [],
frequencyNumber: {},
- typeNumber: {}
-
-
+ typeNumber: {},
+ selectSiteIndex:[0,0]
+
}
},
@@ -342,6 +347,7 @@
this.init()
uni.$on('refresh', () => {
console.log("<====>")
+ this.selectSiteIndex = [0,0]
this.init()
})
},
@@ -486,6 +492,7 @@
// 回调参数为包含columnIndex、value、values
confirmSite(e) {
console.log('confirm', e)
+ this.selectSiteIndex = e.indexs;
this.curSelectSite = e.value[e.value.length - 1]
this.selectBoxShow = false
this.getHouseDataList(e.value[1]?.id)
diff --git a/subPackage/article/list.vue b/subPackage/article/list.vue
index b540fb6..9171088 100644
--- a/subPackage/article/list.vue
+++ b/subPackage/article/list.vue
@@ -10,12 +10,13 @@
{{item.title}}
</view>
<view class="flex a-i-c j-c-s-b">
- <view class="f-28 flex a-i-c">
+ <view class="f-28 flex a-i-c ">
+ <u-tag text="标签" plain plainFill"> </u-tag>
<!-- <view class="flex a-i-c mr-30">
<u-icon name="thumb-up-fill" size="24" color="#CECECE"></u-icon>
<text class="f-24 c-99 ml-10">{{item.countNumber}}</text>
</view> -->
- <view class="flex a-i-c">
+ <view class="flex a-i-c ml-30">
<u-icon name="eye-fill" size="20" color="#CECECE"></u-icon>
<text class="f-24 c-99 ml-10">{{item.viewNumber}}</text>
</view>
diff --git a/subPackage/workbench/views/audit.vue b/subPackage/workbench/views/audit.vue
index 04d0a39..36f0b04 100644
--- a/subPackage/workbench/views/audit.vue
+++ b/subPackage/workbench/views/audit.vue
@@ -54,7 +54,17 @@
}
},
- onLoad() {
+ onLoad(option) {
+ if(option.type == 1){
+ uni.setNavigationBarTitle({
+ title:"一次性"
+ })
+ }
+ if(option.type == 2){
+ uni.setNavigationBarTitle({
+ title:"周期性"
+ })
+ }
this.getList()
},
onReachBottom() {
--
Gitblit v1.9.3