From 627fd69986e6306c4f00881bc6bf0dc9bf6fca28 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Mon, 20 Nov 2023 17:33:36 +0800
Subject: [PATCH] 修改公告样式，修改楼盘列表样式，新增我的家人页面，个人中心样式调整
---
components/noticeList/noticeList.vue | 89 ++++++++
components/noticeList/tagCell.vue | 27 ++
static/icon/nav-center-03.png | 0
subPackage/article/list.vue | 72 +-----
pages.json | 19 +
static/icon/nav-center-01.png | 0
subPackage/workbench/views/audit.vue | 5
subPackage/article/detail.vue | 6
pages/user/center.vue | 47 +++
subPackage/user/family/edit.vue | 164 ++++++++++++++
subPackage/workbench/views/rental.vue | 8
subPackage/house/roomDetails/index.vue | 14
pages/home/index.vue | 64 -----
common/setting.js | 2
subPackage/house/family/index.vue | 35 +-
subPackage/house/list/index.vue | 5
subPackage/user/family/list.vue | 82 +++++++
static/icon/nav-center-02.png | 0
18 files changed, 484 insertions(+), 155 deletions(-)
diff --git a/common/setting.js b/common/setting.js
index cce0c57..583fde1 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -12,7 +12,7 @@
// 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.101:9528',
// devUrl: 'https://srgdjczzxtpt.com:2080/api',
// minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
minioBaseUrl: 'https://srgdjczzxtpt.com:2080/',
diff --git a/components/noticeList/noticeList.vue b/components/noticeList/noticeList.vue
new file mode 100644
index 0000000..0379d6a
--- /dev/null
+++ b/components/noticeList/noticeList.vue
@@ -0,0 +1,89 @@
+<template>
+ <view class="">
+ <view class="notice-list" @click="navToDetail(item.id)" v-for="(item,index) in data" :key="index">
+ <view v-if="item.url" class="notice-inner flex j-c-s-b">
+ <view class="notice-list-left flex f-d-c j-c-s-b">
+ <text class="notice-title f-28 fw">{{item.title}}</text>
+ <view class="flex j-c-s-b a-i-c">
+ <view class="flex a-i-c">
+ <tag-cell :text="item.dictValue" />
+ <view class="flex a-i-c">
+ <u-icon name="eye-fill" size="14" color="#CECECE"></u-icon>
+ <text class="f-24 c-99 ml-5">{{item.viewNumber}}</text>
+ </view>
+ </view>
+ <text class="f-24 c-99">{{item.createTime}}</text>
+ </view>
+ </view>
+ <u-image :src="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>
+ <view class="flex j-c-s-b a-i-c">
+ <view class="flex a-i-c">
+ <tag-cell :text="item.dictValue" />
+ <view class="flex a-i-c">
+ <u-icon name="eye-fill" size="14" color="#CECECE"></u-icon>
+ <text class="f-24 c-99 ml-5">{{item.viewNumber}}</text>
+ </view>
+ </view>
+ <text class="f-24 c-99">{{item.createTime}}</text>
+ </view>
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+ import tagCell from './tagCell'
+ export default {
+ name: "noticeList",
+ props: {
+ data: Array
+ },
+ components: {
+ tagCell
+ },
+ data() {
+ return {
+
+ }
+ },
+ methods: {
+ navToDetail(id) {
+ uni.navigateTo({
+ url: `/subPackage/article/detail?id=${id}`
+ })
+ }
+ }
+ }
+</script>
+
+<style scoped lang="scss">
+ .notice-list {
+ padding: 30rpx 0;
+ border-bottom: 1px solid #f5f5f5;
+
+ .notice-inner {
+ width: 100%;
+ height: 140rpx;
+ }
+ }
+
+ .notice-list-left {
+ width: calc(100% - 200rpx - 20rpx);
+ height: 140rpx;
+ }
+
+ .notice-title {
+ width: 100%;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ overflow: hidden;
+ }
+
+ .ml-5 {
+ margin-left: 5rpx;
+ }
+</style>
\ No newline at end of file
diff --git a/components/noticeList/tagCell.vue b/components/noticeList/tagCell.vue
new file mode 100644
index 0000000..4e4117a
--- /dev/null
+++ b/components/noticeList/tagCell.vue
@@ -0,0 +1,27 @@
+<template>
+ <view class="">
+ <view class="tag-cell f-24 c-main">
+ {{text}}
+ </view>
+ </view>
+
+</template>
+
+<script>
+ export default{
+ name:"tagCell",
+ props:{
+ text:String
+ }
+ }
+</script>
+
+<style scoped>
+ .tag-cell{
+ padding:3rpx 10rpx;
+ border-radius:30rpx;
+ background-color: rgb(236,244,255);
+ border:1px solid currentColor;
+ margin-right:20rpx;
+ }
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 1a20992..10242b4 100644
--- a/pages.json
+++ b/pages.json
@@ -63,7 +63,26 @@
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
}
+ },
+ {
+ "path": "family/list",
+ "style": {
+ "navigationBarTitleText": "我的家人",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "family/edit",
+ "style": {
+ "navigationBarTitleText": "编辑",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black"
+ }
}
+
]
},
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 34a81e4..88c3203 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -154,40 +154,9 @@
</view>
<u-icon name="arrow-right"></u-icon>
</view>
-
- <view v-for="(item,index) in notice" :key="index">
- <view class="notic-list flex j-c-s-b"
- @click="navigatorPage(`/subPackage/article/detail?id=${item.id}`)">
- <!-- <view class="f-28 mb-30 fw">{{item.title}}</view>
- <view class="flex a-i-c j-c-s-b">
- <view class="f-28 flex a-i-c ">
- <u-tag :text="item.dictValue" plain plainFill> </u-tag>
- <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>
- </view>
- <text class="f-24 c-99">{{item.createTime}}</text>
- </view> -->
-
- <view class="notic-list-left flex f-d-c j-c-s-b">
- <text class="notice-title f-28 fw">{{item.title}}</text>
- <view class="tag-content">
- <u-tag :text="item.dictValue" plain plainFill size="mini"> </u-tag>
- </view>
-
- <view class="flex j-c-s-b a-i-c">
- <view class="flex a-i-c">
- <u-icon name="eye-fill" size="16" color="#CECECE"></u-icon>
- <text class="f-24 c-99 ml-10">{{item.viewNumber}}</text>
- </view>
- <text class="f-24 c-99">{{item.createTime}}</text>
- </view>
- </view>
- <u-image :src="item.url" width="260rpx" height="200rpx"></u-image>
- </view>
- </view>
+ <notice-list :data="notice" />
</view>
+
<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>
@@ -212,8 +181,13 @@
import { getBannerList } from "@/api/system/index"
import { uploadUrl } from "@/common/setting"
+ import noticeList from "@/components/noticeList/noticeList";
+
export default {
+ components:{
+ noticeList
+ },
data() {
return {
swiperList: [
@@ -790,7 +764,6 @@
width: 216rpx;
height: 120rpx;
}
-
.item-box {
width: 216rpx;
height: 120rpx;
@@ -801,31 +774,8 @@
box-sizing: border-box;
}
}
-
.notic {
width: 100%;
-
- .notic-list {
- padding: 30rpx 0;
- border-bottom: 1px solid #f5f5f5;
- }
-
- .notic-list-left {
- width: calc(100% - 260rpx - 20rpx);
- height: 200rpx;
- }
-
- .notice-title {
- width: 100%;
- display: -webkit-box;
- -webkit-box-orient: vertical;
- -webkit-line-clamp: 2;
- overflow: hidden;
- }
-
- .tag-content {
- display: inline-flex;
- }
}
.caption {
diff --git a/pages/user/center.vue b/pages/user/center.vue
index 94d902c..1d10284 100644
--- a/pages/user/center.vue
+++ b/pages/user/center.vue
@@ -13,8 +13,20 @@
</view>
</view>
+
+
+
+
<view class="main">
- <view class="main-cell">
+ <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">
+ <u-icon :customStyle="{paddingTop:20+'rpx'}" :name="item.icon" width="64rpx" height="64rpx"></u-icon>
+ <text class="grid-text mt-20 f-28">{{item.title}}</text>
+ </view>
+
+ </view>
+ <view class="main-cell bgc-ff">
<view class="cell-content">
<!-- <u-cell-group :border="false">
<u-cell @click="navigator(item)" v-for="(item, index) in menuList" :icon="item.icon"
@@ -43,7 +55,7 @@
menuList: [{
icon: "/static/icon/menu-center-01.png",
title: "我的家人",
- url: ""
+ url: "/subPackage/user/family/list"
},
{
icon: "/static/icon/menu-center-02.png",
@@ -61,6 +73,23 @@
url: ""
},
],
+ navList:[
+ {
+ icon: "/static/icon/nav-center-01.png",
+ title: "我的房屋",
+ url: ""
+ },
+ {
+ icon: "/static/icon/nav-center-02.png",
+ title: "我的小区",
+ url: ""
+ },
+ {
+ icon: "/static/icon/nav-center-03.png",
+ title: "出租信息",
+ url: ""
+ },
+ ]
// userInfo:{}
}
},
@@ -113,11 +142,17 @@
box-sizing: border-box;
background: linear-gradient(180deg, #017BFC 0%, rgba(1, 123, 252, 0) 100%);
}
-
.main {
- margin: -50rpx 30rpx 0;
- background-color: #fff;
- border-radius: 6rpx;
+ margin: -120rpx 30rpx 0;
+ .nav {
+ width: 100%;
+ padding:20rpx 0;
+ margin-bottom: 20rpx;
+ border-radius:10rpx;
+ }
+ .main-cell{
+ border-radius: 10rpx;
+ }
.cell-item {
width: 100%;
diff --git a/static/icon/nav-center-01.png b/static/icon/nav-center-01.png
new file mode 100644
index 0000000..7ee2622
--- /dev/null
+++ 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
new file mode 100644
index 0000000..5109a74
--- /dev/null
+++ 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
new file mode 100644
index 0000000..168d2f6
--- /dev/null
+++ b/static/icon/nav-center-03.png
Binary files differ
diff --git a/subPackage/article/detail.vue b/subPackage/article/detail.vue
index 87cc124..ae0865e 100644
--- a/subPackage/article/detail.vue
+++ b/subPackage/article/detail.vue
@@ -8,7 +8,7 @@
<text class="f-22 ml-10">120</text>
</view> -->
<view class="flex a-i-c">
- <u-tag :text="detailInfo.dictValue" plain plainFill size="mini"> </u-tag>
+ <tag-cell :text="detailInfo.dictValue"></tag-cell>
<view class="flex a-i-c ml-20">
<u-icon name="eye-fill" color="#CECECE"></u-icon>
<text class="f-22 ml-10">{{detailInfo.viewNumber}}</text>
@@ -35,7 +35,11 @@
import {
getDetail
} from '@/api/article/article.js'
+ import tagCell from '@/components/noticeList/tagCell.vue'
export default {
+ components:{
+ tagCell
+ },
data() {
return {
detailInfo: {},
diff --git a/subPackage/article/list.vue b/subPackage/article/list.vue
index fa72ec4..1de48c3 100644
--- a/subPackage/article/list.vue
+++ b/subPackage/article/list.vue
@@ -4,40 +4,10 @@
<u-tabs :list="tabList" :current="tabIndex" keyName="dictValue" @change="changeTab"
:inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}"></u-tabs>
</view>
- <view class="list">
- <view class="notic-list flex j-c-s-b bgc-ff" v-for="(item,index) in noticeList" :key="index"
- @click="navTo(item.id)">
- <!-- <view class="f-28 mb-30">
- {{item.title}}
- </view>
- <view class="flex a-i-c j-c-s-b">
- <view class="f-28 flex a-i-c ">
- <u-tag :text="item.dictValue" plain plainFill> </u-tag>
- <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>
- </view>
- <text class="f-24 c-99">{{item.createTime}}</text>
- </view> -->
- <view class="notic-list-left flex f-d-c j-c-s-b">
- <text class="notice-title f-28 fw">{{item.title}}</text>
- <view class="tag-content">
- <u-tag :text="item.dictValue" plain plainFill size="mini"> </u-tag>
- </view>
-
- <view class="flex j-c-s-b a-i-c">
- <view class="flex a-i-c">
- <u-icon name="eye-fill" size="16" color="#CECECE"></u-icon>
- <text class="f-24 c-99 ml-10">{{item.viewNumber}}</text>
- </view>
- <text class="f-24 c-99">{{item.createTime}}</text>
- </view>
- </view>
- <u-image :src="item.url" width="260rpx" height="200rpx"></u-image>
- </view>
- <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
+ <view class="list bgc-ff">
+ <notice-list :data="list" />
</view>
+ <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
</view>
</template>
@@ -46,13 +16,17 @@
getPage,
getCategory
} from "@/api/article/article.js";
+ import noticeList from "@/components/noticeList/noticeList.vue"
export default {
+ components:{
+ noticeList
+ },
data() {
return {
tabList: [],
tabId: "",
tabIndex: 0,
- noticeList: [],
+ list: [],
currentPage: 1,
loadingStatus: 'nomore'
}
@@ -71,7 +45,7 @@
changeTab(e) {
this.tabIndex = e.index;
this.tabId = e.dictKey;
- this.noticeList = [];
+ this.list = [];
this.currentPage = 1;
this.getNoticeList()
},
@@ -113,7 +87,7 @@
})
return
}
- this.noticeList = [...this.noticeList, ...records]
+ this.list = [...this.list, ...records]
this.loadingStatus = 'nomore'
},
@@ -128,7 +102,6 @@
page {
background-color: #f5f5f5;
}
-
.tab {
width: 100%;
height: 88rpx;
@@ -144,32 +117,9 @@
padding: 0 30rpx;
box-sizing: border-box;
z-index: 999;
-
}
-
.list {
margin-top: 108rpx;
- }
-
- .notic-list {
- padding: 30rpx;
- border-bottom: 1px solid #f5f5f5;
-
- .notic-list-left {
- width: calc(100% - 260rpx - 20rpx);
- height: 200rpx;
- }
-
- .notice-title {
- width: 100%;
- display: -webkit-box;
- -webkit-box-orient: vertical;
- -webkit-line-clamp: 2;
- overflow: hidden;
- }
-
- .tag-content {
- display: inline-flex;
- }
+ padding:0 30rpx;
}
</style>
\ No newline at end of file
diff --git a/subPackage/house/family/index.vue b/subPackage/house/family/index.vue
index 573596e..f01b443 100644
--- a/subPackage/house/family/index.vue
+++ b/subPackage/house/family/index.vue
@@ -6,7 +6,7 @@
<view>{{ curSelectSite.name }}/{{housingName}}{{buildingName}}</view>
</view>
<view class="h0 flex-1 build-list-box content">
- <u-collapse :border="false">
+ <u-collapse>
<u-collapse-item v-if="isShowBuild" style="border: none;" :name="index" :title="item.unitName"
:icon="'/static/icon/group.png'" v-for="(item, index) in buildingList" :key="index">
<!-- :title="item.unitName" -->
@@ -202,17 +202,12 @@
.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;
@@ -253,31 +248,35 @@
padding: 0 !important;
}
}
-
+ .floor-content:last-child{
+ border:none;
+ }
/deep/ .floor-content {
- border-bottom: 1rpx solid #f5f5f5;
+ // border-bottom: 1rpx solid #f5f5f5;
+ // border-bottom:2px solid #F9F9FA;
+ border-bottom:1px solid #999;
.floor-num-box {
width: 50rpx;
padding: 0 20rpx !important;
- background: #FAFBFE;
+ // background: #FAFBFE;
+ background-color:#F5F5F5;
}
.room-content {
width: 0;
flex: 1;
- padding: 15rpx;
-
+ padding: 6rpx;
.room-box {
- padding: 12rpx;
+ padding: 10rpx;
justify-content: center;
align-items: center;
width: calc(100% - 30rpx);
- min-height: 116rpx;
+ min-height: 110rpx;
box-sizing: border-box;
- background-color: #FAFBFE;
- margin: 15rpx;
-
+ // background-color: #FAFBFE;
+ background-color: rgb(236,244,255);
+ // margin:2rpx;
&>view {
margin: auto;
width: 100%;
@@ -325,4 +324,8 @@
flex-direction: row;
flex-wrap: wrap;
}
+
+ /deep/ .u-cell__body{
+ background-color: rgb(236,244,255);
+ }
</style>
\ No newline at end of file
diff --git a/subPackage/house/list/index.vue b/subPackage/house/list/index.vue
index e4f7e21..a5ab88f 100644
--- a/subPackage/house/list/index.vue
+++ b/subPackage/house/list/index.vue
@@ -174,9 +174,10 @@
align-items: center;
width: calc((100% - 96rpx) / 3);
height: 68rpx;
- border-radius: 5rpx;
+ border-radius: 12rpx;
color: #333333;
- background: #FAFBFE;
+ // background: #FAFBFE;
+ background-color:rgb(236,244,255);
box-sizing: border-box;
}
}
diff --git a/subPackage/house/roomDetails/index.vue b/subPackage/house/roomDetails/index.vue
index 71a165f..6345795 100644
--- a/subPackage/house/roomDetails/index.vue
+++ b/subPackage/house/roomDetails/index.vue
@@ -17,7 +17,8 @@
<text>（共{{ houseInfo.allNum }}人）</text>
</view>
<view class="flex a-i-c">
- <u-button @click="rommManage" size='small' type="primary" class="u_btn_blue" text="房屋管理"></u-button>
+ <u-button @click="rommManage" size='small' type="primary" class="u_btn_blue"
+ text="房屋管理"></u-button>
</view>
</view>
</view>
@@ -69,8 +70,8 @@
<u-icon name="/static/icon/delete.png" size="16" @click="removeHouseholdSub(item)"></u-icon>
</view>
</view>
-
</view>
+
<u-modal :show="isHouseholdModelShow" width="auto" :showCancelButton="true" title="提示"
content="请确认是否删除当前住户信息" @cancel="isHouseholdModelShow = false"
@confirm="deleteHousehold()"></u-modal>
@@ -244,7 +245,7 @@
houseRentalList,
householdList,
subAoi
- } = res.data
+ } = res.data
console.log(res.data);
this.houseCode = addressCode
this.rentOutList = houseRentalList
@@ -426,7 +427,7 @@
.owner-box {
border-radius: 8rpx;
- padding: 30rpx;
+ padding: 30rpx;
margin-top: 20rpx !important;
.card-box {
@@ -491,9 +492,10 @@
}
}
- .btm-box {
+ .btm-box {
padding: 20rpx 0 0 0 !important;
- .owner-img-box {
+
+ .owner-img-box {
margin-left: 10rpx;
background-color: #30D17C;
border-radius: 50%;
diff --git a/subPackage/user/family/edit.vue b/subPackage/user/family/edit.vue
new file mode 100644
index 0000000..b9389bf
--- /dev/null
+++ b/subPackage/user/family/edit.vue
@@ -0,0 +1,164 @@
+<template>
+ <view class="">
+
+ <u-form labelPosition="left" :model="info" :rules="rules" ref="form" labelWidth="100"
+ :labelStyle="{fontSize:'28rpx'}">
+ <view class="form-row">
+ <u-form-item label="地址" prop="districtName" borderBottom required>
+ <view class="content-name f-28">
+ {{info.districtName}}
+ </view>
+ </u-form-item>
+ <u-form-item label="姓名" prop="checkUserName" borderBottom required>
+ <u-input v-model="info.checkUserName" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
+ inputAlign="right"></u-input>
+ </u-form-item>
+ <u-form-item label="手机" prop="checkTelephone" borderBottom required>
+ <u-input v-model="info.checkTelephone" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
+ inputAlign="right"></u-input>
+ </u-form-item>
+ <u-form-item label="性别" prop="applyTime" borderBottom required @click="showSelectDate = true">
+ <u-input v-model="info.applyTime" disabled disabledColor="#ffffff" border="none" placeholder="请输入"
+ placeholderClass="f-28 c-99" inputAlign="right"></u-input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ <u-form-item label="生日" prop="applyTime" borderBottom required @click="showSelectDate = true">
+ <u-input v-model="info.applyTime" disabled disabledColor="#ffffff" border="none" placeholder="请输入"
+ placeholderClass="f-28 c-99" inputAlign="right"></u-input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ <u-form-item label="民族" prop="applyTime" borderBottom required @click="showSelectDate = true">
+ <u-input v-model="info.applyTime" disabled disabledColor="#ffffff" border="none" placeholder="请输入"
+ placeholderClass="f-28 c-99" inputAlign="right"></u-input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ <u-form-item label="是否党员" prop="applyTime" borderBottom required @click="showSelectDate = true">
+ <u-input v-model="info.applyTime" disabled disabledColor="#ffffff" border="none" placeholder="请输入"
+ placeholderClass="f-28 c-99" inputAlign="right"></u-input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ <u-form-item label="与业主关系" prop="applyTime" borderBottom required @click="showSelectDate = true">
+ <u-input v-model="info.applyTime" disabled disabledColor="#ffffff" border="none" placeholder="请输入"
+ placeholderClass="f-28 c-99" inputAlign="right"></u-input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ </view>
+ </u-form>
+ <view class="footer flex j-c-s-b a-i-c" v-if="id">
+ <button class="del-btn footer-btn">删除</button>
+ <button class="save-btn footer-btn">保存</button>
+ </view>
+ <view class="footer flex j-c-s-b a-i-c" v-if="!id">
+ <button class="add-btn footer-btn">提交</button>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ info: {
+ checkUserName: "",
+ checkTelephone: "",
+ applyName: "",
+ applyTime: '',
+ location: "",
+ houseCode: "",
+ districtName: "",
+ checkUserId: "",
+ },
+ rules: {
+ 'name': {
+ type: 'string',
+ required: true,
+ message: '请输入姓名',
+ trigger: ['blur', 'change']
+ },
+
+ 'checkName': {
+ type: 'string',
+ required: true,
+ message: '请输入手机',
+ trigger: ['blur', 'change']
+ },
+ 'checkPhone': {
+ type: 'number',
+ required: true,
+ message: '请输入名称',
+ trigger: ['blur', 'change']
+ },
+ 'location': {
+ type: 'string',
+ required: true,
+ message: '请输入位置',
+ trigger: ['blur', 'change']
+ }
+ },
+ id: ""
+ }
+ },
+
+ onLoad(option) {
+ this.id = option.id;
+ },
+
+ methods: {
+ confirmDate(e) {
+ this.showSelectDate = false;
+ this.info.applyTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
+ },
+ }
+ }
+</script>
+
+<style lang="scss">
+ page {
+ background-color: #F5F5F5;
+ }
+
+ .form-row {
+ margin: 20rpx 30rpx;
+ padding: 0 30rpx;
+ background-color: #fff;
+
+ .content-name {
+ flex: 1;
+ text-align: right;
+ }
+ }
+
+ .footer {
+ width: 100%;
+ padding: 30rpx;
+ box-sizing: border-box;
+ z-index: 10;
+ position:fixed;
+ bottom:0;
+ left:0;
+ backgroun-color:#fff;
+ .footer-btn {
+ height: 78rpx;
+ line-height: 78rpx;
+ border-radius: 8rpx 8rpx 8rpx 8rpx;
+ font-size: 32rpx;
+ color: #fff;
+ }
+
+ .add-btn {
+ width: 100%;
+ background: linear-gradient(163deg, #01BDFC 0%, #017BFC 100%);
+ }
+
+ .del-btn {
+ width: 236rpx;
+ background: linear-gradient(163deg, #FE6C5C 0%, #EA1F1F 99%);
+
+ }
+
+ .save-btn {
+ width: 424rpx;
+ background: linear-gradient(163deg, #01BDFC 0%, #017BFC 100%);
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/subPackage/user/family/list.vue b/subPackage/user/family/list.vue
new file mode 100644
index 0000000..8ba9ef6
--- /dev/null
+++ b/subPackage/user/family/list.vue
@@ -0,0 +1,82 @@
+<template>
+ <view class="">
+
+ <view class="list">
+ <view class="list-item flex j-c-s-b a-i-c" v-for="i in 3">
+ <view class="flex">
+ <u-avatar src="/static/icon/user-01.png" size="44"></u-avatar>
+ <view class="flex f-d-c ml-40 j-c-s-b">
+ <text class="f-28">张三</text>
+ <view class="flex a-i-c">
+ <u-icon name="phone-fill" color="#017BFC"></u-icon>
+ <text class="f-24 ml-10 c-99">13807937200</text>
+ </view>
+ </view>
+ </view>
+ <button class="action-btn c-main f-24" @click="navTo()">管理</button>
+ </view>
+ </view>
+
+ <view class="footer">
+ <button class="footer-btn" @click="navTo()">添加成员</button>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data(){
+ return {
+
+ }
+ },
+ methods:{
+ navTo(){
+ uni.navigateTo({
+ url:'edit'
+ })
+ }
+ }
+ }
+</script>
+
+<style lang="scss">
+ .list{
+ padding:0 30rpx;
+ .list-item{
+ padding:30rpx 0;
+ border-bottom:1px solid #F5F5F5;
+ }
+ .action-btn{
+ width:88rpx;
+ height:40rpx;
+ line-height: 40rpx;
+ border-radius: 30rpx;
+ border:1px solid currentColor;
+ padding:0;
+ margin:0;
+ }
+ .ml-40{
+ margin-left:40rpx;
+ }
+ }
+ .footer {
+ width: 100%;
+ padding: 30rpx;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ z-index: 10;
+ box-sizing: border-box;
+
+ .footer-btn {
+ width: 100%;
+ height: 78rpx;
+ line-height: 78rpx;
+ background: linear-gradient(163deg, #01BDFC 0%, #017BFC 100%);
+ border-radius: 8rpx;
+ color: #fff;
+ font-size: 32rpx;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/subPackage/workbench/views/audit.vue b/subPackage/workbench/views/audit.vue
index 71c52f0..953998a 100644
--- a/subPackage/workbench/views/audit.vue
+++ b/subPackage/workbench/views/audit.vue
@@ -107,7 +107,10 @@
this.$u.func.globalNavigator(`hotelReportDetail?id=${id}`)
} else if (name == "取保候审") {
this.$u.func.globalNavigator(`bailReportDetail?id=${id}`)
- } else {
+ } else if(name == "校园安全自查"){
+ this.$u.func.globalNavigator(`schoolReportDetail?id=${id}`)
+ }
+ else {
this.$u.func.globalNavigator(`labelReportDetail?id=${id}`)
}
}
diff --git a/subPackage/workbench/views/rental.vue b/subPackage/workbench/views/rental.vue
index f311ab6..10d33b3 100644
--- a/subPackage/workbench/views/rental.vue
+++ b/subPackage/workbench/views/rental.vue
@@ -12,7 +12,7 @@
</view>
<view class="content">
- <view class="row flex a-i-c" style="flex-wrap: wrap;">
+ <view class="row flex j-c-s-b a-i-c" v-if="tenantList.length">
<!-- <view class="row-item bgc-ff flex a-i-c">
<view class="dot bgc-green"></view>
<text class="f-24">长期3户 (3)人</text>
@@ -25,7 +25,7 @@
<view class="dot bgc-orange"></view>
<text class="f-24">短期3户 (3)人</text>
</view> -->
- <view v-for="(item,index) in statistics" :key="index" class="row-item bgc-ff flex a-i-c">
+ <view v-for="(item,index) in statistics" :key="index" class="row-item bgc-ff flex a-i-c" >
<view v-if="item.term =='shortTerm' " class="dot bgc-orange"></view>
<view v-if="item.term =='middleTerm' " class="dot bgc-main"></view>
<view v-if="item.term =='longTerm' " class="dot bgc-green"></view>
@@ -33,7 +33,7 @@
</view>
</view>
- <view class="list bgc-ff" v-for="records in tenantList">
+ <view class="list bgc-ff" v-for="(records,index) in tenantList" :key="index">
<view class="flex j-c-s-b a-i-c">
<view class="flex a-i-c">
<text class="f-32 mr-50">{{ records.tenantName }}</text>
@@ -318,7 +318,7 @@
}
.row-item {
- width: calc(100% / 3);
+ width: calc(100% / 3 - 10rpx);
height: 46rpx;
border-radius: 30rpx;
padding: 0 20rpx;
--
Gitblit v1.9.3