Merge remote-tracking branch 'origin/master'

src/assets/css/xpwyfyy.css

@@ -28,6 +28,9 @@ body {
 .colorda94f8 {
 	color: #da94f8/*紫*/
 }
+.color4359DB {
+	color: #4359DB/*紫蓝*/
+}
 
 .color55f868 {
 	color: #389E0D/*绿*/
@@ -3123,7 +3126,7 @@ h3 {
  .vongi-zc .mui-selected a{
  	border:0
  }
-.mui-bar-nav.mui-bar .mui-pull-right{
+.mui-bar-nav.mui-bar .mui-btn.mui-pull-right{
 	line-height: 1.2;
 	top:8px
 }
@@ -3157,3 +3160,61 @@ h3 {
 	font-size:14px;
 	margin-top:5px
 }
+.vongi-zd ul,
+.vongi-zd .mui-table-view:before,
+.vongi-zd .mui-table-view:after,
+.vongi-zd .mui-table-view-cell:after{
+	background:0
+}
+.vongi-zd .mui-table-view-cell{
+	margin:10px;
+	background:#ffffff;
+	border-radius: 7px;
+}
+.vongi-zd .mui-media-object{
+	line-height: 32px;
+    max-width: 32px;
+    height: 32px;
+    display: flex;
+    overflow: hidden;
+    border-radius: 50%;
+}
+.vongi-zd .mui-media-object img{
+	width:100%
+}
+.vongi-zd .mui-table-view-cell .mui-media-body .mui-ellipsis{
+	line-height: 1.5;
+}
+.vongi-cashier .vongi-zd .mui-media-object img{
+	height:100%
+}
+.vongi-cd-pay{
+	text-align: center;
+}
+.vongi-cd-pay .iconfont{
+	font-size:18px
+}
+.vongi-zd h3{
+	margin-left:5px
+}
+.vongi-cd-payli h3{
+	padding:10px 15px;
+	font-weight: bold;
+}
+.vongi-qingjiadt .vongi-cd-payli.mui-input-group span,
+.vongi-qingjiadt .vongi-cd-payli.mui-input-group label{
+	padding:5px 15px
+}
+.vongi-cd-payli.mui-input-group .mui-input-row{
+	margin-bottom:0
+}
+.vongi-cd-payli .mui-input-row.flew-sp{
+	margin-bottom:1px;
+	
+}
+.vongi-cd-payli .mui-input-row:nth-child(2){
+	padding-top:10px
+}
+.vongi-cd-payli .mui-input-row:last-child{
+	padding-bottom:10px
+}

src/components/NullList.vue

@@ -0,0 +1,28 @@
+<template >
+    <div class="mui-slider-group" style="z-index: 8">
+        <div style="text-align: center;margin-top: 100px"  >
+            <img src="~$project/assets/img/lad.png" width="50%" style="width: 50%"  >
+            <p>{{remark}}</p>
+        </div>
+
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'nullList',
+        props: {
+            remark: {
+                require: false,
+                default: '',
+            },
+        },
+        methods: {},
+        mounted() {}
+    }
+</script>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+
+<style scoped="scoped">
+
+</style>

src/projects/business/router/master.js

@@ -128,7 +128,7 @@ const routesMaster = [
 								meta: {
 									requireAuth: false,
 									role: [],
-									title: '账单列表',
+									title: '账单缴费',
 								}
 							},
 							//账单列表

src/projects/business/views/Common/Device/List.vue

@@ -16,6 +16,7 @@
 			</div>
 
 			<ul class="mui-table-view">
+
 				<li class="mui-table-view-cell mui-media" v-for="(device,index) in devices">
 					<a>
 						<div class="mui-media-body flew-sp">
@@ -31,6 +32,8 @@
 			</ul>
 
 		</div>
+		<NullList :remark="''" v-if="!devices.length"></NullList>
+
 		<loading :visible="isLoading"></loading>
 
 	</div>
@@ -39,6 +42,7 @@
 
 <script>
 	import * as API_Device from '@/apis/Common/device'
+	import NullList from '$project/components/NullList.vue'
 
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
@@ -53,7 +57,7 @@
 		components: {
 			Common,
 			Loading,
-			TopHeader
+			TopHeader,NullList
 		},
 		data() {
 			return {

src/projects/business/views/Common/Notice/Home.vue

@@ -17,6 +17,7 @@
 				</ul>
 			</div>
 		</div>
+		<NullList :remark="'暂无消息'" v-if="!recordList.length"></NullList>
 
 		<loading :visible="isLoading"></loading>
 	</div>
@@ -28,6 +29,8 @@
 	import Loading from '$project/components/Loading.vue'
 	import isReachBottom from '$project/utils/isReachBottom'
 	import TopHeader from '$project/components/TopHeader.vue'
+	import NullList from '$project/components/NullList.vue'
+
 	import {
 		mapGetters,
 		mapMutations
@@ -37,7 +40,7 @@
 		components: {
 			Common,
 			Loading,
-			TopHeader
+			TopHeader,NullList
 		},
 		data() {
 			return {

src/projects/business/views/Guest/From/List.vue

@@ -32,7 +32,9 @@
 
 
 		</div>
-		<div class="fyy-footer">
+	<NullList :remark="'您尚未邀请访客来访'" v-if="!recordList.length"></NullList>
+
+	<div class="fyy-footer">
 			<div class="bindfyy-btn">
 				<button type="button" class="mui-btn mui-btn-primary " @click="save">
 						邀请访客
@@ -51,6 +53,8 @@
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
 	import isReachBottom from '$project/utils/isReachBottom'
+	import NullList from '$project/components/NullList.vue'
+
 	import {
 		mapGetters,
 		mapMutations
@@ -60,7 +64,7 @@
 		components: {
 			Common,
 			Loading,
-			TopHeader
+			TopHeader,NullList
 		},
 		data() {
 			return {

src/projects/business/views/Master/Attendance/LeaveList.vue

@@ -22,6 +22,9 @@
 				<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary " @click="save()">写请假条</button></div>
 			</div>
 		</div>
+		<NullList :remark="'暂无请假记录'" v-if="!recordList.length"></NullList>
+
+
 		<loading :visible="isLoading"></loading>
 
 	</div>
@@ -34,6 +37,8 @@
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
 	import isReachBottom from '$project/utils/isReachBottom'
+	import NullList from '$project/components/NullList.vue'
+
 	import {
 		mapGetters,
 		mapMutations
@@ -43,7 +48,7 @@
 		components: {
 			Common,
 			Loading,
-			TopHeader
+			TopHeader,NullList
 		},
 		data() {
 			return {

src/projects/business/views/Master/Attendance/List.vue

@@ -20,6 +20,7 @@
 				</ul>
 			</div>
 		</div>
+		<NullList :remark="'暂无考勤记录'" v-if="!recordList.length"></NullList>
 
 		<loading :visible="isLoading"></loading>
 	</div>
@@ -31,6 +32,7 @@
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
 	import isReachBottom from '$project/utils/isReachBottom'
+	import NullList from '$project/components/NullList.vue'
 	import {
 		mapGetters,
 		mapMutations
@@ -40,7 +42,7 @@
 		components: {
 			Common,
 			Loading,
-			TopHeader
+			TopHeader,NullList
 		},
 		data() {
 			return {

src/projects/business/views/Master/Attendance/VerifyLeaveList.vue

@@ -34,7 +34,10 @@
 										</router-link>
 									</li>
 								</ul>
+								<NullList :remark="'暂无请假申请记录'" v-if="!recordList.length"></NullList>
+
 								<form class="mui-input-group fyy-checkbox" v-if="listForm.type==0">
+
 									<div class="mui-input-row mui-checkbox mui-left" v-for="mod in recordList">
 
 										<router-link class="mui-navigate-right" :to="{name: 'MasterAttendanceVerifyLeaveInfo', query: {id:mod.id}}">
@@ -84,7 +87,6 @@
 				<button class="mui-btn mui-btn-primary" @click="doAction">提交</button>
 			</div>
 		</div>
-
 		<loading :visible="isLoading"></loading>
 
 	</div>
@@ -97,6 +99,7 @@
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
 	import isReachBottom from '$project/utils/isReachBottom'
+	import NullList from '$project/components/NullList.vue'
 	import {
 		mapGetters,
 		mapMutations
@@ -106,7 +109,7 @@
 		components: {
 			Common,
 			Loading,
-			TopHeader
+			TopHeader,NullList
 		},
 		data() {
 			return {

src/projects/business/views/Master/Attendance/VerifyList.vue

@@ -15,6 +15,7 @@
 						</a>
 					</div>
 				</div>
+				<NullList :remark="'暂无审批记录'" v-if="!recordList.length"></NullList>
 				<div class="mui-slider-group">
 
 					<div v-show="listForm.status==0" class="mui-slider-item mui-control-content">
@@ -97,6 +98,7 @@
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
 	import isReachBottom from '$project/utils/isReachBottom'
+	import NullList from '$project/components/NullList.vue'
 	import {
 		mapGetters,
 		mapMutations
@@ -106,7 +108,7 @@
 		components: {
 			Common,
 			Loading,
-			TopHeader
+			TopHeader,NullList
 		},
 		data() {
 			return {

src/projects/business/views/Master/Mine/Bill/Info.vue

@@ -1,8 +1,13 @@
 <template>
+<div>
+
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/business/views/Master/Mine/Bill/List.vue

@@ -1,8 +1,13 @@
 <template>
+<div>
+
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/business/views/Master/Mine/Bill/Pay.vue

@@ -1,8 +1,80 @@
 <template>
+<div>
+    <header class="mui-bar mui-bar-nav">
+				<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+				<h1 class="mui-title">收银台</h1>
+			</header>
+			<div class="mui-content vongi-qingjiadt margin60">
+				<div class="vongi-cashier flew-sp">
+					<div class="vongi-zd flew-items">
+						<div class="mui-media-object">
+							<img src="~$project/assets/img/zd_dian.png">
+						</div>
+						<h3>
+							物业服务费
+						</h3>
+					</div>
+					<div class="vongi-cd-pay">
+						<span class="iconfont icon-baobiao color4fc5f7"></span>
+						<h5>历史账单</h5>
+					</div>
+				</div>
+				<form class="mui-input-group vongi-cd-payli">
+					<div class="mui-input-row flew-sp">
+						<h3>2021年物业管理费</h3>
+						<h3>1998.00</h3>
+					</div>
+					<div class="mui-input-row">
+						<label>缴费单位</label>
+						<span>沙市花园XX物业</span>
+					</div>
+					<div class="mui-input-row">
+						<label>缴费户号</label>
+						<span>1-2-1101</span>
+					</div>
+					<div class="mui-input-row">
+						<label>户名</label>
+						<span>111</span>
+					</div>
+					<div class="mui-input-row">
+						<label>住址信息</label>
+						<span>沙市花园1-2-1101</span>
+					</div>
+					<div class="mui-input-row">
+						<label>创建时间</label>
+						<span>2020-09-18 18:15</span>
+					</div>
+					<div class="mui-input-row">
+						<label style="width:25%">订单号</label>
+						<span style="width:75%" class="mui-ellipsis">202009180000300018150060415263</span>
+					</div>
+				</form>
+				<div class="mui-content-padded">
+					<h5>支付方式</h5></div>
+				<form class="mui-input-group margin10">
+					<div class="mui-input-row mui-radio">
+						<label>微信支付</label>
+						<input name="radio1" type="radio">
+					</div>
+					<div class="mui-input-row mui-radio">
+						<label>支付宝支付</label>
+						<input name="radio1" type="radio" checked>
+					</div>
+				</form>
+				<div class="vongi-cashier-btn-row">
+					<div class="vongi-cashier-btn-white">
+						<span>合计：￥60.00</span>
+						<div class="vongi-cashier-btn">支付</div>
+					</div>
+				</div>
+			</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/business/views/Master/Mine/Bill/Record.vue

@@ -1,8 +1,94 @@
 <template>
+<div>
+    <header class="mui-bar mui-bar-nav">
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+			<h1 class="mui-title">我的账单</h1>
+			<a class="mui-pull-right" href=""><span class="mui-icon iconfont icon-baobiao"></span>账单记录</a>
+		</header>
+		<div class="mui-content vongi-zd">
+			<ul class="mui-table-view">
+				<li class="mui-table-view-cell">
+					<a>
+						<div class="mui-media-object mui-pull-left">
+							<img src="~$project/assets/img/zd_dian.png">
+						</div>
+						<div class="mui-media-body">
+							<div class='flew-sp flew-items'>
+								<div class="mui-ellipsis mui-col-xs-8">2021年沙市花园车位租赁费花园车位租赁费</div><span class="colorf8b155">电费</span></div>
+							<div class='mui-ellipsis flew-sp mui-h2 flew-items'>56.06<span class="mui-h6">09-16 14:00</span></div>
+						</div>
+					</a>
+				</li>
+				<li class="mui-table-view-cell">
+					<a>
+						<div class="mui-media-object mui-pull-left">
+							<img src="~$project/assets/img/zd_shui.png">
+						</div>
+						<div class="mui-media-body">
+							<div class='flew-sp flew-items'>
+								<div class="mui-ellipsis mui-col-xs-8">2021年沙市花园车位租赁费花园车位租赁费</div><span class="color4fc5f7">水费</span></div>
+							<div class='mui-ellipsis flew-sp mui-h2 flew-items'>56.06<span class="mui-h6">09-16 14:00</span></div>
+						</div>
+					</a>
+				</li>
+				<li class="mui-table-view-cell">
+					<a>
+						<div class="mui-media-object mui-pull-left">
+							<img src="~$project/assets/img/zd_fang.png">
+						</div>
+						<div class="mui-media-body">
+							<div class='flew-sp flew-items'>
+								<div class="mui-ellipsis mui-col-xs-8">2021年沙市花园车位租赁费花园车位租赁费</div><span class="colorfe616c">房租</span></div>
+							<div class='mui-ellipsis flew-sp mui-h2 flew-items'>56.06<span class="mui-h6">09-16 14:00</span></div>
+						</div>
+					</a>
+				</li>
+				<li class="mui-table-view-cell">
+					<a>
+						<div class="mui-media-object mui-pull-left">
+							<img src="~$project/assets/img/zd_car.png">
+						</div>
+						<div class="mui-media-body">
+							<div class='flew-sp flew-items'>
+								<div class="mui-ellipsis mui-col-xs-8">2021年沙市花园车位租赁费花园车位租赁费</div><span class="color4359DB">车位费</span></div>
+							<div class='mui-ellipsis flew-sp mui-h2 flew-items'>56.06<span class="mui-h6">09-16 14:00</span></div>
+						</div>
+					</a>
+				</li>
+				<li class="mui-table-view-cell">
+					<a>
+						<div class="mui-media-object mui-pull-left">
+							<img src="~$project/assets/img/zd_admin.png">
+						</div>
+						<div class="mui-media-body">
+							<div class='flew-sp flew-items'>
+								<div class="mui-ellipsis mui-col-xs-8">2021年沙市花园车位租赁费花园车位租赁费</div><span class="color55f868">物业管理费</span></div>
+							<div class='mui-ellipsis flew-sp mui-h2 flew-items'>56.06<span class="mui-h6">09-16 14:00</span></div>
+						</div>
+					</a>
+				</li>
+				<li class="mui-table-view-cell">
+					<a>
+						<div class="mui-media-object mui-pull-left">
+							<img src="~$project/assets/img/zd_prsion.png">
+						</div>
+						<div class="mui-media-body">
+							<div class='flew-sp flew-items'>
+								<div class="mui-ellipsis mui-col-xs-8">2021年沙市花园车位租赁费花园车位租赁费</div><span class="colorfe616c">养老服务费</span></div>
+							<div class='mui-ellipsis flew-sp mui-h2 flew-items'>56.06<span class="mui-h6">09-16 14:00</span></div>
+						</div>
+					</a>
+				</li>
+			</ul>
+
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/business/views/Master/Property/Car/List.vue

@@ -16,15 +16,13 @@
 						</a>
 					</div>
 				</div>
+				<NullList :remark="'暂无车位申请出入记录'" v-if="!recordList.length"></NullList>
+
 				<div class="mui-slider-group">
-					<div style="text-align: center;margin-top: 100px"  v-if="!recordList.length">
-						<img src="~$project/assets/img/lad.png" width="50%"  >
-					</div>
+
 
 					<div  class="mui-slider-item mui-control-content">
-						<div style="text-align: center"  v-if="!recordList.length">
-							<span>暂无车位申请出入记录</span>
-						</div>
+
 
 						<div class="mui-scroll-wrapper">
 							<div class="mui-scroll">
@@ -62,6 +60,8 @@
 <script>
 	import * as API from '@/apis/Master/Property/car'
 	import Common from '$project/components/Common.vue'
+	import NullList from '$project/components/NullList.vue'
+
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
 	import isReachBottom from '$project/utils/isReachBottom'
@@ -74,7 +74,7 @@
 		components: {
 			Common,
 			Loading,
-			TopHeader
+			TopHeader,NullList
 		},
 		data() {
 			return {