Merge remote-tracking branch 'origin/master'

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

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 import Qs from 'qs';
 
 
-//申请
+//申请详情
 export function ParkingApplicationDetail(params) {
 	return request({
 		url: '/mobile/personInfoApi/ParkingApplicationDetail',
@@ -42,3 +42,29 @@ export function parkingPicList(params) {
 		method: 'post',
 	})
 }
+//------------审核列表--------------
+export function ParkingApplicationList(params) {
+	return request({
+		url: '/mobile/personInfoApi/ParkingApplicationList',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+
+//------------审核通过（1，线下，2，线上）--------------
+export function ParkingApplicationConfirmLease(params) {
+	return request({
+		url: '/mobile/personInfoApi/ParkingApplicationConfirmLease',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+//------------审核通过--------------
+export function ParkingApplicationClose(params) {
+	return request({
+		url: '/mobile/personInfoApi/ParkingApplicationClose',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}

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

@@ -36,7 +36,7 @@
 					<h2>暂未开通视频监控服务</h2>
 				</div>
 				<div class="vongi-rec-btn-white">
-					<div class="vongi-rec-btn" @click="goToPay()">开通服务</div>
+					<div style="background: #3385FF"  class="vongi-rec-btn" @click="goToPay()">开通服务</div>
 				</div>
 			</div>
 			<!--已购买尚未开通状态-->
@@ -157,8 +157,7 @@
 	}
 </script>
 
-<style scoped src="$project/assets/css/pension.css"></style>
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+ <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

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

@@ -212,8 +212,7 @@
 	}
 </script>
 
-<style scoped src="$project/assets/css/pension.css"></style>
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+ <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

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

@@ -76,8 +76,7 @@
   }
 </script>
 
-<style scoped src="$project/assets/css/pension.css"></style>
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+ <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

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

@@ -286,8 +286,7 @@
 	}
 </script>
 
-<style scoped src="$project/assets/css/pension.css"></style>
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+ <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

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

@@ -14,7 +14,7 @@
     </div>
     <div class="fyy-footer">
       <div class="bindfyy-btn">
-        <button type="submit" class="mui-btn mui-btn-pink"   @click="toPay()" v-text="paytext">立即开通</button>
+        <button type="submit" class="mui-btn mui-btn-pink"  style="background: #3385FF;border:#3385FF;color: #FFF"   @click="toPay()" v-text="paytext">立即开通</button>
       </div>
     </div>
     <loading :visible="isLoading"></loading>
@@ -109,8 +109,7 @@
     }
 </script>
 
-<style scoped src="$project/assets/css/pension.css"></style>
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+ <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/Apply.vue

@@ -36,12 +36,25 @@
 					<span>{{info.contractDuration}}</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>{{info.applicationTime}}</span>
+				</div>
+
 				<div class="mui-input-row">
 					<label>状态</label>
 					<span>{{info.statusN}}</span>
 				</div>
 			</form>
 		</div>
+
 	</div>
 	<top-header :pageTitle="pageTitle"   v-if="step==1"  ></top-header>
 		<div class="mui-content"  v-if="step==1" >
@@ -261,11 +274,16 @@
 
 					API.submitParkingApply(this.detail ).then(response => {
 						this.isLoading = false;
-						this.$router.push({
-							name: 'Master',
-						})
-						mui.toast("操作成功");
-					}).catch(error => {
+						var _this=this;
+
+						mui.alert('您的车位申请信息已提交，请等待物业确认。', ' ', function() {
+							// _this.$router.push({
+							// 	name: 'Master',
+							// })
+							_this.getDetail()
+						});
+
+ 					}).catch(error => {
 						this.isLoading = false;
 						mui.toast(error);
 					})
@@ -367,12 +385,7 @@
 				this.isLoading = true;
 
 				API.parkingUnit().then(response => {
-					if(!response.unit){
-						mui.toast('未配置租用单位，请联系管理员');
-					}else{
-						this.detail.unitId=response.unit.id;
-						this.unitName=response.unit.name;
-					}
+
 
 					this.isLoading = false;
 					if(response.id){
@@ -387,7 +400,13 @@
 							this.isLoading = false;
 							mui.toast(error);
 						})
-						mui.toast("您已有一条待处理的车位申请记录");
+						//mui.toast("您已有一条待处理的车位申请记录");
+					}
+					if(!response.unit){
+						mui.toast('未配置租用单位，请联系管理员');
+					}else{
+						this.detail.unitId=response.unit.id;
+						this.unitName=response.unit.name;
 					}
 				}).catch(error => {
 					this.isLoading = false;

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

@@ -1,28 +1,28 @@
 <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">
+
+	<common @asynCallBack="asynCallBack"></common>
+	<top-header :pageTitle="pageTitle"></top-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 @click="reloadList(0)" :class="'mui-control-item '+(listForm.status==0?'mui-active':'')">
+							<span class="fyy-badge">待处理<span class="mui-badge" v-if="firstRecordsTotal" v-text="firstRecordsTotal"></span></span>
 						</a>
-						<a class="mui-control-item" href="#item2mobile">
+						<a @click="reloadList(1)" :class="'mui-control-item '+(listForm.status==1?'mui-active':'')">
 							已处理
 						</a>
 					</div>
 				</div>
 				<div class="mui-slider-group">
-					<div id="item1mobile" class="mui-slider-item mui-control-content">
+					<div  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="">
+								<ul class="mui-table-view" >
+									<li class="mui-table-view-cell" v-for="(item,index) in recordList">
+										<a >
 											<div class="mui-media-body flew-sp">
 												<div class="mui-col-xs-9">
 													申请车位：地面-A区-018号<br>
@@ -40,51 +40,129 @@
 							</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>
 
+
 <script>
+	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 isReachBottom from '$project/utils/isReachBottom'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	export default {
+		name: 'MasterAttendanceVerifyList',
+		components: {
+			Common,
+			Loading,
+			TopHeader
+		},
+		data() {
+			return {
+				pageTitle: '车位申请记录',
+
+				isLoading: false,
+
+				listForm: {
+					pageIndex: 1,
+					pageSize: 20,
+					totalPage: 1,
+					status: 0,
+				},
+				recordList: [],
+				selectIdList: [],
+				allSelect: [],
+				subForm: {
+					ids: '',
+					content: '',
+					status: ''
+				},
+				//审批内容弹窗显示
+				openFromVisible: false,
+				firstRecordsTotal: 0,
+
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			//获取列表
+			getList() {
+				this.isLoading = true;
+				API.ParkingApplicationList(this.listForm).then(response => {
+					if (response) {
+						if (this.listForm.pageIndex == 1) {
+							this.recordList = response.list;
+							this.listForm.pageIndex = response.pageNumber;
+							this.listForm.totalPage = response.totalPage;
+						} else {
+							this.recordList = [
+								...this.recordList,
+								...response.list
+							];
+						}
+					}
+
+					if (this.listForm.status == 0) {
+						this.firstRecordsTotal = response.num;
+					}
+
+					this.listForm.pageIndex++;
+					this.isLoading = false;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			//下拉事件
+			handleScrool() {
+				if (isReachBottom()) {
+					console.log('到达底部')
+					if (this.listForm.pageIndex <= this.listForm.totalPage && this.isLoading == false) {
+						this.getList();
+					} else {
+						return;
+					}
+				}
+			},
+			//切换
+			reloadList(status) {
+				this.listForm.status = status;
+				this.listForm.pageIndex = 1;
+				this.getList();
+			},
+
+			asynCallBack() {
+
+			},
+		},
+		mounted() {
+			this.getList();
+			//监控下拉加载事件
+			var _this = this;
+			window.addEventListener('scroll', _this.handleScrool);
+		},
+		destroyed() {
+			//销毁监听事件
+			var _this = this;
+			window.removeEventListener('scroll', _this.handleScrool);
+		},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+			})
+		}
+	}
 </script>
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>