From eed35c26883b4dedddcbe4a8d3dedafdd4e5daf7 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Fri, 17 Nov 2023 09:20:34 +0800
Subject: [PATCH] 首页修改
---
pages/home/index.vue | 17 ++++++++++++-----
common/setting.js | 4 ++--
subPackage/label/index.vue | 4 ++--
store/index.js | 1 +
4 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/common/setting.js b/common/setting.js
index 4239c01..14b7ea8 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -12,8 +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: 'https://srgdjczzxtpt.com:2080/api',
+ devUrl: 'http://192.168.0.102:9528',
+ // devUrl: 'https://srgdjczzxtpt.com:2080/api',
minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
// 数据中台接口url
// dataCenterUrl: 'http://10.10.2.192/services',
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 300549c..de1866d 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -27,15 +27,15 @@
<u-icon name="/static/icon/nav-04.png" width="90rpx" height="90rpx"></u-icon>
<text class="f-26 mt-20">租客上报</text>
</u-grid-item> -->
- <u-grid-item @click.native="navTo()" v-for="(i,k) in liveList" :key="k">
- <u-icon :name="i.source" width="90rpx" height="90rpx"></u-icon>
+ <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-b mt-40">
- <view class="section-item" v-for="i in navList">
+ <view class="section-item" v-for="(i,k) in navList" :key="k">
<image class="section-item-bg" :src="i.bgImg" mode="aspectFill"></image>
<view class="item-box">
<view class="f-28">{{i.title}}</view>
@@ -81,7 +81,7 @@
</view>
<view class="flex flex-wrap">
<view class="cell bgc-main flex a-i-c" v-for="(item, index) in houseDataList.slice(0, 6)"
- @click.native="pushPage(item)">
+ @click.native="pushPage(item)" :key="index">
<u-icon name="/static/icon/floor.png" width="32rpx" height="32rpx"></u-icon>
<text class="cell-text f-26 c-ff">{{item.title}}</text>
</view>
@@ -679,7 +679,14 @@
navigatorPage(path) {
if (path) {
- this.$u.func.globalNavigator(path, "navTo")
+ if (path == '/subPackage/bs/views/zhsb' && this.curHouseCode === '') {
+ uni.showToast({
+ title: "请选择地址",
+ icon: "error"
+ })
+ return
+ }
+ this.$u.func.globalNavigator(`${path}?houseCode=${this.curHouseCode}`, "navTo")
}
},
diff --git a/store/index.js b/store/index.js
index c8321c1..c336d2d 100644
--- a/store/index.js
+++ b/store/index.js
@@ -137,6 +137,7 @@
dynamicMenu(this.state.activeRole.id).then(res=>{
if(res.code == 200){
let data = res.data;
+ if(!data) return
let menu = data.filter(e => e.name == 'app')[0].children;
commit("SET_MENU",menu);
let liveList = menu.filter(item=>item.name == '生活')
diff --git a/subPackage/label/index.vue b/subPackage/label/index.vue
index 6e9a470..b1d81f4 100644
--- a/subPackage/label/index.vue
+++ b/subPackage/label/index.vue
@@ -41,9 +41,9 @@
<view class="nav flex flex-wrap j-c-s-b">
<view class="nav-item" v-for="(i,k) in navList" :key="k" @click="navTo(i.path,k)">
- <image class="nav-item-bg" :src="i.bgImg" mode="aspectFill"></image>
+ <image class="nav-item-bg" :src="i.pictureImg" mode="aspectFill"></image>
<view class="nav-item-inner flex f-d-c">
- <text class="f-32 mb-30">{{i.title}}</text>
+ <text class="f-32 mb-30">{{i.name}}</text>
<button class="item-btn" :style="{backgroundColor:i.background}">立即上报</button>
</view>
</view>
--
Gitblit v1.9.3