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

pages.json

@@ -384,6 +384,11 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
+		},{ "name":"完善信息",
+			"path": "pages/login/completeInfo",
+			"style": {
+				"navigationStyle": "custom"
+			}
 		}
         
     ],

pages/index/index.vue

@@ -50,23 +50,39 @@
 		</view>
         
 		<!-- 模式选择 -->
-		<view class="shema">
-			<view class="title">
-				设置浏览模式
+		<u-mask :show="show" @click="show = false">
+			<view class="wrap">
+				
+		
+			<view class="shema" @tap.stop>
+				<view class="title">
+					设置浏览模式
+				</view>
+				<view class="">
+						<u-radio-group v-model="value" >
+							<u-radio 
+								
+								v-for="(item, index) in list" :key="index" 
+								:name="item.name"
+								
+								active-color="red"
+							>
+								{{item.name}}
+								<p>字体更大 看的清楚</p>
+							</u-radio>
+								
+						</u-radio-group>
+					</view>
+					<view class="hint">可在 {{""}}我的-设置 {{""}}页面中切换</view>
+					<view class="btn-box">
+							<u-button class="choice-btn" type="success" shape="circle" >我选好了</u-button>
+					</view>
 			</view>
-			<view class="">
-					<u-radio-group v-model="value" @change="radioGroupChange" wrap="true">
-						<u-radio 
-							@change="radioChange" 
-							v-for="(item, index) in list" :key="index" 
-							:name="item.name"
-							:disabled="item.disabled"
-						>
-							{{item.name}}
-						</u-radio>
-					</u-radio-group>
 				</view>
-		</view>
+		</u-mask>
+		
+
+ 
  <view style="height:50px"></view>  
 		<!-- 站点 -->
 		<view class="station" v-if="message == 'getLocation:ok' && chargeList.length == 0" @click="gotoUrl('pages/searchPile/stationAndPile/stationDetails?id=' + stationData.id)">
@@ -259,6 +275,7 @@
 				latitude: '',
 				message: '',
 				indexLogo:'',
+				show: true,
 				list: [
 								{
 									name: '长辈模式',
@@ -982,12 +999,12 @@
 
 
 	.shema{
-		width: 80.8%;
-		height: 389px;
+		width: 70%;
+		padding-bottom: 20px;
 		border-radius: 16px;
 		background-color: #fff;
 		position: fixed;
-		top: 195px;
+		top: 150px;
 		left: 0;
 		right: 0;
 	   margin: 0 auto;
@@ -999,16 +1016,51 @@
 		   text-align: center;
 		   padding: 16px 0 ;
 	   }
-	   .u-radio{
-		   width: 68%;
-		   height: 100px;
+	   .u-radio-group{
+		  margin: 16px 24px;
+		  
+	   }
+	   /deep/.u-radio{
+		     width:60vw !important;  
+		   padding: 24px 24px 50px;
 		   line-height: 20px;
 		   border-radius: 16px;
 		   text-align: center;
-		   margin: 0 auto;
+		  border: #101010 1px solid;
+		  margin-top: 12px;
+		
 	   }
-	}
+	  /deep/ .u-radio__label{
+		   text-align: left;
+		   height: 24px;
+		   // color: rgba(0, 185, 98, 100);
+		   font-size: 24px;
 
+	   }
+	   p{
+		   height: 22px;
+		   color: rgba(102, 102, 102, 100);
+		   font-size: 16px;
+		   margin-top: 12px;
+	   }
+	   .hint{
+		   text-align: center;
+		  
+	   }
+	   .btn-box{
+		   margin-top: 20px;
+		   .choice-btn{
+			   width: 80%;
+		   }
+	   }
+	}
+.wrap{
+			display: flex;
+				align-items: center;
+				justify-content: center;
+				height: 100%;
+			
+	}
 	
 
 
@@ -1061,4 +1113,5 @@
 			margin-top: 4px;
 		}
 	}
+	
 </style>

pages/login/completeInfo.vue

@@ -0,0 +1,104 @@
+<template>
+	<view>
+		<u-navbar title="完善信息"><view class="skip">
+			跳过
+		</view></u-navbar>
+		<view class="data">
+			<view class="data-img">
+				<view class="data-icon">
+					<u-icon name="camera-fill" custom-prefix="custom-icon" color="#fff" size="32"></u-icon>
+				</view>
+				<u-avatar :src="form.headImg+'?x-oss-process=image/resize,m_fill,w_256,h_256'" size="216"/></u-avatar>
+			</view>
+			
+			<view class="data-input">
+				<u-form :model="form" ref="uForm" >
+					<u-form-item label-position="top" label="昵称"><u-input v-model="form.nickName" placeholder="请填写昵称"/></u-form-item>
+				</u-form>
+			</view>
+			<p class="car-num">车牌号码</p>
+			<view class="key-input">
+				<u-message-input :focus="true" :value="form.carNum" :maxlength="maxlength" :disabled-keyboard="true"></u-message-input>
+			</view>
+			<view class="default">
+				<u-checkbox-group>
+					<u-checkbox class="tips" v-model="form.defaultFlag" shape="circle" >设为默认车辆</u-checkbox>
+				</u-checkbox-group>
+			</view>
+			<u-button class="login-btn" type="success" shape="circle" >完成</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	
+	
+	export default {
+		data() {
+			return {
+				maxlength:8,
+				keyShow: true,
+				form: {
+					nickName: '',
+					headImg: '',
+				},
+			}
+		},
+		
+		
+	}
+</script>
+<style>
+	page{
+		background: #fff;
+	}
+</style>
+<style lang="scss" scoped>
+	.skip{
+		margin-left: 81.3%;
+	}
+	.data-icon{
+		height: 28px;
+		width: 28px;
+		background-color: #00B962;
+		border-radius: 14px;
+		border: 2px solid #fff;
+		text-align: center;
+		line-height: 24px;
+		position: absolute;
+		z-index: 999;
+		right: 0;
+		bottom:0px
+	}
+	.data-img{
+		margin: 30px auto;
+		height: 108px;
+		width: 108px;
+		position: relative;
+	}
+	.data-input{
+		margin: 0 40px;
+	}
+	.login-btn {
+		margin: 28px ;
+		background-color:#00B962!important;
+		border-color: #00B962!important;
+		color:#fff!important;
+	}
+	.car-num{
+		padding: 40px 0 0 40px;
+		line-height: 18px;
+	}
+	.key-input {
+		padding-top: 19px;
+	}
+	
+	.default {
+		margin: 16px 28px;
+	}
+	/deep/.u-char-item {
+		width: 30px !important;
+		height: 40px !important;
+		font-size: 18px !important;
+	}
+</style>

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -74,7 +74,7 @@
 						</view>
 						<view class="part-bottom">
 							<view class="unitPrice-servicePrice">
-								充电单价：￥{{item.costPrice}} | 服务费：￥{{item.servicePrice}}
+								充电单价：￥{{item.costPrice}}| 服务费：￥{{item.servicePrice}}
 							</view>
 						</view>
 
@@ -338,9 +338,9 @@
 
 				.part-bottom {
 					.unitPrice-servicePrice {
-						eight: 18px;
-						color: rgba(136, 136, 136, 100);
-						font-size: 12px;
+						height: 18px;
+						color: rgba(119, 119, 119, 100);
+						font-size: 14px;
 						text-align: right;
 						padding-right: 16px;
 						padding-bottom: 18px;

pages/user/coupon/myCoupon.vue

@@ -169,7 +169,7 @@
 		</view>
 	
 	 <!-- 已使用 -->
-	  <view class="used" v-show="current==1">
+	  <view class="used" v-show="current==1" style="opacity: 0.6;">
 		  <view class="list-item">
 		  	<view class="voucher">充值券抵扣</view>
 		  	<view class="content">
@@ -249,7 +249,7 @@
 		  
 	  </view>
 	<!-- 已过期 -->
-	<view class="overdue" v-show="current==2">
+	<view class="overdue" v-show="current==2" style="opacity: 0.6;">
 		<view class="list-item">
 			<view class="voucher">充值券抵扣</view>
 			<view class="content">