基础页面整理

src/projects/parking/views/Car/Pay.vue

@@ -1,9 +1,8 @@
 <template>
 	<div>
-		<header id="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>
+		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
 		<div class="mui-content vongi-car-pay">
 			<div class="vongi-car-pay-top">
 				<h4>停车费</h4>
@@ -42,22 +41,38 @@
 				<div class="vongi-cashier-btn">支付离场</div>
 			</div>
 		</div>
+
+		<loading :visible="isLoading"></loading>
 	</div>
 </template>
 
 <script>
+	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'
 	export default {
 		name: 'CarPay',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+		},
 		data() {
-			return {}
+			return {
+				isLoading: false,
+
+				pageTitle: '停车缴费',
+			}
 		},
 		created() {},
 		methods: {
+			asynCallBack() {
 
+			}
 		},
 		mounted() {},
 		destroyed() {

src/projects/parking/views/Car/PayResult.vue

@@ -1,9 +1,8 @@
 <template>
-<div>
-	<header id="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>
+		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
 		<div class="mui-content">
 			<div class="vongi-car-over">
 				<img src="~$project/assets/img/car_yes.png" />
@@ -13,7 +12,7 @@
 				<p>停车时长：1小时20分钟</p>
 				<p>入场时间：07-12 13:51</p>
 				<p>离场时间：07-12 16:30</p>
-			</div>	
+			</div>
 			<!--缴费失败-->
 			<!-- <div class="vongi-car-over">
 				<img src="~$project/assets/img/car_fail.png" />
@@ -22,24 +21,40 @@
 			</div>	 -->
 		</div>
 		<div class="fyy-footer padd30">
-			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary ">返  回</button></div>
+			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary ">返 回</button></div>
 		</div>
-</div>
+
+		<loading :visible="isLoading"></loading>
+	</div>
 </template>
 
 <script>
+	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'
 	export default {
 		name: 'CarPayResult',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+		},
 		data() {
-			return {}
+			return {
+				isLoading: false,
+
+				pageTitle: '停车缴费',
+			}
 		},
 		created() {},
 		methods: {
+			asynCallBack() {
 
+			}
 		},
 		mounted() {},
 		destroyed() {

src/projects/parking/views/Car/Search.vue

@@ -1,14 +1,13 @@
 <template>
-<div>
-	<header id="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>
+		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
 		<div class="mui-content vongi-car-index">
 			<div class="vongi-car-banner">
 				<h5 class="mui-ellipsis">停车位置：金盆洗脚城(金盆岭店)</h5>
 				<div class="flew">
-					<input type="text" onfocus="show(this,'tn')"placeholder="请输入车牌号查询">
+					<input type="text" onfocus="show(this,'tn')" placeholder="请输入车牌号查询">
 					<button class="mui-btn mui-btn-blue">查询</button>
 				</div>
 			</div>
@@ -22,23 +21,39 @@
 				<b>停车场收费说明:</b><br>
 				缴费后请于规定时间离场，离场会自动抬杆。如果找不到停车信息，或者临牌停车，请至集中缴费处缴纳现金。
 			</div>
-		</div>			
-</div>
+		</div>
+
+		<loading :visible="isLoading"></loading>
+	</div>
 </template>
 
 <script>
+	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'
 	export default {
 		name: 'CarPaySearch',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+		},
 		data() {
-			return {}
+			return {
+				isLoading: false,
+
+				pageTitle: '车牌查询',
+			}
 		},
 		created() {},
 		methods: {
+			asynCallBack() {
 
+			}
 		},
 		mounted() {},
 		destroyed() {

src/projects/parking/views/Merchant/Check/Result.vue

@@ -1,9 +1,8 @@
 <template>
-<div>
-    <header id="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>
+		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
 		<div class="mui-content">
 			<div class="vongi-car-over">
 				<img src="~$project/assets/img/car_yes.png" />
@@ -11,12 +10,51 @@
 			</div>
 		</div>
 		<div class="fyy-footer padd30">
-			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary ">返  回</button></div>
+			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary ">返 回</button></div>
 		</div>
-</div>
+
+		<loading :visible="isLoading"></loading>
+	</div>
 </template>
 
 <script>
+	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'
+	export default {
+		name: 'MerchantCheckResult',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+		},
+		data() {
+			return {
+				isLoading: false,
+
+				pageTitle: '车牌登记',
+			}
+		},
+		created() {},
+		methods: {
+			asynCallBack() {
+
+			},
+		},
+		mounted() {},
+		destroyed() {
+
+		},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+			})
+		}
+	}
 </script>
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>

src/projects/parking/views/Merchant/Check/Search.vue

@@ -1,15 +1,13 @@
 <template>
-<div>
-	<header id="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>
-			<a class="mui-pull-right" href=""><span class="mui-icon iconfont icon-riqi"></span>历史记录</a>
-		</header>
+	<div>
+		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle" :rightLink="rightLink" :doRightLink="doRightLink"></top-header>
+
 		<div class="mui-content vongi-car-index">
 			<div class="vongi-car-banner">
 				<h5 class="mui-ellipsis">协议商户：金盆洗脚城(金盆岭店)</h5>
 				<div class="flew">
-					<input type="text" onfocus="show(this,'tn')"placeholder="请输入车牌号查询">
+					<input type="text" onfocus="show(this,'tn')" placeholder="请输入车牌号查询">
 					<button class="mui-btn mui-btn-blue">查询</button>
 				</div>
 			</div>
@@ -18,22 +16,47 @@
 				<div class="mui-text-center">没有找到停车信息!</div>
 			</div>
 		</div>
-</div>
+
+		<loading :visible="isLoading"></loading>
+	</div>
 </template>
 
 <script>
+	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'
 	export default {
-		name: 'MerchantCheckResult',
+		name: 'MerchantCheckSearch',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+		},
 		data() {
-			return {}
+			return {
+				isLoading: false,
+
+				pageTitle: '车牌查询',
+
+				rightLink: {
+					show: true,
+					icon: 'mui-icon iconfont icon-riqi',
+					style: 'font-size:15px;',
+					title: '历史记录'
+				},
+			}
 		},
 		created() {},
 		methods: {
+			asynCallBack() {
 
+			},
+			//完成
+			doRightLink() {}
 		},
 		mounted() {},
 		destroyed() {

src/projects/parking/views/Merchant/Check/SearchResult.vue

@@ -1,9 +1,8 @@
 <template>
-<div>
-	<header id="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>
+		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
 		<div class="mui-content vongi-car-dj">
 			<div class="vongi-car-banner flew-sp flew-items">
 				<div class="flew-items">
@@ -15,7 +14,7 @@
 				</div>
 				<div>
 					<button class="mui-btn mui-btn-outlined">修改</button>
-				</div>	
+				</div>
 			</div>
 			<div class="vongi-car-over">
 				<h1>- 停车中 -</h1>
@@ -24,7 +23,7 @@
 				<h4>停车位置：金盆岭停车场</h4>
 				<h4>入场时间：07-12 13:51</h4>
 				<h4>已停时长：14分钟</h4>
-			</div>	
+			</div>
 			<div class="vongi-car-juan flew-items">
 				<div class="car-juan">
 					<h2>￥<span class="mui-h1">5</span></h2>
@@ -40,22 +39,38 @@
 		<div class="fyy-footer">
 			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary ">确认赠送</button></div>
 		</div>
-</div>
+
+		<loading :visible="isLoading"></loading>
+	</div>
 </template>
 
 <script>
+	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'
 	export default {
 		name: 'MerchantCheckSearchResult',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+		},
 		data() {
-			return {}
+			return {
+				isLoading: false,
+
+				pageTitle: '车牌登记',
+			}
 		},
 		created() {},
 		methods: {
+			asynCallBack() {
 
+			},
 		},
 		mounted() {},
 		destroyed() {

src/projects/parking/views/Merchant/History/Info.vue

@@ -1,9 +1,8 @@
 <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>
+		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
 		<div class="mui-content">
 			<div class="vongi-car-hisdat">
 				<div class="vongi-car-carp">
@@ -53,22 +52,38 @@
 				</form>
 			</div>
 		</div>
-</div>
+
+		<loading :visible="isLoading"></loading>
+	</div>
 </template>
 
 <script>
+	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'
 	export default {
 		name: 'MerchantHistoryInfo',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+		},
 		data() {
-			return {}
+			return {
+				isLoading: false,
+
+				pageTitle: '登记详情',
+			}
 		},
 		created() {},
 		methods: {
+			asynCallBack() {
 
+			},
 		},
 		mounted() {},
 		destroyed() {

src/projects/parking/views/Merchant/History/List.vue

@@ -1,57 +1,73 @@
 <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-kqtj-center vongi-dktz-c">
-				<div class="fyy-temper-date margin10">
-					<a href="" class="mui-col-xs-8">02-19 23:00 至 02-26 01:00<span class="mui-icon mui-icon-arrowdown"></span></a>
-					<a href="" class="mui-col-xs-4">登记人<span class="mui-icon mui-icon-arrowdown"></span></a>
-				</div>
-				<div class="vongi-clasadmin vongi-bagfff">					
-					<div class="vongi-xzdw-search">
-						<input type="search" placeholder="请输入车牌号查询">
-						<span class="mui-icon mui-icon-search"></span>
-					</div>
-				</div>
-				<div class="vongi-archives">
-					<ul class="mui-table-view">
-						<li class="mui-table-view-cell">
-							<a class="mui-navigate-right" href="#">
-								鄂D99999
-								<span class="mui-pull-right mui-h6">
-									02-24 12:00
-								</span>
-							</a>
-						</li>
-						<li class="mui-table-view-cell">
-							<a class="mui-navigate-right" href="#">
-								鄂D99999
-								<span class="mui-pull-right mui-h6">
-									02-24 12:00
-								</span>
-							</a>
-						</li>
-					</ul>
+	<div>
+		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
+		<div class="mui-content vongi-kqtj-center vongi-dktz-c">
+			<div class="fyy-temper-date margin10">
+				<a href="" class="mui-col-xs-8">02-19 23:00 至 02-26 01:00<span
+						class="mui-icon mui-icon-arrowdown"></span></a>
+				<a href="" class="mui-col-xs-4">登记人<span class="mui-icon mui-icon-arrowdown"></span></a>
+			</div>
+			<div class="vongi-clasadmin vongi-bagfff">
+				<div class="vongi-xzdw-search">
+					<input type="search" placeholder="请输入车牌号查询">
+					<span class="mui-icon mui-icon-search"></span>
 				</div>
 			</div>
-</div>
+			<div class="vongi-archives">
+				<ul class="mui-table-view">
+					<li class="mui-table-view-cell">
+						<a class="mui-navigate-right" href="#">
+							鄂D99999
+							<span class="mui-pull-right mui-h6">
+								02-24 12:00
+							</span>
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a class="mui-navigate-right" href="#">
+							鄂D99999
+							<span class="mui-pull-right mui-h6">
+								02-24 12:00
+							</span>
+						</a>
+					</li>
+				</ul>
+			</div>
+		</div>
+
+		<loading :visible="isLoading"></loading>
+	</div>
 </template>
 
 <script>
+	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'
 	export default {
 		name: 'MerchantHistoryList',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+		},
 		data() {
-			return {}
+			return {
+				isLoading: false,
+
+				pageTitle: '历史记录',
+			}
 		},
 		created() {},
 		methods: {
+			asynCallBack() {
 
+			},
 		},
 		mounted() {},
 		destroyed() {