From e4ea1664aeb864f29c572b862270426c8a1a2065 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Wed, 29 Nov 2023 20:17:25 +0800
Subject: [PATCH] 修复部分问题
---
pages/home/index.vue | 57 +++++++++++++++++++++-------
pages.json | 12 +++---
subPackage/label/form.vue | 2
3 files changed, 49 insertions(+), 22 deletions(-)
diff --git a/pages.json b/pages.json
index c0df428..5f5e51a 100644
--- a/pages.json
+++ b/pages.json
@@ -593,12 +593,12 @@
"iconPath": "static/img/tabbar-01.png",
"text": "首页"
},
- {
- "pagePath": "pages/circle/index",
- "iconPath": "static/img/tabbar-02.png",
- "selectedIconPath": "static/img/tabbar-02-selected.png",
- "text": "圈子"
- },
+ // {
+ // "pagePath": "pages/circle/index",
+ // "iconPath": "static/img/tabbar-02.png",
+ // "selectedIconPath": "static/img/tabbar-02-selected.png",
+ // "text": "圈子"
+ // },
{
"pagePath": "pages/user/center",
"iconPath": "static/img/tabbar-03.png",
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 73bd7d1..3dff512 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,5 +1,5 @@
<template>
- <view class="">
+ <view class="layout" >
<u-navbar height="48" :autoBack="false" safeAreaInsetTop placeholder
@leftClick="selectBoxShow = !selectBoxShow">
<view slot="left" class="top flex">
@@ -141,6 +141,7 @@
} from "@/common/setting"
import noticeList from "@/components/noticeList/noticeList";
import captionRow from "@/components/caption/caption.vue"
+import taskListVue from "../../subPackage/task/taskList.vue";
export default {
components: {
@@ -474,6 +475,7 @@
// });
this.menuList = uni.getStorageSync("menu")
let liveList = this.hasMenu('生活')
+ console.log("liveList===>", liveList);
this.liveList = this.setLiveMenu(liveList);
this.contactList = this.hasMenu('快捷拨号');
this.jobList = this.hasMenu('工作台')
@@ -484,7 +486,11 @@
setTimeout(()=>{
if(this.jobList.length){
let taskList = this.jobList.filter(item => item.name == "我的任务")
- uni.setStorageSync("taskMenu",taskList[0].children);
+ if(taskList.length){
+ uni.setStorageSync("taskMenu",taskList[0].children);
+ }else {
+ uni.setStorageSync("taskMenu",[]);
+ }
}else {
uni.setStorageSync("taskMenu",[]);
}
@@ -508,18 +514,31 @@
setLiveMenu(arr) {
- let index = arr.findIndex(item => item.name == "标签报事")
- if (this.curSelectSite.addressType == 1) {
- if (index != -1) {
- arr.splice(index, 1)
- }
- } else {
- if (index == -1) {
- arr.unshift({
- name: "标签报事",
- path: "/subPackage/label/index",
- pictureImg: "/static/icon/nav-01.png"
- })
+ if(arr.length){
+ let index = arr.findIndex(item => item.name == "标签报事")
+ let index2 = arr.findIndex(item => item.name == "租户上报")
+ if (this.curSelectSite.addressType == 1) {
+ if (index != -1) {
+ arr.splice(index, 1)
+ }
+ if(index2 == -1){
+ arr.push({
+ name: "租客上报",
+ path: "/subPackage/bs/views/zhsb",
+ pictureImg: "/static/icon/nav-04.png"
+ })
+ }
+ } else {
+ if (index == -1) {
+ arr.unshift({
+ name: "标签报事",
+ path: "/subPackage/label/index",
+ pictureImg: "/static/icon/nav-01.png"
+ })
+ }
+ if(index2 != -1){
+ arr.splice(index2, 1)
+ }
}
}
return arr;
@@ -612,9 +631,17 @@
}
</script>
-<style lang="scss" scoped>
+<style lang="scss">
page {
color: #333;
+ width:100%;
+ height:100%;
+ background-color:#fff;
+ }
+ .layout{
+ width:100%;
+ height:100%;
+ background-color:#fff;
}
.top {
diff --git a/subPackage/label/form.vue b/subPackage/label/form.vue
index 9a880c6..60282fc 100644
--- a/subPackage/label/form.vue
+++ b/subPackage/label/form.vue
@@ -152,7 +152,7 @@
},
methods: {
setTitle(type) {
- if (type == 2) {
+ if (type == 4) {
return "二手手机维修"
} else if (type == 3) {
return "二手车交易"
--
Gitblit v1.9.3