tianhui 4 anni fa
parent
commit
e3d9ad7702

+ 1 - 1
common/http.interceptor.js

@@ -53,7 +53,7 @@ const install = (Vue, vm) => {
 			let storage = window.sessionStorage; 
 			storage.setItem('backUrl',location.href);
 			alert('还未登录,即将跳转登录');		
-			// setTimeout(()=>{location.href = 'http://h5.pdzhtc.com/#/pages/center/phoneLogin/phoneLogin';});//正式
+			//setTimeout(()=>{location.href = 'http://h5.pdzhtc.com/#/pages/center/phoneLogin/phoneLogin';});//正式
 			// setTimeout(()=>{location.href = 'http://parkingh5.hw.hongweisoft.com/#/pages/center/phoneLogin/phoneLogin';});//64
 			setTimeout(()=>{location.href = 'http://127.0.0.1:8080/#/pages/center/phoneLogin/phoneLogin';});//本地
 			

+ 1 - 1
pages/center/monthly/monthly.vue

@@ -26,7 +26,7 @@
 						<view class="monthly-list-item-bottom" >
 							<view class="mlib-item">
 								<view>包期</view>:
-								<view>{{monthlyItem.beginTime}}-{{monthlyItem.endTime}}</view>
+								<view>{{(monthlyItem.beginTime.split('-')).join('.')}}-{{(monthlyItem.endTime.split('-')).join('.')}}</view>
 							</view>
 							<view class="mlib-item">
 								<view>剩余天数</view>:

+ 29 - 1
pages/index/index.scss

@@ -81,6 +81,34 @@ page{background-color: $my-page-bg-color;}
 			font-weight: 500;
 			color: #787878;
 		}
+		.nosign{
+			width: 100%;
+			line-height: 56rpx;
+			.nosign1{
+				font-size: 40rpx;
+				color: #FF6D6D;
+				text-align: center;
+			}
+			.nosign2{
+				color: #A6A6A6;
+				text-align: center;
+			}
+		}
+		.sign{
+			width: 100%;
+			line-height: 56rpx;
+			.sign1{
+				font-size: 40rpx;
+				color: #52BD4E;
+				text-align: center;
+			}
+			.sign2{
+				color: #A6A6A6;
+				text-align: center;
+			}
+		}
+		
+		
 	}
 	.pending-order-body-left{
 		.car-number{
@@ -114,7 +142,7 @@ page{background-color: $my-page-bg-color;}
 		
 	}
 	.go-pay-wrap{
-		margin-top: 150rpx;
+		margin-top: 100rpx;
 		width: 100%;
 		text-align: center;
 		.go-pay{

+ 18 - 6
pages/index/index.vue

@@ -19,6 +19,7 @@
 			<u-notice-bar
 			 class="u-flex-1"
 			mode="vertical"
+			:autoplay="true"
 			 :list="noticeList" 
 			 :volume-icon="false" 
 			 bg-color="#fff" 
@@ -62,10 +63,10 @@
 					<view class="pending-order-head-right" @click="onRoadInfo(item)"><u-icon class="arrow-down" name="arrow-down" size="32" color="#aaa"></u-icon></view>
 				</view>
 				<view class="pending-order-body" slot="body">
-					<!-- <view class="pending-order-body-nav">
+					<view class="pending-order-body-nav">
 						<view class="nav-item nav-manual" @click="orderNav=0" :class="{active:orderNav==0}">手动缴费</view>
 						<view class="nav-item nav-auto" @click="orderNav=1" :class="{active:orderNav==1}">无感支付</view>
-					</view> -->
+					</view>
 					<view class="pending-order-body-wrap" v-show="orderNav==0">
 						<view class="pending-order-body-left">
 							<view class="car-number">{{item.vehicleNo}}</view>
@@ -73,7 +74,7 @@
 								<span class="pending-order-body-left-label">入场时间:</span>
 								<span>{{item.inTime}}</span>
 							</view>
-							<view class="item-cell">
+							<!-- <view class="item-cell">
 								<span class="pending-order-body-left-label">出场时间:</span>
 								<span>{{item.outTime||'停放中'}}</span>
 							</view>
@@ -87,7 +88,7 @@
 									<span class="number" v-if="item.payAmount">¥{{item.payAmount}}</span>
 									<span class="number" v-else>停放中</span>
 								</span>
-							</view>
+							</view> -->
 						</view>
 						<view class="pending-order-body-right">
 							<view class="order">停车泊位:{{item.spaceName}}</view>
@@ -97,7 +98,14 @@
 						</view>	
 					</view>
 					<view class="pending-order-body-wrap" v-show="orderNav==1">
-						
+						<view v-if="" class="nosign">
+							<view class="nosign1">您的车牌未签约贵州银行无感支付</view>
+							<view class="nosign2">请下载贵州银行手机银行app进行签约</view>
+						</view>
+						<view v-if="" class="sign">
+							<view class="sign1">您已签约贵州银行无感支付</view>
+							<view class="sign2">停车出场时将默认使用无感支付进行支付</view>
+						</view>
 					</view>
 				</view>
 			</u-card>
@@ -213,7 +221,11 @@
 						this.bindCarShow = true;
 					}
 					this.orderList = res.data.orderList;
-					this.noticeList = res.data.news;
+					const list = []
+					res.data.news.forEach(item => {
+						list.push(item.content)
+					})
+					this.noticeList = list;
 				}).catch(err=>{
 					// alert(err.msg);
 					console.log('getIndexData err',err)

+ 0 - 4
pages/message/message.vue

@@ -98,10 +98,6 @@
 						this.mescroll.endSuccess(curPageLen)
 					},20)
 				}).catch(err=>{
-					this.$refs.uToast.show({
-						title: err.msg,
-						type: 'error',
-					});
 				});
 				
 			},

+ 22 - 0
pages/myCars/myCars.scss

@@ -73,6 +73,28 @@
 	font-size: 26rpx;
 	color: #959595;	
 }
+.mycars-item-sign{
+	line-height: 40rpx;
+	text-align: center;
+	border-radius: 5rpx;
+	color: #fff;
+	font-size: 22rpx;
+	padding: 0 15rpx;
+	border: solid 1px #FF6D6D;
+	background-color: #FF6D6D;
+	margin-left: 40rpx;
+}
+.mycars-item-sign1{
+	line-height: 40rpx;
+	text-align: center;
+	border-radius: 5rpx;
+	color: #fff;
+	font-size: 22rpx;
+	padding: 0 15rpx;
+	border: solid 1px #D8D8D8;
+	background-color: #D8D8D8;
+	margin-left: 40rpx;
+}
 .mycars-item-tool{
 	flex: 1;
 	font-size: 22rpx;

+ 2 - 0
pages/myCars/myCars.vue

@@ -26,6 +26,8 @@
 				<view class="mycars-item" v-for="item in mycars">
 					<view class="mycars-item-name">{{item.vehicleNo}}</view>
 					<view class="mycars-item-type">{{item.energyTpye | energyTpye}}</view>
+					<view class="mycars-item-sign" v-if="">已签约</view>
+					<!-- <view class="mycars-item-sign1" v-if="">未签约</view> -->
 					<view class="mycars-item-tool">
 						<span class="default" :class="{'isDefault':item.isDefault == 1}" @click="handlesetDefault(item.id)">默认</span>
 						<span @click="handleDelCar(item.id,item.vehicleNo)">删除</span>

+ 73 - 0
pages/noninductivePay/addVehicle.vue

@@ -0,0 +1,73 @@
+<template>
+	<view>
+		<u-navbar
+		 title-color="#fff" 
+		 :custom-back="customBack" 
+		 :border-bottom="false" 
+		 back-icon-color="#CCE8FF" 
+		 :background="{background: '#008CFF' }" title="新增免密支付车牌"></u-navbar>
+		<view class="new-plate-number">
+			<view class="message-input-wrap" @click="messageInputClick">
+				<u-message-input :maxlength="8" width="70" font-size="50" :disabled-keyboard="true" v-model="newPlateNumber"></u-message-input>
+			</view>				
+			<u-keyboard ref="uKeyboard" mode="car" @change="keyboardChange" @confirm="keyboardConfirm" @backspace="backspace" v-model="keyboardshow"></u-keyboard>
+		</view>
+		
+		<u-toast ref="uToast" />
+		<u-modal v-model="delCarshow" :show-cancel-button="true" @confirm="confirmDelCar" :content="delCarContent"></u-modal>
+		<u-action-sheet :list="colorList" @click="confirmColor" v-model="colorShow"></u-action-sheet>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				keyboardshow:false,
+				delCarshow:false,
+				colorShow:false,
+				delCarContent:'',
+				colorList:[
+					{text:'蓝色',colorCode:0}
+					,{text:'黄色',colorCode:1}
+					,{text:'黑色',colorCode:2}
+					,{text:'白色',colorCode:3}
+					,{text:'绿色',colorCode:4}
+					,{text:'其他',colorCode:99}
+				],
+			}
+		},
+		methods:{
+			customBack(){
+				this.$u.route({
+					type:'switchTab',
+					url: 'pages/index/index'
+				});
+			},
+			messageInputClick(){
+				this.keyboardshow = true;
+			},
+			// 按键被点击(点击退格键不会触发此事件)
+			keyboardChange(val) {
+				// 将每次按键的值拼接到value变量中,注意+=写法
+				this.newPlateNumber += val;
+				console.log(this.newPlateNumber);
+			},
+			// 退格键被点击
+			backspace() {
+				// 删除value的最后一个字符
+				if(this.newPlateNumber.length) this.newPlateNumber = this.newPlateNumber.substr(0, this.newPlateNumber.length - 1);
+				console.log(this.newPlateNumber);
+			},
+			keyboardConfirm(){
+				this.colorShow = true;
+			},
+			confirmColor(e){
+				this.vehicleColor = this.colorList[e].colorCode;
+			},
+		}
+	}
+</script>
+
+<style>
+</style>

+ 8 - 0
pages/noninductivePay/noninductivePay.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>