From 99e66c46d4bfe6b0fe65bc160bf07585c25a1e0f Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Wed, 22 Nov 2023 17:43:09 +0800
Subject: [PATCH] update
---
components/noticeList/tagCell.vue | 2
static/icon/nav-center-03.png | 0
pages/user/center.vue | 4 +-
pages.json | 2
subPackage/house/family/index.vue | 64 +++++++++++++++++++-------------
static/icon/nav-center-01.png | 0
static/icon/nav-center-02.png | 0
7 files changed, 42 insertions(+), 30 deletions(-)
diff --git a/components/noticeList/tagCell.vue b/components/noticeList/tagCell.vue
index 4e4117a..1dac34f 100644
--- a/components/noticeList/tagCell.vue
+++ b/components/noticeList/tagCell.vue
@@ -22,6 +22,6 @@
border-radius:30rpx;
background-color: rgb(236,244,255);
border:1px solid currentColor;
- margin-right:20rpx;
+ margin-right:15rpx;
}
</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 10242b4..507d0e9 100644
--- a/pages.json
+++ b/pages.json
@@ -316,7 +316,7 @@
{
"path": "views/report",
"style": {
- "navigationBarTitleText": "保修报事",
+ "navigationBarTitleText": "报修报事",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
diff --git a/pages/user/center.vue b/pages/user/center.vue
index 2a78fcf..b341713 100644
--- a/pages/user/center.vue
+++ b/pages/user/center.vue
@@ -16,8 +16,8 @@
<view class="main">
<view class="nav bgc-ff flex j-c-s-a a-i-c">
<view v-for="(item,index) in navList" :key="index" class="flex f-d-c a-i-c" @click="navigator(item)">
- <u-icon :customStyle="{paddingTop:20+'rpx'}" :name="item.icon" width="64rpx"
- height="64rpx"></u-icon>
+ <u-icon :customStyle="{paddingTop:20+'rpx'}" :name="item.icon" width="90rpx"
+ height="90rpx"></u-icon>
<text class="grid-text mt-20 f-28">{{item.title}}</text>
</view>
</view>
diff --git a/static/icon/nav-center-01.png b/static/icon/nav-center-01.png
index 7ee2622..8d67be4 100644
--- a/static/icon/nav-center-01.png
+++ b/static/icon/nav-center-01.png
Binary files differ
diff --git a/static/icon/nav-center-02.png b/static/icon/nav-center-02.png
index 5109a74..affdace 100644
--- a/static/icon/nav-center-02.png
+++ b/static/icon/nav-center-02.png
Binary files differ
diff --git a/static/icon/nav-center-03.png b/static/icon/nav-center-03.png
index 168d2f6..c7c9483 100644
--- a/static/icon/nav-center-03.png
+++ b/static/icon/nav-center-03.png
Binary files differ
diff --git a/subPackage/house/family/index.vue b/subPackage/house/family/index.vue
index b71c731..e78b3f6 100644
--- a/subPackage/house/family/index.vue
+++ b/subPackage/house/family/index.vue
@@ -139,27 +139,31 @@
code: this.currentId,
roleName: uni.getStorageSync('activeRole').roleName,
name: this.addressType == 1 ? "" : this.neiCode,
- buildingName:this.addressType == 4 ?this.buildingName: "",
+ buildingName: this.addressType == 4 ? this.buildingName : "",
addressType: this.addressType
}
const res = await getHouseList(param)
- const aoiList = res.data.aoiList
- const shopList = res.data.shopList
- if (aoiList.length > 0) {
- this.isShowBuild = true
- // 正常展示户室数据
- aoiList.forEach(item => {
- item.children && item.children.sort((a, b) => a.floor - b.floor)
+ if (res.code == 200) {
+ const {
+ aoiList,
+ shopList
+ } = res.data;
+ if (aoiList.length) {
+ this.isShowBuild = true
+ // 正常展示户室数据
+ aoiList.forEach(item => {
+ item.children && item.children.sort((a, b) => a.floor - b.floor)
+ })
+ this.buildingList = aoiList || []
+ }
+ if (shopList.length) {
+ this.isShowShop = true
+ this.shopList = shopList || []
+ }
+ this.$nextTick(() => {
+ this.$refs.uToast.isShow = false
})
- this.buildingList = aoiList || []
}
- if (shopList.length > 0) {
- this.isShowShop = true
- this.shopList = shopList || []
- }
- this.$nextTick(() => {
- this.$refs.uToast.isShow = false
- })
},
pushPage(name, scItem) {
const {
@@ -172,7 +176,8 @@
// 跳转到商铺页面
pushShopPage(name, item) {
const {
- addressCode,addressType
+ addressCode,
+ addressType
} = item
let url = `/subPackage/house/houseNumber/index?stdId=${addressCode}&addressType=${addressType}`
this.$u.func.globalNavigator(url, "navTo")
@@ -203,12 +208,15 @@
.content {
margin-top: 20rpx;
background-color: #fff;
+
.floor-info-box {
margin-top: 30rpx;
justify-content: space-between;
+
.proprietor-box {
color: #333333;
}
+
.floor-box {
color: #017BFC;
font-weight: 700;
@@ -249,25 +257,28 @@
padding: 0 !important;
}
}
- .floor-content:last-child{
- border:none;
+
+ .floor-content:last-child {
+ border: none;
}
+
/deep/ .floor-content {
// border-bottom: 1rpx solid #f5f5f5;
// border-bottom:2px solid #F9F9FA;
- border-bottom:1px solid #999;
+ border-bottom: 1px solid #999;
.floor-num-box {
width: 50rpx;
padding: 0 20rpx !important;
// background: #FAFBFE;
- background-color:#F5F5F5;
+ background-color: #F5F5F5;
}
.room-content {
width: 0;
flex: 1;
padding: 6rpx;
+
.room-box {
padding: 10rpx;
justify-content: center;
@@ -276,8 +287,9 @@
min-height: 110rpx;
box-sizing: border-box;
// background-color: #FAFBFE;
- background-color: rgb(236,244,255);
- // margin:2rpx;
+ background-color: rgb(236, 244, 255);
+
+ // margin:2rpx;
&>view {
margin: auto;
width: 100%;
@@ -325,8 +337,8 @@
flex-direction: row;
flex-wrap: wrap;
}
-
- /deep/ .u-cell__body{
- background-color: rgb(236,244,255);
+
+ /deep/ .u-cell__body {
+ background-color: rgb(236, 244, 255);
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3