Merge remote-tracking branch 'origin/master'

src/assets/css/xpwyfyy.css

@@ -228,8 +228,8 @@ body {
 	.mui-content .vongi-photo {
 		height: 240px
 	}
-	.mui-content .vongi-meform-pho .mui-table-view-cell a{
-		padding:3px 5px
+	.mui-content .vongi-meform-pho .mui-table-view-cell a {
+		padding: 3px 5px
 	}
 }
 
@@ -524,9 +524,11 @@ h3 {
 .mui-selected a {
 	border: 1px solid #375cf5
 }
-.vongi-meform-pho .mui-table-view-cell.mui-selected a{
-	color:#375cf5
+
+.vongi-meform-pho .mui-table-view-cell.mui-selected a {
+	color: #375cf5
 }
+
 .fyy-payyes img {
 	width: 60%;
 	padding: 50px 0
@@ -656,7 +658,7 @@ h3 {
 	color: #ffffff;
 	line-height: 16px;
 	font-size: 16px;
-	border:0
+	border: 0
 }
 
 .fyy-radio ul li .mui-media-body {
@@ -1151,7 +1153,7 @@ h3 {
 .vongi-wordcard .mui-media-object img {
 	width: 100%;
 	object-fit: cover;
-	min-height:100%
+	min-height: 100%
 }
 
 .vongi-wordcard-top {
@@ -1291,17 +1293,20 @@ h3 {
 	padding: 10px;
 	margin: 10px 10px 10px 50px
 }
-.vongi-wordcard-sp .mui-input-row a .mui-media-body{
-	position:relative;	
+
+.vongi-wordcard-sp .mui-input-row a .mui-media-body {
+	position: relative;
 }
-.vongi-bksp-time{
-	position:absolute;
-	right:20px;
-	top:50%;
-	margin:0;
-	margin-top:-6px;	
-	color:#999
+
+.vongi-bksp-time {
+	position: absolute;
+	right: 20px;
+	top: 50%;
+	margin: 0;
+	margin-top: -6px;
+	color: #999
 }
+
 .vongi-wordcard-sp .mui-input-group .mui-input-row {
 	background: 0;
 	height: auto
@@ -1948,12 +1953,15 @@ h3 {
 	margin-bottom: 10px;
 	margin-top: 4px
 }
-.vongi-meform-pho textarea{
-	padding:0
+
+.vongi-meform-pho textarea {
+	padding: 0
 }
-.vongi-meform-pho h5{
-	margin-bottom:10px
+
+.vongi-meform-pho h5 {
+	margin-bottom: 10px
 }
+
 .vongi-meform .mui-h5 {
 	padding: 10px 15px
 }
@@ -1961,27 +1969,33 @@ h3 {
 .vongi-meform h5 {
 	margin-bottom: 10px
 }
-.vongi-meform-pho .mui-table-view-radio .mui-table-view-cell>a:not(.mui-btn){
-	margin:0;	
+
+.vongi-meform-pho .mui-table-view-radio .mui-table-view-cell>a:not(.mui-btn) {
+	margin: 0;
 }
+
 .vongi-meform-pho .mui-table-view-radio {
 	flex-wrap: wrap;
 }
-.vongi-meform-pho .mui-table-view-cell a{
+
+.vongi-meform-pho .mui-table-view-cell a {
 	padding: 3px 10px;
-    border-radius: 20px;
-    border: 1px solid #A9A9A9;
-    color:#888888
+	border-radius: 20px;
+	border: 1px solid #A9A9A9;
+	color: #666
 }
+
 .vongi-meform-pho .mui-table-view:before,
 .vongi-meform-pho .mui-table-view:after,
-.vongi-meform-pho .mui-table-view-cell:after{
-	background:0
+.vongi-meform-pho .mui-table-view-cell:after {
+	background: 0
 }
-.mui-table-view-radio .mui-table-view-cell{
-	padding:0;
+
+.mui-table-view-radio .mui-table-view-cell {
+	padding: 0;
 	margin: 5px 0;
 }
+
 .vongi-xzyljg .mui-table-view-cell:after {
 	left: 0
 }
@@ -2173,6 +2187,10 @@ h3 {
 	background: #A3A3A3;
 }
 
+.examine-btn4 {
+	background: #3385FF;
+}
+
 .vongi-popup {
 	width: 100%;
 	height: 100%;
@@ -2265,13 +2283,16 @@ h3 {
 	border: 0;
 	width: 50%;
 }
-.vongi-popup-inner .vongi-login-btn button{
-	border:1px #ccc solid;
-	width:100%
+
+.vongi-popup-inner .vongi-login-btn button {
+	border: 1px #ccc solid;
+	width: 100%
 }
-.vongi-popup-inner .vongi-login-btn button .iconfont{
-	margin-right:5px
+
+.vongi-popup-inner .vongi-login-btn button .iconfont {
+	margin-right: 5px
 }
+
 .vongi-popup-inner .mui-button-row:after {
 	width: 1px;
 	height: 100%;
@@ -2285,11 +2306,13 @@ h3 {
 	background-color: #c8c7cc;
 	left: 0
 }
-.vongi-zbfj-pop{
-	top:10%
+
+.vongi-zbfj-pop {
+	top: 10%
 }
-.vongi-zbfj-pop img{
-	width:70%
+
+.vongi-zbfj-pop img {
+	width: 70%
 }
 
 .vongi-input-up {
@@ -2591,12 +2614,17 @@ h3 {
 	background-color: #fff;
 	display: flex;
 	justify-content: space-between;
-	line-height: 50px;
+	line-height: 49px;
 	padding-left: 15px;
 }
 
 .vongi-cashier-btn-white span {
 	font-size: 16px;
+	width: 70%;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: block;
 }
 
 .vongi-cashier {
@@ -2629,7 +2657,7 @@ h3 {
 .vongi-cashier-btn {
 	background-color: #3385FF;
 	height: 50px;
-	width: 120px;
+	width: 30%;
 	color: #ffffff;
 	text-align: center;
 	line-height: 50px;
@@ -2708,202 +2736,280 @@ h3 {
 	display: flex;
 	height: 100%;
 }
-.dian-list{
-	position:relative;
-	padding-left:15px
+
+.dian-list {
+	position: relative;
+	padding-left: 15px
 }
-.dian-list:after{
-	position:absolute;
-	left:0;
-	width:4px;
-	height:4px;
+
+.dian-list:after {
+	position: absolute;
+	left: 0;
+	width: 4px;
+	height: 4px;
 	border-radius: 50%;
-	background:#333;
-	top:8px;
+	background: #333;
+	top: 8px;
 	content: "";
 }
-.mui-active.dian-list:after{
-	background:#fe616c
+
+.mui-active.dian-list:after {
+	background: #fe616c
 }
-.vongi-spkh-show img{
+
+.vongi-spkh-show img {
 	width: 100%;
 	display: flex
 }
-.vongi-yqsb{
-	background:#ffffff;
-	padding:10px 15px;
-	margin-bottom:10px
+
+.vongi-yqsb {
+	background: #ffffff;
+	padding: 10px 15px;
+	margin-bottom: 10px
 }
-.vongi-yqsb i{
-	margin-right:5px
+
+.vongi-yqsb i {
+	margin-right: 5px
 }
-.vongi-yqsb-tex{
-	margin-bottom:10px;
+
+.vongi-yqsb-tex {
+	margin-bottom: 10px;
 	display: flex;
 }
-.vongi-hdsq .mui-slider-group ul{
-	margin:10px 15px;
-	background:0
+
+.vongi-hdsq .mui-slider-group ul {
+	margin: 10px 15px;
+	background: 0
 }
-.vongi-hdsq .mui-slider-group ul .mui-col-xs-9{
-	white-space:normal;
+
+.vongi-hdsq .mui-slider-group ul .mui-col-xs-9 {
+	white-space: normal;
 	overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
 }
-.vongi-hdsq .mui-slider-group ul .mui-col-xs-3{
+
+.vongi-hdsq .mui-slider-group ul .mui-col-xs-3 {
 	justify-content: flex-end;
 	align-items: center;
 	display: flex;
 }
-.vongi-hdsq .mui-slider-group ul li{
-	margin-bottom:10px;
-	background:#ffffff;
+
+.vongi-hdsq .mui-slider-group ul li {
+	margin-bottom: 10px;
+	background: #ffffff;
 	border-radius: 3px;
 }
-.vongi-hdsq .mui-slider-group ul li .mui-media-body{
-	margin-bottom:5px
+
+.vongi-hdsq .mui-slider-group ul li .mui-media-body {
+	margin-bottom: 5px
 }
-.vongi-hdsq .mui-badge{
-	background:#fe616c;
-	color:#ffffff
+
+.vongi-hdsq .mui-badge {
+	background: #fe616c;
+	color: #ffffff
 }
-.vongi-hdsq .mui-table-view-cell:after{
-	background:0
+
+.vongi-hdsq .mui-table-view-cell:after {
+	background: 0
 }
-.vongi-hdsq .mui-slider .mui-segmented-control.mui-segmented-control-inverted~.mui-slider-group .mui-slider-item{
-	border:0
+
+.vongi-hdsq .mui-slider .mui-segmented-control.mui-segmented-control-inverted~.mui-slider-group .mui-slider-item {
+	border: 0
 }
-.vongi-hdsq-dat{
-	background:#ffffff;
-	padding:10px 15px;
-	margin:10px
+
+.vongi-hdsq-dat {
+	background: #ffffff;
+	padding: 10px 15px;
+	margin: 10px
 }
-.vongi-hdsq-dat h5{
-	margin-bottom:10px
+
+.vongi-hdsq-dat h5 {
+	margin-bottom: 10px
 }
-.vongi-hdsq-dat .mui-card{
+
+.vongi-hdsq-dat .mui-card {
 	border-radius: 7px;
-	margin:0;
-	margin-bottom:10px
+	margin: 0;
+	margin-bottom: 10px
 }
-.vongi-hdsq-dat .mui-card img{
-	width:100%;
+
+.vongi-hdsq-dat .mui-card img {
+	width: 100%;
 	display: flex;
 }
-.vongi-hdsq-dat .mui-card-footer a{
-	padding-right:10px;
-	color:#333
+
+.vongi-hdsq-dat .mui-card-footer a {
+	padding-right: 10px;
+	color: #333
 }
-.vongi-hdsq-dat .mui-card-content-inner{
-	padding:10px
+
+.vongi-hdsq-dat .mui-card-content-inner {
+	padding: 10px
 }
 
-.vongi-qingjiadt .mui-input-row .vongi-span{
-	width:100%;
+.vongi-qingjiadt .mui-input-row .vongi-span {
+	width: 100%;
 	text-align: left;
-	padding:0 15px 15px; 
+	padding: 0 15px 15px;
 	text-align: justify;
 }
+
 .vongi-pop-inner,
-.vongi-mui-pop .mui-popup-button{
-	    background: rgba(255, 255, 255, 1);
-	    
+.vongi-mui-pop .mui-popup-button {
+	background: rgba(255, 255, 255, 1);
+}
+
+.vongi-pop-inner .mui-media-body {
+	padding: 15px 0
 }
-.vongi-pop-inner .mui-popup-title{
-	margin-bottom:15px
+
+.vongi-pop-inner .mui-popup-title {
+	margin-bottom: 15px
 }
-.vongi-pop-inner .mui-popup-input{
-	border:#eee 1px solid
+
+.vongi-pop-inner .mui-popup-input {
+	border: #eee 1px solid
 }
-.vongi-mui-pop .mui-popup-button{
-	color:#666
+
+.vongi-mui-pop .mui-popup-button {
+	color: #666
 }
-.mui-popup-button.mui-popup-button-bold{
+
+.mui-popup-button.mui-popup-button-bold {
 	color: #007aff;
 	font-weight: initial;
 }
-.vongi-hddat-tit{
+
+.vongi-hddat-tit {
 	text-align: center;
-	padding:15px 10px;
+	padding: 15px 10px;
 	border-bottom: 1px #eee solid;
 }
-.vongi-hddat-tit h1{
-	color:#00B0F0;
+
+.vongi-hddat-tit h1 {
+	color: #00B0F0;
 	line-height: 1.2;
-	
 }
-.vongi-hddat-tit h5{
-	color:#999;
-	margin-top:15px
+
+.vongi-hddat-tit h5 {
+	color: #999;
+	margin-top: 15px
 }
-.vongi-hddat-text{
-	padding:15px 10px
+
+.vongi-hddat-text {
+	padding: 15px 10px
 }
-.vongi-hddat-cont p{
-	font-size:14px;
-	color:#333;
-	margin-bottom:10px
+
+.vongi-hddat-cont p {
+	font-size: 14px;
+	color: #333;
+	margin-bottom: 10px
 }
-.vongi-hddat-cont img{
+
+.vongi-hddat-cont img {
 	border-radius: 7px;
 }
-.vongi-hddat-center{
-	margin-top:30px
+
+.vongi-hddat-center {
+	margin-top: 30px
 }
-.vongi-hddat-center p{
+
+.vongi-hddat-center p {
 	text-align: center;
 }
-.vongi-wybx .vongi-meform-pho .fyy-upphoto .mui-col-xs-3{
+
+.vongi-wybx .vongi-meform-pho .fyy-upphoto .mui-col-xs-3 {
 	align-items: initial;
 	border-radius: initial;
-	width:33.333333%;
-	height:100px
+	width: 33.333333%;
+	height: 100px
 }
 
-.vongi-wybx .vongi-meform-pho .fyy-upphoto{
-	position:relative
+.vongi-wybx .vongi-meform-pho .fyy-upphoto {
+	position: relative
 }
-.vongi-wybx .vongi-meform-pho .fyy-upphoto .mui-badge{
-	background:rgba(0,0,0,0.5);
+
+.vongi-wybx .vongi-meform-pho .fyy-upphoto .mui-badge {
+	background: rgba(0, 0, 0, 0.5);
 	border-radius: initial;
-	position:absolute;
-	right:5px;
-	bottom:5px
+	position: absolute;
+	right: 5px;
+	bottom: 5px
 }
-.vongi-wybx .vongi-meform-pho .fyy-upphoto .mui-col-xs-3 img{
+
+.vongi-wybx .vongi-meform-pho .fyy-upphoto .mui-col-xs-3 img {
 	border-radius: initial;
 }
-.vongi-wybx .vongi-meform-pho .fyy-upphoto{
-	margin:0 -5px
+
+.vongi-wybx .vongi-meform-pho .fyy-upphoto {
+	margin: 0 -5px
 }
-.vongi-hdsq .vongi-wybx.mui-slider-group ul .mui-col-xs-9{
+
+.vongi-hdsq .vongi-wybx.mui-slider-group ul .mui-col-xs-9 {
 	white-space: inherit;
-	    display: inline
+	display: inline
 }
-.vongi-wybx .vongi-btn-x{
+
+.vongi-wybx .vongi-btn-x {
 	padding: 10px 0 0;
-    margin-top: 10px;
-    border-top: 1px #eee solid;
-    text-align: right;
+	margin-top: 10px;
+	border-top: 1px #eee solid;
+	text-align: right;
 }
-.vongi-btn-x button{
+
+.vongi-btn-x button {
 	border-radius: 15px;
-	padding:6px 20px;
-	margin-left:10px
+	padding: 6px 20px;
+	margin-left: 10px
 }
-.vongi-qingjiadt .mui-input-row .vongi-span.vongi-meform-pho{
-	padding:0 15px;
-	margin:0
+
+.vongi-qingjiadt .mui-input-row .vongi-span.vongi-meform-pho {
+	padding: 0 15px;
+	margin: 0
 }
-.padd10{
-	padding-bottom:10px
+
+.padd10 {
+	padding-bottom: 10px
 }
-.vongi-kong{
+
+.vongi-kong {
 	text-align: center;
 }
-.vongi-kong img{
+
+.vongi-kong img {
 	padding: 10% 20% 0;
 }
+
+.vongi-car.vongi-meform-pho,
+.vongi-car.vongi-meform-pho .mui-table-view-radio {
+	background: 0
+}
+
+.vongi-car.vongi-meform-pho .mui-table-view-cell.mui-selected a {
+	color: #FFFFFF;
+	background: #3385FF;
+	border-radius: 7px;
+}
+
+.vongi-car.vongi-meform-pho .mui-table-view-cell a {
+	border: 0;
+	padding: 3px 0
+}
+
+.vongi-car.vongi-meform-pho .mui-table-view-cell {
+	width: 20%;
+	text-align: center;
+	padding: 5px
+}
+
+.vongi-car.vongi-meform-pho .mui-table-view-radio {
+	margin: -5px
+}
+
+.vongi-car.vongi-meform-pho h5 {
+	font-size: 14px;
+	font-weight: bold;
+}

src/projects/business/apis/Master/Property/car.js

@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+import Qs from 'qs';
+
+//申请
+export function submitParkingApply(params) {
+	return request({
+		url: '/mobile/personInfoApi/submitParkingApply',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+//车库位子
+export function parkingList(params) {
+	return request({
+		url: '/mobile/parkingInfoApi/parkingList',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+//申请单位
+export function parkingUnit(params) {
+	return request({
+		url: '/mobile/parkingInfoApi/parkingUnit',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+//车库照片
+export function parkingPicList(params) {
+	return request({
+		url: '/mobile/parkingInfoApi/parkingPicList',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}

src/projects/business/views/Master/Guest/Goto.vue

@@ -44,6 +44,10 @@
 		mapGetters,
 		mapMutations
 	} from 'vuex'
+	import {
+		currentTimeStamp,
+		parseUnixTime
+	} from '$project/utils'
 	export default {
 		name: 'MasterGuestGoto',
 		components: {
@@ -61,7 +65,8 @@
 					pageIndex: 1,
 					pageSize: 20,
 					//	token: '',
-					isToDay:1,//是否只查今天
+					queryDate:'',
+					//isToDay:1,//是否只查今天
 					totalPage: 1,
 					result: 0,
 				},
@@ -72,7 +77,7 @@
 			}
 		},
 		created() {
-
+			this.listForm.queryDate = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
 		},
 		methods: {
 			sub(time){

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

@@ -4,6 +4,12 @@
 		<top-header :pageTitle="pageTitle"    ></top-header>
 
 		<div class="mui-content vongi-fklist">
+
+			<div class="mui-content-padded fyy-date mui-clearfix">
+				<h5>{{person_data.companyName}}
+					<a class="mui-navigate-right mui-pull-right" @click="selectData">{{listForm.queryDate}}</a>
+				</h5>
+			</div>
 			<div style="text-align: center;margin-top: 100px"  v-if="!recordList.length">
 				<img src="~$project/assets/img/lad.png" width="50%"  >
 			</div>
@@ -44,7 +50,9 @@
 	import TopHeader from '$project/components/TopHeader.vue'
 	import isReachBottom from '$project/utils/isReachBottom'
 	import {
-		hourDistance
+		hourDistance,
+		currentTimeStamp,
+		parseUnixTime
 	} from '$project/utils'
 	import {
 		mapGetters,
@@ -68,6 +76,7 @@
 					pageSize: 20,
 					//	token: '',
 					//isToDay:1,//是否只查今天
+					queryDate:'',
 					totalPage: 1,
 					result: 0,
 				},
@@ -78,9 +87,26 @@
 			}
 		},
 		created() {
-
+			this.listForm.queryDate = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
 		},
 		methods: {
+			//选择日期
+			selectData() {
+				var _this = this;
+				var picker = new mui.DtPicker({
+					"type": "date",
+					"beginYear": 2020,
+					"endYear": 2040,
+					"endDate": new Date(),
+					"value": _this.listForm.queryDate
+				});
+				picker.show(function(rs) {
+					_this.listForm.queryDate = rs.text;
+					_this.listForm.pageIndex = 1;
+					_this.getList();
+					picker.dispose();
+				});
+			},
 			gethour(t1,t2){
 				return hourDistance(t1,t2)
 			},
@@ -156,6 +182,8 @@
 			...mapGetters({
 				openId: 'wx_openid',
 				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
 			})
 		},
 

src/projects/business/views/Master/Guest/Scan.vue

@@ -83,7 +83,8 @@
 				listForm: {
 					pageIndex: 1,
 					pageSize: 3,
-					//	token: '',
+					//	token: ''
+					queryDate:'',
 					isToDay:1,//是否只查今天
 					totalPage: 1,
 					result: 0,
@@ -95,7 +96,9 @@
 				step:'1'
 			}
 		},
-		created() {},
+		created() {
+			this.listForm.queryDate = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
+		},
 		methods: {
 			scan(){
 				var _this= this;

src/projects/business/views/Master/Live/Info.vue

@@ -16,7 +16,11 @@
 				<ul class="mui-table-view openfyy-list">
 					<li class="mui-table-view-cell mui-media"  v-for="(mod,index) in list">
 						<a @click="goToPlay(mod.id)" >
-							<div class="vongi-video-img"><img :src="mod.picUrl"   width="100%"></div>
+							<div class="vongi-video-img">
+								<img src="~$project/assets/img/gkke02.png" v-if="!mod.picUrl"  width="100%">
+
+								<img :src="mod.picUrl"  v-if="mod.picUrl"  width="100%">
+							</div>
 							<div class="mui-media-body flew">
 								{{mod.roomAddress}}
 								<p class='mui-ellipsis'>[{{mod.status=='1'?'在线':'离线'}}]</p>

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

@@ -1,12 +1,326 @@
 <template>
 <div>
+ 	<top-header :pageTitle="pageTitle"   v-if="step==1"  ></top-header>
+
+
+		<div class="mui-content"  v-if="step==1" >
+			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>业主姓名</label>
+						<span>{{person_data.name}}</span>
+					</div>
+					<div class="mui-input-row">
+						<label>手机号码</label>
+						<span>{{person_data.phone}}</span>
+					</div>
+
+					<div class="mui-input-row">
+						<label>车牌号</label>
+						<input type="text" class="mui-input-clear" v-model="detail.carNum" placeholder="输入车牌号">
+					</div>
+				</form>
+			</div>
+			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>选择车位</label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:65%" @click="selectCar"  v-text="carName" >请选择</button>
+					</div>
+					<div class="mui-input-row">
+						<label>开始时间</label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:65%" @click="selectTime" v-text="detail.startTime?detail.startTime:'请选择'"></button>
+					</div>
+					<div class="mui-input-row">
+						<label>租用时长</label>
+						<input type="number"  class="mui-input-clear" style="width: 50%" v-model="detail.num" placeholder="租用时长">
+
+						<span  style="width: 10%">{{unitName}}</span>
+
+					</div>
+
+				</form>
+			</div>
+		</div>
+		<div class="fyy-footer"  v-if="step==1" >
+			<div class="bindfyy-btn"><button class="mui-btn mui-btn-primary " @click="submit()">提交</button></div>
+		</div>
+
+
+	<header class="mui-bar mui-bar-nav"  v-show="step==2" >
+		<a class="  mui-icon mui-icon-left-nav mui-pull-left" @click="step=1"></a>
+		<h1 class="mui-title">车位选择</h1>
+	</header>
+	<div class="mui-content margin60" v-show="step==2">
+		<div class="mui-content-padded">
+			<img src="~$project/assets/img/02.jpg" width="100%" />
+		</div>
+		<div class="vongi-meform-pho vongi-car">
+			<h5>车位筛选</h5>
+			<ul class="mui-table-view mui-table-view-radio flew" v-for="(cen,i) in listcen">
+				<template v-for="m in map.get(cen)">
+					<li class="mui-table-view-cell " @click="ckbtn(m,i,cen)" :class="m.show?'mui-selected':''" >
+						<a>
+							{{m.parkingName}}
+						</a>
+					</li>
+				</template>
+
+			</ul>
+
+		</div>
+	</div>
+	<div class="vongi-cashier-btn-row" v-show="step==2">
+		<div class="vongi-cashier-btn-white">
+			<span>当前选择：{{selectName}}</span>
+			<div class="vongi-cashier-btn" v-if="parkingId" @click="okCar">确认选择</div>
+		</div>
+	</div>
+	<loading :visible="isLoading"></loading>
 
 </div>
 </template>
 
+
 <script>
-</script>
+	require('$project/assets/js/mui.picker.min.js');
+
+	import * as API from '@/apis/Master/Property/car'
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	import {
+
+	} from '$project/utils'
+	export default {
+		name: 'GuestFromInfo',
+		components: {
+			Common,
+			Loading,
+			TopHeader
+		},
+		data() {
+			return {
+				pageTitle: '车位申请',
+				step:'1',
+
+				detail: {
+					carNum:'',
+					parkingId:'',
+					startTime:'',
+					num:'',
+					unitId:'',
+				},
+				carName:"请选择",
+				unitName:'月',
+				map:null,
+				picList:null,
+				isLoading: false,
+				listcen:[],
+				listcenindex:0,
+				selectName:'',
+				parkingId:'',
+				car:null,
+
+			}
+		},
+		created() {
+			this.map = new Map();
+		},
+		methods:  {
+			okCar(){
+				this.detail.parkingId=this.parkingId;
+				this.carName=this.selectName
+				this.detail.parkingName=this.car.parkingName;
+				this.step='1';
+			},
+			ckbtn(m,i,cen){
+				this.car=m;
+				this.listcen.splice(i+1,this.listcen.length-i+1);
+ 				this.getSelect(m.id);
+				m.show=true;
+				this.selectName="";
+				for(var str in this.listcen){
+
+					if(eval(str+"+1")==this.listcen.length){
+						if(str!="0"){
+							this.selectName+="-";
+						}
+						this.selectName+=m.parkingName;
+						break;
+					}
+					var k= this.listcen[str]
+					var k2= this.listcen[eval(str+"+1")]
+
+					var list=this.map.get(k);
+					for(var i in list){
+						var mod=list[i]
+						if(mod.id==k2){
+							if(str!="0"){
+								this.selectName+="-";
+							}
+							this.selectName+=mod.parkingName;
+
+						}
+					}
+
+				}
+			},
+			//表单校验
+			checkForm() {
+
+				if (!this.detail.unitId) {
+					mui.toast('未配置租用单位，请联系管理员');
+					return false;
+				}else if (!this.detail.carNum) {
+					mui.toast('请输入车牌号');
+					return false;
+				}else if (!this.detail.parkingId) {
+					mui.toast('请选择租用车位');
+					return false;
+				} else if (!this.detail.startTime) {
+					mui.toast('请输入开始时间');
+					return false;
+				}else if (!this.detail.num) {
+					mui.toast('请输入租用时长');
+					return false;
+				}else if(!(/(^[1-9]\d*$)/.test(this.detail.num))){
+					mui.toast('请输入正整数');
+					return false;
+				} else {
+					return true;
+				}
+			},
+			submit(){
+				if (this.checkForm()) {
+					this.isLoading = true;
+
+					API.submitParkingApply(this.detail ).then(response => {
+						this.isLoading = false;
+						mui.toast("操作成功");
+					}).catch(error => {
+						this.isLoading = false;
+						mui.toast(error);
+					})
+				}
+
+			},
+
+			//选择时间
+			selectTime() {
+				var _this = this;
 
+				var picker = new mui.DtPicker({
+					"type": "date",
+					"beginYear": 2020,
+					"endYear": 2040,
+					"beginDate": new Date(),
+
+				});
+				picker.show(function(rs) {
+					_this.detail.startTime = rs.text;
+				});
+			},
+			//选择停车位
+			selectCar() {
+				this.step=2;
+				if(!this.picList){
+					this.getPic();
+				}
+
+			},
+			//获取详情
+			getPic() {
+
+				API.parkingPicList().then(response => {
+ 					this.picList=response;
+				}).catch(error => {
+ 					mui.toast(error);
+				})
+
+				this.getSelect('');
+			} ,
+			//获取详情
+			getSelect(val) {
+				this.parkingId="";
+				var list =this.map.get(val)
+				var newlist=[];
+				for(var i in list){
+					var mod=list[i];
+					mod.show=false
+					newlist.push(mod);
+				}
+				this.map.set(val,newlist)
+
+				if(list){
+
+
+					if(list.length==0){
+						this.parkingId=val;
+					}else{
+						this.listcen.push(val);
+
+					}
+
+				}else{
+
+					API.parkingList({id:val}).then(response => {
+  						this.map.set(val,response.list)
+
+						if(response.list.length==0){
+							this.parkingId=val;
+						}else{
+							this.listcen.push(val);
+						}
+
+					}).catch(error => {
+
+					})
+
+				}
+
+
+			} ,
+
+			//获取详情
+			getDetail() {
+				this.isLoading = true;
+
+				API.parkingUnit().then(response => {
+					this.detail.unitId=response.unit.id;
+					this.unitName=response.unit.name;
+					this.isLoading = false;
+
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},asynCallBack(){},
+		},
+		mounted() {
+
+			this.getDetail();
+		},
+
+
+		destroyed() {
+
+		},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
+			})
+		}
+	}
+</script>
+<style src="$project/assets/css/mui.picker.min.css"></style>
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
 <style>

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

@@ -1,6 +1,131 @@
 <template>
 <div>
-
+    <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">车位申请详情</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content">
+			<div class="mui-content-padded vongi-editme vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>业主姓名</label>
+						<span>赵刚</span>
+					</div>
+					<div class="mui-input-row">
+						<label>手机号码</label>
+						<span class="color4fc5f7">15500001111</span>
+					</div>
+					<div class="mui-input-row">
+						<label>房号</label>
+						<span>1-1-2201</span>
+					</div>
+					<div class="mui-input-row">
+						<label>车牌号</label>
+						<span>鄂D88888</span>
+					</div>
+				</form>
+			</div>
+			<div class="mui-content-padded vongi-editme vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>申请车位</label>
+						<span>地面-A区-018号</span>
+					</div>
+					<div class="mui-input-row">
+						<label style="width:40%">租用起止时间</label>
+						<span style="width:60%">2020-10-21至2021-10-20</span>
+					</div>
+					<div class="mui-input-row">
+						<label>租用时长</label>
+						<span>12个月</span>
+					</div>
+					<div class="mui-input-row">
+						<label style="width:40%">预估租金(元)</label>
+						<span style="width:60%">1440.00</span>
+					</div>
+					<div class="mui-input-row">
+						<label style="width:40%">实际租金(元)</label>
+						<input type="text" class="mui-input-clear" placeholder="请输入调整后金额，无变动可不填" style="width:60%">
+					</div>
+				</form>
+			</div>
+			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>收费方式</label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:65%">账单推送</button>
+					</div>
+				</form>
+			</div>
+			<div class="fyy-scon-botton">
+				<div class="examine-btn examine-btn1">关闭申请</div>
+				<div class="examine-btn examine-btn4">推送账单</div>
+				<!--<div class="examine-btn examine-btn2">确认租出</div>-->
+			</div>
+			<!--已推送状态-->
+			<div class="mui-content-padded vongi-editme vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>收费方式</label>
+						<span class="color4fc5f7">账单推送</span>
+					</div>
+					<div class="mui-input-row">
+						<label>状态</label>
+						<span class="color4fc5f7">已推送</span>
+						<!--<span class="color55f868">已到账</span>-->
+					</div>
+					<div class="mui-input-row">
+						<label>推送时间</label>
+						<span>2020-10-21 10:00:00</span>
+					</div>
+					<div class="mui-input-row">
+						<label>到账时间</label>
+						<span>2020-10-21 10:00:00</span>
+					</div>
+				</form>
+			</div>
+			<!--已关闭状态-->
+			<div class="mui-content-padded vongi-editme vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>状态</label>
+						<span class="color999">已关闭</span>
+						<!--<span class="color55f868">已通过</span>-->
+						<!--<span class="colorfe616c">已拒绝</span>-->
+					</div>
+					<div class="mui-input-row">
+						<label style="width:100%">关闭申请理由</label>
+						<span class="vongi-span">该车位已被售出/租出</span>
+					</div>
+					<div class="mui-input-row">
+						<label>关闭时间</label>
+						<span>2020-10-10 10:00:00</span>
+					</div>
+				</form>
+			</div>
+			<!--弹窗1-->
+			<!--<div class="mui-popup mui-popup-in vongi-mui-pop" style="display: block;">
+				<div class="mui-popup-inner vongi-pop-inner">
+					<div class="mui-popup-title">关闭申请理由</div>
+					<div class="mui-popup-input">
+						<textarea id="textarea" rows="3" placeholder="可输入关闭申请理由"></textarea>
+					</div>
+				</div>
+				<div class="mui-popup-buttons"><span class="mui-popup-button">取消</span><span class="mui-popup-button mui-popup-button-bold">确定</span></div>
+			</div>
+			<div class="mui-popup-backdrop mui-active" style="display: block;"></div>-->
+			<!--弹窗2-->
+			<!--<div class="mui-popup mui-popup-in vongi-mui-pop" style="display: block;">
+				<div class="mui-popup-inner vongi-pop-inner">
+					<div class="mui-popup-title">确认</div>
+					<div class="mui-media-body">
+						确认是否向<b class="color4fc5f7">赵刚</b>推送本次车位费账单？账单金额为<b class="colorfe616c">1440</b>元。
+					</div>
+				</div>
+				<div class="mui-popup-buttons"><span class="mui-popup-button">取消</span><span class="mui-popup-button mui-popup-button-bold">确定</span></div>
+			</div>
+			<div class="mui-popup-backdrop mui-active" style="display: block;"></div>-->
+		</div>
 </div>
 </template>
 

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

@@ -1,6 +1,86 @@
 <template>
 <div>
-
+    <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">车位申请记录</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content vongi-hdsq">
+			<div id="slider" class="mui-slider mui-fullscreen ">
+				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
+					<div class="mui-scroll">
+						<a class="mui-control-item mui-active" href="#item1mobile">
+							<span class="fyy-badge">待处理<span class="mui-badge">5</span></span>
+						</a>
+						<a class="mui-control-item" href="#item2mobile">
+							已处理
+						</a>
+					</div>
+				</div>
+				<div class="mui-slider-group">
+					<div id="item1mobile" class="mui-slider-item mui-control-content">
+						<div class="mui-scroll-wrapper">
+							<div class="mui-scroll">
+								<ul class="mui-table-view">
+									<li class="mui-table-view-cell">
+										<a href="">
+											<div class="mui-media-body flew-sp">
+												<div class="mui-col-xs-9">
+													申请车位：地面-A区-018号<br>
+													租用时间：2020-10-11 至 2021-10-10
+												</div>
+												<div class="mui-col-xs-3"><button type="button" class="mui-btn mui-btn-primary mui-btn-outlined">待确认</button></div>
+											</div>
+											<p class="flew-items flew-sp">
+												申请人:李广宵 1-1-2201
+												<span class='mui-ellipsis'>2020-10-10 10:00:00</span>
+											</p>	
+										</a>
+									</li>
+								</ul>
+							</div>
+						</div>
+					</div>
+					<div id="item2mobile" class="mui-slider-item mui-control-content">
+						<div class="mui-scroll-wrapper">
+							<div class="mui-scroll">
+								<ul class="mui-table-view">
+									<li class="mui-table-view-cell">
+										<a href="">
+											<div class="mui-media-body flew-sp">
+												<div class="mui-col-xs-9">
+													申请车位：地面-A区-018号<br>
+													租用时间：2020-10-11 至 2021-10-10
+												</div>
+												<div class="mui-col-xs-3"><button type="button" class="mui-btn mui-btn-success mui-btn-outlined">已确认</button></div>
+											</div>
+											<p class="flew-items flew-sp">
+												发   起  人：李广宵 1-1-2201
+												<span class='mui-ellipsis'>2020-10-10 10:00:00</span>
+											</p>	
+										</a>
+									</li>
+									<li class="mui-table-view-cell">
+										<a href="">
+											<div class="mui-media-body flew-sp">
+												<div class="mui-col-xs-9">
+													申请车位：地面-A区-018号<br>
+													租用时间：2020-10-11 至 2021-10-10
+												</div>
+												<div class="mui-col-xs-3"><button type="button" class="mui-btn mui-btn-greye mui-btn-outlined">已关闭</button></div>
+											</div>
+											<p class="flew-items flew-sp">
+												发   起  人：李广宵 1-1-2201
+												<span class='mui-ellipsis'>2020-10-10 10:00:00</span>
+											</p>	
+										</a>
+									</li>
+								</ul>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
 </div>
 </template>
 

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

@@ -1,6 +1,129 @@
 <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 margin60">
+			<div class="mui-content-padded">
+				<img src="~$project/assets/img/02.jpg" width="100%" />
+			</div>
+			<div class="vongi-meform-pho vongi-car">
+				<h5>车位筛选</h5>
+				<ul class="mui-table-view mui-table-view-radio flew">
+					<li class="mui-table-view-cell mui-selected">
+						<a>
+							地面
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							地下
+						</a>
+					</li>
+				</ul>
+				<ul class="mui-table-view mui-table-view-radio flew">
+					<li class="mui-table-view-cell mui-selected">
+						<a>
+							A区
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							B区
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							C区
+						</a>
+					</li>
+				</ul>
+				<ul class="mui-table-view mui-table-view-radio flew">
+					<li class="mui-table-view-cell mui-selected">
+						<a>
+							018号
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							019号
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							018号
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							019号
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							019号
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							018号
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							019号
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							019号
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							018号
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							019号
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							019号
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							018号
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							019号
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							019号
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a>
+							018号
+						</a>
+					</li>
+				</ul>
+			</div>
+		</div>
+		<div class="vongi-cashier-btn-row">
+			<div class="vongi-cashier-btn-white">
+				<span>当前选择：地面-A区-018号</span>
+				<div class="vongi-cashier-btn">确认选择</div>
+			</div>
+		</div>
 </div>
 </template>
 

src/projects/pension/views/Master/Live/Info.vue

@@ -16,7 +16,11 @@
 				<ul class="mui-table-view openfyy-list">
 					<li class="mui-table-view-cell mui-media"  v-for="(mod,index) in list">
 						<a @click="goToPlay(mod.id)" >
-							<div class="vongi-video-img"><img :src="mod.picUrl"   width="100%"></div>
+							<div class="vongi-video-img">
+								<img src="~$project/assets/img/gkke02.png" v-if="!mod.picUrl"  width="100%">
+
+								<img :src="mod.picUrl"  v-if="mod.picUrl"  width="100%">
+							</div>
 							<div class="mui-media-body flew">
 								{{mod.roomAddress}}
 								<p class='mui-ellipsis'>[{{mod.status=='1'?'在线':'离线'}}]</p>