Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51 into master

components/Ucarkeyboard.vue

@@ -1,6 +1,14 @@
 <template>
-	<u-popup class="" :mask="mask" :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="value" length="auto"
-	 :safeAreaInsetBottom="safeAreaInsetBottom" @close="popupClose" :zIndex="uZIndex">
+	<view
+	style="    bottom: 0;
+    left: 0;
+    right: 0;
+    background-color: #ffffff;
+
+    display: block;
+    position: absolute;"
+	
+	>
 		<slot />
 		<view class="u-tooltip" v-if="tooltip">
 			<view class="u-tooltip-item u-tooltip-cancel" hover-class="u-tooltip-cancel-hover" @tap="onCancel">
@@ -19,7 +27,7 @@
 		<block v-else>
 			<u-car-keyboard :random="random" @backspace="backspace" ref="thiscar" @change="change"></u-car-keyboard>
 		</block>
-	</u-popup>
+	</view>
 </template>
 
 <script>
@@ -97,7 +105,7 @@
 			// 是否允许通过点击遮罩关闭键盘
 			maskCloseAble: {
 				type: Boolean,
-				default: true
+				default: false
 			},
 			// 通过双向绑定控制键盘的弹出与收起
 			value: {
@@ -107,7 +115,7 @@
 			// 是否显示遮罩，某些时候数字键盘时，用户希望看到自己的数值，所以可能不想要遮罩
 			mask: {
 				type: Boolean,
-				default: true
+				default: false
 			},
 			// z-index值
 			zIndex: {
@@ -136,8 +144,13 @@
 			}
 		},
 		methods: {
+		changeCarInputValue(){
+
+			return this.$refs.thiscar.abc
+		},
 			changeCarInputMode(){
 				this.$refs.thiscar.changeCarInputMode()
+				return this.$refs.thiscar.abc
 			},
 			change(e) {
 				this.$emit('change', e);

pages/searchPile/chargeProcess/dcCharging.vue

@@ -437,10 +437,10 @@
 
 	.progress-bar {
 
-
-
+		text-align: center;
+		    margin-top: 20px;
 		/deep/.u-circle-progress {
-			margin-left: 23.3% !important;
+			
 			position: relative;
 			// min-width:220px;
 			// min-height: 220px;
@@ -481,7 +481,8 @@
 		height: 22px;
 		color: rgba(0, 185, 98, 100);
 		font-size: 16px;
-		text-align: center;
+		text-align: center;
+		margin-top: 10px;
 	}
 
 	.timer {
@@ -591,11 +592,11 @@
 
 
 	.progress-bar2 {
-
-
+			text-align: center;
+			margin-top: 20px;
 
 		/deep/.u-circle-progress {
-			margin-left: 23.3% !important;
+		//	margin-left: 23.3% !important;
 			position: relative;
 
 		}

pages/user/car/carAdd.vue

@@ -2,7 +2,7 @@
 	<view>
 		<u-navbar title="车辆管理">
 			<view class="slot-wrap">
-				<span class="navBtn" v-if="form.id" @click="showDelete">删除车辆</span>
+				<span class="navBtn" @click="showDelete">删除车辆</span>
 			</view>
 		</u-navbar>
 		<view>
@@ -10,9 +10,9 @@
 		</view>
 		<view class="carDet">
 			<u-form :model="form" ref="uForm">
-				<ucarkeyboard ref="uKeyboard" mode="car" v-model="keyShow" @change="valChange" @backspace="backspace"></ucarkeyboard>
+				<ucarkeyboard ref="uKeyboard" mode="car" :showTips="true" :confirmBtn="false" :mask-close-able="false" :tooltip="false" v-show="keyShow" @change="valChange" @backspace="backspace"></ucarkeyboard>
 				<u-form-item label="车牌号码" label-width="150rpx">
-					<view style="margin-left: auto;" :style="form.carNum ? 'color:black;': 'color: #c0c4cc;'" v-text="form.carNum ? form.carNum : '请输入内容'" @click="keyShow = true"></view>
+					<view style="margin-left: auto;" :style="form.carNum ? 'color:black;': 'color: #c0c4cc;'" v-text="form.carNum ? form.carNum : '请输入内容'" @click="keyClick"></view>
 				</u-form-item>
 				<u-form-item label="车辆类型" label-width="150rpx"><u-input input-align="right" placeholder="新能源车" placeholder-style="color:black" disabled /></u-form-item>
 				<u-form-item label="设为默认车辆" label-width="180rpx"><u-switch slot="right" v-model="form.defaultFlag"></u-switch></u-form-item>
@@ -46,36 +46,36 @@
 		},
 		onLoad(op) {
 			if(op.id){
-				var str1 = op.id.slice(0,19);
-				var str2 = op.id.slice(20,21);
-				var str3 = op.id.slice(22);
-				
-				if(str1 == 'jp_team51_charge_id') {
-					if(str2 == 'A') {
-						this.code = str2;
-						this.codeId = str3;
-					}
-				} else {
-					this.form.id = op.id;
-					this.getCarList();
-				}
+				this.form.id = op.id;
+				this.getCarList();
 			}
-		
+		},
+		onReady() {
+			this.$refs.uKeyboard.changeCarInputMode();
 		},
 		methods: {
+			keyClick() {
+				this.keyShow = true;
+			},
 			// 按键被点击(点击退格键不会触发此事件)
 			valChange(val) {
 				// 将每次按键的值拼接到form.carNum变量中，注意+=写法
 				this.form.carNum += val;
 				console.log(this.form.carNum);
-				//	this.$refs.uKeyboard.changeCarInputMode()
-				//	this.$forceUpdate()
+				if(this.form.carNum.length == 1) {
+					this.$refs.uKeyboard.changeCarInputMode();
+				}
 			},
 			// 退格键被点击
 			backspace() {
 				// 删除form.carNum的最后一个字符
 				if(this.form.carNum.length) this.form.carNum = this.form.carNum.substr(0, this.form.carNum.length - 1);
 				console.log(this.form.carNum);
+				
+				var aaa =	this.$refs.uKeyboard.changeCarInputValue();
+				if(this.form.carNum.length == 0 && aaa) {
+					this.$refs.uKeyboard.changeCarInputMode();
+				}
 			},
 			getCarList() {	
 				uni.showLoading({
@@ -102,6 +102,7 @@
 			},
 			showDelete() {
 				this.show = true;
+				this.keyShow = false;
 			},
 			confirmDelete() {
 				uni.showLoading({
@@ -125,6 +126,7 @@
 				})
 			},
 			keepCar() {
+				this.keyShow = false;
 				uni.showLoading({
 					title: "加载中",
 					mask: true,

pages/user/car/carDet.vue

@@ -1,11 +1,13 @@
 <template>
-	<view>
-		<u-navbar title="车辆管理"></u-navbar>
-		<view class="carDet">
-			<ucarkeyboard ref="uKeyboard" mode="car" v-model="keyShow" @change="valChange" @backspace="backspace"></ucarkeyboard>
-			<u-message-input maxlength="8" ></u-message-input>
+	<view class="wrap">
+		<u-navbar title="添加车牌"></u-navbar>
+		<view class="key-input">
+			<u-message-input :focus="true" :value="form.carNum" :maxlength="maxlength" :disabled-keyboard="true"></u-message-input>
+		</view>
+		<ucarkeyboard ref="uKeyboard" mode="car" :showTips="true" :confirmBtn="false" :mask-close-able="false" :tooltip="false" v-model="keyShow" @change="valChange" @backspace="backspace"></ucarkeyboard>
+		<view class="default">
 			<u-checkbox-group>
-				<u-checkbox active-color="#0076FF" v-model="form.defaultFlag" shape="circle" @change="checkboxChange()">设为默认车辆</u-checkbox>
+				<u-checkbox class="tips" v-model="form.defaultFlag" shape="circle" @change="checkboxChange()">设为默认车辆</u-checkbox>
 			</u-checkbox-group>
 		</view>
 		<u-button class="login-btn" type="success" shape="circle" @click="keepCar">保存</u-button>
@@ -15,34 +17,37 @@
 <script>
 	import * as userApi from '@/apis/user.js'
 	import ucarkeyboard from '@/components/Ucarkeyboard.vue'
-	
+
 	export default {
 		components: {
 			ucarkeyboard
 		},
 		data() {
 			return {
-				keyShow: false,
+				maxlength:8,
+				keyShow: true,
 				form: {
-					carNum: '',
+					carNum: '鄂',
 					defaultFlag: true,
 				},
 			}
 		},
 		onLoad(op) {
-			if(op.id){
-				var str1 = op.id.slice(0,19);
-				var str2 = op.id.slice(20,21);
+			if (op.id) {
+				var str1 = op.id.slice(0, 19);
+				var str2 = op.id.slice(20, 21);
 				var str3 = op.id.slice(22);
-				
-				if(str1 == 'jp_team51_charge_id') {
-					if(str2 == 'A') {
+
+				if (str1 == 'jp_team51_charge_id') {
+					if (str2 == 'A') {
 						this.code = str2;
 						this.codeId = str3;
 					}
 				}
 			}
-		
+		},
+		onReady() {
+			this.$refs.uKeyboard.changeCarInputMode();
 		},
 		methods: {
 			checkboxChange() {
@@ -53,23 +58,32 @@
 				// 将每次按键的值拼接到form.carNum变量中，注意+=写法
 				this.form.carNum += val;
 				console.log(this.form.carNum);
-					this.$refs.uKeyboard.changeCarInputMode()
+				
+				if(this.form.carNum.length == 1) {
+					this.$refs.uKeyboard.changeCarInputMode();
+				}
 			},
 			// 退格键被点击
 			backspace() {
 				// 删除form.carNum的最后一个字符
-				if(this.form.carNum.length) this.form.carNum = this.form.carNum.substr(0, this.form.carNum.length - 1);
+				if (this.form.carNum.length) this.form.carNum = this.form.carNum.substr(0, this.form.carNum.length - 1);
 				console.log(this.form.carNum);
+				
+				var aaa =	this.$refs.uKeyboard.changeCarInputValue();
+				if(this.form.carNum.length == 0 && aaa) {
+					this.$refs.uKeyboard.changeCarInputMode();
+				}
 			},
 			keepCar() {
+				console.log(this.form)
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
-				})		
+				})
 				userApi.addRegUserCar(this.form).then((res) => {
-					uni.hideLoading();				
-							
-					if(this.code == 'A') {
+					uni.hideLoading();
+
+					if (this.code == 'A') {
 						uni.navigateBack({
 							url: '/pages/searchPile/stationAndPile/chargingPileDetails?id=' + this.codeId
 						})
@@ -89,22 +103,32 @@
 	}
 </script>
 <style>
-	page{
-		background: #fff;
+	page {
+		background-color: #fff;
 	}
 </style>
 <style lang="scss" scoped>
-	.slot-wrap{
-		flex: 1;
+	.u-drawer{
+		z-index: -1 !important;
+	}
+	/deep/.u-char-item {
+		width: 32px !important;
+		height: 40px !important;
+		font-size: 18px !important;
 	}
-	.carDet{
-		padding: 0 16px;
+
+	.key-input {
+		padding-top: 24px;
+	}
+
+	.default {
+		margin: 16px 28px;
 	}
-	
+
 	.login-btn {
-		margin: 28px ;
-		background-color:#00B962!important;
-		border-color: #00B962!important;
-		color:#fff!important;
+		margin: 28px;
+		background-color: #00B962 !important;
+		border-color: #00B962 !important;
+		color: #fff !important;
 	}
 </style>