From d302ebb0ad2f93cea6c3736f5116c58259cce071 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Wed, 13 Dec 2023 17:36:20 +0800
Subject: [PATCH] 优化部分样式
---
components/noticeList/noticeList.vue | 8 ++
static/icon/nav-14.png | 0
pages/user/center.vue | 2
static/icon/nav-13.png | 0
static/icon/nav-15.png | 0
pages/home/index.vue | 91 +++++++++++++++++-------------
subPackage/bs/views/repairList.vue | 53 ++++++++---------
7 files changed, 85 insertions(+), 69 deletions(-)
diff --git a/components/noticeList/noticeList.vue b/components/noticeList/noticeList.vue
index dd36a49..cf1be03 100644
--- a/components/noticeList/noticeList.vue
+++ b/components/noticeList/noticeList.vue
@@ -15,7 +15,7 @@
<text class="f-24 c-99">{{item.createTime}}</text>
</view>
</view>
- <u-image :src="item.url" width="200rpx" height="140rpx"></u-image>
+ <u-image :src="setUrl(item.url)" width="200rpx" height="140rpx"></u-image>
</view>
<view v-else class="notice-inner flex f-d-c j-c-s-b">
<text class="notice-title f-28 fw">{{item.title}}</text>
@@ -36,6 +36,7 @@
<script>
import tagCell from './tagCell'
+ import { minioBaseUrl } from '@/common/setting.js'
export default {
name: "noticeList",
props: {
@@ -50,6 +51,11 @@
}
},
methods: {
+
+ setUrl(url){
+ return `${minioBaseUrl}${url}`
+ },
+
navToDetail(id,type,pdId) {
if(type == 0 || type == 1){
uni.navigateTo({
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 5050c51..5a5dc63 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -13,13 +13,6 @@
<u-swiper :list="bannerList" height="260rpx"></u-swiper>
</view>
<view class="">
- <u-grid :border="false" :col="liveList.length">
- <u-grid-item @click.native="navigatorPage(i.path)" v-for="(i,k) in liveList" :key="k">
- <u-icon :name="i.pictureImg" width="90rpx" height="90rpx"></u-icon>
- <text class="f-26 mt-20">{{i.name}}</text>
- </u-grid-item>
- </u-grid>
-
<view class="section flex j-c-s-a a-i-c mt-40" v-if="isShowContact && curSelectSite.addressType == 1">
<view class="section-item" v-for="(i,k) in contactList" :key="k" v-if="i.name">
<image class="section-item-bg" :src="i.bgImg" mode="aspectFill"></image>
@@ -32,40 +25,51 @@
</view>
</view>
</view>
- </view>
- <view class="block flex a-i-c j-c-s-b" v-if="roleType == 1">
- <view @click="scan" class="block-item">
- <image class="block-item-bg" src="/static/icon/nav-bg-04.png" mode="aspectFill" />
- <view class="block-item-box flex a-i-c ">
- <u-icon name="/static/icon/nav-05.png" width="65rpx" height="65rpx"></u-icon>
- <view class="item-text flex f-d-c j-c-s-b">
- <text class="f-24 fw">扫一扫</text>
- <text class="f-22 opacity">场所采集</text>
+ <view class="block flex a-i-c j-c-s-b" v-if="roleType == 1">
+ <view @click="scan" class="block-item">
+ <image class="block-item-bg" src="/static/icon/nav-bg-04.png" mode="aspectFill" />
+ <view class="block-item-box flex a-i-c ">
+ <u-icon name="/static/icon/nav-05.png" width="65rpx" height="65rpx"></u-icon>
+ <view class="item-text flex f-d-c j-c-s-b">
+ <text class="f-24 fw">扫一扫</text>
+ <text class="f-22 opacity">场所采集</text>
+ </view>
</view>
</view>
- </view>
- <view class="block-item" @click="navigatorPage('/subPackage/user/clockIn/index')">
- <image class="block-item-bg" src="/static/icon/nav-bg-05.png" mode="aspectFill" />
- <view class="block-item-box flex a-i-c">
- <u-icon name="/static/icon/nav-06.png" width="65rpx" height="65rpx"></u-icon>
- <view class="item-text flex f-d-c j-c-s-b">
- <text class="f-24 fw">打卡登记</text>
- <text class="f-22 opacity">在线打卡</text>
+ <view class="block-item" @click="navigatorPage('/subPackage/user/clockIn/index')">
+ <image class="block-item-bg" src="/static/icon/nav-bg-05.png" mode="aspectFill" />
+ <view class="block-item-box flex a-i-c">
+ <u-icon name="/static/icon/nav-06.png" width="65rpx" height="65rpx"></u-icon>
+ <view class="item-text flex f-d-c j-c-s-b">
+ <text class="f-24 fw">打卡登记</text>
+ <text class="f-22 opacity">在线打卡</text>
+ </view>
</view>
</view>
- </view>
- <view class="block-item" @click="navigatorPage('/subPackage/statistics/index')">
- <image class="block-item-bg" src="/static/icon/nav-bg-04.png" mode="aspectFill" />
- <view class="block-item-box flex a-i-c">
- <u-icon name="/static/icon/nav-12.png" width="65rpx" height="65rpx"></u-icon>
- <view class="item-text flex f-d-c j-c-s-b">
- <text class="f-24 fw">数据驾驶舱</text>
- <text class="f-22 opacity">数据统计</text>
+ <view class="block-item" @click="navigatorPage('/subPackage/statistics/index')">
+ <image class="block-item-bg" src="/static/icon/nav-bg-04.png" mode="aspectFill" />
+ <view class="block-item-box flex a-i-c">
+ <u-icon name="/static/icon/nav-12.png" width="65rpx" height="65rpx"></u-icon>
+ <view class="item-text flex f-d-c j-c-s-b">
+ <text class="f-24 fw">数据驾驶舱</text>
+ <text class="f-22 opacity">数据统计</text>
+ </view>
</view>
</view>
</view>
+ <view class="" v-if="liveList.length">
+ <caption-row title="生活" />
+ <view class="grid">
+ <u-grid :border="false" :col="liveList.length">
+ <u-grid-item @click.native="navigatorPage(i.path)" v-for="(i,k) in liveList" :key="k">
+ <u-icon :name="i.pictureImg" width="90rpx" height="90rpx"></u-icon>
+ <text class="f-26 mt-20">{{i.name}}</text>
+ </u-grid-item>
+ </u-grid>
+ </view>
+ </view>
</view>
<view class="" v-if="isShowHouse">
@@ -82,14 +86,18 @@
<view class="mb-20" v-if="roleType == 2">
<caption-row title="社区" />
<view class="mt-20">
- <u-grid :border="false" col="4">
+ <u-grid :border="false" col="3">
+ <u-grid-item @click="navigatorPage(`/subPackage/article/communityList?type=1`)">
+ <u-icon name="/static/icon/nav-14.png" width="90rpx" height="90rpx"></u-icon>
+ <text class="f-26 mt-10">选举调查</text>
+ </u-grid-item>
<u-grid-item @click="navigatorPage(`/subPackage/article/communityList?type=0`)">
- <u-icon name="/static/icon/nav-09.png" width="90rpx" height="70rpx"></u-icon>
+ <u-icon name="/static/icon/nav-13.png" width="90rpx" height="90rpx"></u-icon>
<text class="f-26 mt-10">公益报名</text>
</u-grid-item>
- <u-grid-item @click="navigatorPage(`/subPackage/article/communityList?type=1`)">
- <u-icon name="/static/icon/nav-10.png" width="90rpx" height="70rpx"></u-icon>
- <text class="f-26 mt-10">选举调查</text>
+ <u-grid-item @click="navigatorPage('')">
+ <u-icon name="/static/icon/nav-15.png" width="90rpx" height="90rpx"></u-icon>
+ <text class="f-26 mt-10">公共收益</text>
</u-grid-item>
</u-grid>
</view>
@@ -646,7 +654,7 @@
title: "尚无绑定房屋信息",
icon: "error"
})
- }
+ }
// else if (path == "/subPackage/statistics/index") {
// uni.showToast({
// title: "功能开发中~",
@@ -694,7 +702,7 @@
//"3C77B40EFC5F4C899AA74BEE747D9DF1"
// let url = "/subPackage/workbench/views/cscj?stdId=" + obj.stdId
// let url = "/subPackage/workbench/views/cscj?houseCode=" + obj.stdId
-
+
// let url = `/subPackage/house/houseNumber/index?stdId=${obj.stdId}`
// that.$u.func.globalNavigator(url, "navTo")
}
@@ -754,6 +762,11 @@
padding: 0 30rpx;
}
+ .grid {
+ margin-top: 20rpx;
+ margin-bottom: 10rpx;
+ }
+
.section {
.section-item {
width: 216rpx;
diff --git a/pages/user/center.vue b/pages/user/center.vue
index c081457..812c420 100644
--- a/pages/user/center.vue
+++ b/pages/user/center.vue
@@ -12,7 +12,7 @@
<!-- <text class="f-28 c-99">您好业主，欢迎回家</text> -->
</view>
- <view class="setting flex a-i-c j-c-c" @click="navigator('/subPackage/user/editUserInfo/editUserInfo')">
+ <view v-if="isLogin" class="setting flex a-i-c j-c-c" @click="navigator('/subPackage/user/editUserInfo/editUserInfo')">
<u-icon name="setting" size="30" color="#fff"></u-icon>
</view>
diff --git a/static/icon/nav-13.png b/static/icon/nav-13.png
new file mode 100644
index 0000000..7907373
--- /dev/null
+++ b/static/icon/nav-13.png
Binary files differ
diff --git a/static/icon/nav-14.png b/static/icon/nav-14.png
new file mode 100644
index 0000000..3c62b12
--- /dev/null
+++ b/static/icon/nav-14.png
Binary files differ
diff --git a/static/icon/nav-15.png b/static/icon/nav-15.png
new file mode 100644
index 0000000..164a698
--- /dev/null
+++ b/static/icon/nav-15.png
Binary files differ
diff --git a/subPackage/bs/views/repairList.vue b/subPackage/bs/views/repairList.vue
index 769fda7..f0f7374 100644
--- a/subPackage/bs/views/repairList.vue
+++ b/subPackage/bs/views/repairList.vue
@@ -18,29 +18,30 @@
</view>
</view>
</view> -->
-<z-paging ref="paging" v-model="dataList" @query="queryList" loading-more-no-more-text="没有更多了">
- <view class="list" >
- <view class="list-item bgc-ff mb-20" v-for="item in dataList" :key="item.id" @click="pushPage(item)">
- <view class="item-title flex a-i-c j-c-s-b mb-20">
- <text class="f-32 fw">{{ getTypeName(item.type) }}</text>
- <u-tag class="u_tag" size="mini" plain plainFill :text="getStatusName(item.status)"></u-tag>
- </view>
- <view class="item-row flex a-i-c j-c-s-b">
- <text class="f-28">时间</text>
- <text class="f-28 c-66">{{ item.createTime }}</text>
- </view>
- <view class="item-row flex a-i-c j-c-s-b">
- <text class="f-28">描述</text>
- <text class="address f-28 c-66">{{ item.remark}}</text>
+ <z-paging ref="paging" v-model="dataList" @query="queryList" :refresher-enabled="false"
+ loading-more-no-more-text="没有更多了" :hide-empty-view="true">
+ <view class="list">
+ <view class="list-item bgc-ff mb-20" v-for="item in dataList" :key="item.id" @click="pushPage(item)">
+ <view class="item-title flex a-i-c j-c-s-b mb-20">
+ <text class="f-32 fw">{{ getTypeName(item.type) }}</text>
+ <u-tag class="u_tag" size="mini" plain plainFill :text="getStatusName(item.status)"></u-tag>
+ </view>
+ <view class="item-row flex a-i-c j-c-s-b">
+ <text class="f-28">时间</text>
+ <text class="f-28 c-66">{{ item.createTime }}</text>
+ </view>
+ <view class="item-row flex a-i-c j-c-s-b">
+ <text class="f-28">描述</text>
+ <text class="address f-28 c-66">{{ item.remark}}</text>
+ </view>
</view>
</view>
- </view>
-</z-paging>
- <!-- <view v-else>
+ </z-paging>
+ <view v-if="!dataList.length">
<u-empty marginTop="50%" mode="list"></u-empty>
- </view> -->
+ </view>
<!-- <u-loading-page :loading="loadingPage"></u-loading-page>
<u-loading-icon :show="loadingIcon"></u-loading-icon> -->
@@ -148,17 +149,13 @@
}
},
- refreshList(){
- this.$refs.paging.reload();
- },
-
- queryList(pageNo,pageSize){
+ queryList(pageNo, pageSize) {
getPage({
- current:pageNo,
- size:pageSize,
- createUser:uni.getStorageSync("userInfo").user_id,
- type:this.repairType
- }).then(res=>{
+ current: pageNo,
+ size: pageSize,
+ createUser: uni.getStorageSync("userInfo").user_id,
+ type: this.repairType
+ }).then(res => {
this.$refs.paging.complete(res.data.records);
})
},
--
Gitblit v1.9.3