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

apis/user.js

@@ -77,7 +77,7 @@ export function changePhone  (data) {
 	return request({
 		method: 'get',
 		data:data ,
-		url: '/mobile/regUser/changePhone '
+		url: '/mobile/regUser/changePhone'
 	})
 }
 

pages/index/index.vue

@@ -230,6 +230,7 @@
 		data() {
 			return {
 				timeOut: false,
+				pointTimeOut: true,
 				stationData: {},
 				chargeList: [],
 				activityList: [],
@@ -260,6 +261,7 @@
 		},
 		onUnload() {
 			this.timeOut = false;
+			this.pointTimeOut = false;
 		},
 		onReachBottom() {
 			if (this.newsList.length < this.recordsTotal) {
@@ -277,12 +279,20 @@
 			}).catch(error => {
 				console.log(res)
 			})
+			
 
-			this.getPoint();
+			this.getPointTimeOut();
 			this.getNewsList();
 			this.getActivityInfoList();
 		},
 		methods: {
+			getPointTimeOut() {
+				if(this.pointTimeOut){
+					setTimeout(()=>{
+						this.getPoint();
+					},1000)
+				}
+			},
 			getFindChargeData() {
 				uni.showLoading({
 					title: "加载中",

pages/record/details.vue

@@ -19,7 +19,7 @@
 			<view class="details-title">
 				<h4>充电详情</h4>
 			</view>
-			<view class="details-row"><p>消费电量(kW-h)</p><span>{{chargeDetail.electricQuantity != null ? chargeDetail.electricQuantity : '0.000'}}</span></view>
+			<view class="details-row"><p>消费电量(度)</p><span>{{chargeDetail.electricQuantity != null ? chargeDetail.electricQuantity/10000 : '0.000'}}</span></view>
 			<view class="details-row"><p>开始时间</p><span>{{chargeDetail.startTime}}</span></view>
 			<view class="details-row"><p>结束时间</p><span>{{chargeDetail.endTime}}</span></view>
 			<view class="details-row"><p>充电时长</p><span>{{chargeDetail.chargingMinute != null ? chargeDetail.chargingMinute+'分' : '00分00秒'}}</span></view>

pages/searchPile/searchPile.vue

@@ -49,7 +49,7 @@
 		</u-navbar>
 		<view class="content" >
 			<view v-if="show" class="preference" :style="show ? 'z-index:1024;top:'+navBarHeight+'px;' : 'z-index:0'" style="width: 100%;">
-				<view style="flex: 1;">
+				<view class="content-s">
 				<view class="preference_group">
 					<view class="preference_group_item"><label class="preference_label">距离我</label></view>
 					<view>
@@ -134,13 +134,15 @@
 				<view class="preference_group">
 					<view style="margin-left: 30rpx;"><u-checkbox shape="circle" v-model="preference.save_preference" @change="radioChange">保存偏好设置</u-checkbox></view>
 				</view>
-				
+			
 				</view>
 				<view class="pre-btn" style="display: flex;flex-direction: row;">
 					<view class="btn-1" @click="reset" style="width: 30%;">重置</view>
 					<view class="btn-2" @click="close" style="width: 70%;background-color: #00B962;color: #fff;">确定</view>
 				</view>
+				
 			</view>
+				<u-mask :show="show" @click="show = false"></u-mask>
 			<view v-show="!viewMode" >
 				 
 				<view v-for="(item,index) in stationslist" :key="item.id" class="charing-slow"   @click="stationDetail(item)">
@@ -979,6 +981,16 @@ export default {
 </script>
 
 <style>
+	.u-mask {
+		position: fixed;
+		left: 0;
+		top: 576px;
+		}
+		
+	.content-s{
+		height: 440px;
+		overflow-y:scroll;
+	}
 .cj-slider {
 	width: 90%;
 	margin: auto;
@@ -997,9 +1009,7 @@ export default {
 .preference {
 	background-color: #ffffff;
 	left: 0rpx;
-	position: absolute;
-	height: 521px;
-	overflow-y: scroll;
+	position: absolute
 
 }
 .preference_item {
@@ -1028,7 +1038,7 @@ export default {
 .pre-btn{
 	width: 100%;
 	height: 48px;
-	
+	z-index: 999;
 }
 
 .btn-1,.btn-2{

pages/user/car/index.vue

@@ -116,13 +116,14 @@
 			}
 		}
 		.car-btn{
+			margin:12px 10px 0;
 			font-size: 16px;
 			color:#00B962;
 			border: 1px solid #00B962;
 			border-radius: 21px;
 			padding: 10px 0;
 			text-align: center;
-			margin-top: 12px;
+			
 		}
 	}
 </style>

pages/user/finance/refundList.vue

@@ -53,8 +53,8 @@
 			<u-modal v-model="showtip" :title="title" :content='content1' :show-confirm-button="true" confirm-text="知道了" ></u-modal> 
 		</view>
 				
-		<view style="bottom:0rpx;position:absolute;width: 100%;" v-show="account.totalAmount>0">
-			<u-button shape="circle"    style="background-color: green;color:white" @click="show=true">申请退款</u-button>
+		<view style="bottom:0;position:absolute;width: 100%;padding: 20px;" v-show="account.totalAmount>0">
+			<u-button shape="circle"    style="background-color:#00b962;color:white" @click="show=true">申请退款</u-button>
 		</view>
 	</view>
 </template>

pages/user/phone.vue

@@ -17,7 +17,7 @@
 		
 		<u-button class="login-btn" type="success" shape="circle" @click="sure">确定修改</u-button>
 		
-		<u-verification-code :seconds="sendMsgSecond" ref="uCode" @change="codeChange" @end="end" @start="start" change-text="已发送(XS)">
+		<u-verification-code :seconds="sendMsgSecond" ref="uCode" @change="codeChange" @end="end" @start="start" change-text="已发送(Xs)">
 		</u-verification-code>
 	</view>
 </template>