退费完成

pages/searchPile/searchPile.vue

@@ -166,7 +166,7 @@
 				<view>
 					<Chargermap   @onMoveEnd="moveEnd" ref="amap" @onload="mapdown" @clickMap="clickMap"></Chargermap>
 					<!--@location="location"-->
-					<u-image style='position:absolute;z-index:1024;right:20px;bottom:260px;' src="@/static/img/location.png" width="30px" height="30px" @click="setCenter"></u-image>
+					<u-image style='position:absolute;z-index:1023;right:20px;bottom:260px;' src="@/static/img/location.png" width="30px" height="30px" @click="setCenter"></u-image>
 					 
 				</view>
 				<view v-if="stationsmap.length>0" class="chargerCard" style="border-radius: 20rpx;" > 
@@ -761,12 +761,15 @@ export default {
 		close() {
 			console.log('偏好设置' + JSON.stringify(this.preference));
 			this.show = false;
-			let data = {latitude:this.latitude,longtitude:this.longitude};
+			let data = {latitude:this.latitude,longtitude:this.longitude};			
+			this.carhelp.set('aa',this.preference)  
+			
 			this.getChargingStationData(data);
 			// console.log('close');
 		},
 		// 获取当前位置
 		clickMap(obj) {
+			this.show=false;
 			//this.currentIndex = 5;
 //			console.log('longitude1  ' + _self.longitude);
 //			console.log('latitude1  ' + _self.latitude);

pages/searchPile/stationAndPile/stationDetailsMap.vue

@@ -5,7 +5,7 @@
 			 
 			<view>
 				<Chargermap   ref="amap" @onload="mapdown" @clickMap="clickMap"></Chargermap>
-				<u-image style='position:absolute;z-index:1024;right:20px;bottom:220px;' src="@/static/img/location.png" width="30px" height="30px" @click="setCenter"></u-image>
+				<u-image style='position:absolute;z-index:1023;right:20px;bottom:220px;' src="@/static/img/location.png" width="30px" height="30px" @click="setCenter"></u-image>
 			</view>
 			 
 			 <view class="chargerCard" @click="stationDetail(item)">

pages/user/finance/refundApp.vue

@@ -7,7 +7,7 @@
 			<p>退费中，预计0-5个工作日退还至原支付账户</p>
 		</view>
 		<view class="paySuccess-btn">
-			<u-button class="success-btn" shape="circle" type="success">
+			<u-button class="success-btn" shape="circle" type="success" @click="finish">
 				<span>完成</span>
 			</u-button>
 		</view>
@@ -29,7 +29,14 @@
 			}
 		},
 		methods: {
-			
+			finish(){
+				uni.navigateTo({
+					url:'refundList'
+				})
+				/*uni.navigateBack({
+					delta:1
+				})*/
+			}
 		}
 	}
 </script>

pages/user/finance/refundDet.vue

@@ -4,30 +4,30 @@
 		<u-navbar title="退费详情"></u-navbar>
 		<view class="rechargeDet-head">
 			<view class="payPrice">
-				<span>￥</span><font>15.00</font>
+				<span>￥</span><font>{{refund.refundRealAmount}}</font>
 			</view>
 			<p>退费金额(元)</p>
 		</view>
 		<view class="rechargeDet-main">
 			<view class="rechargeDet-list">
-				<p>充值订单</p><span>000011112222333344445555</span>
+				<p>退费订单</p><span>{{refund.refundOrderNo}}</span>
 			</view>
 			<view class="rechargeDet-list">
-				<p>交易单号</p><span>000011112222333344445555</span>
+				<p>手续费</p><span>￥{{refund.proceduresAmount.toFixed(2)}}</span>
 			</view>
 			<view class="rechargeDet-list">
-				<p>充值时间</p><span>2022-05-01 10:00:00</span>
+				<p>退费时间</p><span>{{refund.applicationTime}}</span>
 			</view>
 			<view class="rechargeDet-list">
-				<p>充值渠道</p><span>微信</span>
+				<p>退费渠道</p><span>{{refund.refundChannelText}}</span>
 			</view>
 			<view class="rechargeDet-list">
-				<p>充值金额</p><span>￥15.00</span>
+				<p>退费金额</p><span>￥{{refund.refundRealAmount.toFixed(2)}}</span>
 			</view>
 		</view>
 		<view class="rechargeDet-main">
 			<view class="rechargeDet-list">
-				<p>状态</p><span>已退款</span>
+				<p>状态</p><span>{{refund.statusText}}</span>
 			</view>
 		</view>
 	</view>
@@ -35,14 +35,43 @@
 
 <script>
 	import * as api from "@/apis/refund.js"
+	let _self;
 	export default {
 		data() {
 			return {
-				
+				refund :{}
 			}
 		},
-		onLoad(){
-			
+		onLoad(op){
+			_self = this;
+			if(op.id){
+				let data ={id:op.id};
+					api.personAccountRefundDetail(data).then(function(res){
+						console.log('res'+JSON.stringify(res));
+						if(res.result){
+							_self.refund = res.data;
+							
+							if(_self.refund.refundChannel == 'wechat')
+								_self.refund.refundChannelText = "微信"
+							else if (_self.refund.refundChannel == 'alipay')
+								_self.refund.refundChannelText = "支付宝"
+								
+								
+							if(_self.refund.status == '0')
+								_self.refund.statusText = "退款中"
+							else if (_self.refund.status == '1')
+								_self.refund.statusText = "退款成功"
+							else if (_self.refund.status == '2')
+								_self.refund.statusText = "退款拒绝"
+							else if (_self.refund.status == '3')
+								_self.refund.statusText = "退款失败"
+						}
+					},function(err){
+						console.log('err'+JSON.stringify(err));
+					})
+					//console.log('item'+JSON.stringify(item))
+				
+			}
 		},
 		methods: {
 

pages/user/finance/refundList.vue

@@ -16,18 +16,14 @@
 						<u-icon name="todo-fill" custom-prefix="custom-icon" color="#6BC6A7" size="40"></u-icon>
 						<span>退费记录</span>
 					</view>
-					<view class="more">
-						<span>查看全部</span>
-						<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
-					</view>
 				</view>
 				<view class="refundList">
-					<view class="refundList-item" v-for="(item,index) in items" :key="index"> 
+					<view class="refundList-item" v-for="(item,index) in items" :key="index" @click="refundItem(item)"> 
 						<view class="refundList-row">
 							<font>退至 {{item.refundChannelText}}</font>
 							<span :class="item.status == '0'? 'state1':'state2' ">{{item.statusText}}</span>
 						</view>
-						<view class="refundList-row">
+						<view class="refundList-row" >
 							<p>{{item.applicationTime}}</p>
 							<p>￥{{item.refundAmount.toFixed(2)}}</p>
 						</view>
@@ -57,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;background-color: green;width: 100%;">
-			<u-button style="background-color: green;color:white" @click="show=true">申请退款</u-button>
+		<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>
 	</view>
 </template>
@@ -94,14 +90,14 @@
 					_self.account = res.data;
 					
 				}
-				console.log('个人余额信息'+JSON.stringify(res));
+//				console.log('个人余额信息'+JSON.stringify(res));
 			},function(err){
 				console.log('个人信息余额错误'+JSON.stringify(err));
 			});
 			let data = {pageIndex:1,pageSize:10};
 			api.personAccountRefundList(data).then(function(res){
 				if(res.result){
-					console.log('res'+JSON.stringify(res));
+//					console.log('res'+JSON.stringify(res));
 					_self.items = res.data.data;
 					for(let i = 0;i< _self.items.length;i++){
 						if(_self.items[i].refundChannel == 'wechat')
@@ -119,11 +115,17 @@
 							_self.items[i].statusText = "退款失败"
 										 
 					}
-					console.log('res'+JSON.stringify(_self.items));
+//					console.log('res'+JSON.stringify(_self.items));
 				}
 			});
 		},
 		methods: {
+			refundItem(item){
+				uni.navigateTo({
+					url:'refundDet?id='+item.id
+				})
+				
+			},
 			confirm(){
 				let data = {amount:_self.account.availableAmount,refundChannel:'wechat'}
 				api.personAccountRefundApplication(data).then(function(res){