调整

.env.dev.js

@@ -1,5 +1,5 @@
 const UNI_APP = {  
-	// BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
+	 BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
 	BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
 	// BASE_URL: 'http://192.168.77.162:8080/charging-station/' ,
 	
@@ -7,9 +7,9 @@ const UNI_APP = {
 	SIMPLE_RUN:true,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
 	//openId:"oHjCawsxTJkxixR74OVp7aCKahj8",//测试用openId  
 	//openId:"oHjCawgwCGen5k1-hAsimdEX5lZo",
-	//openId:"1000",
-	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",
-	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
+	openId:"1000",
+	openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",
+	//openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
 	
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",

apis/login.js

@@ -11,12 +11,25 @@ export function findByOpenId(data) {
 	})
 }
 
+ export function validateGuestCode(data) {
+ 	var url='/mobile/regUser/validateGuestCode ';
+ 	return requestWhite({
+ 		method: 'post',
+ 		data: data,
+ 		url: url
+ 	})
+ }
+
+
 export function validateCode(data) {
-	 
+	var url='/mobile/regUser/validateCode ';
+	 if(data.validateGuestCode==1){
+		  url='/mobile/regUser/validateGuestCode ';
+	 }
 	return requestWhite({
 		method: 'post',
 		data:data ,
-		url: '/mobile/regUser/validateCode'
+		url:url
 	})
 } 
 

pages.json

@@ -98,297 +98,10 @@
 			"name": "登录",
 			"path": "pages/login/index",
 			"style": {
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "登录",
-			"path": "pagesFinance/login/index",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "收益明细",
-			"path": "pagesFinance/detailed/index",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "收益详情",
-			"path": "pagesFinance/detailed/details",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "分润明细",
-			"path": "pagesFinance/share/index",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "分润详情",
-			"path": "pagesFinance/share/details",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "收益统计",
-			"path": "pagesFinance/statistics/index",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "个人中心",
-			"path": "pagesFinance/user/index",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "提现",
-			"path": "pagesFinance/user/withdraw",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "提现记录",
-			"path": "pagesFinance/user/withdrawRecord",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "申请结果",
-			"path": "pagesFinance/user/applyResult",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "申请结果",
-			"path": "pagesFinance/user/chargingDetails",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-
-		{
-			"name": "帮助中心",
-			"path": "pagesFinance/user/help",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "关于我们",
-			"path": "pagesFinance/user/about",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "我的设备",
-			"path": "pagesFinance/user/deviceList",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "我的设备",
-			"path": "pagesFinance/user/deviceListLine",
-			"style": {
-		
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "我的站点",
-			"path": "pagesFinance/user/stationsList",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-{
-			"name": "我的站点",
-			"path": "pagesFinance/user/stationsListLine",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-
-
-		{
-			"name": "设备详情",
-			"path": "pagesFinance/user/deviceDetails",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "电桩管理",
-			"path": "pagesFinance/user/pileManagement",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "充电枪设置",
-			"path": "pagesFinance/user/myPile",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "我被预约",
-			"path": "pagesFinance/preengaged/preengaged",
-			"style": {
-
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name": "预约单详情",
-			"path": "pagesFinance/preengaged/preengagedListDetails",
-			"style": {
-
 				//"navigationStyle": "custom" // 隐藏系统导航栏
 			}
 		}
-
-
-
-		, {
-			"name": "申请开票记录",
-			"path": "pagesFinance/recordOfInvoice/recordOfInvoice",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		},
-		{
-			"name": "申请详情",
-			"path": "pagesFinance/recordOfInvoice/applicationDetails",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"name": "发票预览",
-			"path": "pagesFinance/recordOfInvoice/invoicePreview",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		}
-	    ,{
-            "path" : "pagesFinance/user/chargingGunSetup",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pagesFinance/user/deviceLine",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pagesFinance/share/monthlyCardDetails",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        },
-		{
-		    "path" : "pagesFinance/detailed/monthlyCardDetails",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-        ,{
-            "path" : "pagesFinance/user/ownManagement",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pagesFinance/user/addOwnerInformation",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pagesFinance/user/editOwnerInformation",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pagesFinance/user/applicationForWithdrawal",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pagesFinance/user/applicationDetails",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
+		
     ],
 	"globalStyle": {
 		"navigationStyle": "custom", // 隐藏系统导航栏

pages/login/index.vue

@@ -50,7 +50,8 @@
 	} from '@/utils'
 	export default {
 		data() {
-			return {
+			return {
+				validateGuestCode:0,
 				form: {
 					phone: '',
 					code: '',
@@ -117,7 +118,8 @@
 				}
 
 
-				API.validateCode({
+				API.validateCode({
+					validateGuestCode:this.validateGuestCode,
 					verifyCode: this.form.code,
 					telephone: this.form.phone,
 					openId: this.carhelp.getOpenId(),
@@ -211,6 +213,10 @@
 					
 				}).then((response) => {
 					
+					if(response.data.regUser.userType==1){
+						this.validateGuestCode=1;
+						throw 1
+					}
 					var token = response ? response.data.token : '';
 					this.carhelp.setToken(token);
 					this.carhelp.setPersonInfo(response.data.regUser);
@@ -222,6 +228,7 @@
 					})
 				
 				}).catch(error => {
+					console.log(error)
 					uni.hideLoading();
 					if (!this.carhelp.getOpenId()) {
 						// uni.showToast({

pages/user/index.vue

@@ -9,6 +9,7 @@
 				</view>
 				<view class="userHead-img">
 					<u-avatar class="userHead-head" :src="src" size="144"></u-avatar>
+					<view v-if="detail" style="font-size: 16px;    margin-top: 4px;">{{detail.regUser?detail.regUser.nickName:''}}</view>
 				</view>
 				<view class="userHead-btn" 
 				 @click="gotoUrl('pages/user/recharge')" >
@@ -219,7 +220,7 @@
 				text-align: center;
 				position: absolute;
 				top: 35px;
-				left: 30px;
+				left: 60rpx;
 				p{
 					margin-bottom: 5px;
 				}
@@ -228,10 +229,12 @@
 				}
 			}
 			.userHead-img{
+				    text-align: center;
+				    color: #FFF;
 				position: absolute;
-				left: 50%;
-				margin-left: -36px;
-				top:24px ;
+				left: 320rpx;
+				margin-left: -72rpx;
+				top:14px ;
 				.userHead-head{
 					border:4px solid  #5ca0ff;
 				}
@@ -239,7 +242,7 @@
 			.userHead-btn{
 				position: absolute;
 				top: 46px;
-				right: 20px;
+				right: 40rpx;
 				width: 80px;
 				height: 28px;
 				border-radius: 14px;

pagesFinance/detailed/details.vue

@@ -1,329 +0,0 @@
-<template>
-	<view>
-		<u-navbar >  充电详情</u-navbar>
-		<view class="details">
-			<view class="details-head">
-<!-- 				<u-icon name="charging-pile-fill" custom-prefix="custom-icon" color="#27B148" size="48"></u-icon>
- -->			
-				
-				<h4>{{detail.record&&detail.record.flowNo?detail.record.flowNo:'无充电单号'}}</h4>
-				
-			</view>
-			<view class="details-main">
-				<view class="details-price">
-					<h3>{{detail.income?detail.income.toFixed(2):0}}</h3><span>元</span>
-				</view>
-				<p>本单收益</p>
-			</view>
-			<view class="details-row" v-if="detail.deviceType"   ><p>订单类型 </p><span>{{options0[detail.deviceType].label}}
-			</span></view>
-			
-			<view class="details-row"  v-if="detail.deviceType!='0'" ><p>电费 </p><span>{{detail.electricityAmount?detail.electricityAmount.toFixed(2):0}}元</span></view>
-		
-			
- 			<view class="details-row" v-if="detail.deviceType!='0'" >
- 				<p>服务费</p>
-   				
-				<span v-if="detail.record">{{detail.surplusAmount?detail.surplusAmount.toFixed(2):0}}元
-				
-<!-- 				<span v-if="couponObj&&couponObj.status=='1'">({{detail.surplusAmount}}-{{detail.record.discountAmount}})</span>
- -->				
- 				</span>
- 			</view>
- 			<view class="details-row" v-if="couponObj&&couponObj.status=='1'" >
- 				<p>优惠券 </p>
- 				<span>
- 					{{couponObj.useText}}	
- 				</span>
- 			</view>
-			<view class="details-row" v-if="detail.record&&detail.record.discountAmount" >
-				<p>实际减免 </p>
-				<span>
-					-{{detail.record.discountAmount?detail.record.discountAmount.toFixed(2):0}}元	
-				</span>
-			</view>
-			<view class="details-row" v-if="detail.record&&detail.record.userCardId" >
-				<p>会员活动 </p>
-				<span>
-					充电服务费包月卡	
-				</span>
-			</view>
-		<view class="details-row"   ><p>订单来源 </p><span>{{detail.record?detail.record.platformText:''}}</span></view>
-		
- 		</view>
-		
-	
-	<view class="details">
-		<view class="details-title">
-			<h4>用电明细</h4>
-		</view>
-		<view class="details-row" >
-			<p>总充电量</p>
-			<span>{{detail.electricQuantity?detail.electricQuantity/10000:0}}度</span>
-		</view>
-		<view class="details-row"><p>开始时间</p><span>{{detail.startTime?detail.startTime:detail.endTime}}</span></view>
-			<view class="details-row"><p>结束时间</p><span>{{detail.endTime}}</span></view>
-			<view class="details-row"><p>充电时长</p><span>{{getPercent(detail.chargingMinute)}}</span></view>
-		
-		<view class="details-row" v-if="detail.deviceType=='0'" >
-			<p>电费单价</p>
-			<span>{{detail.unitPrice?detail.unitPrice.toFixed(2):0}}元/小时</span>
-		</view>
-		
-				
-			<view v-for="(item,i) in chargeDetails" :key="i"  v-if="detail.deviceType!=0" >
-				<view class="details-row" style=" margin-top: 18px;" >
-					<p>区间充电量({{item.startTime}}-{{item.endTime}})</p>
-					<span >{{item.kwh }}度</span>
-				</view>
-				
-				<view class="details-row" style="display: block;" >
-					<p>
-						<span style="    color: #37393c;">区间定价</span>
-						
-						<span style="float: right; color: #333;font-weight: normal;" v-if="!item.discountServicePrice" >{{((item.electricityPrice*100+item.servicePrice*100)/100).toFixed(2)}}元/度</span>
-						<span style="float: right; color: #333;font-weight: normal;" v-if="item.discountServicePrice" >{{((item.electricityPrice*100+item.discountServicePrice*100)/100).toFixed(2)}}元/度 <span style="text-decoration:line-through;margin-left: 3px;">{{((item.electricityPrice*100+item.servicePrice*100)/100).toFixed(2)}}元/度</span></span>
-						
-					</p>
-						<span class="details-row-sum"  v-if="!item.discountServicePrice" >{{item.electricityPrice.toFixed(2)}}元/度(电费)+{{item.servicePrice.toFixed(2)}}元/度(服务费) </span>
-						<span class="details-row-sum" style="float:none" v-if="item.discountServicePrice"  >电费{{item.electricityPrice.toFixed(2)}}元/度|服务费{{item.discountServicePrice.toFixed(2)}}元/度(折前{{item.servicePrice.toFixed(2)}}元/度) </span>
-						
-				</view>
-			</view>
-	</view>
-		
-		
-		<view class="details" v-if="sprList&&sprList.length">
-			<view class="details-title">
-				<h4>分润明细</h4>
-			</view>
-			<view class="details-row" v-for="(item,i) in sprList" :key="i" v-if="item.disProportion">
-				<p>{{item.merchantAccountName}}({{(item.disProportion*100).toFixed(2)}}%)</p>
-				<span>{{item.shareProfitAmount.toFixed(2)}}元</span>
-			</view>
-		
-		</view>
-		
-		
-		<view class="details">
-			<view class="details-title">
-				<h4>更多信息</h4>
-			</view>
-		
-			<view class="details-row"><p>来源站点</p><span>{{detail.stationName}}</span></view>
-			<view class="details-row"><p>来源充电桩</p><span>{{detail.deviceName}}</span></view>
-			<view class="details-row" ><p>桩号</p><span>{{detail.deviceNo}}</span></view>
-			<view class="details-row" v-if="detail.deviceType!='0'" ><p>枪号</p><span>{{detail.gunNo}}号充电枪</span></view>
-			<view class="details-row" v-if="detail.deviceType=='0'" ><p>通道号</p><span>{{detail.gunNo}}号</span></view>
-			
-			<view class="details-row"><p>结束原因</p><span>{{detail.record&&detail.record.remark?detail.record.remark:'无'}}</span></view>
-			
-			
-		</view>
-		
-		<view class="details">
-			<view class="details-title">
-				<h4>充电用户</h4>
-			</view>
-		
-			<view class="details-row"><p>用户昵称</p><span>{{detail.chargeUserName?detail.chargeUserName:'未命名'}}</span></view>
-			<view class="details-row"><p>手机号码</p><span>{{detail.chargeUserPhone}}</span></view>
- 			<view class="details-row" v-if="detail.deviceType!='0'" ><p>车牌号</p><span>{{detail.record&&detail.record.carNumber?detail.record.carNumber:'未绑定'}}</span></view>
- 			
-			
-		</view>
-		
-		
-		
-		<view class="detailsBtn">
-			<u-button class="detailsBtn-btn" @click="back" type="primary" plain>返回</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				chargeDetails:[],
-				id:'',
-				sprList:[
-					
-				],
-				detail:{
-					
-				},
-				options0: [
-				
-					{
-						label: '自行车充电',
-						value: 0,
-					},
-					{
-						label: '直流快充',
-						value: 1,
-					},
-					{
-						label: '交流慢充',
-						value: 2,
-					}
-					
-				],
-				title:"",
-				 couponObj:null,
-			}
-		},
-		onLoad(op){
-			
-			 		
-			
-			this.id=op.id;
-			this.getInfo()
-		},
-		methods: {
-			getPercent(estimateMinute) {
-				var value="";
-				 
-				var ms =estimateMinute
-				if (ms > 0) {
-					var Hour = parseInt(Math.floor(ms / 60 ));
-					var Fen = parseInt(Math.floor(ms % 60 ));	
-				
-					if(Hour){
-						value += Hour + "小时" 
-					}
-						
-					if(Fen){
-						value += Fen+"分钟"
-					}
-				}else{
-					value="0分钟"
-				}
-			
-				return value;
-			},
-			back(){
-				uni.navigateBack({
-					
-				})
-			},
-			getInfo(){
-				uni.showLoading({
-					title:"加载中",mask:true,
-				})
-				API.incomeDetails({
-					recordId:this.id
-				}).then((res) => {
-					this.detail=res.data
-						 
-					//this.sprList=res.data.cdmList	
-					this.couponObj=res.data.userCoupon;
-					this.chargeDetails=JSON.parse(res.data.ChargeDetails)
-					this.sprList=res.data.detailList	
-					uni.hideLoading()
-					 console.log(this.detail)
-				}).catch(error => {
-						uni.showToast({
-							
-							title:error
-						})
-				})
-			}
-		}
-	}
-</script>
-<style>
-	page{
-		background-color: #F7F7F7;
-	}
-</style>
-<style lang="scss" scoped>
-	.detailsBtn{
-		margin: 16px;
-		.detailsBtn-btn{
-			border-color:#185AC6!important;
-			border-radius: 8px!important;
-			background: none!important;
-			color:#185AC6!important;
-		}
-	}
-	.details-title{
-		margin-bottom: 16px;
-		h4{
-			font-weight: normal;
-			font-size: 16px;
-			position: relative;
-			padding-left:10px;
-			&::after{
-				content: '';
-				position: absolute;
-				height: 12px;
-				width: 4px;
-				background-color: #27B148;
-				left: 0;
-				top:5px;
-			}
-		}
-	}
-	.details-row{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 15px;
-		
-		p{
-			color: #37393c;
-			font-weight: bold;	
-		}
-	}
-	.details{
-		margin: 34rpx;
-		padding: 34rpx;
-		background-color: #fff;
-		border-radius: 8px;
-		.details-head{
-			text-align: center;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			h4{
-				font-size: 18px;
-				font-weight: normal;
-				margin-left: 4px;
-			}
-		}
-		.details-price{
-			margin-top: 28px;
-			display: flex;
-			align-items: flex-end;
-			justify-content: center;
-			h3{
-				font-size: 36px;
-				color:#27B148;
-				line-height: 36px;
-				margin: 0  4px;
-				font-weight: normal;
-			}
-			span{
-				font-size: 20px;
-				color:#27B148;
-			}
-		}
-		.details-main{
-			text-align: center;
-			margin-bottom: 20px;
-			p{
-				color:#777;
-				margin-top: 4px;
-			}
-		}
-	}
-	.details-row-sum{
-		float: right;
-		color: #888;
-		font-size: 24rpx;
-	
-	}
-</style>

pagesFinance/detailed/index.vue

@@ -1,695 +0,0 @@
-<template>
-	<view>
-		<u-navbar :is-back="false">
-			<view class="navbar">
-				<view class="navbar-tit"  >充电明细</view>
-				<view class="navbar-screen" v-show="current==0" @click="popupShow = true"><span>筛选</span>
-				<u-icon name="filter-2-fill" custom-prefix="custom-icon" color="#b0b8c8" size="32"></u-icon>
-				</view>
-				
-			</view>
-		</u-navbar>
-		<u-popup v-model="popupShow" mode="top" height="80%" >
-			<view class="popup-screen">
-				<view class="screen">
-					<view class="screen-item">
-						<view class="screen-head">查询日期</view>
-						<view class="screen-main2">
-							
-							<u-calendar v-model="showdate" mode="range" @change="changedate"></u-calendar>
-							
-							<u-input :value="startTime?startTime+'至'+endTime:'选择时间筛选'" :type="type" :border="border" @click="showdate = true" />
-						<!-- 	
-							<u-action-sheet :list="actionSheetList" v-model="show" @click="actionSheetCallback"></u-action-sheet>
-						 --></view>
-					</view>
-					<view class="screen-item">
-						<view class="screen-head">充电桩类型</view>
-						<view class="screen-main">
-							<view 
-							:class="{
-								active:selecttype==''
-							}" @click="selecttype=''"
-							class="screen-entry ">全部</view>
-							<view 
-							:class="{
-								active:selecttype=='0'
-							}" @click="selecttype='0'"
-							
-							class="screen-entry type1">自行车充电</view>
-							<view 
-							:class="{
-								active:selecttype=='2'
-							}" @click="selecttype='2'"
-							class="screen-entry type3">交流慢充</view>
-							<view 
-							:class="{
-								active:selecttype=='1'
-							}" @click="selecttype='1'"
-							class="screen-entry type2">直流快充</view>
-						</view>
-					</view>
-					<view class="screen-item">
-						<view class="screen-head">站点</view>
-						<view class="screen-main">
-							<view class="screen-entry  "
-							:class="{
-								active:selectstationId==''
-							}"
-							 @click="selectstationId=''"
-							>全部</view>
-							<view 
-							v-for="(item,i) in stationList" :key="i"
-							:class="{
-								active:selectstationId==item.id
-							}"
-							 @click="selectstationId=item.id,selectdeviceNo=''"
-							class="screen-entry" >{{item.name}}</view>
-						
-						</view>
-					</view>
-					<view 
-					
-					class="screen-item">
-						<view class="screen-head">桩号</view>
-						<view class="screen-main">
-							 
-							<view class="screen-entry  "
-							:class="{
-								active:selectdeviceNo==''
-							}"
-							 @click="selectdeviceNo=''"
-							>全部</view>
-							<view 
-							v-for="(item,i) in stationListSon" :key="i"
-							v-show="selectstationId?(selectstationId==item.stationId):true"
-							:class="{
-								active:selectdeviceNo==item.deviceNo
-							}"
-							
-							 @click="selectdeviceNo=item.deviceNo"
-							class="screen-entry" >{{item.name}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="screen-foot">
-					<view class="screen-btn-l" @click="resetBtn" >重置</view>
-					<view class="screen-btn-r" @click="okbtn" >确定</view>
-				</view>
-			</view>
-		</u-popup>
-		
-		<u-tabs 
-		 :bar-width="100"
-		:list="tabList" :is-scroll="false" :current="current" @change="change" inactive-color="#acb2af"
-			active-color="#101010"></u-tabs>
-			
-		<view class="detailed" v-show="current==0" >
-				<view style="text-align: center;margin-top: 100px" v-if="!list.length">
-					<img src="@/assets/img/blankpage.png">
-					<view>查询为空</view>
-				</view>
-				
-				<view class="detailed-list" v-for="(item ,index) in list"
-				@click="gotoUrl('pagesFinance/detailed/details?id='+item.id)"
-				:key="index">
-				<view class="detailed-time"    v-if="item.show">
-					<p>{{item.showtime}}</p>
-					<p  v-if="showMap">共收{{showMap.get(item.showtime).num}}笔,{{showMap.get(item.showtime).amount.toFixed(2)}}元</p>
-				</view>
-				<view class="detailed-item">
-					<view class="detailed-item-name" style="
-							    width: 70%;
-						">
-						<h2 class="showName">{{item.stationName}}/{{item.deviceName}}</h2>
-						<!-- <p>{{item.flowNo?item.flowNo:'无充电单号'}}</p> -->
-						<span
-						
-						 :style="{
-							color:colorList[item.platform%3]
-						}">{{item.platformText}}</span>
-						
-						<span v-if="item.userCardId" style="color:#FF8B00  ;margin-left: 10px;">月卡订单</span>
-					</view>
-					<view class="detailed-item-name"  style="
-						
-							    min-width: 60px;
-							    width: 30%;
-						">
-						
-						<h2 style="   text-align: end;">{{item.actualFee?item.actualFee.toFixed(2):0}}元</h2>
-						<p style="   text-align: end;" >{{item.endTime?item.endTime.slice(11):''}}</p>
-						
-					</view>
-					<view class="sign" v-if="false">
-						<!-- //<img src="../../assets/img/tixian.png" alt=""> -->
-						<!-- 月卡 -->
-						<view class="product_tip" >
-								<view class="product_tip_bg"></view>
-								<p>月卡</p>
-							</view>
-					</view>
-					
-					
-				</view>
-				
-					
-				</view>
-			<u-divider v-if="list.length&&list.length == recordsTotal" color="#B6BDC3" style="margin-top:20px;" bg-color="#f7f7f7">已经到底了</u-divider>
-			
-			 
-		</view>
-		<!-- 包月卡 -->
-		<view class="detailed" 
-		style="    padding-bottom: 20px;"
-		v-show="current==1">
-		
-		<view style="text-align: center;margin-top: 100px" v-if="!list2.length">
-			<img src="@/assets/img/blankpage.png">
-			<view>查询为空</view>
-		</view>
-		
-			<view class="detailed-list"  v-for="(item ,index) in list2" 
-			@click="gotoUrl('pagesFinance/detailed/monthlyCardDetails?id='+item.id)"
-			
-			:key="index" >
-		
-				<view class="detailed-time"   v-if="item.show" >
-					<p>{{item.showtime}}</p>
-		
-					<p v-if="showMap2">共收{{showMap2.get(item.showtime).num}}笔,{{showMap2.get(item.showtime).amount.toFixed(2)}}元</p>
-		
-				</view>
-				<view class="detailed-item">
-					<view class="detailed-item-name" style="
-								    width: 70%;
-							">
-						<h2 class="showName">{{item.monthlyRentName}}</h2>
-						<p>{{item.payTime?item.payTime.slice(11):''}}</p>
-					</view>
-					<view class="detailed-item-name" style="
-								min-width: 60px;
-								width: 30%;
-								font-size: 16px;
-								text-align: right;
-							">
-							<h2>{{item.payFee.toFixed(2)}}<span style="font-size: 12px;">元</span></h2>
-						
-					</view>
-					<!-- <view class="sign">
-						<img src="../../assets/img/tixian.png" alt="">
-					</view> -->
-				</view> 
-				
-				 
-				
-			</view>
-			
-			<u-divider v-if="list2.length&&list2.length == recordsTotal2" color="#B6BDC3" style="margin-top:20px;" bg-color="#f7f7f7">已经到底了</u-divider>
-			
-		</view>
-		
-		<Tabbar :current="1" ref="tabbarMain"></Tabbar>
- 	</view>
-</template>
-
-<script>
-	import Tabbar from '@/components/TabbarFinance.vue'
-	import * as API from '@/apis/finance.js'
-	// import {
-	// 	beforeTimeStamp,
-	// 	currentTimeStamp,
-	// 	parseUnixTime
-	// } from '@/utils'
-	
-	export default {
-		data() {
-			return {
-				showdate: false,
-				startTime: "",
-				colorList:["#00B962","#1677FF","#eb372a"],
-				endTime: "",
-				selecttype:"",
-				selectstationId:"",
-				selectdeviceNo:"",
-				title:"",
-			 
-				form:{
-					
-				},
-				// current: 0,
-				 tabList: [{
-				 	name: '充电订单'
-				 }, {
-				 	name: '月卡订单'
-				 }],
-				pageIndex: 1,
-				recordsTotal: 0,
-				list: [],
-				
-				pageIndex2: 1,
-				recordsTotal2: 0,
-				list2: [],
-				
-				popupShow: false,
-				tabbarList: [{
-						iconPath: "bar-chart-box-fill",
-						selectedIconPath: "bar-chart-box-fill",
-						text: '统计',
-						count: 0,
-						isDot: true,
-						customIcon: true,
-					},
-					{
-						iconPath: "article-fill",
-						selectedIconPath: "article-fill",
-						text: '明细',
-						midButton: true,
-						customIcon: true,
-					},
-					{
-						iconPath: "account-pin-box-fill",
-						selectedIconPath: "account-pin-box-fill",
-						text: '我的',
-						count: 0,
-						isDot: false,
-						customIcon: true,
-					},
-				],
-				showMap:null,
-				showMap2:null,
-				current: 0,
-				value: '',
-				type: 'select',
-				show: false,
-				border: true,
-				stationList:[],
-				stationListSon:[],
-				actionSheetList: [
-					{
-						text: '男'
-					},
-					{
-						text: '女'
-					},
-					{
-						text: '保密'
-					}
-				],
-			}
-		},
-		components: {
-			Tabbar
-		
-		},
-		onReachBottom() {
-			
-				this.myLoadmore();
-			
-		},
-		onShow() {
-			if(this.$refs.tabbarMain){
-				this.$refs.tabbarMain.setcount(1);
-			}
-		},
-		onLoad() {
-			
-		},
-		onReady() {
-			
-			this.getList()
-			this.getList2()
-			this.getStation()
-			
-		},
-		methods: {
-			change(index) {
-				this.current = index;
-			},
-			changedate(e) {
-				this.startTime = e.startDate
-				this.endTime = e.endDate
-				
-			},
-			resetBtn(){
-				this.startTime=""
-				this.endTime=""
-				this.selecttype=""
-				this.selectstationId=""
-				this.selectdeviceNo=""
-				this.pageIndex = 1;
-				this.form = {
-					startDate:"",
-					endDate:"",
-					pageIndex: this.pageIndex,
-					type:this.selecttype,
-					stationId:this.selectstationId,
-					deviceNo:this.selectdeviceNo,
-				};
-				this.popupShow=false;
-				this.list = [];
-				this.getList()
-				
-			},
-			okbtn(){
-				this.popupShow=false;
-				this.pageIndex = 1;
-				
-				this.form = {
-					startDate:this.startTime,
-					endDate:this.endTime,
-					pageIndex: this.pageIndex,
-					type:this.selecttype,
-					stationId:this.selectstationId,
-					deviceNo:this.selectdeviceNo,
-				};
-				this.list = [];
-				this.getList()
-			},
-			getList() {
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				this.form.pageIndex=this.pageIndex
-				this.form.pageSize=20
-				
-				API.incomeList(this.form).then((res) => {
-					
-					var showMap=new Map()
-					
-					
-					this.list = [
-						...this.list,
-						...res.data.data
-					];
-				
-					this.list.forEach(item=>{
-						if(item.endTime){
-							var ktime=item.endTime.split(" ")[0]
-							if(showMap.has(ktime)){
-								item.show=false;
-							
-								
-							}else{
-								var Amount=item.totalAmount 
-								var num=item.totalNum
-								showMap.set(ktime,{
-									amount:Amount,
-									num:num
-								})
-							
-								
-								item.show=true;
-								item.showtime=ktime;
-							}
-						}
-						
-					})
-					
-					this.showMap=showMap;
-					this.recordsTotal = res.data.recordsTotal
-					uni.hideLoading()
-					
-				}).catch(error => {
-					uni.showToast({
-					
-						title: error
-					})
-				})
-			},
-			getList2() {
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-			
-				
-				API.buyCardList({
-					pageIndex:this.pageIndex2,
-					pageSize:20
-				}).then((res) => {
-					var showMap=new Map()
-					this.showMap2=showMap;
-					this.list2 = [
-						...this.list2,
-						...res.data.data
-					];
-					
-					this.list2.forEach(item=>{
-						if(item.createTime){
-							var ktime=item.createTime.split(" ")[0]
-							if(showMap.has(ktime)){
-								item.show=false;
-							
-								
-							}else{
-								var Amount=item.totalAmount 
-								var num=item.totalNum
-								showMap.set(ktime,{
-									amount:Amount,
-									num:num
-								})
-							
-								item.show=true;
-								item.showtime=ktime;
-							}
-						}
-						
-					})
-					
-					this.showMap2=showMap;
-					this.recordsTotal2 = res.data.recordsTotal
-					uni.hideLoading()
-					
-				}).catch(error => {
-					uni.showToast({
-					
-						title: error
-					})
-				})
-			},
-			getStation(bl) {
-				
-				API.stationList().then((res) => {
-					
-					this.stationList = res.data.stationList
-					this.stationListSon=res.data.deviceList	
-				}).catch(error => {
-					uni.showToast({
-					
-						title: error
-					})
-				})
-			},
-			myLoadmore() {
-					if(this.current==0){
-						if (this.list.length < this.recordsTotal) {
-							this.pageIndex += 1;
-							this.getList()
-						}
-						
-					}else{
-						if (this.list2.length < this.recordsTotal2) {
-							this.pageIndex2 += 1;
-							this.getList2()
-						}
-					}
-				
-				
-			},
-			// 点击actionSheet回调
-			actionSheetCallback(index) {
-				this.value = this.actionSheetList[index].text;
-			}
-		}
-	}
-</script>
-<style>
-	page{
-		background-color: #F7F7F7;
-	}
-</style>
-<style lang="scss" scoped>
-	.product_tip{
-		  position: absolute;
-		  top: 0;
-		  right: 0;
-		  width: 26px;
-		  height: 26px;
-		  text-align: right;
-		  p{
-		    font-size: 24rpx;
-		    color: #ffffff;
-		    transform: rotate(45deg);
-		    position: relative;
-		    top: 0rpx;
-		    right: 0rpx;
-		  }
-		  .product_tip_bg{
-		    width: 0;
-		    height: 0;
-		    border-bottom: 48rpx solid #FD662A;
-		    border-right: 48rpx solid transparent;
-		    border-left: 48rpx solid transparent;
-		    transform: rotate(45deg);
-		    position: absolute;
-		    top: -7rpx;
-		    right: -29rpx;
-		  }
-		}
-	.popup-screen{
-		padding: 20px;
-		position: relative;
-		.screen{
-			padding-bottom: 30px;
-		}
-		.screen-item{
-			margin-bottom: 20px;
-			.screen-head{
-				margin-bottom: 8px;
-				font-size: 16px;
-			}
-			.screen-main{
-				display: flex;
-				//    display: -webkit-box;
-				flex-wrap: wrap;
-			
-			}
-			.screen-entry{
-				width: 29%;
-				padding:6px 0;
-								display: flex;
-								align-items: center;
-								justify-content: center;
-
-
-				background-color: #F2F5FA ;
-				text-align: center;
-				margin-bottom: 10px;
-				border-radius: 3px;
-			
-				margin-right: 6px;
-
-			}
-			.screen-entry.active{
-				background-color: #185AC6;
-				color:#fff;
-			}
-		}
-		.screen-foot{
-			position: fixed;
-			left: 0;
-			right: 0;
-			bottom: 0;
-			display: flex;
-			height:50px;
-			border-top: 1px solid #ededed;
-			.screen-btn-l{
-				 background-color: #fff;
-				flex: 0.2;
-				text-align: center;
-				line-height: 50px;
-			}
-			.screen-btn-r{
-				flex: 0.8;
-				text-align: center;
-				line-height: 50px;
-				background-color: #185AC6;
-				color:#fff;
-			}
-		}
-	}
-	.navbar{
-		display: flex;
-		justify-content: space-between;
-		flex: 1;
-		padding: 0 15px;
-	}
-	.navbar-tit{
-		font-size: 20px;
-	}
-	.navbar-screen{
-		display: flex;
-		align-items: center;
-		span{
-			margin-right: 2px;
-			color:#999;
-		}
-	}
-	.detailed-time{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 10px 20px;
-		font-size: 16px;
-		p{
-			color:#666;
-			
-		}
-	}
-	.detailed-item{
-		background-color: #fff;
-		display: flex;
-		justify-content: space-between;
-		padding: 10px 20px;
-		border-bottom: 1px solid #ededed;
-		position: relative;
-		.sign{
-			width: 32px;
-			height: 32px;
-			position: absolute;
-			top: 0;
-			right: 0;
-			img{
-				width: 100%;
-			}
-		}
-		
-		
-		.detailed-item-name{
-			h4{
-				font-weight: normal;
-			}
-			span{
-				font-size: 15px;
-			}
-			p{
-				font-size: 15px;
-				margin-top: 4px;
-				color:#A2A9B5;
-				  
-			}
-		}
-		.detailed-item-num{
-			display: flex;
-			align-items: center;
-			h2{
-				margin-right: 4px;
-			}
-		}
-	}
-	.showName{
-		font-weight: unset;
-		    font-weight: unset;
-		    overflow: hidden;
-		    text-overflow: ellipsis;
-		    white-space: nowrap;
-			font-size: 16px;
-	}
-	
-	.u-tabs{
-		/deep/.uni-scroll-view-content {
-			width: 56.2% !important;
-			margin: auto;
-		}
-	}
-	
-	/deep/.u-tab-bar {
-		
-		background-color: #0076FF !important;
-		
-	 }
-</style>

pagesFinance/detailed/monthlyCardDetails.vue

@@ -1,240 +0,0 @@
-<template>
-	<view>
-		<u-navbar>订单详情</u-navbar>
-
-		<view class="details">
-			<view class="details-title">
-				<h4>订单明细</h4>
-			</view>
-			<view class="details-row">
-				<p>商品名称 </p>
-				<span>{{monthlyRentCard.name}}</span>
-			</view>
-			<view class="details-row">
-				<p>订单金额</p>
-				<span>{{regUserCard.payFee?regUserCard.payFee.toFixed(2):0}}元</span>
-			</view>
-			<view class="details-row">
-				<p>月卡卡号</p>
-				<span>{{regUserCard.cardNo}}</span>
-			</view>
-			<view class="details-row">
-				<p>订单编号</p>
-				<span>{{regUserCard.outOrderNo}}</span>
-			</view>
-			<view class="details-row">
-				<p>购买时间</p>
-				<span>{{regUserCard.payTime}}</span>
-			</view>
-		</view>
-
-		<view class="details">
-			<view class="details-title">
-				<h4>更多信息</h4>
-			</view>
-		<!-- 	<view class="details-row">
-				<p>用户昵称 </p>
-				<span>{{buyRegUser.nickName?buyRegUser.nickName:'未命名'}}</span>
-			</view> -->
-			<view class="details-row">
-				<p>用户姓名 </p>
-				<span>{{buyRegUser.realName?buyRegUser.realName:'未命名'}}</span>
-			</view>
-			<view class="details-row">
-				<p>车牌号 </p>
-				<span>{{buyRegUser.carNum?buyRegUser.carNum:'未绑定'}}</span>
-			</view>
-			
-			<view class="details-row">
-				<p>联系方式</p>
-				<span>{{getPhone(buyRegUser.phone)}}</span>
-			</view>
-			
-			<view class="details-row">
-				<p>月卡有效期</p>
-				<span>{{regUserCard.startTime?regUserCard.startTime.slice(0,10):''}}至{{regUserCard.endTime?regUserCard.endTime.slice(0,10):''}}</span>
-			</view>
-			
-
-
-		</view>
-
-
-
-	</view>
-</template>
-
-<script>
-	import {
-		parseUnixTime,
-		substrMb
-	} from '@/utils'
-	
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				buyRegUser: {},
-				monthlyRentCard: {},
-				regUserCard: {},
-			}
-		},
-		onLoad(op) {
-
-
-
-			this.id = op.id;
-			this.getInfo()
-		},
-		methods: {
-	getPhone(phone){
-				var backphone="";
-				if(phone){
-					backphone=substrMb(phone,0,3)+"****"+substrMb(phone,7,4)
-				}
-				
-				return backphone;
-			},
-			getInfo() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.buyCardDetail({
-					id: this.id
-				}).then((res) => {
-					this.buyRegUser = res.data.buyRegUser
-					this.monthlyRentCard = res.data.monthlyRentCard
-					this.regUserCard = res.data.regUserCard
-
-					uni.hideLoading()
-
-				}).catch(error => {
-					uni.showToast({
-
-						title: error
-					})
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-	page {
-		background-color: #F7F7F7;
-	}
-</style>
-<style lang="scss" scoped>
-	.detailsBtn {
-		margin: 16px;
-
-		.detailsBtn-btn {
-			border-color: #185AC6 !important;
-			border-radius: 8px !important;
-			background: none !important;
-			color: #185AC6 !important;
-		}
-	}
-
-	.details-title {
-		margin-bottom: 20px;
-
-		h4 {
-			font-weight: normal;
-			font-size: 16px;
-			position: relative;
-			padding-left: 10px;
-
-			&::after {
-				content: '';
-				position: absolute;
-				height: 12px;
-				width: 4px;
-				background-color: #185ac6;
-				left: 0;
-				top: 5px;
-			}
-		}
-	}
-
-	.details-row {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 15px;
-
-		p {
-			color: #86898C;
-
-		}
-
-	}
-
-	.details-row-sum {
-		float: right;
-		color: #101010;
-		font-size: 14px;
-
-	}
-
-	.details {
-		margin: 16px;
-		padding: 20px;
-		background-color: #fff;
-		border-radius: 8px;
-		position: relative;
-
-		.details-head {
-			text-align: center;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-
-			h4 {
-				font-size: 18px;
-				font-weight: normal;
-				margin-left: 4px;
-			}
-		}
-
-		.details-price {
-			margin-top: 12px;
-			margin-bottom: 4px;
-			display: flex;
-			align-items: flex-end;
-			justify-content: center;
-
-			h3 {
-				font-size: 36px;
-				color: #27B148;
-				line-height: 36px;
-				margin: 0 4px;
-				font-weight: normal;
-			}
-
-			span {
-				font-size: 20px;
-				color: #27B148;
-			}
-		}
-
-		.details-main {
-			text-align: center;
-
-			.withdraw {
-				width: 21.3vw;
-				height: 21.3vw;
-				position: absolute;
-				top: 2vw;
-				right: 2.5vw;
-			}
-
-			p {
-				color: #777;
-				margin-top: 4px;
-			}
-		}
-	}
-</style>

pagesFinance/login/index.vue

@@ -1,287 +0,0 @@
-<template>
-	<view>
-		<view class="login-logo">
-			<u-image width="120rpx" height="120rpx" src="../../assets/img/logo.png" border-radius="20"></u-image>
-			<h3>51充电联盟</h3>
-			<p>合伙收益通</p>
-		</view>
-		<view class="login-form">
-			<u-form :model="form" ref="uForm">
-				<view class="login-form-row">
-					<u-icon name="user-2-fill" custom-prefix="custom-icon" color="#b0b8c8" size="40"></u-icon>
-					<u-line color="#d9e0ec" length="20" direction="col" margin="10px"/>
-					<u-form-item label="" prop="phone"  :border-bottom="false">
-						<u-input  v-model="form.phone" placeholder="请输入手机号"  />
-					</u-form-item>
-				</view>
-				<view class="login-form-row">
-					<u-icon name="message-3-fill" custom-prefix="custom-icon" color="#b0b8c8" size="40"></u-icon>
-					<u-line color="#d9e0ec" length="20" direction="col" margin="10px"/>
-					<u-form-item label="" prop="code"  :border-bottom="false">
-						<u-input v-model="form.code"  placeholder="请输入验证码" />
-					</u-form-item>
-				</view>
-				<view class="login-code" >
-					<span  @click="getCode" >{{codeTips}}</span>
-				</view>
-			</u-form>
-			<u-verification-code :seconds="sendMsgSecond" ref="uCode" @change="codeChange" @end="end" @start="start">
-			</u-verification-code>
-			<u-button  style="    margin-top: 30px;"
-			 :class="{
-			 	'login-btn':!(form.phone&&form.code)
-			 }" type="primary"
-			 @click="finish">登录</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	import {
-		checkPhone
-	} from '@/utils'
-	export default {
-		data() {
-			return {
-				form: {
-					name: '',
-					intro: '',
-				
-					phone: '',
-					code: '',
-				},
-				backUrl: "",
-				message: "",
-				codeTips: '',
-				isSendMsgIng: false,
-				sendMsgSecond: 60 * 2,
-				customStyle: {
-					background: '#1677ff'
-				}
-			}
-		},
-		onLoad(op) {
-		
-			this.message = op.message;
-			this.backUrl = op.back;
-			if (op.phone) {
-				this.form.phone = op.phone;
-			}
-		
-		},
-		methods: {
-		codeChange(text) {
-				this.codeTips = text;
-			},
-			//倒计时
-		
-			end() {
-				this.sendMsgSecond = 2 * 60;
-				this.isSendMsgIng = false;
-			},
-			finish() {
-		
-				if (!this.carhelp.getOpenId()) {
-					// uni.showToast({
-					// 	title: "请使用“微信”访问本系统登录"
-					// })
-					// return
-				}
-				if (!this.form.phone) {
-					uni.showToast({
-						title: "请输入手机号"
-					})
-					return
-				}
-				if (!this.form.code) {
-					uni.showToast({
-						title: "请输入验证码"
-					})
-					return
-				}
-		
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				var headImg = "";
-				var userInfo = this.carhelp.get("xpgj_wx_user_info")
-				if (userInfo) {
-		
-					headImg = userInfo.headimgurl;
-				}
-		
-		
-				API.validateCode({
-					verifyCode: this.form.code,
-					telephone: this.form.phone,
-					openId: this.carhelp.getOpenId(),
-					headImg: headImg
-				}).then((response) => {
-					this.loginset(response)
-		
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			start() {
-				if (!this.isSendMsgIng) {
-		
-		
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					})
-					API.getVerifyCode(this.form.phone).then((response) => {
-		
-		
-						uni.hideLoading();
-						this.carhelp.set("getvcodetime", new Date().getTime());
-		
-						if (!"") {
-							//倒计时
-							uni.showToast({
-								title: "发送成功"
-							})
-						} else {
-							uni.showToast({
-								title: "您的验证码已经发送[5分钟有效]，请勿重复点击"
-							})
-						}
-					}).catch(error => {
-						uni.showToast({
-							title: error,
-							icon: "none"
-						})
-					})
-		
-		
-				}
-			},
-			// 获取验证码
-			getCode() {
-				if (this.$refs.uCode.canGetCode) {
-		
-				} else {
-		
-					uni.showToast({
-						title: '倒计时结束后再发送',
-						icon: "none"
-					})
-					return
-				}
-		
-				var checkPhoneResult = checkPhone(this.form.phone);
-		
-				if (checkPhoneResult !== true) {
-					uni.showToast({
-						title: checkPhoneResult,
-		
-					})
-					return;
-				}
-				this.$refs.uCode.start();
-			},
-			loginset(response){
-				var token = response ? response.data.token : '';
-				this.carhelp.setToken(token,"merchantUser");
-				this.carhelp.setPersonInfo(response.data.user,"merchantUser");
-				this.carhelp.setPersonInfoPlus(response.data, "merchantUser")
-				//this.gotoUrl("pages/user/index")
-				uni.redirectTo({
-					url: '/pagesFinance/statistics/index'
-				})
-			},
-			query(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.findByOpenId({
-					
-					openId: this.carhelp.getOpenId(),
-					
-				}).then((response) => {
-					this.loginset(response)
-					
-				
-				}).catch(error => {
-					uni.hideLoading();
-					// if (!this.carhelp.getOpenId()) {
-					// 	uni.showToast({
-					// 		title: "请使用“微信”访问本系统登录"
-					// 	})
-					// 	return
-					// }
-					var time = this.carhelp.get("getvcodetime");
-					if (time) {
-						//this.$refs.uCode.start();
-						var nowtime = new Date().getTime()
-						var differ = (nowtime - time) / 1000
-						if (differ < 2 * 60) {
-							this.sendMsgSecond = 2 * 60 - parseInt(differ)
-							this.isSendMsgIng = true;
-							this.$refs.uCode.start();
-						}
-					}
-				})
-			}
-		},
-		onReady() {
-			this.query()
-			
-		}
-	}
-</script>
-<style>
-	page{
-		background: url(../../assets/img/bgbg.png) no-repeat;
-		background-size: 100%;
-	}
-</style>
-<style lang="scss" scoped>
-	.login-logo{
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		padding-top: 20%;
-		h3{
-			margin:15px 0;
-		}
-	}
-	/deep/.u-form-item{
-		padding: 0;
-		flex: 1;
-	}
-	.login-form{
-		width: 80%;
-		margin:50px auto 0;
-	}
-	.login-form-row{
-		height: 40px;
-		border: 1px solid #c7d1e2;
-		background-color: #fff;
-		border-radius: 10px;
-		display: flex;
-		align-items: center;
-		padding: 2px 10px;
-		margin-bottom: 15px;
-	}
-	.login-code{
-		text-align: right;
-		span{
-			color:#005AD9;
-		}
-	}
-	.login-btn{
-		background-color: #cdd7e8;
-		border-color:#cdd7e8 ;
-		color:#fff;
-		margin-top: 30px;
-	}
-</style>

pagesFinance/preengaged/preengaged.vue

@@ -1,336 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="我被预约">
-			<view class="screen" @click="screenClick">筛选</view>
-		</u-navbar>
-		<view>
-			<view v-if="screenShow" class="preference" :style="screenShow ? 'z-index:1024;top:'+navBarHeight+'px;' : 'z-index:0'"
-				style="width: 100%;">
-				<view class="content-s">
-					<view class="preference_group">
-						<view class="preference_group_item" :class="statusClass == index ? 'active' : ''" v-for="(item,index) in statusList" :key="item.id" @click="statusClick(index,item)">{{item.name}}</view>
-					</view>
-				</view>
-			</view>
-			<u-mask :show="screenShow" @click="screenShow = false" z-index="100"></u-mask>
-		</view>
-		<view class="carNone" v-if="appointmentList.length == 0">
-			<img src="@/assets/img/暂无数据-缺省页.png" alt="">
-			<p>暂无预约</p>
-		</view>
-		<view class="reservation-items" v-for="(item,index) in appointmentList" :key="item.id" @click="gotoUrl('pagesFinance/preengaged/preengagedListDetails?id='+item.id)">
-			<view class="station-name">
-				预约{{item.reserveMinutes}}分钟后充电
-				<view class="toBe-confirmed btn" v-if="item.status == '0'">{{item.statusText}}</view>
-				<view class="confirmed btn" v-if="item.status == '1'">{{item.statusText}}</view>
-				<view class="canceled btn" v-if="item.status == '3'">{{item.statusText}}</view>
-				<view class="have-expired btn" v-if="item.status == '9'">{{item.statusText}}</view>
-				<view class="finished btn" v-if="item.status == '2'">{{item.statusText}}</view>
-				<view class="refused btn" v-if="item.status == '4'">{{item.statusText}}</view>
-				<view class="have-expired btn" v-if="item.status == '5'">已过期</view>
-				<view class="have-expired btn" v-if="item.status == '6'">已过期</view>
-			</view>
-			<view class="details-items">
-				<view class="items">
-					<view class="items-name">
-						预留截止时间
-					</view>
-					<view class="items-content">
-						{{item.endTime}}
-					</view>
-				</view>
-				<view class="items">
-					<view class="items-name">				
-						预计充电时长
-					</view>
-					<view class="items-content">
-						{{item.estimateMinutes != null ? (item.estimateMinutes/60).toFixed(1)+'小时' : '0'}}
-					</view>
-				</view>
-				<view class="items">
-					<view class="items-name">					
-						预约站点
-					</view>
-					<view class="items-content">
-						{{item.stationName}}
-					</view>
-				</view>
-				<view class="items">
-					<view class="items-name">	
-						预约桩号
-					</view>
-					<view class="items-content">
-						{{item.deviceName}}
-					</view>
-				</view>
-				<view class="items">
-					<view class="items-name">
-						充电桩类型
-					</view>
-					<view class="items-content">
-						{{item.typeText}}
-					</view>
-				</view>
-			</view>
-			<view class="button" v-if="item.status == '0'">
-				<u-button class="affirm" shape="circle" @click="sureClick(item)">确认</u-button>
-				<u-button class="refuse" shape="circle" @click="refuseClick(item)">拒绝</u-button>
-			</view>
-		</view>
-		<u-divider  v-if="appointmentList.length == recordsTotal && recordsTotal != 0" style="margin-top: 10px;">已经到底了</u-divider>
-	</view>
-</template>
-
-<script>
-	import * as myApi from '@/apis/my.js'
-	
-	export default {
-		data() {
-			return {
-				screenShow: false,
-				navBarHeight:44,
-				statusList: [
-					{id:"",name:"全部预约单"},
-					{id:"0",name:"待确认"},
-					{id:"1",name:"已预约"},
-					{id:"2",name:"已完成"},
-					{id:"3",name:"已取消"},
-					{id:"4",name:"已拒绝"},
-					{id:"9",name:"已过期"},
-				],
-				statusClass: '',
-				pageIndex: 1,
-				recordsTotal: 0,
-				appointmentList: [],
-				status: '',
-			}
-		},
-		onShow() {
-			this.getAppointmentList(true);
-		},
-		onReachBottom() {
-			if (this.appointmentList.length < this.recordsTotal) {			
-				this.myLoadmore();
-			}
-		},
-		methods: {
-			screenClick() {
-				this.screenShow = !this.screenShow;
-			},
-			statusClick(index,item) {
-				this.statusClass = index;
-				this.status = item.id;
-				this.screenShow = false;
-				this.getAppointmentList(true);
-			},
-			getAppointmentList(bl) {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				if (bl) {
-					this.appointmentList = [];
-					this.pageIndex = 1;
-				}
-				myApi.merchantAppointmentList({
-					pageIndex: this.pageIndex,
-					status: this.status
-				}).then((res) => {
-					uni.hideLoading();
-					
-					this.appointmentList = [
-						...this.appointmentList,
-						...res.data.data
-					];
-					this.recordsTotal = res.data.recordsTotal;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			myLoadmore() {
-				this.pageIndex += 1;
-				this.getAppointmentList()
-			},
-			sureClick(item) {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				myApi.merchantChangeStatus({
-					id: item.id,
-					status: '1'
-				}).then((res) => {
-					uni.hideLoading();
-					this.getAppointmentList(true);
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			refuseClick(item) {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				myApi.merchantChangeStatus({
-					id: item.id,
-					status: '4'
-				}).then((res) => {
-					uni.hideLoading();
-					this.getAppointmentList(true);
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		p{
-			margin-top: -60px;
-		}
-	}
-	.preference {
-		background-color: #ffffff;
-		left: 0rpx;
-		position: absolute
-	
-	}
-	.preference_group_item {
-		padding: 15rpx;
-		text-align: center;
-		color: #777777;
-	}
-	.active {
-		color: #00B962;
-	}
-	.preference_group {
-		padding-bottom: 20rpx;
-	}
-	.content-s{
-		height: 240px;
-		overflow-y:scroll;
-	}
-	page{
-		padding-bottom: 155px;
-	}
-	.screen {
-		margin-left: 85.3%;
-		color: rgba(119, 119, 119, 100);
-		font-size: 12px
-	}
-
-	.btn {
-		width: 60px;
-		height: 24px;
-		line-height: 20px;
-		border-radius: 4px;
-		background-color: rgba(255, 255, 255, 100);
-		font-size: 14px;
-		text-align: center;
-		float: right;
-		margin-right: 24px;
-		margin-top: 12px;
-	}
-// 待确认按钮
-	.toBe-confirmed {
-
-		color: rgba(78, 141, 246, 100);
-		border: 1px solid rgba(78, 141, 246, 100);
-
-	}
-// 已确认按钮
-	.confirmed {
-		border: 1px solid rgba(0, 185, 98, 100);
-		color: rgba(0, 185, 98, 100);
-
-	}
-// 已取消按钮
-	.canceled {
-		border: 1px solid rgba(153, 153, 153, 100);
-		color: rgba(153, 153, 153, 100);
-		;
-	}
-// 已过期/已完成按钮
-	.have-expired,.finished{
-		color: rgba(162, 169, 181, 100);
-		border: 1px solid rgba(162, 169, 181, 100);
-	}
-	
-	// 已拒绝
-	.refused{
-		color: rgba(255, 79, 63, 100);
-		border: 1px solid rgba(255, 79, 63, 100);
-	}
-	.reservation-items {
-		width: 100%;
-		background-color: #fff;
-		padding-left: 14px;
-		margin-bottom: 12px;
-
-		.station-name {
-			line-height: 48px;
-			color: rgba(16, 16, 16, 100);
-			font-size: 20px
-		}
-
-		.details-items {
-			border: 1px solid rgba(238, 242, 240, 100);
-			border-left: none;
-			padding-bottom: 13px;
-
-			.items {
-				display: flex;
-				justify-content: space-between;
-				padding: 12px 14px 0px 0;
-				line-height: 20px;
-			}
-
-		}
-
-		
-
-		.button {
-			height: 56px;
-			padding: 12px 0;
-
-			/deep/.u-btn {
-				height: 32px;
-				line-height: 32px;
-				background-color: rgba(255, 255, 255, 100);
-				color: rgba(153, 153, 153, 100);
-				font-size: 16px;
-				text-align: center;
-				float: right;
-				margin-right: 16px;
-			}
-      .refuse,.delete{
-		  color: #999999;
-	  }
-		.contact,.affirm{
-			color: #00b962;
-		}
-			
-
-			
-		}
-	}
-</style>

pagesFinance/preengaged/preengagedListDetails.vue

@@ -1,461 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="预约单详情" :custom-back="customback"  >
-
-		</u-navbar>
-		
-		<u-alert-tips type="warning" v-if="detail.chargingAppointment.status == '0'" :description="description"></u-alert-tips>
-		<view class="reverse-time">
-			<view class="time" v-if="detail.chargingAppointment.status == '0'">
-				预留{{detail.chargingAppointment.reserveMinutes}}分钟
-			</view>
-			<view class="time" v-if="detail.chargingAppointment.status == '1'">
-				预留{{detail.chargingAppointment.reserveMinutes}}分钟
-				<view class="img-box">
-					<img src="../../assets/img/finished.png" alt="">
-				</view>
-			</view>
-			<view class="time" v-if="detail.chargingAppointment.status == '3'">
-				预留{{detail.chargingAppointment.reserveMinutes}}分钟
-				<view class="img-box">
-					<img src="../../assets/img/canc.png" alt="">
-				</view>
-			</view>
-			<view class="time" v-if="detail.chargingAppointment.status == '2'">
-				预留{{detail.chargingAppointment.reserveMinutes}}分钟
-				<view class="img-box">
-					<img src="../../assets/img/f.png" alt="">
-				</view>
-			</view>
-			<view class="time refused" v-if="detail.chargingAppointment.status == '4'">
-				{{detail.chargingAppointment.statusText}}
-			</view>
-			<view class="time refused" v-if="detail.chargingAppointment.status == '5'">
-				{{detail.chargingAppointment.statusText}}
-			</view>
-			<view class="time refused" v-if="detail.chargingAppointment.status == '6'">
-				{{detail.chargingAppointment.statusText}}
-			</view>
-			<view class="details-item">
-				<view class="item">
-					<view class="item-name">
-						预约单号
-					</view>
-					<view class="item-content">
-						{{detail.chargingAppointment.flowNo}}
-					</view>
-				</view>
-				<view class="item">
-					<view class="item-name">
-						预计开始充电
-					</view>
-					<view class="item-content">
-						{{detail.chargingAppointment.endTime}}
-					</view>
-				</view>
-				<view class="item">
-					<view class="item-name">
-						预计充电时长
-					</view>
-					<view class="item-content">
-						{{(detail.chargingAppointment.estimateMinutes/60).toFixed(1)}}小时
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- 充电桩详情 -->
-		<view class="charge-pile">
-			<view class="tel">
-			
-			</view>
-			<view class="box">
-				<view class="name ellipsis">
-					{{detail.chargingDevice.stationName}}/{{detail.chargingDevice.name}}
-				</view>
-				<view class="address ellipsis">
-					{{detail.chargingDevice.address}}
-				</view>
-			</view>
-			<view class="tel">
-
-			</view>
-			<view class="details-item">
-				<view class="item">
-					<view class="item-name">
-						预约单生成时间
-					</view>
-					<view class="item-content">
-						{{detail.chargingAppointment.createTime}}
-					</view>
-				</view>
-				<view class="item">
-					<view class="item-name">
-						电费单价
-					</view>
-					<view class="item-content">
-						{{detail.price.electricityPrice.toFixed(2)}}元/度
-					</view>
-				</view>
-				<view class="item">
-					<view class="item-name">
-						充电服务费
-					</view>
-					<view class="item-content">
-						{{detail.price.servicePrice.toFixed(2)}}元/度
-					</view>
-				</view>
-				<view class="item" v-if="detail.chargingAppointment.status == '2'">
-					<view class="item-name">
-						充电订单信息
-					</view>
-					<view class="item-content" @click="gotoUrl('pages/charge/chargeDetails?id='+detail.chargingRecord.id)" style="color: #00B962;">
-						查看
-					</view>
-				</view>
-				<view class="item" v-if="detail.chargingAppointment.status == '4'">
-					<view class="item-name">
-						拒绝时间
-					</view>
-					<view class="item-content">
-						{{detail.chargingAppointment.confirmTime}}
-					</view>
-				</view>
-				<view v-if="detail.chargingAppointment.status == '3'">
-					<view class="item">
-						<view class="item-name">
-							取消时间
-						</view>
-						<view class="item-content">
-							{{detail.chargingAppointment.confirmTime}}
-						</view>
-					</view>
-					<view class="item">
-						<view class="item-name">
-							取消类型
-						</view>
-						<view class="item-content">
-							{{detail.chargingAppointment.remark}}
-						</view>
-					</view>
-				</view>
-				<view v-if="detail.chargingAppointment.status == '5'">
-					<view class="item">
-						<view class="item-name">
-							过期时间
-						</view>
-						<view class="item-content">
-							{{detail.chargingAppointment.confirmTime}}
-						</view>
-					</view>
-					<view class="item">
-						<view class="item-name">
-							过期原因
-						</view>
-						<view class="item-content">
-							{{detail.chargingAppointment.remark}}
-						</view>
-					</view>
-				</view>
-				<view v-if="detail.chargingAppointment.status == '6'">
-					<view class="item">
-						<view class="item-name">
-							过期时间
-						</view>
-						<view class="item-content">
-							{{detail.chargingAppointment.confirmTime}}
-						</view>
-					</view>
-					<view class="item">
-						<view class="item-name">
-							过期原因
-						</view>
-						<view class="item-content">
-							{{detail.chargingAppointment.remark}}
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 底部按钮 -->
-		<view class="bottom">
-			<u-button shape='circle' class="refuse-btn" v-if="detail.chargingAppointment.status == '0'" @click="refuseClick(detail.chargingAppointment)">拒绝</u-button>
-			<u-button type="success" shape='circle' v-if="detail.chargingAppointment.status == '0'" @click="sureClick(detail.chargingAppointment)">确认</u-button>
-			<!-- <u-button shape='circle' class="cancel-btn" v-if="detail.chargingAppointment.status == '4' || detail.chargingAppointment.status == '9'">删除订单</u-button> -->
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as myApi from '@/apis/my.js'
-	import {
-		hourDistanceArr,
-		currentTimeStamp,
-		parseUnixTime
-	} from '@/utils'
-	
-	export default {
-		data() {
-			return {
-				description: '等待桩主确认预约单，剩余时间04:59:59',
-				id: '',
-				isback:false,
-				detail: {},
-				estimateMinutes: '',
-			}
-		},
-		onLoad(op) {
-			if(op.notice){
-				this.isback=true
-			}
-			if(op.id) {
-				this.id = op.id;
-				this.getAppointmentDetail();
-			}
-		},
-		methods: {
-			customback(){
-				if(this.isback){
-					uni.reLaunch({
-						url:"/pagesFinance/user/index"
-					})
-				}else{
-					uni.navigateBack({
-						
-					})
-				}
-				
-			},
-			getAppointmentDetail(bl) {
-				if(!bl){
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					})	
-				}
-				myApi.merchantAppointmentDetail(this.id).then((res) => {
-					if(!bl){
-						uni.hideLoading()
-					}
-					
-					this.detail = res.data;
-					
-					if(this.detail.chargingAppointment.status=="0"){
-						//this.description= '等待桩主确认预约单，剩余时间'
-						var data=new Date(this.detail.chargingAppointment.createTime).getTime()
-						var c=hourDistanceArr(new Date(),new Date(data+5*60*1000))
-					
-						this.description= '等待桩主确认预约单，剩余时间'+c[1]+'分'+c[2]+"秒";		
-						
-						
-						setTimeout(()=>{
-							this.getAppointmentDetail(true);
-						},2000)
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			sureClick(item) {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				myApi.merchantChangeStatus({
-					id: item.id,
-					status: '1'
-				}).then((res) => {
-					uni.hideLoading();
-					this.id = item.id;
-					this.getAppointmentDetail();
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			refuseClick(item) {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				myApi.merchantChangeStatus({
-					id: item.id,
-					status: '4'
-				}).then((res) => {
-					uni.hideLoading();
-					this.id = item.id;
-					this.getAppointmentDetail();
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-	page{
-		padding-bottom: 151px;
-		background-color: #f6f8f6;
-	}
-	.tittle-font {
-
-		font-size: 24px;
-		position: fixed;
-		top: 12px;
-		right: 16px;
-		z-index: 99999;
-
-	}
-
-	/deep/.u-alert-desc {
-		width: 100vw;
-		text-align: center;
-		color: #ff5a00;
-	}
-
-	.reverse-time {
-		background-color: #fff;
-		padding: 36px 12px 16px 28px;
-
-		.time {
-			height: 36px;
-			color: rgba(0, 185, 98, 100);
-			font-size: 36px;
-			text-align: center;
-			position: relative;
-			.img-box{
-				width: 72px;
-				height: 72px;
-				img{
-					width: 72px;
-					height: 72px;
-					position: absolute;
-					top: -12px;
-					right: -2px;
-				}
-			}
-		}
-		.refused{
-			color: #666666;
-		}
-		
-
-	}
-
-	.details-item {
-		margin-top: 40px;
-		padding-right: 16px;
-		padding-bottom: 12px;
-
-		.item {
-			display: flex;
-			justify-content: space-between;
-			margin-top: 8px;
-		}
-	}
-
-	// 充电桩详情
-	.charge-pile {
-		background-color: #fff;
-		margin-top: 12px;
-		padding: 0 0 12px 16px;
-
-		.box {
-			position: relative;
-			height: 66px;
-			padding: 12px 0;
-
-			.more {
-				position: absolute;
-				top: 19px;
-				right: 12px;
-				font-size: 24px;
-				color: #b3b3b3;
-			}
-		}
-	
-		.name {
-			width: 90%;
-			line-height: 18px;
-			color: rgba(16, 16, 16, 100);
-			font-size: 18px;
-			font-weight: 600;
-		}
-		.ellipsis{
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			overflow: hidden;
-		}
-
-		.address {
-			width: 90%;
-			line-height: 20px;
-			color: rgba(51, 51, 51, 100);
-			margin-top: 4px;
-		}
-
-		// 联系电话
-		.tel {
-			line-height: 48px;
-			display: flex;
-			justify-content: space-between;
-			border: 1px solid #eef2f0;
-			border-left: none;
-			position: relative;
-
-			.tel-num {
-				width: 50%;
-			}
-
-			.more2 {
-				display: inline-block;
-				font-size: 24px;
-				color: #b3b3b3;
-				height: 48px;
-				position: absolute;
-				top: 1px;
-				right: 12px;
-
-			}
-		}
-
-		.item {
-			margin-top: 20px;
-		}
-	}
-
-
-// 按钮
-.bottom{
-	width: 100%;
-	height: 56px;
-	position: fixed;
-	bottom: 0;
-	background-color: #fff;
-	display: flex;
-	.refuse-btn{
-		background-color: #DBDBDB;
-	}
-	.u-btn{
-		width: 44%;
-		height: 40px;
-		margin: auto;
-		font-size: 18px;
-		
-	}
-	.cancel-btn{
-		width: 91.4%;
-		background-color: #dbdbdb;
-		color: #666666
-	}
-}
-</style>

pagesFinance/recordOfInvoice/applicationDetails.vue

@@ -1,127 +0,0 @@
-<template>
-	<view >
-		<u-navbar title="发票详情"></u-navbar>
-		<view class="price" v-if="invoiceInfo">
-			<view class="num">
-				{{invoiceInfo.amount.toFixed(2)}}元
-			</view>
-			<view class="text" >
-				发票金额
-			</view>
-		</view>
-		
-		<u-cell-group v-if="invoiceInfo">
-				<u-cell-item  title="开票状态" :arrow="false">
-					<text class="success"
-					:class="{
-						 success:invoiceInfo.status==2,
-						invoicing:invoiceInfo.status==1
-					}"
-					>{{invoiceInfo.statusText}}</text>
-					<!-- <text class="invoicing">开票中</text> -->
-				</u-cell-item>
-			<!-- 	<u-cell-item  title="发票代码" :arrow="false" :value="invoiceInfo.code"></u-cell-item>
-				<u-cell-item  title="发票号码" :arrow="false" :value="invoiceInfo.number"></u-cell-item>
-			 --><u-cell-item  title="所属站点" :arrow="false" :value="invoiceInfo.stationName"></u-cell-item>
-					<u-cell-item  title="充电度数" :arrow="false" :value="invoiceInfo.totalElectricQuantity/10000+'度'"></u-cell-item>
-				<u-cell-item  title="充电笔数" :arrow="false" :value="invoiceInfo.recordNum+'笔'"></u-cell-item>
-				
-				
-					<u-cell-item  title="发票类型":arrow="false" :value="invoiceInfo.headerType=='1'?'企业单位':'个人/非企业单位'"></u-cell-item>
-					<u-cell-item  title="发票抬头" :arrow="false"  :value="invoiceInfo.title"></u-cell-item>
-					<u-cell-item  title="发票税号" :arrow="false" :value="invoiceInfo.companyTaxNo?invoiceInfo.companyTaxNo:'--'"></u-cell-item>
-					<u-cell-item  title="开票时间" :arrow="false"  :value="invoiceInfo.invoicingTime"></u-cell-item>
-			</u-cell-group>
-		<!-- 	<u-cell-item style="background-color: #fff;"  title="发票预览":arrow="false">
-				<text class="success">查看</text>
-			</u-cell-item> -->
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				id: '',
-		
-				invoiceInfo:null,
-			}
-		},
-		onLoad(op) {
-			if(op.id) {
-				this.id = op.id;
-				this.invoiceDetail();
-			}
-			
-			
-		},
-		methods: {
-		
-			invoiceDetail() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})		
-				API.merchantInvoiceDetail({
-					invoiceId:this.id
-				}).then((res) => {
-					uni.hideLoading();
-					this.invoiceInfo=res.data.invoiceInfo;
-				
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		padding-bottom: 50px;
-		background-color: #F2F4F4;  
-	}
-	.price{
-		background-color: #fff;
-		padding: 24px 0;
-		text-align: center;
-		.num{
-			line-height: 36px;
-			color: rgba(16, 16, 16, 100);
-			font-size: 36px;
-		}
-		.text{
-			color: rgba(102, 102, 102, 100);
-			font-size: 16px;
-			margin-top: 4px;
-		}
-		
-	}
-	.success{
-		color: #00b962;
-		font-size: 16px;
-		margin-top: 4px;
-	}
-	.invoicing{
-		color: #ff6100;
-	}
-	/deep/.u-cell-box{
-		margin: 12px 0;
-		
-	}
-	/deep/.u-cell__value,/deep/.u-cell_title{
-		font-size: 18px 
-	}
-	/deep/.u-cell_title{
-		color: #666666;
-	}
-	/deep/.u-cell__value{
-		color: #101010;
-	}
-	
-</style>

pagesFinance/recordOfInvoice/invoicePreview.vue

@@ -1,42 +0,0 @@
-<template>
-	<view >
-		<u-navbar title="发票预览"></u-navbar>
-		
-		<view class="img-box">
-			<img src="../../static/img/preview.png" alt="">	
-		</view>
-		
-		<view class="btn">
-			<u-button shape="circle" style="color: #00b962;">下载图片</u-button>
-			<u-button shape="circle" type="success">下载PDF</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-</script>
-
-<style lang="scss" scoped>
-	page{
-		background-color: #fff;
-	}
-	.img-box{
-		margin-bottom: 20px;
-		width: 100%;
-		height: 238px;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-	}
-	
-	.btn{
-		margin: 0 40px;
-		display: flex;
-		.u-btn{
-		width: 37.8vw;	
-	
-		line-height: 44px;
-		}
-	}
-</style>

pagesFinance/recordOfInvoice/recordOfInvoice.vue

@@ -1,254 +0,0 @@
-<template>
-	<view >
-		<u-navbar title="申请开票记录">
-			
-		</u-navbar>
-	
-	
-			<u-tabs  inactive-color="#888888" active-color="#101010" :list="list" :is-scroll="true"
-					:current="current" @change="change"></u-tabs>
-					
-					<view style="text-align: center;margin-top: 100px" v-if="list[current].list.length == 0" >
-						<img src="@/assets/img/blankpage.png">
-						<view>查询为空</view>
-					</view>
-<!-- 待开票 -->
-      <view :class="{
-		  'not-invoiced':current==0,
-		   'invoiced':current==1,
-	  }">
-	  	<view class="invoiced-item" v-for="(item,index) in list[current].list"
-		 @tap="view(item.id)"
-		 :key="index" >
-	  		<view class="content"  >
-	  			<view class='title' 
-				:class="{
-					 success:item.status==2,
-					error:item.status==1
-				}"
-				>
-	  				用户充电订单发票 <text class="to-invoice">{{item.statusText}}</text>
-	  			</view>
-	  			<p><text class="text-1">发票金额</text> <text class="text-2">{{item.amount.toFixed(2)}}元</text></p>
-	  			<p><text class="text-1">发票抬头</text><text class="text-2">{{item.title}}</text></p>
-	  			<p><text class="text-1">申请时间</text> <text class="text-2">{{item.createTime}}</text></p>
-	  		</view>
-	  	</view>
-		
-		<p class="tips" v-show="current==1" > 仅展示最近12个月的发票信息</p>
-		
-      </view>
-	 
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				list: [{
-					value:1,
-					name: '待开票',
-					pageIndex: 1,
-					recordsTotal: 0,
-					list:[],
-				}, {
-					value:2,
-					name: '已开票',
-					pageIndex: 1,
-					recordsTotal: 0,
-					list:[],
-				}],
-				
-				current: 0,
-				
-			}
-		},
-		onReachBottom() {
-			var list=this.list[this.current].list;
-			var recordsTotal=this.list[this.current].recordsTotal;
-			
-			if (list.length < recordsTotal) {			
-				this.myLoadmore();
-			}
-		},
-		onShow(){
-			this.allck=false;
-			this.getlist(true);
-		},
-		methods: {
-			view(id){
-				uni.navigateTo({
-					url:'/pagesFinance/recordOfInvoice/applicationDetails?id='+id
-				})
-			},
-			getlist(bl) {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				var current=this.current;
-				var pageIndex=this.list[current].pageIndex;
-				var list=this.list[current].list;
-				if (bl) {
-					 list = [];
-					pageIndex = 1;
-				}
-			 
-				API.merchantInvoiceList({
-					pageIndex: pageIndex,
-					status:this.list[current].value,
-				
-				}).then((res) => {
-					uni.hideLoading();
-					
-					var datalist=[]
-					datalist=res.data.data;
-				
-					
-				
-					this.list[current].list = [
-						...list,
-						...datalist
-					];
-					this.list[current].recordsTotal = res.data.recordsTotal;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			myLoadmore() {
-				var pageIndex=this.list[this.current].pageIndex;
-				
-				pageIndex += 1;
-				this.getlist()
-			},
-			change(index) {
-				this.current = index;
-				var list =this.list[this.current].list
-				if(list.length==0){
-					this.getlist(true);
-				}
-			},
-				
-	},
-	}
-</script>
-
-<style lang="scss" scoped>
-	page{
-		background-color: #F2F4F4;  
-	}
-	
-	/deep/.u-scroll-box{
-		 width: 65.8% !important;
-		 margin: 0 auto;
-		 display: flex;
-		 
-	}
-	/deep/.u-tab-bar{
-		width: 18% !important;
-		left: -5% !important;
-		background-color: #00B962 !important; }
-	
-	// 未开票
-	.flex{
-		display: flex;
-	}
-	.not-invoiced-item,.invoiced-item{
-		width: 91.4%;
-		border-radius: 12px;
-		background-color: rgba(255, 255, 255, 100);
-		border: 1px solid rgba(235, 235, 235, 100);
-		padding: 16px 0;
-		padding-left: 18px;
-		margin:12px auto;
-		
-	}
-	.content{
-		width: 100%;
-		margin-left: 4px;
-		.title{
-			line-height: 18px;
-			color: rgba(16, 16, 16, 100);
-			font-size: 16px;
-			margin-bottom: 12px;
-			padding-right: 12px;
-			display: flex;
-			justify-content: space-between;
-			.price,.invoice,.have-invoiced{
-				height: 18px;
-				color: rgba(255, 61, 0, 100);
-				font-size: 18px;
-				
-			}
-			
-		}
-		.error{
-			color: #FF6100;
-		}
-		.success{
-			color: #00b962;
-		}
-		
-		p{
-			color: rgba(102, 102, 102, 100);
-			line-height: 26px;
-			
-		}
-		.text-1{
-			display: inline-block;
-			width: 17vw;
-			
-		}
-		.text-2{
-			display: inline-block;
-			margin-left:4px;
-			width:54.6vw;
-			
-		}
-		.order-box{
-			
-			display: flex;
-			.order{
-				width: 17vw;
-			}
-			.order-num{
-				flex: 1;
-				margin-left:4px;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				
-			}
-		}
-		
-	}
-	.radio{
-		margin: auto 0;
-		/deep/.uni-radio-input{
-			width: 20px !important;
-			height: 20px !important;
-		}
-	}
-	
-	
-	.to-invoice{
-		//color:#FF6100!important;
-		font-size: 18px
-	}
-	.have-invoiced{
-		//color: #00B962!important;
-		font-size: 18px
-	}
-	.tips{
-		color: rgba(153, 153, 153, 100);
-		text-align: center;
-	}
-	
-	
-</style>

pagesFinance/share/details.vue

@@ -1,319 +0,0 @@
-<template>
-	<view>
-		<u-navbar >分润详情</u-navbar>
-		<view class="details" v-if="detail">
-			<view class="details-head">
-<!-- 				<u-icon name="charging-pile-fill" custom-prefix="custom-icon" color="#27B148" size="48"></u-icon>
- -->				<h4>{{detail.flowNo?detail.flowNo:'无充电单号'}}</h4>
-			</view>
-			<view class="details-main">
-				<view class="details-price">
-					<h3>{{detail.income.toFixed(2)}}<span>元</span></h3>
-				</view>
-				<p>分润金额</p>
-			</view>
-	
-		<view class="details-row"   v-if="detail.deviceType"   ><p>订单类型 </p><span>{{options0[detail.deviceType].label}}
-		</span></view>
-			<view class="details-row" >
-				<p>订单金额</p>
-				<span>{{detail.actualFee.toFixed(2)}}元</span>
-			</view>
-			<view class="details-row"  v-if="detail.deviceType!='0'"  >
-				<p>电费金额</p>
-				<span>{{detail.electricityAmount.toFixed(2)}}元</span>
-			</view>
-			<view class="details-row"   v-if="detail.deviceType!='0'"  >
-				<p>服务费</p>
-				<span>{{detail.surplusAmount.toFixed(2)}}元
-				
-			<!-- 	<span>{{detail.surplusAmount-detail.discountAmount.toFixed(2)}}元 -->
-<!-- 				<span v-if="couponObj&&couponObj.status=='1'">({{detail.surplusAmount}}-{{detail.discountAmount}})</span>
- -->				
-				</span>
-			</view>
-			<view class="details-row" v-if="couponObj&&couponObj.status=='1'" >
-				<p>优惠券 </p>
-				<span>
-					{{couponObj.useText}}	
-				</span>
-			</view>
-			
-		<view class="details-row" v-if="detail.discountAmount" >
-			<p>实际减免</p>
-			<span>
-				-{{detail.discountAmount.toFixed(2)}}元
-			</span>
-		</view>
-			<view class="details-row" v-if="detail.chargingUserCardId" >
-				<p>会员活动 </p>
-				<span>
-					充电服务费包月卡	
-				</span>
-			</view>
-		</view>
-		<view class="details" v-if="detail">
-			<view class="details-title">
-				<h4>用电明细</h4>
-			</view>
-			<view class="details-row" >
-				<p>总充电量</p>
-				<span >{{detail.electricQuantity/10000}}度</span>
-			</view>
-					<view class="details-row" v-if="detail.deviceType=='0'" >
-						<p>电费单价</p>
-						<span>{{detail.unitPrice.toFixed(2)}}元/小时</span>
-					</view>
-					<view class="details-row"><p>充电时长</p><span>{{getPercent(detail.chargingMinute)}}</span></view>
-					
-				<view v-for="(item,i) in chargeDetails" :key="i"   v-if="detail.deviceType!=0" >
-					<view class="details-row" style=" margin-top: 18px;" >
-						<p>区间充电量({{item.startTime}}-{{item.endTime}})</p>
-						<span >{{item.kwh }}度</span>
-					</view>
-					
-					<view class="details-row" style="display: block;" >
-						<p>
-							<span style="    color: #37393c;">区间定价</span>
-							
-							<span style="float: right; color: #333;font-weight: normal;" v-if="!item.discountServicePrice" >{{((item.electricityPrice*100+item.servicePrice*100)/100).toFixed(2)}}元/度</span>
-							<span style="float: right; color: #333;font-weight: normal;" v-if="item.discountServicePrice" >{{((item.electricityPrice*100+item.discountServicePrice*100)/100).toFixed(2)}}元/度 <span style="text-decoration:line-through;margin-left: 3px;">{{((item.electricityPrice*100+item.servicePrice*100)/100).toFixed(2)}}元/度</span></span>
-							
-						</p>
-							<span class="details-row-sum"  v-if="!item.discountServicePrice" >{{item.electricityPrice.toFixed(2)}}元/度(电费)+{{item.servicePrice.toFixed(2)}}元/度(服务费) </span>
-							<span class="details-row-sum" style="float:none" v-if="item.discountServicePrice"  >电费{{item.electricityPrice.toFixed(2)}}元/度|服务费{{item.discountServicePrice.toFixed(2)}}元/度(折前{{item.servicePrice.toFixed(2)}}元/度) </span>
-											
-					</view>
-				</view>
-		</view>
-		
-		<view class="details">
-			<view class="details-title">
-				<h4>分润明细</h4>
-			</view>
-			<view class="details-row" v-for="(item,i) in frmxList" :key="i" v-if="item.disProportion" >
-				<p>{{item.merchantAccountName}}({{(item.disProportion*100).toFixed(2)}}%)</p>
-				<span>{{item.shareProfitAmount.toFixed(2)}}元</span>
-			</view>
-		
-		</view>
-		
-		<view class="details" v-if="detail">
-			<view class="details-title">
-				<h4>更多信息</h4>
-			</view>
-			<view class="details-row"><p>来源站点</p><span>{{detail.stationName}}</span></view>
-			<view class="details-row"><p>来源充电桩</p><span>{{detail.deviceName}}</span></view>
-			<view class="details-row" ><p>桩号</p><span>{{detail.deviceNo}}</span></view>
-			<view class="details-row" v-if="detail.deviceType!='0'" ><p>枪号</p><span>{{detail.gunNo}}号充电枪</span></view>
-			<view class="details-row" v-if="detail.deviceType=='0'" ><p>通道号</p><span>{{detail.gunNo}}号</span></view>
-			
-			<view class="details-row"><p>发放时间</p><span>{{detail.createTime}}</span></view>
- 		<view class="details-row"   ><p>订单来源 </p><span>{{detail.chargingRecord?detail.chargingRecord.platformText:''}}</span></view>
- 		
-		
-		</view>
-		<view class="detailsBtn">
-			<u-button class="detailsBtn-btn" @click="back" type="primary" plain>返回</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				options0: [
-				
-					{
-						label: '自行车充电',
-						value: 0,
-					},
-					{
-						label: '直流快充',
-						value: 1,
-					},
-					{
-						label: '交流慢充',
-						value: 2,
-					}
-					
-				],
-				chargeDetails:[],
-				data:{},
-				id:'',
-				frmxList:[
-					
-				],
-				couponObj:null,
-				detail:null,
-				title:"",
-				 
-			}
-		},
-		onLoad(op){
-			
-			this.data.detailId=op.id;
-			this.getInfo()
-		},
-		methods: {
-			getPercent(estimateMinute) {
-				var value="";
-				 
-				var ms =estimateMinute
-				if (ms > 0) {
-					var Hour = parseInt(Math.floor(ms / 60 ));
-					var Fen = parseInt(Math.floor(ms % 60 ));	
-				//	value = Hour + "小时"  + Fen+"分钟"
-					if(Hour){
-						value += Hour + "小时" 
-					}
-						
-					if(Fen){
-						value += Fen+"分钟"
-					}
-				}
-			
-				return value;
-			},
-			showDateMoth(date){
-				
-				var back=date;
-				if(date){
-					var k=	date.slice(5,6)
-					console.log(k)
-					if(k=='0'){
-						back=	date.slice(6,7)
-					}else{
-						back=	date.slice(5,7)
-					}
-					
-					
-				}
-				return back;
-			},
-		 
-			back(){
-				uni.navigateBack({
-					
-				})
-			},
-			getInfo(){
-				uni.showLoading({
-					title:"加载中",mask:true,
-				})
-				API.recordDetailData(this.data).then((res) => {
-					this.detail=res.data
-						this.couponObj=res.data.userCoupon;
-						
-					 this.chargeDetails=JSON.parse(res.data.ChargeDetails)
-					 console.log( this.chargeDetails)
-					this.frmxList=res.data.detailList	 
-					uni.hideLoading()
-					 
-				}).catch(error => {
-						uni.showToast({
-							
-							title:error
-						})
-				})
-			}
-		}
-	}
-</script>
-<style>
-	page{
-		background-color: #F7F7F7;
-	}
-</style>
-<style lang="scss" scoped>
-	.detailsBtn{
-		margin: 16px;
-		.detailsBtn-btn{
-			border-color:#185AC6!important;
-			border-radius: 8px!important;
-			background: none!important;
-			color:#185AC6!important;
-		}
-	}
-	.details-title{
-		margin-bottom: 16px;
-		h4{
-			font-weight: normal;
-			font-size: 16px;
-			position: relative;
-			padding-left:10px;
-			&::after{
-				content: '';
-				position: absolute;
-				height: 12px;
-				width: 4px;
-				background-color: #27B148;
-				left: 0;
-				top:5px;
-			}
-		}
-	}
-	.details-row{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 15px;
-	
-				p{
-					color: #37393c;
-					font-weight: bold;	
-				}
-
-	}
-	.details-row-sum{
-		float: right;
-		color: #888;
-		font-size: 24rpx;
-	
-	}
-	.details{
-		margin: 34rpx;
-		padding: 34rpx;
-		background-color: #fff;
-		border-radius: 8px;
-		.details-head{
-			text-align: center;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			h4{
-				font-size: 18px;
-				font-weight: normal;
-				margin-left: 4px;
-			}
-		}
-		.details-price{
-			margin-top: 28px;
-			display: flex;
-			align-items: flex-end;
-			justify-content: center;
-			h3{
-				font-size: 36px;
-				color:#27B148;
-				line-height: 36px;
-				margin: 0  4px;
-				font-weight: normal;
-			}
-			span{
-				font-size: 20px;
-				color:#27B148;
-			}
-		}
-		.details-main{
-			text-align: center;
-			margin-bottom: 20px;
-			p{
-				color:#777;
-				margin-top: 4px;
-			}
-		}
-	}
-</style>

pagesFinance/share/index.vue

@@ -1,695 +0,0 @@
-<template>
-	<view>
-		<u-navbar :is-back="false">
-			<view class="navbar">
-				<view class="navbar-tit">分润记录</view>
-				<view class="navbar-screen" v-show="current==0" @click="popupShow = true"><span>筛选</span>
-					<u-icon name="filter-2-fill" custom-prefix="custom-icon" color="#b0b8c8" size="32"></u-icon>
-				</view>
-			</view>
-		</u-navbar>
-		<u-popup v-model="popupShow" mode="top" height="80%">
-			<view class="popup-screen">
-				<view class="screen">
-					<view class="screen-item">
-						<view class="screen-head">查询日期</view>
-						<view class="screen-main2">
-
-							<u-calendar v-model="showdate" mode="date" @change="changedate"></u-calendar>
-
-							<u-input :value="queryDate?queryDate:'选择时间筛选'" :type="type" :border="border"
-								@click="showdate = true" />
-							<!-- 	
-							<u-action-sheet :list="actionSheetList" v-model="show" @click="actionSheetCallback"></u-action-sheet>
-						 -->
-						</view>
-					</view>
-					<view class="screen-item">
-						<view class="screen-head">充电桩类型</view>
-						<view class="screen-main">
-							<view :class="{
-								active:selecttype==''
-							}" @click="selecttype=''" class="screen-entry ">全部</view>
-							<view :class="{
-								active:selecttype=='0'
-							}" @click="selecttype='0'" class="screen-entry type1">自行车充电</view>
-							<view :class="{
-								active:selecttype=='2'
-							}" @click="selecttype='2'" class="screen-entry type3">交流慢充</view>
-							<view :class="{
-								active:selecttype=='1'
-							}" @click="selecttype='1'" class="screen-entry type2">直流快充</view>
-						</view>
-					</view>
-					<view class="screen-item">
-						<view class="screen-head">站点</view>
-						<view class="screen-main">
-							<view class="screen-entry  " :class="{
-								active:selectstationId==''
-							}" @click="selectstationId=''">全部</view>
-							<view v-for="(item,i) in stationList" :key="i" :class="{
-								active:selectstationId==item.id
-							}" @click="selectstationId=item.id,selectdeviceNo=''" class="screen-entry">{{item.name}}</view>
-
-						</view>
-					</view>
-					<view class="screen-item">
-						<view class="screen-head">桩号</view>
-						<view class="screen-main">
-
-							<view class="screen-entry  " :class="{
-								active:selectdeviceNo==''
-							}" @click="selectdeviceNo=''">全部</view>
-							<view v-for="(item,i) in stationListSon" :key="i"
-								v-show="selectstationId?(selectstationId==item.stationId):true" :class="{
-								active:selectdeviceNo==item.deviceNo
-							}" @click="selectdeviceNo=item.deviceNo" class="screen-entry">{{item.name}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="screen-foot">
-					<view class="screen-btn-l" @click="resetBtn">重置</view>
-					<view class="screen-btn-r" @click="okbtn">确定</view>
-				</view>
-			</view>
-		</u-popup>
-		<u-tabs :list="tabList"  bar-width="100"  :is-scroll="false" :current="current" @change="change" inactive-color="#acb2af"
-
-			active-color="#101010"></u-tabs>
-		<!-- 充电订单 -->
-		<view class="detailed" v-show="current==0">
-			<view style="text-align: center;margin-top: 100px" v-if="!list.length">
-				<img src="@/assets/img/blankpage.png">
-				<view>查询为空</view>
-			</view>
-
-			<view class="detailed-list" v-for="(item ,index) in list"
-				@click="gotoUrl('pagesFinance/share/details?id='+item.id)" :key="index">
-
-				<view class="detailed-time" v-if="item.show">
-					<p>{{item.showtime}}</p>
-
-					<p>共收{{showMap.get(item.showtime).num}}笔,{{showMap.get(item.showtime).amount.toFixed(2)}}元</p>
-
-				</view>
-				<view class="detailed-item">
-					<view class="detailed-item-name" style="
-								    width: 70%;
-							">
-						<h2 class="showName">{{item.stationName}}/{{item.deviceName}}</h2>
-					
-						<p 
-						v-if="item.chargingRecord"
-						:style="{
-							color:colorList[item.chargingRecord.platform%3]
-						}">{{item.chargingRecord.platformText}}</p>
-					</view>
-					<view class="detailed-item-name" style="
-								min-width: 60px;
-								width: 30%;
-							">
-
-						<h2 style="   text-align: end;">{{item.shareProfitAmount.toFixed(2)}}元</h2>
-						<p style="   text-align: end;">{{item.createTime?item.createTime.slice(10):''}}</p>
-					</view>
-				
-					<view class="sign" v-if="item.status=='1'">
-						<img src="../../assets/img/tixian.png" alt="">
-					</view>
-				</view>
-
-				
-			</view>
-			<u-divider v-if="list.length&&list.length == recordsTotal" color="#B6BDC3" style="margin-top:20px;"
-				bg-color="#f7f7f7">已经到底了</u-divider>
-		</view>
-		
-		<!-- 包月卡 -->
-		<view  class="detailed" 
-		style="    padding-bottom: 20px;" v-show="current==1">
-			<view style="text-align: center;margin-top: 100px" v-if="!list2.length">
-				<img src="@/assets/img/blankpage.png">
-				<view>查询为空</view>
-			</view>
-			
-			<view class="detailed-list"  v-for="(item ,index) in list2" 
-			@click="gotoUrl('pagesFinance/share/monthlyCardDetails?id='+item.id)"
-			
-			:key="index"
-			>
-
-				<view class="detailed-time"  v-if="item.show" >
-					<p>{{item.showtime}}</p>
-							<!-- {{showMap2.get(item.showtime).num}}笔, -->
-					<p v-if="showMap2">共收{{showMap2.get(item.showtime).amount.toFixed(2)}}元</p>
-							
-				</view>
-				<view class="detailed-item">
-					<view class="detailed-item-name" style="
-								    width: 70%;
-							">
-						<h2 class="showName" v-if="item.stationName">{{item.stationName}}/{{item.deviceName}}</h2>
-						<h2 class="showName" v-else>平台收益</h2>
-						<p>{{item.regUserCardNo}}</p>
-					</view>
-					<view class="detailed-item-name" style="
-								min-width: 60px;
-								width: 30%;
-							">
-
-						<h2 style="   text-align: end;">{{item.shareProfitAmount.toFixed(2)}}元</h2>
-						<p style="   text-align: end;">{{item.stationName?item.stationProportion:item.disProportion}}%</p>
-					</view>
-					<view class="sign" v-if="item.status==2">
-						<img src="../../assets/img/tixian.png" alt="">
-					</view>
-				</view>
-				
-				
-			</view>
-			<u-divider v-if="list2.length&&list2.length == recordsTotal2" color="#B6BDC3" style="margin-top:20px;" bg-color="#f7f7f7">已经到底了</u-divider>
-			
-		</view>
-		<Tabbar ref="tabbarMain" :current="2"></Tabbar>
-	</view>
-</template>
-
-<script>
-	import Tabbar from '@/components/TabbarFinance.vue'
-	import * as API from '@/apis/finance.js'
-	import {
-
-		currentTimeStamp,
-		parseUnixTime
-	} from '@/utils'
-
-	export default {
-		data() {
-			return {
-				showdate: false,
-				startTime: "",
-				queryDate: "",
-				endTime: "",
-				selecttype: "",
-				selectstationId: "",
-				selectdeviceNo: "",
-				title: "",
-				year: "",
-				startyear: "",
-				endyear: "",
-				current: 0,
-				tabList: [{
-					name: '分润记录'
-				}, {
-					name: '月卡分润'
-				}],
-				params: {
-					year: true,
-					month: false,
-					day: false,
-					hour: false,
-					minute: false,
-					second: false,
-					// timestamp: true,
-				},
-				colorList:["#00B962","#1677FF","#eb372a"],
-				form: {
-
-				},
-
-				pageIndex: 1,
-				recordsTotal: 0,
-				list: [],
-				pageIndex2: 1,
-				recordsTotal2: 0,
-				list2: [],
-				showMap2:null,
-				popupShow: false,
-				tabbarList: [{
-						iconPath: "bar-chart-box-fill",
-						selectedIconPath: "bar-chart-box-fill",
-						text: '统计',
-						count: 0,
-						isDot: true,
-						customIcon: true,
-					},
-					{
-						iconPath: "article-fill",
-						selectedIconPath: "article-fill",
-						text: '明细',
-						midButton: true,
-						customIcon: true,
-					},
-					{
-						iconPath: "account-pin-box-fill",
-						selectedIconPath: "account-pin-box-fill",
-						text: '我的',
-						count: 0,
-						isDot: false,
-						customIcon: true,
-					},
-				],
-				showMap: null,
-				//current: 0,
-				value: '',
-				type: 'select',
-				show: false,
-				border: true,
-				stationList: [],
-				stationListSon: [],
-				actionSheetList: [{
-						text: '男'
-					},
-					{
-						text: '女'
-					},
-					{
-						text: '保密'
-					}
-				],
-			}
-		},
-		components: {
-			Tabbar
-		},
-		onShow() {
-			if (this.$refs.tabbarMain) {
-				this.$refs.tabbarMain.setcount(2);
-			}
-		},
-		onReachBottom() {
-			this.myLoadmore();
-		},
-		onLoad() {
-			// this.queryDate=parseUnixTime(new Date(),"{y}-{m}-{d}")
-
-			this.startyear = new Date().getFullYear()
-			console.log(this.startyear)
-			this.endyear = this.startyear - 3
-			console.log(this.endyear)
-		},
-		onReady() {
-
-			this.getList()
-			this.getList2()
-			this.getStation()
-
-		},
-		methods: {
-			change(index) {
-				this.current = index;
-			},
-			showDateMoth(date) {
-
-				var back = date;
-				if (date) {
-					var k = date.slice(5, 6)
-					console.log(k)
-					if (k == '0') {
-						back = date.slice(6, 7)
-					} else {
-						back = date.slice(5, 7)
-					}
-
-
-				}
-				return back;
-			},
-			changedate(e) {
-				console.log(e)
-				this.queryDate = e.result
-
-
-			},
-			resetBtn() {
-				//	this.queryDate=parseUnixTime(new Date(),"{y}-{m}-{d}")
-
-				this.year = ""
-				this.startTime = ""
-				this.endTime = ""
-				this.selecttype = ""
-				this.selectstationId = ""
-				this.selectdeviceNo = ""
-				this.pageIndex = 1;
-				this.form = {
-					queryDate: "",
-
-					pageIndex: this.pageIndex,
-					type: this.selecttype,
-					stationId: this.selectstationId,
-					deviceNo: this.selectdeviceNo,
-				};
-				this.popupShow = false;
-				this.list = [];
-				this.getList()
-
-			},
-			okbtn() {
-				this.popupShow = false;
-				this.pageIndex = 1;
-
-				this.form = {
-					queryDate: this.queryDate,
-
-					pageIndex: this.pageIndex,
-					type: this.selecttype,
-					stationId: this.selectstationId,
-					deviceNo: this.selectdeviceNo,
-				};
-				this.list = [];
-				this.getList()
-			},
-			getList() {
-
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				this.form.pageIndex = this.pageIndex
-				this.form.pageSize = 20
-
-				API.recordData(this.form).then((res) => {
-
-					this.list = [
-						...this.list,
-						...res.data.data
-					];
-
-					var showMap = new Map()
-					this.list.forEach(item => {
-						var ktime = item.createTime.split(" ")[0]
-						if (showMap.has(ktime)) {
-							item.show = false;
-
-
-						} else {
-							var Amount = item.todaySPAmount
-							var num = item.todaySPNum
-							showMap.set(ktime, {
-								amount: Amount,
-								num: num
-							})
-
-							item.show = true;
-							item.showtime = ktime;
-						}
-					})
-
-					this.showMap = showMap;
-
-					this.recordsTotal = res.data.recordsTotal
-					uni.hideLoading()
-
-				}).catch(error => {
-					uni.showToast({
-
-						title: error
-					})
-				})
-			},
-			getList2() {
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-			
-				
-				API.cardProfitData({
-					pageIndex:this.pageIndex2,
-					pageSize:20
-				}).then((res) => {
-					var showMap=new Map()
-					this.showMap2=showMap;
-					this.list2 = [
-						...this.list2,
-						...res.data.data
-					];
-					
-					this.list2.forEach(item=>{
-						if(item.createTime){
-							var ktime=item.createTime.split(" ")[0]
-							if(showMap.has(ktime)){
-								item.show=false;
-							
-								
-							}else{
-								var Amount=item.todayAmount 
-								var num=0;//item.totalNum
-								showMap.set(ktime,{
-									amount:Amount,
-									num:num
-								})
-							
-								item.show=true;
-								item.showtime=ktime;
-							}
-						}
-						
-					})
-					
-					this.showMap2=showMap;
-					this.recordsTotal2 = res.data.recordsTotal
-					uni.hideLoading()
-					
-				}).catch(error => {
-					uni.showToast({
-					
-						title: error
-					})
-				})
-			},
-			getStation(bl) {
-
-				API.stationList().then((res) => {
-
-					this.stationList = res.data.stationList
-					this.stationListSon = res.data.deviceList
-				}).catch(error => {
-					uni.showToast({
-
-						title: error
-					})
-				})
-			},
-			myLoadmore() {
-
-				if(this.current==0){
-					if (this.list.length < this.recordsTotal) {
-						this.pageIndex += 1;
-						this.getList()
-					}
-					
-				}else{
-					if (this.list2.length < this.recordsTotal2) {
-						this.pageIndex2 += 1;
-						this.getList2()
-					}
-				}
-
-			},
-			// 点击actionSheet回调
-			actionSheetCallback(index) {
-				this.value = this.actionSheetList[index].text;
-			}
-		}
-	}
-</script>
-<style>
-	page {
-		background-color: #F7F7F7;
-	}
-</style>
-<style lang="scss" scoped>
-	
-
-
-	.popup-screen {
-		padding: 20px;
-		position: relative;
-
-		.screen {
-			padding-bottom: 30px;
-		}
-
-		.screen-item {
-			margin-bottom: 20px;
-            
-			.screen-head {
-				margin-bottom: 8px;
-				font-size: 16px;
-			}
-
-			.screen-main {
-				// display: -webkit-box;
-				display: flex;
-				flex-wrap: wrap;
-			}
-
-			.screen-entry {
-				width: 29%;
-				padding: 6px 0;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				background-color: #F2F5FA;
-				text-align: center;
-				margin-bottom: 10px;
-				border-radius: 3px;
-				margin-right: 6px;
-			}
-
-			.screen-entry.active {
-				background-color: #185AC6;
-				color: #fff;
-			}
-		}
-
-		.screen-foot {
-			position: fixed;
-			left: 0;
-			right: 0;
-			bottom: 0;
-			display: flex;
-			height: 50px;
-			border-top: 1px solid #ededed;
-
-			.screen-btn-l {
-				background-color: #fff;
-				flex: 0.2;
-				text-align: center;
-				line-height: 50px;
-			}
-
-			.screen-btn-r {
-				flex: 0.8;
-				text-align: center;
-				line-height: 50px;
-				background-color: #185AC6;
-				color: #fff;
-			}
-		}
-	}
-
-	.navbar {
-		display: flex;
-		justify-content: space-between;
-		flex: 1;
-		padding: 0 15px;
-	}
-
-	.navbar-tit {
-		font-size: 20px;
-	}
-
-	.navbar-screen {
-		display: flex;
-		align-items: center;
-
-		span {
-			margin-right: 2px;
-			color: #999;
-		}
-	}
-.product_tip{
-	  position: absolute;
-	  top: 0;
-	  right: 0;
-	  width: 26px;
-	  height: 26px;
-	  text-align: right;
-	  p{
-	    font-size: 12px;
-	    color: #ffffff;
-	    transform: rotate(45deg);
-	    position: relative;
-	    top: 0rpx;
-	    right: 0rpx;
-	  }
-	  .product_tip_bg{
-	    width: 0;
-	    height: 0;
-	    border-bottom: 44rpx solid #FD662A;
-	    border-right: 44rpx solid transparent;
-	    border-left: 44rpx solid transparent;
-	    transform: rotate(45deg);
-	    position: absolute;
-	    top: -7rpx;
-	    right: -29rpx;
-	  }
-	}
-	.detailed-time {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 10px 20px;
-		font-size: 16px;
-
-		p {
-			color: #666;
-		}
-	}
-
-	.detailed-item {
-		background-color: #fff;
-		display: flex;
-		justify-content: space-between;
-		padding: 10px 20px;
-		border-bottom: 1px solid #ededed;
-		position: relative;
-		.sign{
-			width: 32px;
-			height: 32px;
-			position: absolute;
-			top: 0;
-			right: 0;
-			img{
-				width: 100%;
-			}
-		}
-
-		.detailed-item-name {
-			h4 {
-				font-weight: normal;
-			}
-
-			p {
-				font-size: 15px;
-				margin-top: 4px;
-				color: #A2A9B5;
-			}
-		}
-
-		.detailed-item-num {
-			display: flex;
-			align-items: center;
-
-			h2 {
-				margin-right: 4px;
-			}
-		}
-	}
-
-	.showName {
-		font-weight: unset;
-
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-		font-size: 16px;
-	}
-
-
-	.u-tabs{
-		/deep/.uni-scroll-view-content {
-			width: 56.2% !important;
-			margin: auto;
-		}
-	}
-
-	/deep/.u-tab-bar {
-		
-		background-color: #0076FF !important;
-		
-	 }
-</style>

pagesFinance/share/monthlyCardDetails.vue

@@ -1,275 +0,0 @@
-<template>
-	<view>
-		<u-navbar>分润详情</u-navbar>
-		<view class="details">
-		
-			<view class="details-main">
-				<view class="details-price">
-					<h3>{{rentCardShareProfit.shareProfitAmount.toFixed(2)}}<span style="font-size: 12px;">元</span></h3>
-				</view>
-				<p>分润金额</p>
-				<img 
-				v-if="rentCardShareProfit.status==2"
-				class="withdraw" src="../..//assets/img/withdraw.png" alt="">
-			</view>
-		</view>
-		<view class="details">
-			
-			<view class="details-title">
-				<h4>订单明细</h4>
-			</view>
-			<template v-if="rentCardShareProfit.stationName">
-				
-			</template>
-			<template v-else>
-				<view class="details-row">
-					<p>平台收益</p>
-					<span>{{rentCardShareProfit.disProportion}}%</span>
-				</view>
-			</template>
-			
-			
-		
-			<view class="details-row">
-				<p>月卡总金额</p>
-				<span>{{regUserCard.payFee.toFixed(2)}}元</span>
-			</view>
-			<view class="details-row" v-if="rentCardShareProfit.stationName" >
-				<p>服务费总金额</p>
-				<span>{{rentCardShareProfit.serviceTotalAmount.toFixed(2)}}元</span>
-			</view>
-			
-			<view class="details-row" v-if="rentCardShareProfit.stationName">
-				<p>分润比例</p>
-				<span>{{rentCardShareProfit.stationProportion}}%</span>
-			</view>
-			
-			<view class="details-row">
-				<p>月卡分润金额</p>
-				<span>{{rentCardShareProfit.shareProfitAmount.toFixed(2)}}元</span>
-			</view>
-			
-			<view class="details-row" v-if="rentCardShareProfit.stationName">
-				<p>周期内充电次数</p>
-				<span>{{rentCardShareProfit.chargingCount}}次</span>
-			</view>
-		</view>
-
-<view class="details">
-			<view class="details-title">
-				<h4>更多信息</h4>
-			</view>
-			<view class="details-row" v-if="rentCardShareProfit.stationName">
-				<p>来源站点 </p>
-				<span>{{rentCardShareProfit.stationName}}</span>
-			</view>
-			
-			
-			<view class="details-row"  v-if="rentCardShareProfit.stationName" >
-				<p>设备名称</p>
-				<span>{{rentCardShareProfit.deviceName}}</span>
-			</view>
-			
-			
-			<view class="details-row">
-				<p>用户姓名 </p>
-				<span>{{regUser.realName?regUser.realName:'未命名'}}</span>
-			</view>
-			<view class="details-row">
-				<p>车牌号 </p>
-				<span>{{regUser.carNum?regUser.carNum:'未绑定'}}</span>
-			</view>
-			<view class="details-row">
-				<p>月卡卡号</p>
-				<span>{{regUserCard.cardNo}}</span>
-			</view>
-<view class="details-row">
-				<p>月卡有效期</p>
-				<span>{{regUserCard.startTime?regUserCard.startTime.slice(0,10):''}}至{{regUserCard.endTime?regUserCard.endTime.slice(0,10):''}}</span>
-				
-			</view>
-<view class="details-row">
-				<p>结算时间</p>
-				<span>{{rentCardShareProfit.createTime}}</span>
-			</view>
-
-
-		</view>
-
-
-		
-	</view>
-</template>
-
-<script>
-	import {
-		parseUnixTime,
-		substrMb
-	} from '@/utils'
-	
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				regUser: {},
-				rentCardShareProfit: {},
-				regUserCard: {},
-			}
-		},
-		onLoad(op) {
-	
-	
-	
-			this.id = op.id;
-			this.getInfo()
-		},
-		methods: {
-		getPhone(phone){
-				var backphone="";
-				if(phone){
-					backphone=substrMb(phone,0,3)+"****"+substrMb(phone,7,4)
-				}
-				
-				return backphone;
-			},
-			getInfo() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.cardProfitDataDetail({
-					id: this.id
-				}).then((res) => {
-					this.regUser = res.data.regUser
-					this.regUserCard = res.data.regUserCard
-					this.rentCardShareProfit = res.data.rentCardShareProfit
-	
-					uni.hideLoading()
-	
-				}).catch(error => {
-					uni.showToast({
-	
-						title: error
-					})
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-	page {
-		background-color: #F7F7F7;
-	}
-</style>
-<style lang="scss" scoped>
-	.detailsBtn {
-		margin: 16px;
-
-		.detailsBtn-btn {
-			border-color: #185AC6 !important;
-			border-radius: 8px !important;
-			background: none !important;
-			color: #185AC6 !important;
-		}
-	}
-
-	.details-title {
-		margin-bottom: 20px;
-
-		h4 {
-			font-weight: normal;
-			font-size: 16px;
-			position: relative;
-			padding-left: 10px;
-
-			&::after {
-				content: '';
-				position: absolute;
-				height: 12px;
-				width: 4px;
-				background-color: #185ac6;
-				left: 0;
-				top: 5px;
-			}
-		}
-	}
-
-	.details-row {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 15px;
-
-		p {
-			color: #86898C;
-			
-		}
-
-	}
-
-	.details-row-sum {
-		float: right;
-		color: #101010;
-		font-size: 14px;
-
-	}
-
-	.details {
-		margin: 16px;
-		padding: 20px;
-		background-color: #fff;
-		border-radius: 8px;
-        position: relative;
-		.details-head {
-			text-align: center;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-
-			h4 {
-				font-size: 18px;
-				font-weight: normal;
-				margin-left: 4px;
-			}
-		}
-
-		.details-price {
-			margin-top: 12px;
-			margin-bottom: 4px;
-			display: flex;
-			align-items: flex-end;
-			justify-content: center;
-
-			h3 {
-				font-size: 36px;
-				color: #27B148;
-				line-height: 36px;
-				margin: 0 4px;
-				font-weight: normal;
-			}
-
-			span {
-				font-size: 20px;
-				color: #27B148;
-			}
-		}
-
-		.details-main {
-			text-align: center;
-             
-           .withdraw{
-			   width: 21.3vw;
-			   height: 21.3vw;
-			   position: absolute;
-			   top: 2vw;
-			   right: 2.5vw;
-		   }
-			p {
-				color: #777;
-				margin-top: 4px;
-			}
-		}
-	}
-</style>

pagesFinance/statistics/index.vue

@@ -1,1108 +0,0 @@
-<template>
-	<view>
-
-		<view class="navbar-tit">{{title}}</view>
-
-		<view class="statisticsData">
-		<!-- 	<view class="statisticsData-item">
-				<h3 style="font-size: 20px;">{{info.merchantAccountName}}</h3>
-			</view> -->
-			<view class="detailstableHead" v-if="indexData">
-				<view class="detailsline"  >
-						<view class="details-row ">
-							
-							<view class="span1">今日充电流水</view>
-							<view class="span2">{{indexData.todayAmount?indexData.todayAmount.toFixed(2):0}}<span >元</span></view>
-						</view>
-						<view class="details-row">
-							<view class="span1">今日充电笔数</view>
-							<view class="span2">{{indexData.todayEQNum?indexData.todayEQNum:0}}<span >笔</span></view>
-						</view>
-					</view>
-					<view class="detailsline"  >
-							<view class="details-row ">
-								
-								<view class="span1">昨日充电流水</view>
-								<view class="span2">{{indexData.yesterdayAmount?indexData.yesterdayAmount.toFixed(2):0}}<span>元</span></view>
-							</view>
-							<view class="details-row">
-								<view class="span1">昨日充电笔数</view>
-								<view class="span2">{{indexData.yesterdayEQNum?indexData.yesterdayEQNum:0}}<span >笔</span></view>
-							</view>
-						</view>
-						<view class="detailsline—bottom"  >
-								<view class="details-row ">
-									
-									<view class="span1">本月充电流水</view>
-									<view class="span2">{{indexData.thisMonthAmount?indexData.thisMonthAmount.toFixed(2):0}}<span >元</span></view>
-								</view>
-								<view class="details-row">
-									<view class="span1">本月充电笔数</view>
-								<view class="span2">{{indexData.thisMonthEQNum?indexData.thisMonthEQNum:0}}<span >笔</span></view>
-								</view>
-							</view>
-					
-			</view>
-				
-			
-		</view>
-	 
-		<u-picker mode="time" v-model="popupShow" @confirm="changedate" :default-time="queryTime" :params="params"></u-picker>
-		<u-picker mode="time" v-model="popupShow2" @confirm="changedate2" :default-time="queryTime2+'-1'"  :params="params"></u-picker>
-		<u-picker mode="selector" v-model="popupShow3" @confirm="changedate3" :range="stationList" range-key="name" :default-selector="[selectstationIndex]"></u-picker>
-
-
-		<view class="statisticsChart">
-
-
-			<view class="statisticsChart-head" style="margin-top: 20px;">
-				<h4>流水统计</h4>
-				<!-- <view class="navbar-screen" >
-					 {{startTime}}至{{endTime}}
-				 </view> -->
-							 <view class="navbar-screen" @click="popupShow = true" v-if="false">
-								 <span>{{showTime(queryTime)}}</span>
-							 <u-icon name="arrow-down" color="#b0b8c8" size="32" v-show="!popupShow"></u-icon>
-							 <u-icon name="arrow-up" color="#b0b8c8" size="32" v-show="popupShow"></u-icon>
-							 
-							 </view>
-
-
-			</view>
-			<u-calendar v-model="popupShow4" mode="range" @change="changedate4"></u-calendar>
-			<view class="details detailstable">
-					<p style="text-align: center; margin-bottom: 5px;" @click="popupShow4 = true">
-					<img src="@/assets/img/riLine-calendar-todo-line.svg"  align="absmiddle" style="height:40rpx;width: 40rpx ;" >
-					
-					{{startTime}}至{{endTime}}
-					 <u-icon name="arrow-down" color="#b0b8c8" size="32" v-show="!popupShow4"></u-icon>
-					 <u-icon name="arrow-up" color="#b0b8c8" size="32" v-show="popupShow4"></u-icon>
-					 </p>
-
-
- 					<u-collapse  :style="changeitemBl?' border-Bottom: 1px solid #000205':''"
-					 
-					 :headStyle="{
-								color:'#101010',
-								 fontWeight: 'bold',
-								 padding:'24rpx 0',
-								 borderBottom: '1px solid #ededed'
-								 
-							}"
-					v-if="stationFlowList.length">
-							<u-collapse-item   @change="changeitem" 
-							v-for="(item, index) in stationFlowList"  :index="index" :open="index==0"  :key="index">
-							<view slot="title" class="u-collapse-title u-line-1" style="width: 100%;">
-								{{item.stationName}} <span style="float:right;"><span style="font-size: 24rpx;margin-right: 8rpx;font-weight: normal;">总收入</span>{{item.actualMoney.toFixed(2)}}元</span>
-							</view>
-							
-							<!-- -->
-							 <view class="detailsline">
-							
-							 
-							 		<view class="details-row details-row-1">
-							 			
-							 			<view class="span1">电费</view>
-							 			<view class="span2">{{item.elecMoney.toFixed(2)}}<span>元</span></view>
-							 		</view>
-							 		<view class="details-row">
-							 			<view class="span1">服务费</view>
-							 			<view class="span2">{{item.serviceMoney.toFixed(2)}}<span>元</span></view>
-							 		</view>
-							 	</view>
-							 
-							 	<view class="detailsline">
-							 		<view class="details-row details-row-1">
-							 			
-							 			<view class="span1">总用电量</view>
-							 			<view class="span2">{{(item.eq/10000).toFixed(1)}}<span>度</span></view>
-							 		</view>
-							 		<view class="details-row">
-							 			
-							 			
-							 			<view class="span1">充电枪数量</view>
-							 			<view class="span2">快充{{item.fastNum}}/慢充{{item.slowNum}}</view>
-							 		</view>
-							 	</view>
-								
-							 	<view class="detailsline" v-if="item.fastNum&&item.slowNum">
-							 		<view class="details-row details-row-1">
-							 			
-							 			
-							 			<view class="span1">快充枪平均充电量</view>
-							 			<view class="span2" v-if="item.fastNum">{{(item.averageFast/10000).toFixed(1)}}<span>度/枪/天</span></view>
-										<view class="span2" v-else>0<span>度/枪/天</span></view>
-									</view>
-							 		<view class="details-row">
-							 			
-							 			<view class="span1">慢充枪平均充电量</view>
-							 			<view class="span2"  v-if="item.slowNum" >{{(item.averageSlow/10000).toFixed(1)}}<span>度/枪/天</span></view>
-							 			<view class="span2" v-else>0<span>度/枪/天</span></view>
-									</view>
-							 	</view>
-								
-								<view class="detailsline" v-if="item.fastNum&&item.slowNum" >
-									<view class="details-row details-row-1">
-										
-										
-										<view class="span1">月卡收益</view>
-										<view class="span2"  >{{(item.cardMoney).toFixed(2)}}<span>元</span></view>
-									 
-									</view>
-									<view class="details-row">
-										
-										
-									</view>
-								</view>
-								
-								
-								<view v-if="item.fastNum&&item.slowNum"  :style="item.slowDayNum==nowTime?'color: #ffffff;':'border-bottom: 1px solid #ededed;'"	
-								 >查询范围内实际订单天数{{item.slowDayNum}}</view>
-															 
-							</u-collapse-item>
-						</u-collapse>
-				
-				<view class="detailsline" v-if="stationFlowList.length>1" >
-				
-				
-						<view class="details-row details-row-1">
-							
-							<view class="span1">合计总收入</view>
-							<view class="span2">{{(allMoneySum).toFixed(2)}}<span>元</span></view>
-						</view>
-						<view class="details-row">
-							<view class="span1">合计总利润</view>
-							<view class="span2">{{(serviceMoneySum).toFixed(2)}}<span>元</span></view>
-						</view>
-					</view>
-					<view  
-					 >合计总利润=服务费收益+月卡收益</view>
-
-			</view>
-
-			<view class="statisticsChart-head" style="margin-top: 20px;">
-				<h4>收益统计</h4>
-				<!-- <view class="navbar-screen" >
-					 {{startTime}}至{{endTime}}
-				 </view> -->
-				<!-- <view class="navbar-screen" @click="popupShow2 = true"><span>筛选</span>
-					<u-icon name="filter-2-fill" custom-prefix="custom-icon" color="#b0b8c8" size="32"></u-icon>
-				</view> -->
-
-
-			</view>
-
-			<view class="details" v-if="indexData2&&indexData2.incomeMap">
-				
-				<view class="details-row2">
-					<p  @click="popupShow3 = true">{{selectstationName}}
-						<u-icon name="arrow-down" color="#b0b8c8" size="32" v-show="!popupShow3"></u-icon>
-						<u-icon name="arrow-up" color="#b0b8c8" size="32" v-show="popupShow3"></u-icon>
-					</p>
-					<p  @click="popupShow2 = true">
-						{{showTime(queryTime2)}}
-						<u-icon name="arrow-down" color="#b0b8c8" size="32" v-show="!popupShow2"></u-icon>
-						<u-icon name="arrow-up" color="#b0b8c8" size="32" v-show="popupShow2"></u-icon>
-					</p>
-				</view>
-				
-				<view class="details-row">
-					<p>投资人收入</p>
-					<span>{{indexData2.incomeMap.incomeAmount.toFixed(2)}}元</span>
-				</view>
-				<view class="details-row" >
-					<p>预估用电度数</p>
-					<span>{{(indexData2.incomeMap.electricQuantity/10000).toFixed(1)}}度</span>
-				</view>
-				<view class="details-row">
-					<p>预估电费</p>
-					<span>{{indexData2.incomeMap.costAmount.toFixed(2)}}元</span>
-				</view>
-				<view class="details-row">
-					<p>服务费预估收益</p>
-					<span><b>{{indexData2.incomeMap.serviceAmount.toFixed(2)}}元</b></span>
-				</view>
-				<view class="details-row">
-					<p>月卡收益</p>
-					<span>{{indexData2.incomeMap.cardIncomeAmount.toFixed(2)}}元</span>
-				</view>
-			</view>
-
-		</view>
-		<Tabbar :current="0" ref="tabbarMain"></Tabbar>
-		<!-- 		<u-tabbar v-model="current" :list="tabbarList" active-color="#185ac6"></u-tabbar>
- -->
-	</view>
-</template>
-
-<script>
-	import Tabbar from '@/components/TabbarFinance.vue'
-	import * as API from '@/apis/finance.js'
-	import * as echarts from "echarts";
-	//require("@/apis/echarts-5-3.min.js")
-	//import * as echarts from "@/apis/echarts-5-3.min.js";
-	import {
-		daysDistance,
-		beforeTimeStamp,
-		currentTimeStamp,
-		parseUnixTime
-	} from '@/utils'
-	export default {
-		data() {
-			return {
-				popupShow3:false,
-				params: {
-									year: true,
-									month: true,
-									day: false,
-									hour: false,
-									minute: false,
-									second: false
-								},
-				isinit: true,
-				form: {},
-				form2: {},
-				selecttype: "",
-				selectstationId: "",
-				selectdeviceNo: "",
-				popupShow2: false,
-				popupShow: false,
-				 popupShow4:false,
-				nowTime:0,
-				selectstationId2: "",
-				selectstationIndex:0,
-				selectstationName: "",
-				info: {},
-				title: "",
-				showdate: false,
-				showdate2: false,
-				
-				queryTime:"",
-				queryTime2:"",
-				
-				indexData: {},
-			
-				indexData2: null,
-				changeitemBl:false,
-
-				myChart: null,
-				myChartReady: false,
-				myChartTime: false,
-				subsection: [{
-						name: '金额'
-					},
-					{
-						name: '笔数'
-					}
-				],
-				stationFlowList: [],
-				serviceMoneySum:0,
-				allMoneySum:0,
-				stationList: [],
-				stationListSon: [],
-				tabbarList: [{
-						iconPath: "bar-chart-box-fill",
-						selectedIconPath: "bar-chart-box-fill",
-						text: '统计',
-						count: 0,
-						isDot: true,
-						customIcon: true,
-					},
-					{
-						iconPath: "article-fill",
-						selectedIconPath: "article-fill",
-						text: '明细',
-						midButton: true,
-						customIcon: true,
-					},
-
-					{
-						iconPath: "account-pin-box-fill",
-						selectedIconPath: "account-pin-box-fill",
-						text: '我的',
-						count: 0,
-						isDot: false,
-						customIcon: true,
-					},
-				],
-				endTime:'',
-				endTime2:'',
-				
-				current: 0,
-				background: {
-					background: 'none'
-				},
-				value: '',
-				type: 'select',
-				show: false,
-				border: true,
-				step: 0,
-				stepname: '',
-				startTime:'',
-				stepid: 0,
-				
-			}
-		},
-		onShow() {
-			if (this.$refs.tabbarMain) {
-				this.$refs.tabbarMain.setcount(0);
-			}
-		},
-		onLoad() {
-			
-			
-			this.info = this.carhelp.getPersonInfo("merchantUser")
-			this.title = this.info.merchantAccountName
-		},
-		components: {
-			Tabbar
-
-		},
-		onReady() {
-			var date=new Date();
-			this.nowTime=7
-			
-			
-			this.queryTime=parseUnixTime(currentTimeStamp(), '{y}-{m}');
-			this.queryTime2=parseUnixTime(currentTimeStamp(), '{y}-{m}'),
-			
-			console.log(this.queryTime);
-			
-			this.startTime = parseUnixTime(beforeTimeStamp(7), '{y}-{m}-{d}')
-			this.endTime = parseUnixTime(beforeTimeStamp(1), '{y}-{m}-{d}')
-			//this.startTime2 = parseUnixTime(beforeTimeStamp(6), '{y}-{m}-{d}')
-			this.endTime2 = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}')
-
-			this.getStation()
-		},computed:{
-		
-			// startTime(){
-			// 	return this.queryTime+'-1'
-			// },
-			startTime2(){
-				return this.queryTime2+'-1'
-			},
-			
-		},
-		methods: {
-			changeitem(e){
-				if(this.stationFlowList.length>1&&e.index==this.stationFlowList.length-1&&e.show){
-					this.changeitemBl=true;
-				}else{
-					this.changeitemBl=false;
-				}
-			},
-			showTime(name){
-				if(!name){
-					return ''
-				}
-				return name.replace('-','年')+'月';
-			},
-			getStation(bl) {
-
-				API.stationList().then((res) => {
-
-					this.stationList = res.data.stationList
-					this.stationList.unshift({
-						id:'',name:"全部站点"
-					})
-					this.selectstationName="全部站点"
-					
-					this.stationListSon = res.data.deviceList
-					this.getDataHome()
-					this.getData()
-					this.getData2()		
-				}).catch(error => {
-					uni.showToast({
-
-						title: error
-					})
-				})
-			},
-			resetBtn() {
-				this.nowTime=7
-				this.startTime = parseUnixTime(beforeTimeStamp(6), '{y}-{m}-{d}')
-				this.endTime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}')
-
-
-
-				this.selecttype = ""
-				this.selectstationId = ""
-				this.selectdeviceNo = ""
-
-				this.form = {
-
-					type: this.selecttype,
-					stationId: this.selectstationId,
-					deviceNo: this.selectdeviceNo,
-				};
-				this.popupShow = false;
-				this.list = [];
-				this.getData()
-
-			},
-			okbtn() {
-				this.popupShow = false;
-
-				this.form = {
-
-					type: this.selecttype,
-					stationId: this.selectstationId,
-					deviceNo: this.selectdeviceNo,
-				};
-				this.list = [];
-				this.getData()
-			},
-			resetBtn2() {
-				this.startTime2 = parseUnixTime(beforeTimeStamp(6), '{y}-{m}-{d}')
-				this.endTime2 = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}')
-
-
-
-				this.selectstationId2 = ""
-
-				this.form2 = {
-
-					stationId: this.selectstationId2,
-
-				};
-				this.popupShow2 = false;
-
-				this.getData2()
-
-			},
-			okbtn2() {
-				this.popupShow2 = false;
-
-				this.form2 = {
-
-					stationId: this.selectstationId2,
-
-				};
-
-				this.getData2()
-			},
-			getDataHome() {
-
-
-
-
-				API.homeHeadStatistics().then((res) => {
-					this.indexData = res.data;
-
-				}).catch(error => {
-					uni.showToast({
-
-						title: error
-					})
-				})
-			},
-			getData() {
-
-				this.form.startDate = this.startTime,
-					this.form.endDate = this.endTime
-
-				API.homeFlowStatistics(this.form).then((res) => {
-					this.stationFlowList = res.data.stationFlowList;
-					this.nowTime=daysDistance(this.startTime, this.endTime)+1;
-					this.serviceMoneySum=0;
-					this.allMoneySum=0;
-					for(var i in this.stationFlowList ){
-						var item=this.stationFlowList[i];
-						
-						this.allMoneySum+=item.actualMoney
-						this.serviceMoneySum+=item.serviceMoney
-						this.serviceMoneySum+=item.cardMoney
-					}
-					console.log(this.nowTime)
-					
-				}).catch(error => {
-					uni.showToast({
-
-						title: error
-					})
-				})
-			},
-			getData2() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-
-				this.form2.startDate = this.startTime2,
-					this.form2.endDate = this.endTime2
-
-				API.homeIncomeStatistics(this.form2).then((res) => {
-					this.indexData2 = res.data
-
-					uni.hideLoading()
-
-				}).catch(error => {
-					uni.showToast({
-
-						title: error
-					})
-				})
-			},
-			changesub(e) {
-
-				this.current = e
-				this.getPie()
-			},
-			changedate4(e) {
-							this.startTime = e.startDate
-							this.endTime = e.endDate
-							this.okbtn()
-						
-			},
-			changedate3(e) {
-					console.log(e)
-					var index=e[0];
-					var obj=this.stationList[index];
-					this.selectstationId2=obj.id;
-					this.selectstationIndex=index;
-					this.selectstationName=obj.name;
-					this.okbtn2()
-			},
-			changedate(e) {
-				console.log(e)
-				
-				this.queryTime=e.year+'-'+e.month;
-				this.startTime=e.year+'-'+e.month+'-1';
-				if(e.month=='12'){
-					this.endTime=(e.year)+"/12/31"
-				}else{
-					var b=e.year+'/'+(parseInt(e.month)+1)+'/1';
-					var a=beforeTimeStamp(1,b);
-					this.endTime= parseUnixTime(a, '{y}-{m}-{d}')
-					
-				}
-				
-				this.okbtn()
-			},
-			changedate2(e) {
-				console.log(e)
-				this.queryTime2=e.year+'-'+e.month;
-				
-				if(e.month=='12'){
-					this.endTime2=(e.year)+"/12/31"
-				}else{
-					var b=e.year+'/'+(parseInt(e.month)+1)+'/1';
-					var a=beforeTimeStamp(1,b);
-					this.endTime2= parseUnixTime(a, '{y}-{m}-{d}')
-					
-				}
-				
-				this.okbtn2()
-
-			},
-			getPie1(list) {
-				var getData = [];
-
-				var map = new Map()
-				var stationNum = 0;
-				list.forEach(item => {
-
-					var value = this.current ? item.eqNum : item.amount
-					if (value) {
-
-						var stationName = ""
-						var obj = this.stationListSon.find(item2 => {
-							return item2.deviceNo == item.deviceNo
-						})
-						if (obj && obj.stationId) {
-							var obj2 = this.stationList.find(item3 => {
-								return item3.id == obj.stationId
-							})
-							if (obj2 && obj2.name) {
-								stationName = obj2.name;
-							}
-
-							if (!map.has(obj.stationId)) {
-
-								map.set(obj.stationId, {
-									id: obj.stationId,
-									value: value,
-									name: stationName,
-								})
-								this.stepid = obj.stationId;
-								stationNum++;
-							} else {
-								var omap = map.get(obj.stationId)
-								var addvalue = (omap.value * 100 + value * 100) / 100
-								map.set(obj.stationId, {
-									id: obj.stationId,
-									value: addvalue,
-									name: stationName,
-								})
-
-							}
-
-						}
-
-					}
-
-				})
-				map.forEach((item, i) => {
-					getData.push(item)
-				})
-
-				if (stationNum == 1) {
-					this.step = 2; //只有一个站， 就不拆分了
-
-				} else {
-					this.stepid = 0;
-				}
-
-				return getData;
-			},
-			getPie2(list) {
-				var getData = [];
-				var sz = ['自行车充电桩', '直流汽车充电桩', '交流汽车充电桩']
-
-				list.forEach(item => {
-
-					var value = this.current ? item.eqNum : item.amount
-					if (value) {
-						var typeName = "";
-						var stationName = ""
-						var obj = this.stationListSon.find(item2 => {
-							return item2.deviceNo == item.deviceNo
-						})
-
-
-						if (this.stepid != obj.stationId) {
-							return
-						}
-
-						if (obj && obj.stationId) {
-							var obj2 = this.stationList.find(item3 => {
-								return item3.id == obj.stationId
-							})
-							if (obj2 && obj2.name) {
-								stationName = obj2.name;
-							}
-						}
-
-						if (obj && obj.type) {
-							typeName = sz[obj.type]
-						}
-						getData.push({
-							id: item.id,
-							value: value,
-							name: item.deviceName,
-							typeName: typeName,
-							stationName: stationName
-						})
-
-					}
-
-				})
-				return getData;
-			},
-			getPie() {
-
-				var list = this.indexData.pieChart;
-
-				var unit = this.current ? '笔' : '元'
-
-				var getData = [];
-				if (this.step == 0) {
-					getData = this.getPie1(list)
-				}
-				if (this.step == 1 || this.step == 2) {
-					getData = this.getPie2(list)
-				}
-
-
-				if (!this.myChart) {
-					this.myChart = echarts.init(document.getElementById('pieEcharts'));
-
-				}
-
-				// 指定图表的配置项和数据
-				var option = {
-					tooltip: {
-						trigger: 'item',
-						formatter: (value) => {
-							var info = value.data;
-							var showvalue = info.value;
-							if (!this.current) {
-								showvalue = info.value.toFixed(2)
-							}
-							if (this.step == 0) {
-								if (!info) {
-									return ""
-								}
-								return info.name + ' <br/> ' + showvalue + unit
-							}
-							if (this.step == 1 || this.step == 2) {
-								return info.stationName + ' <br/> ' + info.name + ' <br/> ' + showvalue + unit +
-									' <br/> ' + info.typeName
-
-							}
-						},
-						position: function(point, params, dom, rect, size) {
-
-							return ['10%', '0%']
-						}
-
-					},
-
-					series: [{
-						//name: 'Access From',
-						type: 'pie',
-						radius: '40%',
-						data: getData,
-						emphasis: {
-							itemStyle: {
-								shadowBlur: 10,
-								shadowOffsetX: 0,
-								shadowColor: 'rgba(0, 0, 0, 0.5)'
-							}
-						},
-
-						label: {
-
-							fontWeight: "bold",
-							fontSize: 14,
-						}
-					}]
-				};
-
-				// 使用刚指定的配置项和数据显示图表。
-				this.myChart.setOption(option);
-
-				var _this = this;
-				if (!this.myChartReady) {
-					this.myChartReady = true;
-					//双击事件不能生效 ， 改为多次点击
-					this.myChart.on('click', function(params) {
-						var tid = _this.stepid; //上一次
-
-						_this.stepid = params.data.id
-
-
-						if (!_this.myChartTime || tid != _this.stepid) {
-							_this.stepid = params.data.id
-							_this.myChartTime = true;
-							setTimeout(function() {
-								console.log("setTimeout")
-
-								_this.myChartTime = false;
-							}, 500)
-							return
-						}
-
-						if (_this.step == 0) {
-							_this.step = 1
-							_this.stepname = params.data.name
-							_this.myChart.clear()
-							_this.getPie()
-						} else if (_this.step == 1) {
-							//_this.step=0
-						}
-
-
-						// window.open('https://www.baidu.com/s?wd=' + encodeURIComponent(params.name));
-					});
-				}
-
-			}
-		}
-	}
-</script>
-<style>
-	page {
-		background: url(../../assets/img/index_header_bg.png) no-repeat top center #f7f7f7;
-		background-size: 100%;
-	}
-</style>
-
-<style lang="scss" scoped>
-	.detailstable{
-		padding: 20px 15px !important;
-	}
-	.detailstableHead{
-		.span2{
-			font-size: 44rpx !important;
-			font-weight: bold;
-			width: 100%;
-			color: #101010;
-			span{
-				font-size: 24rpx !important;
-			}
-		}
-	}
-	.detailstable,.detailstableHead {
-		font-size: 16px;
-		
-		p{
-			font-size: 14px;
-		}
-		.details-row-main{
-			border-bottom: 1px solid #ededed;
-			padding: 10px 0;
-			
-		}
-		.detailsline{
-				border-bottom: 1px solid #ededed;
-		}
-		.detailsline,.detailsline—bottom {
-		
-			display: flex;
-
-			.details-row {
-				width: 48%;
-				display: flex;
-				justify-content: space-between;
-				flex-direction: column;
-				padding-left: 10px;
-				margin-bottom: 10px;
-				.span1 {
-					color: rgba(136, 136, 136, 100);
-					font-size: 14px;
-					width: 100%;
-				}
-				.span2{
-					font-size: 18px;
-					width: 100%;
-					color: #101010;
-					span{
-						font-size: 12px;
-					}
-				}
-			}
-		}
-
-		.details-row-1 {
-			padding-left: 0px !important;
-			border-right: 1px solid #ededed;
-		}
-
-
-	}
-	
-	.details {
-		margin-top: 16px;
-		padding: 20px;
-		background-color: #fff;
-		border-radius: 8px;
-
-	}
-
-	.details-title {
-		margin-bottom: 16px;
-
-		h4 {
-			font-weight: normal;
-			font-size: 16px;
-			position: relative;
-			padding-left: 10px;
-
-			&::after {
-				content: '';
-				position: absolute;
-				height: 12px;
-				width: 4px;
-				background-color: #27B148;
-				left: 0;
-				top: 5px;
-			}
-		}
-	}
-
-	.details-row {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 15px;
-
-		p {
-			color: #37393c;
-			font-weight: bold;
-		}
-	}
-	.details-row2 {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 15px;
-	
-		p {
-			// color: #37393c;
-			// font-weight: bold;
-		}
-	}
-
-	.popup-screen {
-		padding: 20px;
-		position: relative;
-
-		.screen {
-			padding-bottom: 30px;
-		}
-
-		.screen-item {
-			margin-bottom: 20px;
-
-			.screen-head {
-				margin-bottom: 8px;
-				font-size: 16px;
-			}
-
-			.screen-main {
-				display: flex;
-				//    display: -webkit-box;
-				flex-wrap: wrap;
-
-			}
-
-			.screen-entry {
-				width: 29%;
-				padding: 6px 0;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-
-
-				background-color: #F2F5FA;
-				text-align: center;
-				margin-bottom: 10px;
-				border-radius: 3px;
-
-				margin-right: 6px;
-
-			}
-
-			.screen-entry.active {
-				background-color: #185AC6;
-				color: #fff;
-			}
-		}
-
-		.screen-foot {
-			position: fixed;
-			left: 0;
-			right: 0;
-			bottom: 0;
-			display: flex;
-			height: 50px;
-			border-top: 1px solid #ededed;
-
-			.screen-btn-l {
-				background-color: #fff;
-				flex: 0.2;
-				text-align: center;
-				line-height: 50px;
-			}
-
-			.screen-btn-r {
-				flex: 0.8;
-				text-align: center;
-				line-height: 50px;
-				background-color: #185AC6;
-				color: #fff;
-			}
-		}
-	}
-
-	.navbar-tit {
-		color: #fff;
-		font-size: 24px;
-		padding-left: 15px;
-		padding-top: 10px;
-	}
-
-	.statisticsData {
-		background-color: #fff;
-		margin: 12px 12px;
-
-		padding: 12px 16px;
-		border-radius: 8px;
-
-		margin-top: 60px;
-	}
-
-	.statisticsDataMain {
-		 flex-wrap: wrap;
-		display: flex;
-
-	}
-
-	.statisticsData-item {
-		flex: 1;
-		width: 40%;
-		.statisticsData-head {
-			display: flex;
-			align-items: center;
-
-			p {
-				color: #637AA2;
-				font-size: 12px;
-			}
-		}
-
-		.statisticsData-main {
-			margin-top: 4px;
-			font-size: 18px;
-		}
-
-		.statisticsData-foot {
-			display: flex;
-			align-items: center;
-			margin-top: 16px;
-
-			p {
-				color: #637AA2;
-			}
-
-			h4 {
-				margin-left: 8px;
-			}
-		}
-	}
-
-	.statisticsChart {
-		margin: 16px;
-
-		.statisticsChart-head {
-			margin-bottom: 5px;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			h4 {
-				font-weight: normal;
-				font-size: 16px;
-				position: relative;
-				padding-left: 10px;
-
-				&::after {
-					content: '';
-					position: absolute;
-					height: 12px;
-					width: 4px;
-					background-color: #4E8DF6;
-					left: 0;
-					top: 5px;
-				}
-			}
-
-			.statisticsChart-time {
-				display: flex;
-				align-items: center;
-
-				p {
-					color: #666;
-				}
-			}
-		}
-
-		.statisticsChart-main {
-			background-color: #fff;
-			padding: 10px 16px 16px 16px;
-			border-radius: 8px;
-		}
-	}
-</style>

pagesFinance/user/about.vue

@@ -1,63 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="关于我们"></u-navbar>
-		<u-cell-group>
-			<u-cell-item title="平台介绍"></u-cell-item>
-			<u-cell-item title="用户注册协议"></u-cell-item>
-			<u-cell-item title="隐私协议"></u-cell-item>
-			<u-cell-item title="证照信息"></u-cell-item>
-		</u-cell-group>
-		<view class="code">
-			<h4>分享公众号给好友</h4>
-			<view class="code-img">
-				<img src="../../assets/img/logo.png" alt="">
-				<p>微信扫码关注</p>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				form: {
-					name: '',
-					intro: '',
-				},
-			}
-		},
-		methods: {
-
-		}
-	}
-</script>
-<style>
-	page{
-		background-color: #F7F7F7;
-	}
-</style>
-<style lang="scss" scoped>
-	.code{
-		margin-top: 10px;
-		background-color: #fff;
-		padding: 16px;
-		.code-img{
-			text-align: center;
-			margin-top: 10px;
-			p{
-				
-			}
-		}
-		h4{
-			font-weight: normal;
-			font-size: 16px;
-		}
-		img{
-			height: 120px;
-			width: 120px;
-		}
-	}
-</style>

pagesFinance/user/addOwnerInformation.vue

@@ -1,255 +0,0 @@
-<template>
-	<view>
-		<u-navbar :title="id!=0?'编辑':'新增'">
-			
-			<view slot="right"  @click="infodelete()"
-			v-if="id!=0"
-			style="margin-right: 20px;">
-				<span class="delete"  >删除</span>
-			</view>
-		</u-navbar>
-				<u-keyboard ref="uKeyboard" 
-				 @change="valChange" @backspace="backspace"
-				mode="car" v-model="show"></u-keyboard>
-
-		<view class="ower-infos">
-			
-			<view class="infos-item">
-				<view class="title">
-					手机号码<text class="asterisk">*</text>
-				</view>
-				<view class="content">
-					
-					<u-input  v-model="obj.phone" placeholder="请填写手机号码"  />
-					
-				</view>
-				
-			</view>
-			<view class="infos-item">
-				<view class="title">
-					用户姓名
-				</view>
-				<view class="content">
-					
-					<u-input  v-model="obj.userName" placeholder="请填写车主姓名"  />
-				</view>
-				
-			</view>
-			<view class="infos-item border-none">
-				<view class="title">
-					车牌号码
-				</view>
-				<view class="content" @click="show=true">
-					
-					{{obj.carNum?obj.carNum:'请填写车牌号码'}}
-					
-				</view>
-				
-			</view>
-			
-		</view>
-		
-		<u-button type="primary" @click="submit()">保存</u-button>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	import {
-		checkPhone
-	} from '@/utils'
-	export default {
-		data() {
-			return {
-				show:false,
-				value:'',
-					uuid:'',
-					id:"",
-					platform:"",
-					obj:{
-						platform:"",
-						userName:"",
-						phone:"",
-						carNum:"",
-						vipUserId:"",
-					}
-			}
-		},
-		onReady() {
-			
-			if(this.id!=0){
-				
-				this.getInfo()
-			}
-		
-					
-		},
-		onLoad(op) {
-			this.platform=op.p
-			this.id=op.id
-			this.uuid=op.uuid;
-			
-		},
-		methods: {
-			// 按键被点击(点击退格键不会触发此事件)
-						valChange(val) {
-							// 将每次按键的值拼接到value变量中，注意+=写法
-							this.value += val;
-							console.log(this.value);
-							this.obj.carNum=this.value
-						},
-						// 退格键被点击
-						backspace() {
-							// 删除value的最后一个字符
-							if(this.value.length) this.value = this.value.substr(0, this.value.length - 1);
-							console.log(this.value);
-							this.obj.carNum=this.value
-						},
-						
-			infodelete(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				this.obj.platform=this.platform
-				API.vipUserDelete(this.obj).then((res) => {
-						uni.hideLoading()	
-					this.carhelp.set("addOwnerInformation",{
-						uuid:this.uuid,
-						selectObj:this.obj
-					})
-					uni.showModal({
-						showCancel:false,
-						title: '提示',
-						content: '操作成功',
-						success: function (res) {
-							
-							uni.navigateBack({
-								
-							})
-						}
-					});
-							
-				}).catch(error => {
-					uni.showToast({
-							
-						title: error
-					})
-				})
-			},
-			submit(){
-				
-				if(!this.obj.phone){
-					uni.showToast({				
-						title: "请填写手机号码"
-					})
-					return  false
-				}
-				var checkPhoneResult = checkPhone(this.obj.phone);
-						
-				if (checkPhoneResult !== true) {
-					uni.showToast({
-						title: checkPhoneResult,
-					})
-					return;
-				}
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				this.obj.platform=this.platform
-				API.vipUserSave(this.obj).then((res) => {
-						uni.hideLoading()	
-					this.carhelp.set("addOwnerInformation",{
-						uuid:this.uuid,
-						selectObj:this.obj
-					})
-					uni.showModal({
-						showCancel:false,
-						title: '提示',
-						content: '操作成功',
-						success: function (res) {
-							
-							uni.navigateBack({
-								
-							})
-						}
-					});
-							
-				}).catch(error => {
-					uni.showToast({
-							
-						title: error
-					})
-				})
-			},
-			getInfo(){
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.vipUserDetails({
-					vipUserId:this.id,
-				
-				}).then((res) => {
-							
-					this.obj=res.data.vipUser;
-					this.obj.vipUserId=this.id
-					
-					uni.hideLoading()
-							
-				}).catch(error => {
-					uni.showToast({
-							
-						title: error
-					})
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page{
-		background-color: #f3f4f7;
-	}
-	.ower-infos{
-		background-color: #fff;
-		padding-left: 16px;
-		.border-none{
-			border: none !important;
-		}
-		.infos-item{
-			padding: 14px 0;
-			display: flex;
-			border-bottom: 1px solid #BABABA ;
-			.title{
-				width: 30%;
-				font-size: 16px;
-				color: #7d7d7d;
-				.asterisk{
-					color: #EE3138;
-				}
-			}
-			.content{
-				color: rgba(172, 172, 172, 100);
-				font-size: 16px;
-			}
-		}
-	}
-	.u-btn{
-		background-color: rgba(0, 90, 217, 100);
-		margin: 16px;
-		height: 44px;
-		line-height: 44px;
-		font-size: 18px
-	}
-	.delete{
-		color: rgba(238, 49, 56, 100);
-		font-size: 16px;
-	}
-</style>

pagesFinance/user/applicationDetails.vue

@@ -1,524 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="提现申请详情"></u-navbar>
-		<u-tabs name="cate_name" gutter="200" bar-width="100" active-color="#101010" inactive-color="#A1A1A1"
-			:list="tabList" :is-scroll="false" :current="current" @change="change"></u-tabs>
-
-		<template v-if="current==0">
-			<view class="withdraw">
-				<view class="withdraw-head">
-					<b>申请站点</b>
-					<span>
-						<view class="uni-input">{{info.stationName}}</view>
-					</span>
-				</view>
-				<view class="withdraw-head">
-					<b>申请时间</b>
-					<span>
-						<view class="uni-input">{{info.updateTime}}</view>
-					</span>
-				</view>
-				<view class="withdraw-head">
-					<b>申请人身份</b>
-					<span>
-						<view class="uni-input">{{info.shareProfitRoleName}}</view>
-					</span>
-				</view>
-				<view class="withdraw-head">
-					<b>提现事由</b>
-					<span>
-						<view class="uni-input">{{info.applicationTypeText}}</view>
-					</span>
-				</view>
-				<view class="withdraw-head">
-					<b>提现月份</b>
-					<span>
-						<view class="uni-input">{{info.applicationMonth}}</view>
-					</span>
-				</view>
-				<view class="withdraw-head">
-					<b>审核进度</b>
-					<span>
-						<view class="uni-input"  :class="{
-								 wsuccess:info.status=='1',
-								  werror:info.status=='2',
-								   werror2:info.status=='0'
-							 }" >{{info.statusText}}</view>
-					</span>
-				</view>
-				<view class="withdraw-head border-n">
-					<b>充电分成</b>
-					<span>
-						<view class="uni-input">{{info.chargingProfitAmount}}元</view>
-					</span>
-				</view>
-			</view>
-
-			<view class="withdraw">
-				<view class="withdraw-head">
-					<b>成本电价</b>
-					<span>
-						<view class="uni-input">{{info.electricityPrice}}元/度</view>
-					</span>
-				</view>
-
-				<view class="withdraw-head ">
-					<b>实际电量</b>
-					<span>
-						<view class="uni-input">{{info.electricQuantity}}度</view>
-					</span>
-				</view>
-				<view class="withdraw-head border-n">
-					<b>电费成本</b>
-					<span>
-						{{info.electricityCost}}元
-
-					</span>
-				</view>
-			</view>
-			<view class="withdraw">
-				<view class="withdraw-head ">
-					<b>充电分成比例</b>
-					<span>
-						<view class="uni-input">{{info.chargingPercent}}%</view>
-					</span>
-				</view>
-				<view class="withdraw-head ">
-					<b>充电分成</b>
-					<span>
-						<view class="uni-input">{{info.chargingProfitAmount}}元</view>
-					</span>
-				</view>
-				<view class="withdraw-head border-n">
-					<b>充电服务收益</b>
-					<span>
-						<view class="uni-input">{{info.chargingServiceProfitAmount}}元</view>
-					</span>
-				</view>
-
-
-			</view>
-			<view class="withdraw">
-
-				<view class="withdraw-head">
-					<b>月卡分润笔数</b>
-					<span>
-					{{info.monthlyCardTotal}}笔
-
-					</span>
-				</view>
-				<view class="withdraw-head border-n">
-					<b>月卡收益</b>
-					<span>
-						{{info.monthlyCardIncome?info.monthlyCardIncome.toFixed(2):0}}元
-						
-					</span>
-				</view>
-
-
-			</view>
-			<view class="withdraw">
-
-				<view class="withdraw-head">
-					<b>合伙人总收入</b>
-					<span>
-						{{info.totalIncome}}元
-
-					</span>
-				</view>
-				<view class="withdraw-head border-n">
-					<b>合伙人总收益</b>
-					<span>
-						{{info.totalProfitAmount}}元
-
-					</span>
-				</view>
-
-			</view>
-
-
-			<view class="withdraw">
-				<view class="withdraw-head ">
-					<b>是否开票</b>
-					<span>
-						<view class="uni-input">{{info.invoiceRequired?'是':'否'}}</view>
-					</span>
-				</view>
-				<view class="withdraw-head ">
-					<b>发票类型</b>
-					<span>
-						<view class="uni-input" v-if="!info.invoiceType">无</view>
-						
-						<view class="uni-input" v-else>{{invoiceTypeName}}</view>
-					</span>
-				</view>
-<view class="withdraw-head border-n ">
-					<b>发票税率</b>
-					<span>
-						<view class="uni-input">{{info.taxRate?info.taxRate+'%':''}}</view>
-					</span>
-				</view>
-
-
-
-
-
-			</view>
-			<view class="withdraw">
-				<view class="withdraw-head ">
-					<b class="asterisk">申请提现金额</b>
-					<span>
-						<view class="uni-input">{{info.applicationAmount}}元</view>
-					</span>
-
-				</view>
-				<view class="withdraw-head border-n">
-					<b>大写金额</b>
-
-					<span>
-						<view class="uni-input">{{applicationAmountDX}}</view>
-					</span>
-
-				</view>
-			</view>
-			<view class="withdraw">
-				<view class="withdraw-head ">
-					<b class="asterisk">提现人收款户名</b>
-					<p class="infos">{{info.accountName}}</p>
-
-				</view>
-				<view class="withdraw-head ">
-					<b class="asterisk">提现人收款银行</b>
-					<p class="infos">{{info.bankName}}</p>
-
-				</view>
-				<view class="withdraw-head border-n">
-					<b class="asterisk">提现人收款账号</b>
-					<p class="infos">{{info.accountNo}}</p>
-				</view>
-
-			</view>
-
-		</template>
-
-
-		<template v-if="current==1">
-			<view class="margin">
-				<view style="text-align: center;margin-top: 100px" v-if="!detailList.length">
-					<img src="@/assets/img/blankpage.png">
-					<view>未填写提现明细</view>
-				</view>
-				
-				<view class="details "  v-for="(item,i) in detailList" :key="i">
-					
-						<p>{{item.itemName}}</p>
-						
-					<view class="withdraw"  >
-						<view class="withdraw-head ">
-							<b class="asterisk">金额</b>
-							<span >
-								<view class="uni-input">{{item.itemAmount}}元</view>
-							</span>
-						
-						</view>
-						<view class="withdraw-head ">
-							<b class="asterisk">备注</b>
-							<span>
-								<view class="uni-input">{{item.itemRemark?item.itemRemark:'无'}}</view>
-							</span>
-						
-						</view>
-						
-					</view>
-				
-				</view>
-			</view>
-			
-			
-			
-		</template>
-
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	import {
-	
-		DX
-	} from '@/utils'
-	export default {
-		data() {
-			return {
-				isPt: false,
-			id:'',
-				detailList:[],
-				info: {
-					electricityPrice: '',
-					electricQuantity: '',
-					stationId: "",
-					applicationType: '1'
-				},
-				stationList: [],
-				stationObj: {},
-				current: 0, // tabs组件的current值，表示当前活动的tab选项
-
-				list1: [{
-					name: '普票',
-					value: "1"
-				}, {
-					name: '专票',
-					value: "2"
-				}, {
-					name: '收据',
-					value: "3"
-				}],
-				list2: [{
-					name: '是',
-					value: "1"
-				}, {
-					name: '否  ',
-					value: "0"
-				}],
-				tabList: [{
-					name: '申请单主表'
-				}, {
-					name: '提现明细'
-				}],
-
-
-			}
-		},
-
-		onLoad(op){
-			if(op.id){
-				this.id=op.id
-				this.getInfo()
-			}
-		},computed: {
-			invoiceTypeName(){
-				
-				var info =this.list1.find(item=>{
-					console.log(item.value==this.info.invoiceType)
-					return item.value==this.info.invoiceType
-				})
-				
-				if(info){
-					return info.name
-				}
-				return''
-			},
-			
-			
-			applicationAmountDX() {
-				if (this.info.applicationAmount) {
-					var c = DX(this.info.applicationAmount)
-					return c
-				} else {
-					return ''
-				}
-			},
-		},
-		watch:{
-			
-			detailList(nVal, oVal) {
-				console.log(nVal)
-				var obj=[
-					{
-						name: '申请单主表'
-					}, {
-						name: '提现明细'
-					}
-				]
-			
-				if(nVal&&nVal.length){
-					obj[1].count=nVal.length
-				}
-			 
-				this.tabList=obj
-			
-			}
-			
-		},
-		methods: {
-			getInfo(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.getWithdrawInfo(this.id).then((res) => {
-					
-					this.info=res.data.record
-					this.detailList=res.data.detailList
-					uni.hideLoading()
-				
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			change(index) {
-				this.current = index;
-			}
-
-
-
-		}
-	}
-</script>
-<style>
-	page {
-		background-color: #F7F7F7;
-		padding-bottom: 65px;
-	}
-</style>
-<style lang="scss" scoped>
-	.download {
-		color: #185AC6;
-	}
-
-	/deep/.u-tab-bar {
-		background-color: #0076FF !important;
-	}
-
-	/deep/.u-tabs-scorll-flex {
-		width: 56%;
-		margin: 0 auto;
-	}
-
-	.withdraw-tips {
-		margin: 24px 16px;
-
-		p {
-			color: #999;
-			margin-top: 4px;
-		}
-	}
-
-	.withdraw {
-		margin-bottom: 8px;
-		background-color: #fff;
-		padding: 0px 16px 0 16px;
-         
-		.withdraw-head {
-			padding: 14px 0;
-			border-bottom: 1px solid #F2F2F2;
-
-			align-items: center;
-			position: relative;
-			
-			.wsuccess{color:#27b148 !important}
-			.werror{color:#FF6200 !important;}
-			.werror2{color:#1ba7f4 !important;}
-			
-			.unit {
-				position: absolute;
-				top: 34rpx;
-				right: 0;
-
-			}
-
-			.whthdraw-price {
-				font-size: 18px;
-				color: #101010;
-				font-weight: 600;
-			}
-
-			b {
-				color: rgba(119, 119, 119, 100);
-				font-size: 16px;
-			}
-
-			span {
-				width: 60%;
-				float: right;
-				text-align: left;
-				font-size: 16px;
-				color: #333333;
-				
-			}
-			  @media screen and (max-width:320px) {
-			            span{
-			               width: 55%;
-			            }
-			        }
-
-			.uni-input {
-				font-size: 16px;
-				color: #333333;
-				line-height: 18px;
-			}
-		}
-
-		.withdraw-main {
-			border-top: 1px solid #f7f7f7;
-			border-bottom: 1px solid #f7f7f7;
-
-			margin: 16px 0;
-			padding: 16px 0;
-
-			.withdraw-input {
-				margin-top: 32px;
-				display: flex;
-				align-items: center;
-				font-size: 28px;
-
-				/deep/.uni-input-input {
-					font-size: 28px;
-				}
-			}
-		}
-
-		.withdraw-foot {
-			display: flex;
-			align-items: center;
-
-			p {
-				color: #999
-			}
-
-			span {
-				color: #2979FF;
-				margin-left: 16px;
-
-			}
-		}
-	}
-
-	.more {
-		float: right;
-		color: #B3B3B3;
-		font-size: 24px
-	}
-
-	.border-n {
-		border: none !important;
-	}
-
-   .infos{
-	   margin-top: 16px;
-	   color: rgba(51, 51, 51, 100);
-	   font-size: 16px;
-   }
-  .margin{
-	  margin-top: 12px !important;
-  }
-	.details {
-		margin: 0 16px;
-		margin-bottom: 8px ;
-		border-radius: 8px;
-		background-color: #fff;
-		padding:0 12px 0px 12px;
-		p{
-			font-size: 16px;
-			color: #333333;
-			line-height: 50px;
-			border-bottom: solid 1px #E5E7EA;
-			padding-left: 16px;
-		}
-		span{
-			width: 75% !important;
-		}
-	}
-</style>

pagesFinance/user/applicationForWithdrawal.vue

@@ -1,1086 +0,0 @@
-<template>
-	<view>
-		<u-tabs
-		 ref="jputabs"
-		 class="jputabs" name="cate_name" gutter="200" bar-width="100" active-color="#101010"
-			inactive-color="#A1A1A1" :list="tabList" :is-scroll="false" :current="current" @change="change"></u-tabs>
-
-		<u-navbar title="提现申请单" style="margin-bottom: 40px;">
-
-		</u-navbar>
-
-		<template v-if="current==0">
-			<view class="withdraw">
-				<view class="withdraw-head">
-					<b class="asterisk"><text>*</text>申请站点</b>
-					<span>
-						<picker @change="bindPickerChange1" range-key="name" :range="stationList">
-							<view class="uni-input">
-								<view class="input-text">
-									{{stationObj.name?stationObj.name:'无站点'}}
-								</view>
-								<view class="iconfont more">
-									&#xe600;
-								</view>
-							</view>
-
-						</picker>
-
-					</span>
-				</view>
-				<view class="withdraw-head">
-					<b class="asterisk"><text>*</text>提现事由</b>
-					<span>
-						<picker @change="bindPickerChange2" range-key="name" :range="applicationList">
-							<view class="uni-input">{{info.applicationTypeText}}<text
-									class="iconfont more">
-									&#xe600;
-								</text></view>
-						</picker>
-
-					</span>
-				</view>
-				<view class="withdraw-head">
-					<b class="asterisk"><text>*</text>提现月份</b>
-					<span>
-						<picker @change="bindPickerChange3" mode="date" fields="month" :end="nowTime"
-							:value="queryTime">
-							<view class="uni-input">{{showTime(queryTime)}}<text class="iconfont more">
-									&#xe600;
-								</text></view>
-						</picker>
-
-					</span>
-				</view>
-				<view class="withdraw-head ">
-					<b>充电收入</b><span class="classFFF">{{info.chargingIncome}}元</span>
-				</view>
-				<view class="withdraw-head border-n">
-					<b>分润提现明细表</b><span class="download"  @click="ckdownload" >
-						<u-icon name="download"></u-icon> 下载
-					</span>
-				</view>
-			</view>
-
-			<view class="withdraw">
-				<view class="withdraw-head">
-					<b class="asterisk"><text>*</text>成本电价</b>
-					<text class="unit" style="float: right;font-size: 16px;">元/度</text>
-					<span class="withdraw-input" style="width: 63%;">
-						<u-input height="20px" v-model="info.electricityPrice" 
-						maxlength="10"
-						placeholder="请填写电单价" input-align="left"
-							type="digit">
-
-						</u-input>
-
-
-					</span>
-
-				</view>
-				<view class="withdraw-head">
-					<b class="asterisk">预估电量</b>
-
-					<span class="withdraw-input classFFF" style="width: 63%;">
-
-						{{info.estimateElectricQuantity}}度
-
-					</span>
-
-				</view>
-				<view class="withdraw-head">
-					<b class="asterisk"><text>*</text>实际电量</b>
-					<text class="unit" style="float: right;font-size: 16px;">度</text>
-					<span class="withdraw-input" style="width: 63%;">
-						<u-input height="20px" placeholder="请填写实际电量"
-						 maxlength="10"
-						 v-model="info.electricQuantity" input-align="left"
-							type="digit">
-
-						</u-input>
-
-
-					</span>
-
-				</view>
-				<view class="withdraw-head border-n">
-					<b>电费成本</b>
-					<text class="unit" style="float: right;font-size: 16px;">元</text>
-					<span class="withdraw-input" style="width: 63%;">
-						<view class="classFFF" v-show="electricityPriceX">{{electricityPriceX}}</view>
-						<view class="classFFF" v-show="!electricityPriceX">自动计算出结果</view>
-
-
-
-					</span>
-
-				</view>
-
-			</view>
-			<view class="withdraw">
-
-				<view class="withdraw-head">
-					<b>充电分成比例</b>
-					<span  class="classFFF" >
-						{{info.chargingPercent}}%
-
-					</span>
-				</view>
-				<view class="withdraw-head">
-					<b>充电分成</b>
-					<span  class="classFFF" >
-						{{info.chargingProfitAmount?info.chargingProfitAmount.toFixed(2):0}}元
-
-					</span>
-				</view>
-				<view class="withdraw-head border-n">
-					<b>充电服务收益</b>
-					<span>
-						
-						<view class="classFFF" v-show="electricityPriceX">{{(info.chargingProfitAmount-electricityPriceX).toFixed(2)}}元</view>
-						<view class="classFFF" v-show="!electricityPriceX">自动计算出结果</view>
-						
-					</span>
-				</view>
-
-			</view>
-			<view class="withdraw">
-
-				<view class="withdraw-head">
-					<b>月卡分润笔数</b>
-					<span  class="classFFF"  >
-						{{info.monthlyCardTotal}}笔
-
-					</span>
-				</view>
-				<view class="withdraw-head border-n">
-					<b>月卡收益</b>
-					<span  class="classFFF" >
-						{{info.monthlyCardIncome?info.monthlyCardIncome.toFixed(2):0}}元
-
-					</span>
-				</view>
-
-			</view>
-
-
-
-			<view class="withdraw">
-
-				<view class="withdraw-head">
-					<b>合伙人总收入</b>
-					<span  class="classFFF" >
-						{{info.totalIncome?info.totalIncome.toFixed(2):0}}元
-
-					</span>
-				</view>
-				<view class="withdraw-head border-n">
-					<b>合伙人总收益</b>
-					<span   >
-						<view class="classFFF" v-show="electricityPriceX">{{(info.chargingProfitAmount+info.monthlyCardIncome-electricityPriceX).toFixed(2)}}元</view>
-						<view class="classFFF" v-show="!electricityPriceX">自动计算出结果</view>
-						
-						
-
-					</span>
-				</view>
-
-			</view>
-			<view class="withdraw">
-
-
-				<view class="withdraw-head">
-					<b>是否开票</b><span>
-						<u-radio-group  v-model="info.invoiceRequired">
-
-							<u-radio v-for="(item, index) in list2" style="margin-right: 16px;" :key="index+'a'"
-								:name="item.value"  active-color="blue">
-
-								{{item.name}}
-
-							</u-radio>
-
-						</u-radio-group>
-					</span>
-				</view>
-				<view class="withdraw-head">
-					<b v-if="info.invoiceRequired!='1'">发票类型</b>
-					<b v-else class="asterisk"><text>*</text>发票类型</b>
-					<span>
-						<u-radio-group  v-model="info.invoiceType" >
-
-							<u-radio v-for="(item, index) in list1" :key="index+'a'" :name="item.value"
-								:disabled="item.disabled" active-color="blue">
-
-								{{item.name}}
-
-							</u-radio>
-
-						</u-radio-group>
-					</span>
-				</view>
-				<view class="withdraw-head border-n">
-					<b v-if="info.invoiceRequired!='1'">发票税率</b>
-					<b v-else class="asterisk"><text>*</text>发票税率</b>
-					
-				
-					<text style="float: right;font-size: 16px;">%</text>
-					<span class="withdraw-input" style="width: 58%;">
-						<u-input height="20px"  v-model="info.taxRate"
-						placeholder="请输入开票税率" input-align="left"
-						 maxlength="10"
-						 type="digit">
-						</u-input>
-					</span>
-
-				</view>
-
-			</view>
-			<view class="withdraw">
-				<view class="withdraw-head ">
-					<b class="asterisk"><text>*</text>申请提现金额</b>
-					<text class="unit" style="float: right;font-size: 16px;">元</text>
-					<span class="withdraw-input" style="width: 63%;">
-						<u-input height="20px" v-model="info.applicationAmount" maxlength="10" placeholder="请填写金额" input-align="left"
-							type="digit">
-
-						</u-input>
-
-
-					</span>
-
-				</view>
-				<view class="withdraw-head border-n">
-					<b>大写金额</b>
-
-					<span class="withdraw-input" style="width: 63%;">
-
-						<view  class="classFFF" v-show="applicationAmountDX">{{applicationAmountDX}}</view>
-						<view class="classFFF" v-show="!applicationAmountDX">自动转换</view>
-
-
-
-					</span>
-				</view>
-				
-			
-			</view>
-
-		
-			<view class="withdraw">
-				<view class="withdraw-head ">
-					<b class="asterisk"><text>*</text>提现人收款户名</b>
-					<u-input class="textarea" type="textarea" 
-					v-model="info.accountName"
-					placeholder="请填写收款户名" height="96" cursor-spacing="8" />
-
-				</view>
-				<view class="withdraw-head ">
-					<b class="asterisk"><text>*</text>提现人收款银行</b>
-					<u-input class="textarea" type="textarea"
-					v-model="info.bankName"
-					 placeholder="请填写收款银行全称" height="96" cursor-spacing="8" />
-
-				</view>
-				<view class="withdraw-head border-n">
-					<b class="asterisk"><text>*</text>提现人收款账号</b>
-					<u-input class="textarea" v-model="info.accountNo"
-					type="textarea" placeholder="提现人收款账号" height="96" cursor-spacing="8" />
-
-				</view>
-
-			</view>
-
-		</template>
-
-
-		<template v-if="current==1">
-			<view class="details withdrawHead" v-if="detailList.length&&info.applicationAmount">
-				申请提现金额：{{info.applicationAmount}}元<br/>
-				明细金额合计：<span :class="{
-					red:itemApplicationAmountSum>parseFloat(info.applicationAmount)
-				}">{{itemApplicationAmountSum}}元</span>
-			</view>
-			<view class="details" v-for="(item,i) in detailList" :key="i" >
-				<view class="withdraw">
-					<view class="withdraw-head">
-						<b class="asterisk"><text>*</text>项目</b>
-						<text class="unit" style="float: right;font-size: 16px;z-index: 99;"  @click="delItem(i)">
-							<i class="ri-indeterminate-circle-fill" style="color: red;font-size: 24px;"></i>
-						</text>
-						<span class="withdraw-input" style="width: 80%;">
-							<u-input height="20px" 
-							v-model="item.itemName"
-							placeholder="请填写项目名称" input-align="left" >
-
-							</u-input>
-
-
-						</span>
-
-					</view>
-					<view class="withdraw-head border-n">
-						<b class="asterisk"><text>*</text>金额</b>
-						<text class="unit" style="float: right;font-size: 16px;">元</text>
-						<span class="withdraw-input" style="width: 80%;">
-							<u-input height="20px"
-							 v-model="item.itemAmount"
-							 placeholder="请填写价格"
-							  maxlength="10"
-							  input-align="left" type="digit">
-
-							</u-input>
-
-
-						</span>
-
-					</view>
-					<view class="withdraw-head border-n">
-						<b>备注</b>
-
-						<span class="withdraw-input" style="width: 80%;">
-							<u-input height="20px"
-							 v-model="item.itemRemark"
-							 placeholder="请填写备注信息" input-align="left">
-
-							</u-input>
-
-
-						</span>
-
-					</view>
-				</view>
-
-			</view>
-			<view class="add" @click="addItem" ><i class="ri-add-circle-fill"></i><text>增加项目</text></view>
-		</template>
-		<view class="applyBtn">
-			<u-button class="save" @click="submit(-1)">保存草稿</u-button>
-			<u-button class="submit" @click="submit(0)">提交申请单</u-button>
-		</view>
-	</view>
-</template>
-
-
-<script>
-	import * as API from '@/apis/finance.js'
-	import * as API_common from '@/apis/common.js'
-	
-
-	import {
-		beforeTimeStamp,
-		parseUnixTime,
-		substrMb,
-		DX
-	} from '@/utils'
-	export default {
-		data() {
-			return {
-				id:'',
-				uuid:'',
-				isPt: false,
-				detailList:[],
-				info: {
-					electricityPrice: '',
-					electricQuantity: '',
-					stationId: "",
-					applicationType: '1'
-				},
-				applicationList: [{
-						name: '物业结算',
-						value: "1"
-					}, {
-						name: '市场费用',
-						value: "2"
-					}, {
-						name: '利润提现',
-						value: "3"
-					}
-
-				],
-
-				stationList: [],
-				queryTime: '',
-				nowTime: '',
-				stationObj: {},
-				current: 0, // tabs组件的current值，表示当前活动的tab选项
-				params: {
-					year: true,
-					month: true,
-					day: false,
-					hour: false,
-					minute: false,
-					second: false,
-					timestamp: false,
-				},
-				list1: [{
-					name: '普票',
-					value: "1"
-				}, {
-					name: '专票',
-					value: "2"
-				}, {
-					name: '收据',
-					value: "3"
-				}],
-				list2: [{
-					name: '是',
-					value: "1"
-				}, {
-					name: '否  ',
-					value: "0"
-				}],
-				tabList: [{
-					name: '申请单主表'
-				}, {
-					name: '提现明细'
-				}],
-				startTime:'',
-				endTime:'',
-			}
-		},
-		onLoad(op){
-			if(op.id){
-				this.id=op.id
-			}
-			this.uuid=op.uuid;
-		},
-		onShow() {
-
-
-		},
-		onReady() {
-			var nowTime = parseUnixTime(new Date(), "{y}-{m}-01")
-			this.queryTime = parseUnixTime(beforeTimeStamp(1, new Date(nowTime)), '{y}-{m}')
-			this.nowTime = parseUnixTime(beforeTimeStamp(1, new Date(nowTime)), '{y}-{m}')
-
-			this.getStationList()
-		},
-		computed: {
-			 
-			itemApplicationAmountSum(){
-				if (this.info.applicationAmount&&this.detailList&&this.detailList.length) {
-					var applicationAmount=0;
-					for(var i in this.detailList){
-						var obj=this.detailList[i]
-						var itemAmount=obj.itemAmount?obj.itemAmount:0
-						applicationAmount+=parseFloat(itemAmount)
-					}
-					 
- 					if(applicationAmount){
-						return parseFloat(applicationAmount).toFixed(2)
-					}else {
-						return '0'
-					}
-					
-					
-				}else{
-					return '0'
-				}
-				
-			},
-			applicationAmountDX() {
-				if (this.info.applicationAmount) {
-					var c = DX(this.info.applicationAmount)
-					return c
-				} else {
-					return ''
-				}
-			},
-			electricityPriceX() {
-				if (this.info.electricityPrice != '' && this.info.electricQuantity != '') {
-					return (this.info.electricityPrice * this.info.electricQuantity).toFixed(2)
-				}
-				return ''
-			}
-		},
-		watch:{
-			
-			detailList(nVal, oVal) {
-				
-				var obj=[
-					{
-						name: '申请单主表'
-					}, {
-						name: '提现明细'
-					}
-				]
-			
-				if(nVal&&nVal.length){
-					obj[1].count=nVal.length
-				}
-			 
-				this.tabList=obj
-			
-			
-			
-			}
-			
-		},
-		methods: {
-			addItem(){
-				this.detailList.push({})
-			},
-			delItem(i){
-				
-				this.detailList.splice(i,1)
-			},
-			submit(status){
-				if(status==0){
-					
-				//this.value=this.info.amount
-				if(!this.stationObj.id){
-						uni.showToast({
-							title: "请选择站点"
-						})
-				
-					return
-				}
-				if(!this.info.electricityPrice){
-						uni.showToast({
-							title: "请输入成本电价"
-						})
-				
-					return
-				}
-					
-					if(!this.info.electricQuantity){
-							uni.showToast({
-								title: "请输入实际电量"
-							})
-					
-						return
-					}
-					
-					if(this.info.invoiceRequired=="1"){
-						if(!this.info.invoiceType){
-								uni.showToast({
-									title: "请选择发票类型"
-								})
-						
-							return
-						}
-						if(!this.info.taxRate){
-								uni.showToast({
-									title: "请选择发票税率"
-								})
-						
-							return
-						}
-					}
-					
-					if(!this.info.applicationAmount){
-							uni.showToast({
-								title: "请输入申请提现金额"
-							})
-						return
-					}
-					
-					if(!this.info.accountName){
-							uni.showToast({
-								title: "请输入提现人收款户名"
-							})
-						return
-					}
-					if(!this.info.bankName){
-							uni.showToast({
-								title: "请输入提现人收款银行"
-							})
-						return
-					}
-					if(!this.info.accountNo){
-							uni.showToast({
-								title: "请输入提现人收款账号"
-							})
-						return
-					}
-					for(var i in this.detailList){
-						var obj=this.detailList[i]
-						
-						if(!obj.itemName){
-							uni.showToast({
-								title: `请填写提现明细中第${parseInt(i)+1}项的项目名称`
-							})
-							return
-						}
-						if(!obj.itemAmount){
-							uni.showToast({
-								title: `请填写提现明细[${obj.itemName}]项目的金额`
-							})
-							return
-						}
-					}
-					if(this.detailList&&this.detailList.length){
-						
-						
-						if(!(this.itemApplicationAmountSum==parseFloat(this.info.applicationAmount))){
-							uni.showToast({
-								title: `[申请提现金额]与[明细金额合计]不相等`
-							})
-							return
-						}
-					}
-					
-			}
-			if(this.info.invoiceRequired!=''){
-				this.info.invoiceRequired=this.info.invoiceRequired=='1'?true:false
-			}
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				if(this.id){
-					this.info.id=this.id;
-				}
-				this.info.status=status;
-				
-				//var str=JSON.stringify();
-				API.applyWithdraw({
-					
-					record:this.info,
-					detailList:this.detailList
-				
-				}).then((res) => {
-					
-					this.carhelp.set("withdrawRecord",{
-						uuid:this.uuid,
-					})
-					this.id=res.data;
-					uni.hideLoading()
-					if(status==-1){
-						uni.showModal({
-							title:"提示",
-							content:"保存成功",
-							showCancel:false
-						})
-					}else{
-						uni.redirectTo({
-							url:"/pagesFinance/user/applyResult?value="+this.info.applicationAmount
-						})
-					}
-						
-					
-				}).catch(error => {
-					uni.hideLoading()
-					uni.showModal({
-						title:"提示",
-						content:error,
-						showCancel:false
-					})
-				})
-			},
-			 
-			ckdownload(){
-				//this.value=this.info.amount
-				if(!this.stationObj.id){
-						uni.showToast({
-							title: "请选择站点"
-						})
-				
-					return
-				}
-				
-				API.profitDetailsExcel({
-					stationId:this.stationObj.id,
-					yearMonth:this.queryTime,
-				
-				}).then((resDown) => {
-					
-					if(resDown.data){
-						window.location.href=resDown.data
-						
-					}else{
-						uni.showToast({
-							title:"无文件下载"
-						})
-					}
-				}).catch(error => {
-					
-					uni.showToast({
-						title:error
-					})
-				})
-				
-			},
-			
-			showTime(name) {
-				if (!name) {
-					return ''
-				}
-				return name.replace('-', '年') + '月';
-			},
-
-			queryWithdrawInfo() {
-				 
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.queryWithdrawInfo({
-					stationId: this.stationObj.id,
-					yearMonth: this.queryTime,
-					applicationType: this.info.applicationType
-				}).then((res) => {
-					this.info = res.data.record;
-					var detailList = res.data.detailList;
-					this.detailList=[];
-					
-					if(detailList==null){
-						detailList=[];
-					}
-					for(var i in detailList){
-						if(this.id){
-							this.detailList.push(detailList[i])
-						}else{
-							this.detailList.push({
-								itemName:detailList[i].itemName,
-								itemRemark:detailList[i].itemRemark,
-								itemAmount:'',
-							})
-						}
-					}
-					
-					uni.hideLoading()
-
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			getInfo(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.getWithdrawInfo(this.id).then((res) => {
-					
-					this.info=res.data.record
-					this.detailList=res.data.detailList
-					uni.hideLoading()
-				
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			getStationList() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.stationList().then((res) => {
-					this.stationList = res.data.stationList;
-					
-						if (this.stationList.length) {
-							this.stationObj = this.stationList[0];
-							if(this.id){
-									this.getInfo()
-							}else{
-									this.queryWithdrawInfo()
-							}
-						
-						}
-					
-					
-					uni.hideLoading()
-				
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-				
-				API_common.findByCatalogName2({
-					catalogName:"提现类型"
-				}).then((res) => {
-					this.applicationList= res.data.dataDictionaryList;
-					// this.applicationList =dataDictionaryList.map((item)=>{
-					// 	return {
-					// 		name:item.name,
-					// 		value:item.value
-					// 	}
-					// })
-					uni.hideLoading()
-
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			bindPickerChange1(e) {
-
-				if (this.stationList[e.detail.value]) {
-					this.stationObj = this.stationList[e.detail.value];
-					this.queryWithdrawInfo()
-				}
-			},
-			bindPickerChange2(e) {
-				this.info.applicationType = this.applicationList[e.detail.value].value;
-				this.queryWithdrawInfo()
-			},
-			bindPickerChange3(e) {
-				this.queryTime = e.detail.value;
-				this.queryWithdrawInfo()
-			},
-			change(index) {
-				this.current = index;
-			}
-
-
-
-		}
-	}
-</script>
-<style>
-	page {
-		background-color: #F7F7F7;
-		padding-bottom: 65px;
-	}
-</style>
-<style lang="scss" scoped>
-	.jputabs {
-		//position: absolute;
-		position: fixed;
-		background-color: #FFF;
-		width: 100%;
-		top: 40px;
-		z-index: 99;
-	}
-
-	.classFFF {
-		color: #607d8b  !important;
-	}
-
-	.download {
-		color: #185AC6 !important;
-	}
-
-	/deep/.u-tab-bar {
-		background-color: #0076FF !important;
-
-	}
-
-	/deep/.u-tabs-scorll-flex {
-		width: 56%;
-		margin: 0 auto;
-	}
-
-	.withdraw-tips {
-		margin: 24px 16px;
-
-		p {
-			color: #999;
-			margin-top: 4px;
-		}
-	}
-
-	.uni-input {
-		font-size: 16px;
-		color: #333333;
-
-
-	}
-	
-	.withdraw {
-		margin-bottom: 8px;
-		background-color: #fff;
-		padding: 0px 16px 0 16px;
-
-		.withdraw-head {
-			padding: 16px 0;
-			border-bottom: 1px solid #E5E7EA;
-
-			align-items: center;
-			position: relative;
-
-			.unit {
-				position: absolute;
-				top: 34rpx;
-				right: 0;
-
-			}
-
-			.whthdraw-price {
-				font-size: 18px;
-				color: #101010;
-				font-weight: 600;
-			}
-
-			b {
-				color: rgba(119, 119, 119, 100);
-				font-size: 16px;
-			}
-
-			span {
-				width: 60%;
-				float: right;
-				text-align: left;
-				font-size: 16px;
-				color: #333333;
-			}
-
-			@media screen and (max-width:320px) {
-				span {
-					width: 55%;
-				}
-			}
-
-		}
-
-		.withdraw-main {
-			border-top: 1px solid #f7f7f7;
-			border-bottom: 1px solid #f7f7f7;
-
-			margin: 16px 0;
-			padding: 16px 0;
-
-			.withdraw-input {
-				margin-top: 32px;
-				display: flex;
-				align-items: center;
-				font-size: 28px;
-
-				/deep/.uni-input-input {
-					font-size: 28rpx;
-				}
-			}
-		}
-
-		.withdraw-foot {
-			display: flex;
-			align-items: center;
-
-			p {
-				color: #999
-			}
-
-			span {
-				color: #2979FF;
-				margin-left: 16px;
-
-			}
-		}
-	}
-
-	.more {
-
-		color: #B3B3B3;
-		font-size: 24px
-	}
-
-	.applyBtn {
-		padding: 0 16px;
-
-		display: flex;
-		background-color: #FFF;
-		font-size: 16px;
-		line-height: 44px;
-		height: 60px;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-
-		.save {
-			width: 33.6%;
-			border-radius: 8px 0px 0px 8px;
-			background-color: rgba(0, 185, 98, 100);
-			color: rgba(255, 255, 255, 100);
-		}
-
-		.submit {
-			width: 66.4%;
-			border-radius: 0px 8px 8px 0px;
-			background-color: rgba(24, 90, 198, 100);
-			color: rgba(255, 255, 255, 100);
-		}
-	}
-
-
-	/deep/.uni-input-input {
-		text-align: start !important;
-	}
-
-	.border-n {
-		border: none !important;
-	}
-
-	.textarea {
-		background-color: rgba(242, 242, 242, 100);
-		margin-top: 12px;
-		line-height: 20px;
-		border-radius: 4px;
-		color: rgba(136, 136, 136, 100);
-
-		.uni-textarea-placeholder {
-			padding: 0 16rpx;
-
-		}
-
-		/deep/.uni-textarea-textarea {
-			width: 90%;
-			padding: 0 16rpx;
-
-		}
-	}
-	.withdrawHead{
-		padding: 15px;
-		font-size: 14px;
-		.red{
-			color: red;
-		}
-	}
-	.details {
-		margin: 16px;
-		border-radius: 8px;
-		background-color: #fff;
-		overflow: hidden;
-	}
-
-	.asterisk {
-		position: relative;
-
-		text {
-			position: absolute;
-			top: 0px;
-			left: -14rpx;
-			color: #EE3138;
-		}
-	}
-
-	.add {
-		text-align: center;
-		font-size: 18px;
-		color: #101010;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-
-		.ri-add-circle-fill {
-			font-size: 24px;
-			color: #44B371;
-			margin: auto 0;
-			margin-right: 4rpx;
-		}
-
-	}
-
-	/deep/.u-input__input {
-		font-size: 16px !important
-	}
-
-	.uni-input {
-		display: flex;
-		justify-content: space-between;
-	}
-
-	.input-text {
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-</style>

pagesFinance/user/applyResult.vue

@@ -1,100 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="申请结果"></u-navbar>
-		<view class="applyResult">
-			<u-icon name="chenggong" custom-prefix="custom-icon" color="#27B148" size="150"></u-icon>
-			<h3>申请成功</h3>
-			<p v-if="value">申请提现 ￥{{(value).toFixed(2)}}元</p>
-		</view>
-		<view class="applySpeed">
-			<view class="applySpeed-item">
-				<u-icon name="time-line" custom-prefix="custom-icon" color="#185AC6" size="48"></u-icon>
-				<p>等待财务确认提现金额并打款</p>
-			</view>
-			<view class="applySpeed-item">
-				<u-icon name="money-cny-circle-line" custom-prefix="custom-icon" color="#185AC6" size="48"></u-icon>
-				<p>等待银行清算后金额到账</p>
-			</view>
-		</view>
-		<view class="applyBtn">
-			<u-button class="applyBtn-btn" type="primary" @click="back">查看申请记录</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				value:0,
-				form: {
-					name: '',
-					intro: '',
-				},
-			}
-		},onLoad(op) {
-			if(op.value){
-				this.value=parseFloat(op.value)
-				
-			}
-		},
-		methods: {
-			back(){
-				uni.navigateBack()
-			}
-		}
-	}
-</script>
-<style>
-	
-</style>
-<style lang="scss" scoped>
-	.applyResult{
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		margin: 36px 0;
-		h3{
-			margin-top: 20px;
-		}
-		p{
-			color: #999;
-			margin-top: 4px;
-		}
-	}
-	.applySpeed{
-		margin: 0 72px;
-	}
-	
-	.applySpeed-item{
-		display: flex;
-		margin-bottom: 24px;
-		align-items: center;
-		position: relative;
-		&:after{
-			content: '';
-			position: absolute;
-			width: 1px;
-			height: 18px;
-			background-color: #185AC6;
-			left:12px;
-			top: 26px;
-		}
-		&:last-child:after{
-			background: none;
-		}
-		p{
-			margin-left: 8px;
-		}
-	}
-	.applyBtn{
-		margin: 36px;
-	}
-	.applyBtn-btn{
-		background-color: #185AC6;
-		border-color:#185AC6 ;
-		border-radius: 8px;
-	}
-</style>

pagesFinance/user/chargingDetails.vue

@@ -1,406 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="充电价格详情"></u-navbar>
-		<!-- 主体 -->
-		<!-- 充电桩信息 -->
-		<view class="main"> 
-			<!-- 收费标准 -->
-						 <view class="rates" v-if="prices&&prices.length">
-							<view class="rates-title">
-								<view class="title-left">
-									收费标准
-								</view>
-								<view class="title-right">
-									充电功率计费
-								</view>
-			
-							</view> 
-							<!-- 时段分类 -->
-							 <view class="time-rates">
-								
-								<view class="time-part" v-for="(item,index) in prices" :key="index">
-									<view class="part-top">
-										<view class="time">
-											{{item.minPower}}W-{{item.maxPower}}W
-										</view>
-										<view class="price">
-			
-											<text class="price-number">{{item.price}}</text>
-											<text class="price-unit">元每小时</text>
-										</view>
-									</view>
-									<!-- <view class="part-bottom">
-										<view class="unitPrice-servicePrice">
-											充电单价：￥{{item.costPrice}} | 服务费：￥{{item.servicePrice}}
-										</view>
-									</view> -->
-								</view>
-							 
-			
-							</view> 
-			
-						 </view>
-					 </view>	
-			<!-- 收费标准 -->
-			<!-- <view class="rates" v-if="carPrices&&carPrices.length">
-				<view class="rates-title">
-					<view class="title-left">
-						收费标准
-					</view>
-					<view class="title-right">
-						峰谷平电价计费
-					</view>
-
-				</view> -->
-				<!-- 时段分类 -->
-				<!-- <view class="time-rates">
-					
-					<view class="time-part" v-for="(item,index) in carPrices" :key="index">
-						<view class="part-top">
-							<view class="time">
-								{{item.startTime}}-{{item.endTime}}
-							</view>
-							<view class="price">
-
-								<text class="price-number">{{item.electricityPrice.toFixed(2)}}</text>
-								<text class="price-unit">元/度</text>
-							</view>
-						</view>
-						<view class="part-bottom">
-							<view class="unitPrice-servicePrice">
-								充电单价：￥{{item.costPrice.toFixed(2)}} | 服务费：￥{{item.servicePrice.toFixed(2)}}
-							</view>
-						</view>
-					</view>
-				 
-					<view style=" text-align: center;  color: #999999;">*充电费用仅供参考，请以充电桩上的费用为准。</view>
-
-				</view> -->
-			<!-- </view> -->
-		<!-- </view> -->
-		<view class="price-main"  v-if="carPrices&&carPrices.length" >
-			<view class="price-item" v-for="(item,i) in carPrices" :key="i" >
-						<view class="time " v-if="!item.current">
-							{{item.startTime}}-{{item.endTime}}
-						</view>
-						<view class="time curent" v-if="item.current">
-							{{item.startTime}}-{{item.endTime}} <view class="current-time">当前时段</view>
-						</view>
-						<view class="price">
-							<text class="price-1"><text class="num">{{item.costPrice.toFixed(2)}}</text> <text >元/度</text></text> 
-							<text class="price-2"   v-if="item.discountServicePrice"  >
-								<text class="num">{{((item.servicePrice*1000+item.electricityPrice*1000)/1000).toFixed(2)}}元/度</text>
-							</text>
-						</view>
-						<view class="else-price">
-							<view class="electric-price">
-								电费{{item.electricityPrice.toFixed(2)}}元/度
-							</view>
-							
-							<view
-							 v-if="item.discountServicePrice"
-							
-							 class="service-price">服务费{{item.discountServicePrice}}元/度(折前{{item.servicePrice.toFixed(2)}}元/度)</view>
-							
-							<view 
-								 v-if="!item.discountServicePrice"
-							class="service-price">服务费{{item.servicePrice}}元/度</view>
-				
-				</view>
-					</view>
-			 
-			
-			
-			
-		</view>
-		<u-divider color="#B6BDC3" style="margin-top:20px;" bg-color="#F2F4F4">*充电费用仅供参考，请以充电桩上的费用为准。</u-divider>
-	</view>
-
-
-</template>
-<script>
-	var formatNum=function(num) {
-		let res = Number(num);
-		return res < 10 ? '0' + res : res;
-	};
-	import * as API from '@/apis/finance.js'
-
-	export default {
-		data() {
-			return {
-				id:'',
-				carPrices: [],
-				device: [],
-				prices: null,
-				description: '温馨提示：充电前请确保您的车辆已与充电桩连接！并关闭车内电源。'
-			}
-		},
-		onLoad(op) {
-			if(op){
-				this.id=op.id
-					this.getInfo()
-			}
-		},
-		onReady() {
-		
-		},
-		methods: {
-			carPricesMethod(){
-				
-				let date = new Date();
-				let hours = date.getHours();
-				let minutes = date.getMinutes();
-				let seconds = date.getSeconds();
-				let date_str = formatNum(hours) + ':' + formatNum(minutes); //+ ' ' +formatWeek;
-				for (var i in this.carPrices) {
-					var obj = this.carPrices[i]
-				
-					if (date_str >= obj.startTime && date_str <= obj.endTime) {
-						obj.current = true;
-					}
-				
-				}
-				
-			},
-			getInfo(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.priceList({
-					deviceNo:this.id
-				}).then((res) => {
-				
-					this.carPrices=res.data.carPrices
-					this.device=res.data.device
-					this.prices=res.data.prices
-					if(this.carPrices){
-						this.carPricesMethod();
-					}
-					
-					uni.hideLoading()
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			}
-		}
-	}
-</script>
-
-
-<style lang="scss">
-	page{
-		background-color: #F2F4F4;  
-	}
-	// 头部
-	.title {
-		width: 100%;
-		line-height: 44px;
-		background-color: rgba(255, 255, 255, 100);
-		text-align: center;
-		border: 1px solid rgba(242, 242, 242, 100);
-		position: fixed;
-		top: 0;
-
-	}
-	.title-left,.title-right{
-			font-size: 18px;
-	}
-	
-	// 主体
-	.main {
-		width: 100%;
-
-		//margin-top: 44px;
-		// margin-bottom: 64px;
-		//padding-bottom: 234px;
-		.main-detail {
-			display: flex;
-			justify-content: space-between;
-			padding: 14px 16px 0 0;
-			height: 48px;
-			line-height: 48px;
-			background-color: #fff;
-			border-bottom: 1px solid rgba(242, 242, 242, 100);
-
-			.detail-name {
-				margin-left: 16px;
-				height: 20px;
-				line-height: 23px;
-				color: rgba(102, 102, 102, 100);
-				font-size: 14px;
-
-			}
-
-			.detail-content {
-				height: 23px;
-				line-height: 23px;
-				color: rgba(51, 51, 51, 100);
-				font-size: 14px;
-
-			}
-		}
-
-		// 收费标准
-		.rates {
-			width: 100%;
-			background-color: #fff;
-			margin-top: 12px;
-
-			.rates-title {
-				display: flex;
-				justify-content: space-between;
-				height: 48px;
-				line-height: 48px;
-				padding: 0px 16px 0;
-				border-bottom: 1px solid rgba(242, 242, 242, 100);
-			}
-
-			.time-part {
-				width: 100%;
-
-				.part-top {
-					display: flex;
-					justify-content: space-between;
-					padding: 16px;
-
-					.time {
-						font-weight: bold;
-						color: rgba(16, 16, 16, 100);
-						font-size: 18px;
-					}
-
-					.price {
-						.price-number {
-							color: rgba(255, 61, 0, 100);
-							font-size: 24px;
-							text-align: right;
-							font-family: Roboto-regular;
-							display: inline-block;
-							height: 20px;
-							font-weight: 600;
-						}
-
-						.price-unit {
-							color: rgba(102, 102, 102, 100);
-							font-size: 16px;
-							text-align: right;
-							margin-left: 4px;
-							display: inline-block;
-							height: 20px;
-						}
-					}
-				}
-
-				.part-bottom {
-					.unitPrice-servicePrice {
-						eight: 18px;
-						color: rgba(136, 136, 136, 100);
-						font-size: 18px;
-						text-align: right;
-						padding-right: 16px;
-						padding-bottom: 18px;
-					}
-				}
-			}
-		}
-
-		.tips {
-
-			font-size: 12px;
-			margin-top: 24px;
-
-			/deep/.u-alert-desc[data-v-4d234687] {
-				font-size: 12px
-			}
-		}
-	}
-
-	// 尾部
-	.bottom {
-		background-color: #fff;
-		 
-		width: 100%;
-		height: 64px;
-		line-height: 64px;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		z-index: 999;
-		padding: 12px 16px;
-
-		.botton {
-			width: 343px;
-			height: 40px;
-			line-height: 40px;
-			border-radius: 50px;
-			background-color: rgba(0, 185, 98, 100);
-			color: rgba(255, 255, 255, 100);
-			font-size: 16px;
-			text-align: center;
-			margin: 0 auto;
-		}
-
-	}// 价格详情
-		.price-main{
-			background-color: #fff;
-			.price-item{
-				padding: 10px 20px 10px 0;
-				margin-left: 20px;
-				border-bottom:rgb(238, 242, 240) solid 1px;
-				.time{
-					color:  #00b962;;
-					font-size: 18px;
-					position: relative;
-					
-				}
-				.curent{
-					position: relative;
-					color: #ff8b17;
-					.current-time{
-						background-color: #ffecdd;
-						width: 72px;
-						line-height: 20px;
-						border-radius: 4px;
-						padding:2px;
-						position: absolute;
-						top: 0;
-					    right: 0;
-						font-size: 14px;
-						text-align: center;
-					}
-				}
-				.price{
-					color: #101010;
-					  font-size: 16px;
-					.price-1{
-						
-						
-						.num{
-							font-size: 28px;
-							font-weight: 550;
-							margin-right: 4px;
-						}
-					}
-					.price-2{
-						margin-left: 8px;
-						text-decoration: line-through;
-						.num{
-							margin-right: 4px;
-						}
-					}
-				}
-				.else-price{
-					
-					display: flex;
-					justify-content: space-between;
-					color:  rgba(153, 153, 153, 100);
-					
-				}
-			}
-			
-		}
-</style>

pagesFinance/user/chargingGunSetup.vue

@@ -1,892 +0,0 @@
-<template>
-	<view>
-		
-		<u-navbar title="充电枪设置"></u-navbar>
-		<u-tabs :list="list" :is-scroll="false" :current="current" @change="change" active-color="#101010"></u-tabs>
-		
-		<u-modal v-model="show2" @confirm="submitApi()" :show-cancel-button='true' title="以下预约时段存在问题:" :confirm-text="'继续提交'" >
-			<view style="padding: 15px;text-align: center;">
-				<!-- <p style="padding-bottom: 10px;">以下预约时段存在问题:</p> -->
-				<p v-for="(item,i) in errorlist" :key="i" >
-					{{item.name}}{{item.value}}
-				</p>
-			</view>
-		</u-modal>
-
-	<u-select v-model="show" :title="'开始时间-结束时间'"
-	mode="mutil-column-auto" :list="listmutilcolumnauto" :default-value="defaultTime" @confirm="confirm"></u-select>
-
-		<!-- <udoublepicker v-model="show" 
-		:defaultTime="defaultTime" 
-		:defaultTime2="defaultTime2"
-		 @confirm="confirm" ></udoublepicker> -->
-
-<!-- 开放共享 -->
-		<view class="" v-if="current==0">
-			<view class="share-set" >
-				<view class="title">
-					开放共享
-				</view>
-				<view class="">
-					<u-radio-group v-model="detail.enableShare" >
-					
-						<u-radio  v-for="(item, index) in list2" :key="index+'a'" :name="item.value"
-							:disabled="item.disabled" active-color="#00b962">
-					
-							{{item.name}}
-					
-						</u-radio>
-					
-					</u-radio-group>
-				</view>
-			
-			</view>
-		
-		</view>
-		<!-- 预约设置 -->
-		<view class="" v-if="current==1">
-			<view class="share-set" >
-				<view class="title">
-					开放预约
-				</view>
-				<view class="">
-					<u-radio-group  v-model="detail.enableAppointment" >
-					
-						<u-radio  v-for="(item, index) in list2" :key="index+'b'" :name="item.value"
-							:disabled="item.disabled" active-color="#00b962">
-					
-							{{item.name}}
-					
-						</u-radio>
-					
-					</u-radio-group>
-					
-				</view>
-			
-			</view>
-			<view class="share-set" >
-				<view class="title">
-					预约自动确认
-				</view>
-				<view class="">
-					<u-radio-group  v-model="detail.autoConfirm" >
-					
-						<u-radio   v-for="(item, index) in list2" :key="index+'c'" :name="item.value"
-							active-color="#00b962">
-					
-							{{item.name}}
-					
-						</u-radio>
-					
-					</u-radio-group>
-					
-				</view>
-			
-			</view>
-			<!-- 预留时长选项 -->
-			<view class="time-options">
-				<view class="title">
-					预留时长选项
-				</view>
-					<view class="radio-box">
-						<u-checkbox-group  shape="square">
-						
-							<u-checkbox   v-for="(item, index) in timeList"
-							 	v-model="item.checked"  @change="checkboxChange(item,$event)" 
-								:key="index" :name="item.value"
-								:disabled="item.disabled" active-color="#00b962">
-						
-								{{item.name}}
-						
-							</u-checkbox>
-						</u-checkbox-group>
-						
-					</view>
-			</view>
-			 
-		</view>
-		
-		<!-- 开发时间设置 -->
-		<view class="main">
-			<view class="title">
-				{{current?'预约':'共享'}}时段 <span style="
-					float: right;
-					color: #53b56b;
-					font-size: 14px;
-				"
-				@click="copy"
-				v-show="current==1">
-				<u-icon name="file-text"></u-icon>
-				同步共享设置</span>
-			</view>
-			<view class="item" v-for="(item,i) in  weekSz" :key="i">
-				<view class="switch">
-					<view class="week">
-						{{item}} <!-- {{weekOpenSz[i].lookcollect}} -->
-					</view>
-					<u-switch v-model="weekOpenSz[i].op" @change="change2($event,i)" size="40" active-color="#00b962"></u-switch>
-				</view>
-				
-				<view class="frame-box"   v-for="(item2,index) in  weekOpenSz[i].list"  :key="index">
-					<view class="time-frame">
-						<view class="frame-title">
-							开放时段 
-						</view>
-						<view class="time" @click="showDbTime(item2,index,i)">
-							{{item2.startTime }} 至 {{item2.endTime}}
-						</view>
-						<view class="iconfont more" @click="showDbTime(item2,index,i)" >
-							&#xe600;
-						</view>
-					</view>
-					<view class="img" 
-					
-					v-if="index==0&&weekOpenSz[i].list.length==2" >
-						<img src="../../assets/img/add.png" alt="">
-					</view>
-					<view class="img" 
-					
-					 v-else-if="index==1" >
-						<img 
-						 @click="delItem(i)"
-						src="../../assets/img/sub.png" alt="">
-					</view>
-					<view class="img" 
-					
-					v-else >
-						<img 
-						@click="addItem(i)"
-						src="../../assets/img/add1.png" alt="">
-					</view>
-				</view>
-				
-			</view>
-			
-		</view>
-		<!-- 底部 -->
-		<view class="bottom">
-			<view class="radio-box">
-				
-				
-				
-				<u-checkbox-group>
-					<u-checkbox  v-model="detail.changeOther" shape="circle" ></u-checkbox>
-				</u-checkbox-group>
-				
-				<text class="text">将该设置同步到其他充电枪</text>
-			</view>
-				<u-button class="save" type="primary" @click="submit"  >保存</u-button>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import udoublepicker from '@/components/u-double-picker.vue'
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		components: {
-			udoublepicker
-		},
-		data() {
-			return {
-				listmutilcolumnauto:[],
-				list2: [{
-						value:"1",
-						name: "是"
-					},
-					{
-						value:"0",
-						name: "否"
-					}
-				],
-				errorlist:[],
-				detail:{
-				
-				},
-				weekSz:[
-					'周一','周二','周三','周四',
-					'周五','周六','周日',
-				],
-				weekOpenSzData:[
-					[{
-						op:0,
-						list:[]
-					},
-					{
-						op:0,
-						list:[]
-					},
-					{
-						op:0,
-						list:[]
-					},
-					{
-						op:0,
-						list:[]
-					},
-					{
-						op:0,
-						list:[]
-					},
-					{
-						op:0,
-						list:[]
-					},
-					{
-						op:0,
-						list:[]
-					}],[
-						{
-							op:0,
-							list:[]
-						},
-						{
-							op:0,
-							list:[]
-						},
-						{
-							op:0,
-							list:[]
-						},
-						{
-							op:0,
-							list:[]
-						},
-						{
-							op:0,
-							list:[]
-						},
-						{
-							op:0,
-							list:[]
-						},
-						{
-							op:0,
-							list:[]
-						}
-					]
-				],
-				obj1:[],
-				obj2:[],
-				show:false,
-				show2:false,
-				list: [{
-					name: '共享设置'
-				}, {
-					name: '预约设置'
-				}],
-				
-				shareList: [{
-						name: '是',
-						disabled: false
-					},
-					{
-						name: '否',
-						disabled: false
-					}
-				],
-				timeList: [
-					{
-						value:"10",
-						name: "10分钟"
-					},
-					{
-						value:"20",
-						name: "20分钟"
-					},
-					{
-						value:"30",
-						name: "30分钟"
-					}
-				],
-				// u-radio-group的v-model绑定的值如果设置为某个radio的name，就会被默认选中
-				value: '',
-				current: 0,
-				checked:false,
-				defaultTime:[],
-				defaultTime2:'',
-				selectIndex:0,
-				selectI:0,
-			}
-		},
-		onLoad(op){
-			this.initlistmutilcolumnauto();
-			this.id=op.id;
-			this.getInfo()
-		},
-		computed:{
-			weekOpenSz(){
-				
-				return this.weekOpenSzData[this.current]
-			}
-		},
-		methods: {
-			
-			initlistmutilcolumnauto(){
-				
-				function	formatNumber(num) {
-					return +num < 10 ? '0' + num : String(num);
-				}
-				function	getSz(obj,ivalue,jvalue) {
-					
-					if(jvalue==0){
-						var item={
-							value:ivalue*100+30,
-							label:formatNumber(ivalue)+":30",
-						}
-						obj.children.push(item)
-					}
-					
-					for(var i=ivalue+1;i< 24;i++){
-						for(var j=0;j< 2;j++){
-							var item={
-								value:i*100+j*30,
-								label:formatNumber(i)+":"+(j==0?'00':'30'),
-							}
-							obj.children.push(item)
-							
-						}
-					}
-					
-						var item={
-							value:24*100,
-							label:formatNumber(24)+":00",
-						}
-						obj.children.push(item)
-					
-					return obj.children;
-				}
-				this.listmutilcolumnauto=[]
-				for(var i=0;i< 24;i++){
-					for(var j=0;j< 2;j++){
-						var obj={
-							value:i*100+j*30,
-							label:formatNumber(i)+":"+(j==0?'00':'30'),
-							children:[]
-						}
-						obj.children=getSz(obj,i,j)
-						this.listmutilcolumnauto.push(obj)
-					}
-				}
-				console.log(this.listmutilcolumnauto);
-			},
-			copy(){
-				var list= this.weekOpenSzData[1]
-				 for(var i in  list){
-					 var obj1=  this.weekOpenSzData[1][i]
-					var obj0=  this.weekOpenSzData[0][i]
-					obj1.op=obj0.op;
-					obj1.list=[];
-					for(var j in  obj0.list){
-						var item=obj0.list[j]
-						var newObj=Object.assign({},item)
-						obj1.list.push(newObj);
-					}
-					
-					
-				 }
-				
-				
-				this.$nextTick(()=>{
-					 this.$forceUpdate()
-				})
-			},
-			
-			checkoverflow(){
-				
-				function getTime(time){
-					var c=(time=='24:00')?"2020/01/02 00:00:00":"2020/01/01 "+time
-					var gettime= new Date(c).getTime()
-					return gettime;
-				}
-				var step =false;
-				this.errorlist=[];
-				
-				var list= this.weekOpenSzData[1]
-				 for(var i in  list){
-					//预约
-					var obj1=  this.weekOpenSzData[1][i]
-					//开放
-					var obj0=  this.weekOpenSzData[0][i]
-					//obj1.op=obj0.op;
-					//obj1.list=[];
-					
-					if(obj1.op&&!obj0.op){
-						this.errorlist.push({
-							name:this.weekSz[i],
-							value:"未开启共享"
-						})
-					}else if(obj1.op==0&&obj0.op==0){
-						
-					} else{
-						var optionList=[];
-						if(obj0.list.length==2){
-							//判断是否有交集
-							var startTime1=getTime(obj0.list[1].startTime);
-							var endTime1=getTime(obj0.list[1].endTime);
-							
-							var startTime0=getTime(obj0.list[0].startTime);
-							var endTime0=getTime(obj0.list[0].endTime);
-							
-							
-							if(startTime1>=startTime0&&endTime1<=endTime0){
-								optionList.push(obj0.list[0]);//并集
-								obj0.lookcollect="并集"
-								
-							}else if(startTime1<=startTime0&&endTime1>=endTime0){
-								optionList.push(obj0.list[1]);//并集
-								obj0.lookcollect="并集"
-								
-							}
-							else  if(endTime0<startTime1&&endTime0<=endTime1){
-								//不相交
-								optionList=obj0.list;
-								obj0.lookcollect="不相交"
-								
-							}else  if(endTime1<startTime0&&endTime1<=endTime0){
-								//不相交
-								
-								obj0.lookcollect="不相交"
-								optionList=obj0.list;
-							}else{
-								obj0.lookcollect="交集"
-								
-								//交集
-								if(startTime0<startTime1){
-									optionList.push({
-										startTime:obj0.list[0].startTime,
-										endTime:obj0.list[1].endTime
-									});
-								}else{
-									optionList.push({
-										startTime:obj0.list[1].startTime,
-										endTime:obj0.list[0].endTime
-									});
-								}
-								
-							}
-							
-							// if(){
-							// 	optionList.push({
-							// 		startTime:obj0.list[1].startTime
-							// 		endTime:obj0.list[1].startTime
-							// 	})
-							// }
-							
-						}else{
-							optionList=obj0.list;
-						}
-						
-						
-						for(var j in  obj1.list){
-						
-							var item1=obj1.list[j]
-							var bl=true;
-							for(var k in  optionList){
-								var item2=optionList[k];
-								var startTime1=getTime(item1.startTime);
-								var endTime1=getTime(item1.endTime);
-								
-								var startTime0=getTime(item2.startTime);
-								var endTime0=getTime(item2.endTime);
-								
-								if(startTime1>=startTime0&&endTime1<=endTime0){
-									
-									bl=false;
-								}
-							}
-							if(bl){
-								this.errorlist.push({
-									name:this.weekSz[i],
-									value:"不在共享开放时段"
-								})
-							}
-						}
-					}
-				
-					
-					//this.weekOpenSzData[0][i]=obj0
-					
-				 }
-				 
-				 if(this.errorlist.length==0){
-					
-					 this.submitApi()
-				 }else{
-					 this.show2=true;
-				 }
-				 
-			},
-			submit(){
-				this.detail.sharedWeekSetting=""
-				this.detail.reserveWeekSetting=""
-				
-				var list = this.weekOpenSzData[0];
-				var listJson=[]
-				for(var i in list){
-					var obj=list[i];
-					listJson=listJson.concat(obj.list);
-				}
-				this.detail.sharedWeekSetting=JSON.stringify(listJson)
-				
-				if(this.detail.enableShare=="1"){
-				
-					if(listJson.length==0){
-						uni.showToast({
-							title:"开放共享功能需要添加【共享时段】"
-						})
-						return
-					}
-				}
-				// var sz=[]
-				// for(var i in this.weekList){
-				// 	var item=this.weekList[i]
-				// 	if(item.checked){
-				// 		sz.push(item.value)
-				// 	}
-				// }
-				// var weekDay=sz.join();
-				
-				
-				var sz2=[]
-				for(var i in this.timeList){
-					var item=this.timeList[i]
-					if(item.checked){
-						sz2.push(item.value)
-					}
-				}
-				var reserveMinutes=sz2.join();
-				this.detail.reserveMinutes=reserveMinutes
-				
-				var list = this.weekOpenSzData[1];
-				var listJson=[]
-				for(var i in list){
-					var obj=list[i];
-					listJson=listJson.concat(obj.list);
-				}
-				this.detail.reserveWeekSetting=JSON.stringify(listJson)
-				if(this.detail.autoConfirm==null){
-					this.detail.autoConfirm=false
-				}
-				if(this.detail.enableAppointment=="1"){
-					
-				
-					if(listJson.length==0){
-						uni.showToast({
-							title:"开放预约功能需要添加【预约时段】"
-						})
-						return
-					}
-					 
-					if(reserveMinutes==""){
-						uni.showToast({
-							title:"开放预约功能需要选择【预留时长】"
-						})
-						return
-					}
-					this.checkoverflow()
-					
-					
-				}else{
-					this.submitApi()
-				}
-				
-			},
-			submitApi(){
-				uni.showLoading({
-					title:"加载中",mask:true,
-				})
-				API.saveGunShare(this.detail).then((res) => {
-					
-					uni.hideLoading()
-					uni.showToast({
-						title:"操作成功"
-					})
-				
-					
-				}).catch(error => {
-						uni.showToast({
-							
-							title:error
-						})
-				})
-			},
-			getInfo(){
-				uni.showLoading({
-					title:"加载中",mask:true,
-				})
-				API.gunShareDetail({
-					gunId:this.id
-				}).then((res) => {
-					this.detail={};
-					this.detail.sharedSettingList=res.data.sharedSettingList
-					this.detail.reserveSettingList=res.data.reserveSettingList
-					var obj=res.data.gunShare;
-					
-					for(var i in obj){
-						
-						if(obj[i]===true){
-							this.detail[i]="1";
-						}else if(obj===false){
-							this.detail[i]="0";
-						}else {
-							this.detail[i]=obj[i];
-						}
-					}
-					
-					if(this.detail.reserveMinutes){
-						var sz=this.detail.reserveMinutes.split(",")
-						for(var i in this.timeList){
-							var item=this.timeList[i]
-						
-							if(sz.indexOf(item.value)!=-1){
-								item.checked=true;
-							}
-						}
-					}
-					
-					if(this.detail.sharedSettingList.length){
-						
-						var list=this.detail.sharedSettingList;
-						var weekOpenSzDataList=this.weekOpenSzData[0]
-						for(var i in list){
-							var obj={
-								weekDay:list[i].weekDay,
-								startTime:list[i].startTime,
-								endTime:list[i].endTime
-							}
-							weekOpenSzDataList[parseInt(list[i].weekDay)-1].op=1;
-							weekOpenSzDataList[parseInt(list[i].weekDay)-1].list.push(obj)
-						}
-					}
-					if(this.detail.reserveSettingList.length){
-						var list=this.detail.reserveSettingList;
-						var weekOpenSzDataList=this.weekOpenSzData[1]
-						for(var i in list){
-							var obj={
-								weekDay:list[i].weekDay,
-								startTime:list[i].startTime,
-								endTime:list[i].endTime
-							}
-							weekOpenSzDataList[parseInt(list[i].weekDay)-1].op=1;
-							weekOpenSzDataList[parseInt(list[i].weekDay)-1].list.push(obj)
-						}
-					}
-				
-					uni.hideLoading()
-					 
-				}).catch(error => {
-						uni.showToast({
-							
-							title:error
-						})
-				})
-			},
-			checkboxChange(item,e){
-				item.checked=e.value
-				this.$forceUpdate()
-				console.log(e)
-			},
-			confirm(e){
-				console.log(e)
-				
-				
-				var obj=this.weekOpenSz[this.selectI].list[this.selectIndex];
-				obj.startTime=e[0].label;
-				obj.endTime=e[1].label;
-			},
-			showDbTime(item,index,i){
-				this.show=true;
-				this.selectI=i
-				this.selectIndex=index
-				var sz=[];
-				for(var i in this.listmutilcolumnauto){
-					var obj=this.listmutilcolumnauto[i]
-					if(obj.label==item.startTime){
-						sz.push(parseInt(i))
-						
-						for(var j in obj.children){
-							var ob=obj.children[j]
-							if(ob.label==item.endTime){
-								sz.push(parseInt(j))
-							}
-						}
-					}
-				}
-				this.defaultTime=sz;
-				console.log(sz)
-			},
-			change(index) {
-				this.current = index;
-			},
-			change2(index,szindex) {
-				
-				if(index){
-					
-					if(this.weekOpenSz[szindex].list.length==0){
-						this.weekOpenSz[szindex].list.push({
-							weekDay:szindex+1,
-							startTime:'00:00',
-							endTime:'08:00'
-						})
-					}	
-				}else{
-					this.weekOpenSz[szindex].list=[]
-				}
-			},
-			addItem(szindex){
-				this.weekOpenSz[szindex].list.push({
-					weekDay:szindex+1,
-					startTime:'20:00',
-					endTime:'24:00'
-				})
-			},
-			delItem(szindex){
-				this.weekOpenSz[szindex].list.pop()
-			}
-			
-		}
-	}
-</script>
-
-
-<style lang="scss" scoped>
-	page {
-		background-color: #f3f4f7;
-		padding-bottom: 147px;
-	}
-
-	/deep/.u-tabs-scorll-flex {
-		width: 56.2%;
-		margin: 0 auto;
-	}
-
-	/deep/.u-tab-bar {
-		background-color: #0076ff !important;
-		width: 28% !important;
-		left: -19px;
-		bottom: -3px;
-	}
-	// 开发共享
-	.share-set{
-		width: 100%;
-		background-color: #fff;
-		display: flex;
-		padding: 8px 16px;
-		.title{
-			width: 28%;
-			margin-right: 41px;
-			line-height: 27px;
-		}
-		/deep/.u-radio{
-			margin-right: 20px
-		}
-		border-top: 1px solid  rgba(242, 242, 242, 100);
-		border-bottom: 1px solid  rgba(242, 242, 242, 100);
-	}
-	// 每周开放时间段设置
-	.main{
-		
-		.title{
-			line-height: 16px;
-			color: rgba(16, 16, 16, 100);
-			font-size: 16px;
-			padding: 12px 16px;
-		}
-		.item{
-			width: 91.4%;
-			padding: 16px;
-			line-height: 20px;
-			border-radius: 8px;
-			background-color: rgba(255, 255, 255, 100);
-			color: rgba(16, 16, 16, 100);
-			font-size: 14px;
-			text-align: center;
-			margin: 0  auto 12px;
-			.switch{
-				display: flex;
-				justify-content: space-between;
-				height: 42px;
-				border-bottom: 1px solid rgba(229, 231, 234, 100);
-			}
-			.frame-box{
-				display: flex;
-				justify-content: space-between;
-			}
-			.time-frame{
-				padding-top: 11px;
-				display: flex;
-				justify-content: start;
-				.time{
-					margin-left: 25px;
-				}
-				.more{
-					margin-left: 8px;
-					color: #b3b3b3;
-					font-size: 24px
-				}
-			}
-			.img{
-				width: 24px;
-				height: 24px;
-				
-				img{
-					margin-top: 10px;
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-	}
-	
-	
-	// 预约时长选项
-	.time-options{
-		width: 100%;
-		padding: 14px 0 14px 16px;
-		background-color: #fff;
-		
-		.radio-box{
-			margin-top: 12px;
-			/deep/.u-checkbox-group {
-				width: 100%;
-				display: flex;
-				justify-content: space-between;
-			}
-		}
-	}
-	
-	// 底部
-	.bottom{
-		width: 100%;
-		padding: 12px 16px ;
-		background-color: #fff;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		z-index: 9999;
-	
-		.radio-box{
-			height: 16px;
-			margin-bottom: 10px;
-		
-			/deep/.uni-radio-input{
-				width: 14px;
-				height: 14px;
-			}
-		}
-		.save{
-			
-			line-height: 40px;
-			
-			border-radius: 50px;
-			background-color: rgba(24, 90, 198, 100);
-			color: rgba(255, 255, 255, 100);
-			font-size: 18px;
-			text-align: center;
-			
-		}
-	}
-</style>

pagesFinance/user/deviceDetails.vue

@@ -1,195 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="设备详情"></u-navbar>
-		<view class="details">
-			<view class="details-title">
-				<h4>充电桩分润信息</h4>
-			</view>
-			<view class="details-row"><p>所属站点</p><span>{{detail.stationName}}</span></view>
-			<view class="details-row"><p>桩号</p><span>{{detail.deviceNo}}</span></view>
-			<view class="details-row"><p>充电桩类型</p><span v-if="detail.type">{{options0[detail.type].label}}</span></view>
-			<view class="details-row"><p>设备状态</p><span>{{detail.online?'在线':'离线'}}</span></view>
-			<!-- <view class="details-row"><p>我的身份</p><span>{{detail.roleName}}</span></view>
-			<view class="details-row"><p>分润标准</p><span>{{detail.disProportion}}</span></view> -->
-		<view class="details-row"><p>收费标准</p><span
-		 style="
-		     color: #5a8eef;
-		 "
-		 @click="gotoUrl('pagesFinance/user/chargingDetails?id='+detail.deviceNo)" >查看详情</span></view>
-		
-		
-		</view>
-		
-		<view class="details">
-			<view class="details-title">
-				<h4>分润明细</h4>
-			</view>
-			<view class="details-row" v-for="(item,i) in sprList" :key="i" v-if="item.describe!='0%'">
-				<p>{{item.name}}</p>
-				<span>{{item.describe}}</span>
-			</view>
-		
-		</view>
-		<!-- <view class="details">
-			<view class="details-title">
-				<h4>设备相关信息</h4>
-			</view>
-			<view class="details-row"><p>设备型号</p><span>HCD0001-A</span></view>
-			<view class="details-row"><p>初次安装时间</p><span>2022-05-01</span></view>
-			<view class="details-row"><p>输出功率范围(瓦)</p><span>100-400</span></view>
-		</view> -->
-		<view class="detailsBtn">
-			<u-button class="detailsBtn-btn" type="primary" @click="back" plain>返回</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				id:'',
-				
-				detail:{
-					
-				},
-				options0: [
-					
-					{
-						label: '自行车充电',
-						value: 0,
-					},
-					
-					{
-						label: '直流快充',
-						value: 1,
-					},
-					{
-						label: '交流慢充',
-						value: 2,
-					},
-				],
-				sprList:[],
-				form: {
-					name: '',
-					intro: '',
-				},
-			}
-		},
-		onLoad(op){
-			
-			this.id=op.id;
-			this.getInfo()
-		},
-		methods: {
-			back(){
-				uni.navigateBack()
-			},
-			getInfo(){
-				uni.showLoading({
-					title:"加载中",mask:true,
-				})
-				API.deviceDetail({
-					deviceId:this.id
-				}).then((res) => {
-					this.detail=res.data.device	 
-					this.sprList=res.data.sprList
-					uni.hideLoading()
-					 
-				}).catch(error => {
-						uni.showToast({
-							
-							title:error
-						})
-				})
-			}
-		}
-	}
-</script>
-<style>
-	page{
-		background-color: #F7F7F7;
-	}
-</style>
-<style lang="scss" scoped>
-	.detailsBtn{
-		margin: 16px;
-		.detailsBtn-btn{
-			border-color:#185AC6!important;
-			border-radius: 8px!important;
-			background: none!important;
-			color:#185AC6!important;
-		}
-	}
-	.details-title{
-		margin-bottom: 16px;
-		h4{
-			font-weight: normal;
-			font-size: 16px;
-			position: relative;
-			padding-left:10px;
-			&::after{
-				content: '';
-				position: absolute;
-				height: 12px;
-				width: 4px;
-				background-color: #27B148;
-				left: 0;
-				top:5px;
-			}
-		}
-	}
-	.details-row{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 15px;
-		p{
-			color: #37393c;
-			font-weight: bold;	
-		}
-	}
-	.details{
-		margin: 16px;
-		padding: 20px;
-		background-color: #fff;
-		border-radius: 8px;
-		.details-head{
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			h4{
-				font-size: 18px;
-				font-weight: normal;
-				margin-left: 4px;
-			}
-		}
-		.details-price{
-			margin-top: 28px;
-			display: flex;
-			align-items: flex-end;
-			justify-content: center;
-			h3{
-				font-size: 36px;
-				color:#27B148;
-				line-height: 36px;
-				margin: 0  4px;
-				font-weight: normal;
-			}
-			span{
-				font-size: 20px;
-				color:#27B148;
-			}
-		}
-		.details-main{
-			text-align: center;
-			margin-bottom: 20px;
-			p{
-				color:#777;
-				margin-top: 4px;
-			}
-		}
-	}
-</style>

pagesFinance/user/deviceLine.vue

@@ -1,152 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="设备详情"></u-navbar>
-		<view style=" padding: 10px 16px;
-    font-size: 16px;" >{{detail.deviceName}}<span style="float: right;"><span class="boot" :class="{
-		boot2:detail.status
-	}"></span>{{detail.status?'在线':'离线'}}</span></view>
-		<img src="@/assets/img/gkke02.png" v-if="!detail.status" style="width: 100%;height: 234px;" />
-		
-		<view class="video-wrap" style="width: 100%;height: 234px;"
-		 v-html="html"
-		 v-show="detail.status" ref="videoWrapHls">
-			
-		</view>
-		<!--  -->
-		<view style="    text-align: center;" v-if="endTime"> 
-			<u-button 
-			type="primary" size="medium"
-			@click="getInfo" >继续播放</u-button>
-		</view>
-		<view style="padding: 10px ;" v-if="endTime">
-			单次播放时间为{{expireTime/60}}分钟；<br/>
-			过期后可点击“继续播放”
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	//import Hls from '@/apis/hls.js';
-	//	import  videojs from  '@/apis/video.js'
-	 import Hls from 'hls.js'
-	export default {
-		data() {
-			return {
-				html:'<video id="myVideo"  autoplay controls  style="width: 100%; height: 234px;"><source id="myVideoSource" type="application/x-mpegURL" /></video>',
-				subForm: {},
-				liveAddressUrl: "",
-				detail: {},
-				hls: null,
-				player: null,
-				expireTime:10*60,
-				endTime:0,
-			}
-		},
-		onLoad(op) {
-			this.subForm.id=op.id;
-		},
-		onReady() {
-			//uniapp 渲染有问题， 自主渲染
-			if(!this.player){
-				// var video = document.createElement('video');
-				// video.id = 'myVideo';
-				// video.style="width: 100%;height: 234px;"
-				// this.$refs.videoWrapHls.$el.appendChild(video);					
-				// this.player = video;
-				var	video=document.getElementById("myVideo")
-				this.player = video;
-			}
-			this.getInfo();
-			
-
-		},
-		methods: {
-			getInfo(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				//秒
-				this.subForm.expireTime=this.expireTime
-				API.cameraDetail(this.subForm).then((res) => {
-					this.detail=res.data.cameraInfo;
-					this.endTime=0;
-					if(this.detail.status&&res.data.liveJson){
-						var myVideoSource =document.getElementById("myVideoSource")
-						
-						myVideoSource.src=this.liveAddressUrl;
-						
-						this.liveAddressUrl = res.data.liveJson.url
-						
-						var endTime=new Date(res.data.liveJson.expireTime).getTime()
-						var nowTime=new Date().getTime()
-						
-						setTimeout(()=>{
-							this.endTime=1;
-						},endTime-nowTime)
-						
-						this.$nextTick(()=>{
-								this.play();
-						})
-					}
-					
-					uni.hideLoading()
-					
-					
-				
-				}).catch(error => {
-					uni.showToast({
-				
-						title: error
-					})
-				})
-			},
-			handlePlay() {
-
-			},
-			play() {
-
-				var video=	this.player;
-				
-				this.liveAddressUrl = this.liveAddressUrl.replace("http:", "https:");				
-				var videoSrc = this.liveAddressUrl;
-				if (Hls.isSupported()) {
-					var hls = new Hls();
-					hls.loadSource(videoSrc);
-					hls.attachMedia(video);
-					hls.on(Hls.Events.MANIFEST_PARSED, () => {
-						video.play();
-					});
-					this.hls = hls;
-				} else if (video.canPlayType('application/vnd.apple.mpegurl')) {
-					video.src = videoSrc;
-					video.addEventListener('loadedmetadata', () => {
-						video.play();
-					});
-				}
-				//监听开始播放事件
-				//	this.player.addEventListener('play', this.handlePlay);
-				
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.boot{
-		
-			display: inline-block;
-			width: 12px;
-			height: 12px;
-			margin-left: 2px;
-			background-color: rgba(255, 115, 0, 100);
-			border-radius: 999px;
-		
-	}
-	.boot2{
-		background-color:rgba(0, 185, 98, 100)
-	}
-</style>

pagesFinance/user/deviceList.vue

@@ -1,277 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="我的设备"></u-navbar>
-		<view class="deviceDropdown">
-			<u-dropdown>
-				<u-dropdown-item v-model="value1" @change="change1" title="充电桩类型" :options="options1"></u-dropdown-item>
-<!-- 				<u-dropdown-item v-model="value2" @change="change2" title="所属站点" :options="options2"></u-dropdown-item>
- -->				<u-dropdown-item v-model="value3" @change="change3" title="运行状态" :options="options3"></u-dropdown-item>
-			</u-dropdown>
-		</view>
-		<view class="deviceList"
-		
-		>
-		<view style="text-align: center;margin-top: 100px" v-if="!list.length">
-			<img src="@/assets/img/blankpage.png">
-			<view>查询为空</view>
-		</view>
-			<view v-for="(item ,index) in list" :key="item.id"
-			@click="gotoUrl('pagesFinance/user/'+(item.type!=0?'pileManagement':'deviceDetails')+'?id='+item.id)"
-			:class="{
-				'deviceList-bg1':item.type==1,
-				'deviceList-bg2':item.type==2,
-				'deviceList-bg3':item.type==0
-				
-			}"
-			class="deviceList-item " >
-				<view class="deviceList-head">{{item.name}} <span style="float: right;font-size: 12px;" class="iconfont more">详情&#xe600;</span></view>
-				<view class="deviceList-main">{{item.deviceNo}} </view>
- 				<view class="deviceList-foot">
-					<view class="deviceList-label">{{ options0[item.type].label}}</view>
-					<view class="deviceList-label" 
-					:style="item.online?'':'color:red'"
-					>{{item.online?'在线':'离线'}}</view>
-				<!-- 	<view class="deviceList-label">{{item.roleName}}</view> -->
-				</view>
-			</view>
-			<u-divider v-if="list.length&&list.length == recordsTotal" color="#B6BDC3" style="margin-top:20px;" bg-color="#f7f7f7">已经到底了</u-divider>
-			
-		<!-- 	<view class="deviceList-item deviceList-bg2">
-				<view class="deviceList-head">荆鹏软件园充电站</view>
-				<view class="deviceList-main">A0001</view>
-				<view class="deviceList-foot">
-					<view class="deviceList-label">直流快充</view>
-					<view class="deviceList-label">正常运行</view>
-					<view class="deviceList-label">市场服务 70%</view>
-				</view>
-			</view>
-			<view class="deviceList-item deviceList-bg3">
-				<view class="deviceList-head">荆鹏软件园充电站</view>
-				<view class="deviceList-main">A0001</view>
-				<view class="deviceList-foot">
-					<view class="deviceList-label">直流快充</view>
-					<view class="deviceList-label">正常运行</view>
-					<view class="deviceList-label">市场服务 70%</view>
-				</view>
-			</view> -->
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				form: {
-				
-				},
-				startDate:'',
-				endDate:'',
-				pageIndex: 1,
-				recordsTotal: 0,
-				list: [],
-				value1: -1,
-				value2: -1,
-				value3: -1,
-				stationList:[],
-				options0: [
-				
-					{
-						label: '自行车充电',
-						value: 0,
-					},
-					{
-						label: '直流快充',
-						value: 1,
-					},
-					{
-						label: '交流慢充',
-						value: 2,
-					}
-					
-				],
-				options1: [{
-						label: '全部',
-						value: '-1',
-					},
-					{
-						label: '自行车充电',
-						value: 0,
-					},
-					{
-						label: '交流慢充',
-						value: 2,
-					},
-					{
-						label: '直流快充',
-						value: 1,
-					}
-				],
-				options2: [
-				],
-				options3: [
-					{
-						label: '全部',
-						value: -1,
-					},
-					{
-						label: '在线',
-						value: 1,
-					},
-					{
-						label: '离线',
-						value: 0,
-					},
-				],
-			}
-		},
-		onReachBottom() {
-			if (this.list.length < this.recordsTotal) {
-				this.myLoadmore();
-			}
-		},
-		onLoad(op) {
-				this.form.stationId=op.id
-		},
-		methods: {
-			change1(e){
-				this.form.type=e
-				if(e==-1){
-					this.form.type=""
-				}
-				this.getList(true)
-			},
-			change2(e){
-				this.form.stationId=e
-				if(e==-1){
-					this.form.stationId=""
-				}
-				this.getList(true)
-			},
-			change3(e){
-				this.form.onlineStatus=e
-				if(e==-1){
-					this.form.onlineStatus=""
-				}
-				this.getList(true)
-			},
-			getStation() {
-				
-				API.stationList().then((res) => {
-					this.options2.push({
-						label: '全部',
-						value:-1,
-					})
-					this.stationList = res.data.stationList
-					this.stationList.forEach(item=>{
-						this.options2.push({
-							label: item.name,
-							value: item.id,
-						})
-					})
-					
-				}).catch(error => {
-					uni.showToast({
-					
-						title: error
-					})
-				})
-			},
-		myLoadmore() {
-
-				this.pageIndex += 1;
-				this.getList()
-			},
-			getList(bl) {
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				if (bl) {
-					this.list = [];
-					this.pageIndex = 1;
-				}
-				this.form.pageIndex= this.pageIndex
-				
-				API.devicesList(this.form).then((res) => {
-
-					this.list = [
-						...this.list,
-						...res.data.data
-					];
-					this.recordsTotal = res.data.recordsTotal
-					uni.hideLoading()
-
-				}).catch(error => {
-					uni.showToast({
-
-						title: error
-					})
-				})
-			},
-			onReady() {
-				this.getStation()
-				this.getList()
-				
-			}
-		}
-	}
-</script>
-<style>
-	page{
-		background-color: #F7F7F7;
-	}
-</style>
-<style lang="scss" scoped>
-	.deviceDropdown{
-		background-color: #fff;
-	}
-	.deviceList-item{
-		margin: 16px;
-		border-radius: 8px;
-		.deviceList-head{
-			font-size: 16px;
-			padding: 8px 16px;
-		}
-		.deviceList-main{
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-			
-			font-size: 28px;
-			padding: 0px 16px;
-			font-weight: bold;
-		}
-		.deviceList-foot{
-			display: flex;
-			align-items: center;
-			flex-wrap: wrap;
-			padding: 16px;
-			.deviceList-label{
-				background-color: #F0F2F4 ;
-				padding: 4px 10px;
-				margin: 1px;
-				border-radius: 4px;
-			}
-		}
-	}
-	.deviceList-bg1{
-		background:url(../../assets/img/charging_type_fast.png) no-repeat #fff;
-		background-size:100%;
-	}
-	.deviceList-bg2{
-		background:url(../../assets/img/charging_type_slow.png) no-repeat #fff;
-		background-size:100%;
-	}
-	.deviceList-bg3{
-		background:url(../../assets/img/charging_type_bike.png) no-repeat #fff;
-		background-size:100%;
-	}
-	.deviceList-bg4{
-		background:url(../../assets/img/charging_type_line.png) no-repeat #fff;
-		background-size:100%;
-	}
-</style>

pagesFinance/user/deviceListLine.vue

@@ -1,276 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="我的设备"></u-navbar>
-		<!-- <view class="deviceDropdown">
-			<u-dropdown>
-				<u-dropdown-item v-model="value1" @change="change1" title="充电桩类型" :options="options1"></u-dropdown-item>
- 				<u-dropdown-item v-model="value2" @change="change2" title="所属站点" :options="options2"></u-dropdown-item>
-				<u-dropdown-item v-model="value3" @change="change3" title="运行状态" :options="options3"></u-dropdown-item>
-			</u-dropdown>
-		</view> -->
-		<view class="deviceList"
-		
-		>
-		<view style="text-align: center;margin-top: 100px" v-if="!list.length">
-			<img src="@/assets/img/blankpage.png">
-			<view>查询为空</view>
-		</view>
-			<view v-for="(item ,index) in list" :key="item.id"
-			@click="gotoUrl('pagesFinance/user/deviceLine?id='+item.id)"
-			:class="{
-			 
-				'deviceList-bg4':true
-				
-			}"
-			class="deviceList-item " >
-				<view class="deviceList-head">{{item.deviceName}} <span style="float: right;font-size: 12px;" class="iconfont more">详情&#xe600;</span></view>
-				<view class="deviceList-main"> {{item.roomAddress}}</view>
- 				<view class="deviceList-foot">
-<!-- 					<view class="deviceList-label">{{item.classifyText}}</view>
- -->					<view class="deviceList-label" 
-					:style="item.status?'':'color:red'"
-					>{{item.status?'在线':'离线'}}</view>
-				<!-- 	<view class="deviceList-label">{{item.roleName}}</view> -->
-				</view>
-			</view>
-			<u-divider v-if="list.length&&list.length == recordsTotal" color="#B6BDC3" style="margin-top:20px;" bg-color="#f7f7f7">已经到底了</u-divider>
-			
-		<!-- 	<view class="deviceList-item deviceList-bg2">
-				<view class="deviceList-head">荆鹏软件园充电站</view>
-				<view class="deviceList-main">A0001</view>
-				<view class="deviceList-foot">
-					<view class="deviceList-label">直流快充</view>
-					<view class="deviceList-label">正常运行</view>
-					<view class="deviceList-label">市场服务 70%</view>
-				</view>
-			</view>
-			<view class="deviceList-item deviceList-bg3">
-				<view class="deviceList-head">荆鹏软件园充电站</view>
-				<view class="deviceList-main">A0001</view>
-				<view class="deviceList-foot">
-					<view class="deviceList-label">直流快充</view>
-					<view class="deviceList-label">正常运行</view>
-					<view class="deviceList-label">市场服务 70%</view>
-				</view>
-			</view> -->
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				form: {
-				
-				},
-				startDate:'',
-				endDate:'',
-				pageIndex: 1,
-				recordsTotal: 0,
-				list: [],
-				value1: -1,
-				value2: -1,
-				value3: -1,
-				stationList:[],
-				options0: [
-				
-					{
-						label: '自行车充电',
-						value: 0,
-					},
-					{
-						label: '直流快充',
-						value: 1,
-					},
-					{
-						label: '交流慢充',
-						value: 2,
-					}
-					
-				],
-				options1: [{
-						label: '全部',
-						value: '-1',
-					},
-					{
-						label: '自行车充电',
-						value: 0,
-					},
-					{
-						label: '交流慢充',
-						value: 2,
-					},
-					{
-						label: '直流快充',
-						value: 1,
-					}
-				],
-				options2: [
-				],
-				options3: [
-					{
-						label: '全部',
-						value: -1,
-					},
-					{
-						label: '在线',
-						value: 1,
-					},
-					{
-						label: '离线',
-						value: 0,
-					},
-				],
-			}
-		},
-		onReachBottom() {
-			if (this.list.length < this.recordsTotal) {
-				this.myLoadmore();
-			}
-		},
-		onLoad(op) {
-				this.form.stationId=op.id
-		},
-		methods: {
-			change1(e){
-				this.form.type=e
-				if(e==-1){
-					this.form.type=""
-				}
-				this.getList(true)
-			},
-			change2(e){
-				this.form.stationId=e
-				if(e==-1){
-					this.form.stationId=""
-				}
-				this.getList(true)
-			},
-			change3(e){
-				this.form.onlineStatus=e
-				if(e==-1){
-					this.form.onlineStatus=""
-				}
-				this.getList(true)
-			},
-			getStation() {
-				
-				API.stationList().then((res) => {
-					this.options2.push({
-						label: '全部',
-						value:-1,
-					})
-					this.stationList = res.data.stationList
-					this.stationList.forEach(item=>{
-						this.options2.push({
-							label: item.name,
-							value: item.id,
-						})
-					})
-					
-				}).catch(error => {
-					uni.showToast({
-					
-						title: error
-					})
-				})
-			},
-		myLoadmore() {
-
-				this.pageIndex += 1;
-				this.getList()
-			},
-			getList(bl) {
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				if (bl) {
-					this.list = [];
-					this.pageIndex = 1;
-				}
-				this.form.pageIndex= this.pageIndex
-				
-				API.cameraList(this.form).then((res) => {
-
-					this.list = [
-						...this.list,
-						...res.data.data
-					];
-					this.recordsTotal = res.data.recordsTotal
-					uni.hideLoading()
-
-				}).catch(error => {
-					uni.showToast({
-
-						title: error
-					})
-				})
-			},
-			onReady() {
-				//this.getStation()
-				this.getList()
-				
-			}
-		}
-	}
-</script>
-<style>
-	page{
-		background-color: #F7F7F7;
-	}
-</style>
-<style lang="scss" scoped>
-	.deviceDropdown{
-		background-color: #fff;
-	}
-	.deviceList-item{
-		margin: 16px;
-		border-radius: 8px;
-		.deviceList-head{
-			font-size: 16px;
-			padding: 8px 16px;
-		}
-		.deviceList-main{
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-			
-			font-size: 18px;
-			padding: 0px 16px;
-			font-weight: bold;
-		}
-		.deviceList-foot{
-			display: flex;
-			align-items: center;
-			flex-wrap: wrap;
-			padding: 16px;
-			.deviceList-label{
-				background-color: #F0F2F4 ;
-				padding: 4px 10px;
-				margin: 1px;
-				border-radius: 4px;
-			}
-		}
-	}
-	.deviceList-bg1{
-		background:url(../../assets/img/charging_type_fast.png) no-repeat #fff;
-		background-size:100%;
-	}
-	.deviceList-bg2{
-		background:url(../../assets/img/charging_type_slow.png) no-repeat #fff;
-		background-size:100%;
-	}
-	.deviceList-bg3{
-		background:url(../../assets/img/charging_type_bike.png) no-repeat #fff;
-		background-size:100%;
-	}
-	.deviceList-bg4{
-		background:url(../../assets/img/charging_type_line.png) no-repeat #fff;
-		background-size:100%;
-	}
-</style>

pagesFinance/user/editOwnerInformation.vue

@@ -1,96 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="编辑">
-			<view slot="right" style="margin-right: 20px;">
-				<span class="delete"  >删除</span>
-			</view>
-		</u-navbar>
-		<view class="ower-infos">
-			<view class="infos-item">
-				<view class="title">
-					<text class="asterisk">*</text>姓名
-				</view>
-				<view class="content">
-					李广宵
-				</view>
-				
-			</view>
-			<view class="infos-item">
-				<view class="title">
-					<text class="asterisk">*</text>手机号码
-				</view>
-				<view class="content">
-					15500001111
-				</view>
-				
-			</view>
-			<view class="infos-item border-none">
-				<view class="title">
-					<text class="asterisk">*</text>车牌号码
-				</view>
-				<view class="content">
-					鄂DD10999
-				</view>
-				
-			</view>
-			
-		</view>
-		
-		<u-button type="primary">保存</u-button>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page{
-		background-color: #f3f4f7;
-	}
-	.delete{
-		color: rgba(238, 49, 56, 100);
-		font-size: 16px;
-	}
-	.ower-infos{
-		background-color: #fff;
-		padding-left: 16px;
-		.border-none{
-			border: none !important;
-		}
-		.infos-item{
-			padding: 14px 0;
-			display: flex;
-			border-bottom: 1px solid #BABABA ;
-			.title{
-				width: 30%;
-				font-size: 16px;
-				color: #7d7d7d;
-				.asterisk{
-					color: #EE3138;
-				}
-			}
-			.content{
-				color: #101010;
-				font-size: 16px;
-			}
-		}
-	}
-	.u-btn{
-		background-color: rgba(0, 90, 217, 100);
-		margin: 16px;
-		height: 44px;
-		line-height: 44px;
-		font-size: 18px
-	}
-
-</style>

pagesFinance/user/help.vue

@@ -1,63 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="帮助中心"></u-navbar>
-		<view class="collapse">
-			<u-collapse v-if="itemList.length">
-				<u-collapse-item :title="item.title" v-for="(item, index) in itemList" :key="index">
-				<!-- -->
-					<view v-html="item.content"></view> 
-<!-- 					<textarea maxlength="-1" :auto-height="true" v-model="item.content" readonly ></textarea>
- -->					
-				</u-collapse-item>
-			</u-collapse>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				itemList: [],
-			}
-		},
-		onReady() {
-			this.getHomePage()
-		},
-		methods: {
-		getHomePage(){
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					})
-					API.helpList({
-						category:3
-					}).then((res) => {
-						this.itemList = res.data.helpList
-					
-					
-						uni.hideLoading()
-						
-					}).catch(error => {
-						uni.showToast({
-							title: error
-						})
-					})
-				}
-		}
-	}
-</script>
-<style>
-	page{
-		background-color: #F7F7F7;
-	}
-</style>
-<style lang="scss" scoped>
-	.collapse{
-		margin: 16px;
-		background-color: #fff;
-		padding:0 10px;
-	}
-</style>

pagesFinance/user/index.vue

@@ -1,533 +0,0 @@
-<template>
-	<view>
-		<view class="userHead">
-			<view class="userHead-img">
-				<u-avatar src="../../assets/img/head.png" size="140"></u-avatar>
-			</view>
-			<view class="userHead-text">
-				<h3>{{info.merchantAccountName}}</h3>
-				<view class="userHead-text-position">
-					<u-icon name="account-pin-box-fill" custom-prefix="custom-icon" color="#fff" size="32"></u-icon>
-					<p>{{getPhone(info.phone)}}</p>
-				</view>
-			</view>
-		</view>
-		<view class="userData" v-if="home">
-			<view class="userData-item">
-				<view class="userData-data">{{home.deviceNumbers}}台</view>
-				<view class="userData-foot" @click="gotoUrl('pagesFinance/user/stationsList')" >我的设备<span style="color: #307af6; margin-left: 5px;">查看</span></view>
-			</view>
-			<u-line color="#d9e0ec" length="60" direction="col" margin="10px"/>
-			<view class="userData-item">
-				<view class="userData-name">银行账户</view>
-				
-				<view class="userData-foot" v-if="!home.bank"  >未绑定</view>
-				
-				<view class="userData-foot" v-if="home.bank"  @click="showModel"  >提现账户<span style="color: #307af6; margin-left: 5px;">查看</span></view>
-			</view>
-		</view>
-		
-		<view class="userInfo" v-if="home">
-			<view class="userInfo-head"><p>可提现金额</p></view>
-			<view class="userInfo-main">
-				<h2>{{home.accountBalance.toFixed(2)}}元
-				<view class="withdraw"  v-if="info.status" @click="gotoUrl('pagesFinance/user/withdrawRecord')" >
-					账户提现
-				</view>
-				</h2>
-				<!-- <view class="userInfo-btn" >帐户提现</view> -->
-			</view>
-			<view class="userInfo-foot">
-				<!-- <view class="userInfo-item">
-					<p>今日收益</p>
-					<h4>{{home.todayAmount}}</h4>
-				</view> -->
-				<view class="userInfo-item">
-					<p>冻结金额(提现中)</p>
-					<h4>{{home.waitingAmount.toFixed(2)}}元</h4>
-				</view>
-				<view class="userInfo-item">
-					<p>已提现</p>
-					<h4>{{home.withdrawnAmount.toFixed(2)}}元</h4>
-				</view>
-			</view>
-		</view>
-		<!-- 功能菜单 -->
-		<view class="function-menu">
-			<view class="item" @click="gotoUrl('pagesFinance/user/withdrawRecord')">
-				<view class="item-icon">
-					<i data-v-7e5aa06e="" class="ri-todo-line"></i>
-				</view>
-				<view class="item-name">
-					提现记录
-				</view>
-				
-			</view>
-			<view class="item" @click="gotoUrl('pagesFinance/preengaged/preengaged')">
-				<view class="item-icon">
-					<i data-v-137d5072="" class="ri-map-pin-time-line"></i>
-				</view>
-				<view class="item-name">
-					我被预约
-				</view>
-				
-			</view>
-			<view class="item" @click="gotoUrl('pagesFinance/recordOfInvoice/recordOfInvoice')">
-				<view class="item-icon">
-					<i data-v-137d5072="" class="ri-ticket-line"></i>
-				</view>
-				<view class="item-name">
-					开票记录
-				</view>
-				
-			</view>
-			<view class="item"  @click="gotoUrl('pagesFinance/user/stationsListLine')">
-				<view class="item-icon">
-					<i class="ri-webcam-line"></i>
-				</view>
-				<view class="item-name">
-					摄像头
-				</view>
-				
-			</view>
-			<view class="item" 
-			 v-for="(item,i) in vipPlatformList" :key="i"
-			 @click="gotoUrl('pagesFinance/user/ownManagement?id='+item.id)" >
-				<view class="item-icon">
-					<i class="ri-folder-user-line"></i>
-				</view>
-				<view class="item-name">
-					{{vipPlatformList.length==1?'车主管理':item.name}}
-				</view>
-				
-			</view>
-			<view class="item" @click="gotoUrl('pagesFinance/user/help')"  v-if="false" >
-				<view class="item-icon">
-					<i data-v-137d5072="" class="ri-compass-3-line"></i>
-				</view>
-				<view class="item-name">
-					帮助中心
-				</view>
-				
-			</view>
-			<view class="item" @click="phone()" >
-				<view class="item-icon">
-					<i data-v-137d5072="" class="ri-customer-service-2-line"></i>
-				</view>
-				<view class="item-name">
-					联系客服
-				</view>
-				
-			</view>
-			<view class="item" @click="gotoUrl('pagesFinance/user/about')" v-if="false" >
-				<view class="item-icon">
-					<i data-v-137d5072="" class="ri-account-pin-box-line"></i>
-				</view>
-				<view class="item-name">
-					关于我们
-				</view>
-				
-			</view>
-			
-		</view>
-		
-		<button class="logout-btn" @click="logout">退出账号</button>
-		
-	<!-- 	<view class="userCell">
-			<view class="userCell-item"  @click="gotoUrl('pagesFinance/preengaged/preengaged')">
-				<view class="userCell-title">
-					<img src="@/assets/img/booked.png" style="height:36rpx;width: 36rpx ;" >
-					<p>我被预约</p>
-				</view>
-				<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
-			</view>
-			<view class="userCell-item" @click="gotoUrl('pagesFinance/user/withdrawRecord')">
-				<view class="userCell-title">
-					<u-icon name="refund-fill" custom-prefix="custom-icon" color="#9EAAC6" size="36"></u-icon>
-					<p>提现记录</p>
-				</view>
-				<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
-			</view>
-			
-			<view class="userCell-item"  @click="gotoUrl('pagesFinance/recordOfInvoice/recordOfInvoice')">
-				<view class="userCell-title">
-					<img src="@/assets/img/riFill-todo-fill.png" style="height:36rpx;width: 36rpx ;" >
-					<p>开票申请记录</p>
-				</view>
-				<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
-			</view>
-			
-			<view class="userCell-item" v-if="info.allowShare"  @click="gotoUrl('pagesFinance/user/stationsListLine')">
-				<view class="userCell-title">
-					<svg style="height:36rpx;width: 36rpx ;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-						<path fill="none" d="M0 0h24v24H0z"/><path fill="#9EAAC6" d="M11 21v-1.07A7.002 7.002 0 0 1 5 13V8a7 7 0 1 1 14 0v5a7.002 7.002 0 0 1-6 6.93V21h4v2H7v-2h4zm1-12a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm0 2a3 3 0 1 0 0-6 3 3 0 0 0 0 6z"/></svg>
-					
-					<p>我的摄像头</p>
-				</view>
-				<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
-			</view>
-			
-			
-			<view class="userCell-item" @click="gotoUrl('pagesFinance/user/help')" >
-				<view class="userCell-title">
-					<u-icon name="question-fill" custom-prefix="custom-icon" color="#9EAAC6" size="36"></u-icon>
-					<p>帮助中心</p>
-				</view>
-				<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
-			</view>
-			<view class="userCell-item"  @click="phone()" >
-				<view class="userCell-title">
-					<u-icon name="customer-service-fill" custom-prefix="custom-icon" color="#9EAAC6" size="36"></u-icon>
-					<p>联系客服</p>
-				</view>
-				<span>{{tel}}</span>
-			</view>
-			<!-- <view class="userCell-item"  @click="gotoUrl('pagesFinance/user/about')">
-				<view class="userCell-title">
-					<u-icon name="information-fill" custom-prefix="custom-icon" color="#9EAAC6" size="36"></u-icon>
-					<p>关于小鹏管家</p>
-				</view>
-				<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
-			</view> -->
-		<!-- 	<view class="userCell-item" @click="logout" >
-				<view class="userCell-title">
-					<u-icon name="logout-box-r-fill" custom-prefix="custom-icon" color="#9EAAC6" size="36"></u-icon>
-					<p>帐号登出</p>
-				</view>
-				<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
-			</view>
-		</view> --> 
-		
-			<Tabbar :current="3"  ref="tabbarMain"></Tabbar>
- 	</view>
-</template>
-
-<script>
-	import Tabbar from '@/components/TabbarFinance.vue'
-	import * as API from '@/apis/finance.js'
-	import {
-		substrMb
-	} from '@/utils'
-	
-	export default {
-		data() {
-			return {
-				
-				tel:'400-8899-619',
-				role:{},
-				info:{},
-				home:null,
-				current: 0,
-				vipPlatformList:[],
-				background:{
-					background: 'none'
-				},
-			}
-		},
-		components: {
-			Tabbar
-		
-		},
-		onLoad() {
-			this.info=this.carhelp.getPersonInfo("merchantUser")
-			
-			
-			
-			console.log(this.info)
-		},
-		onReady() {
-			this.getHomePage()
-			
-		},
-		onShow() {
-			if(this.$refs.tabbarMain){
-				this.$refs.tabbarMain.setcount(3);
-			}
-			this.query()
-			this.getHomePage()
-		},
-		methods: {
-			query(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.findByOpenId({
-					
-					openId: this.carhelp.getOpenId(),
-					
-				}).then((response) => {
-					//this.loginset(response)
-					var token = response ? response.data.token : '';
-					this.carhelp.setToken(token,"merchantUser");
-					this.carhelp.setPersonInfo(response.data.user,"merchantUser");
-					this.carhelp.setPersonInfoPlus(response.data, "merchantUser")
-					this.info=response.data.user
-					uni.hideLoading();
-				}).catch(error => {
-					uni.hideLoading();
-					
-				})
-			},
-			getPhone(phone){
-				var backphone="";
-				if(phone){
-					backphone=substrMb(phone,0,3)+"****"+substrMb(phone,7,4)
-				}
-				
-				return backphone;
-			},
-			showModel(){
-				var bankCard="";
-				var sss=""
-				if(this.home.bankCard){
-					
-					bankCard=substrMb(this.home.bankCard,0,4)+"****"+substrMb(this.home.bankCard,this.home.bankCard.length-4,4)
-				}
-				var code=this.home.bank+":"+bankCard;
-				if(this.home.bank==null&&this.home.bankCard==null){
-					code="未绑定"
-				}
-				uni.showModal({
-					showCancel:false,
-					content:code,
-					
-				})
-			},
-			logoutApi(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				var data = {
-					
-				};
-				 
-				API.logout(data).then((res) => {
-					this.carhelp.setToken("","merchantUser");
-					this.carhelp.set("merchantUser_token_tdate","")
-					this.carhelp.setPersonInfo("","merchantUser");
-					this.carhelp.setPersonInfoPlus("" ,"merchantUser" )
-					
-					uni.reLaunch({
-						url:"/pagesFinance/login/index?phone="+this.info.phone
-					})
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			logout(){
-				uni.showModal({
-				    title: '提示',
-				    content: '确认是否退出？',
-				    success: res=> {
-				        if (res.confirm) {
-				           //付钱  改为组件
-				           this.logoutApi();
-				           
-				        } else if (res.cancel) {
-				            console.log('用户点击取消');
-				        }
-				    }
-				});
-			},
-			phone(){
-				uni.makePhoneCall({
-				    phoneNumber:this.tel //仅为示例
-				});
-			},
-			getHomePage(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.homePage().then((res) => {
-					this.home = res.data
-				if(res.data.vipPlatformList){
-					this.vipPlatformList=res.data.vipPlatformList
-				}
-					
-					uni.hideLoading()
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			}
-		}
-	}
-</script>
-<style>
-	page{
-		background:url(../../assets/img/index_header_bg.png) no-repeat top center #f7f7f7;
-		background-size: 100%;
-	}
-</style>
-<style lang="scss" scoped>
-	.userCell{
-		background-color: #fff;
-		border-radius: 8px;
-		margin: 16px;
-		.userCell-item{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 16px;
-			.userCell-title{
-				display: flex;
-				align-items: center;
-				p{
-					margin-left: 8px;
-				}
-			}
-			span{
-				color:#999;
-			}
-		}
-	}
-	.userInfo{
-		// background-color: #fff;
-		background: linear-gradient(#fff2eb,#ffffff);
-		margin: 16px;
-		padding: 16px;
-		border-radius: 8px;
-		p{
-			color:#637AA2;
-		}
-		.userInfo-main{
-			display: flex;
-			justify-content: space-between;
-			margin-top: 4px;
-			align-items: center;
-			h2{ 
-				flex: 1;
-				font-size: 32px;
-				display: flex;
-				justify-content: space-between;
-				.withdraw{
-					margin: auto 0;
-					width: 80px;
-					height:30px;
-					line-height: 28px;
-					border-radius: 20px;
-					background-color: rgba(255, 133, 1, 100);
-					color: rgba(255, 255, 255, 100);
-					font-size: 14px;
-					text-align: center;
-				}
-			}
-		}
-		.userInfo-btn{
-			padding: 6px 10px;
-			background-color: #FF8501;
-			color:#fff;
-			border-radius: 15px;
-		}
-		.userInfo-foot{
-			display: flex;
-			justify-content: space-between;
-			margin-top: 12px;
-			.userInfo-item{
-				flex: 1;
-				h4{
-					font-size: 16px;
-					margin-top: 4px;
-				}
-			}
-		}
-	}
-	.userHead{
-		display: flex;
-		align-items: center;
-		padding:40px 20px 0;
-		.userHead-img{
-		}
-		.userHead-text{
-			margin-left: 12px;
-			h3{
-				font-size: 24px;
-				color:#fff;
-				font-weight: normal;
-			}
-			.userHead-text-position{
-				display: flex;
-				align-items: center;
-				margin-top: 5px;
-				p{
-					color:#fff;
-					margin-left: 4px;
-				}
-			}
-		}
-	}
-	.userData{
-		background-color: #fff;
-		margin: 16px;
-		padding: 16px;
-		border-radius: 8px;
-		display: flex;
-	}
-	.userData-item{
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content:space-between;
-		.userData-data{
-			font-size: 24px;
-			font-weight: bold;
-		}
-		.userData-name{
-			font-size: 16px;
-		}
-		.userData-foot{
-			margin-top: 4px;
-			color:#637AA2;	
-		}
-	}
-	
-	
-	//功能菜单
-	.function-menu{
-		margin: 12px 16px;
-		background-color: #fff;
-		border-radius: 8px;
-		padding: 0 13px;
-		display: flex;
-		flex-wrap: wrap;
-	}
-	@media screen and (max-width: 375px) {
-	  		.item {
-	    		width: 33% !important;
-	  		}
-		}
-	.item{
-		width: 25%;
-		margin-top: 20px;
-		margin-bottom: 11px;
-		    display: flex;
-		    flex-direction: column;
-		    align-items: center;
-			color: rgba(119, 119, 119, 100);
-			i{
-				font-size: 24px
-			}
-			.item-name{
-				font-size: 16px;
-				margin-top: 8px;
-			}
-	}
-	.logout-btn{
-		background-color: #fff;
-		margin: 12px 16px;
-		border: 8px;
-		color: rgba(238, 49, 56, 100);
-		font-size: 16px;
-		line-height: 40px;
-	}
-</style>

pagesFinance/user/myPile.vue

@@ -1,482 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="充电桩设置"></u-navbar>
-
-		<view class="options">
-
-			<u-cell-group>
-
-				<u-cell-item title="开放共享" :arrow="false">
-
-					<view class="" >
-
-						<u-radio-group v-model="detail.enableShare" >
-
-							<u-radio  v-for="(item, index) in list2" :key="index+'a'" :name="item.value"
-								:disabled="item.disabled" active-color="#00b962">
-
-								{{item.name}}
-
-							</u-radio>
-
-						</u-radio-group>
-
-					</view>
-
-
-
-				</u-cell-item>
-
-				<u-cell-item title="开放预约" :arrow="false">
-					<view class="">
-
-						<u-radio-group  v-model="detail.enableAppointment" >
-
-							<u-radio  v-for="(item, index) in list2" :key="index+'b'" :name="item.value"
-								:disabled="item.disabled" active-color="#00b962">
-
-								{{item.name}}
-
-							</u-radio>
-
-						</u-radio-group>
-
-					</view>
-				</u-cell-item>
-
-				<u-cell-item title="预约自动确认" :arrow="false">
-					<view class="">
-
-						<u-radio-group  v-model="detail.autoConfirm" >
-
-							<u-radio   v-for="(item, index) in list2" :key="index+'c'" :name="item.value"
-								active-color="#00b962">
-
-								{{item.name}}
-
-							</u-radio>
-
-						</u-radio-group>
-
-					</view>
-				</u-cell-item>
-
- 				
-				
-				<u-cell-item :arrow="false" class="time-cell border-bottom" title="允许预约日期">
-				
-				</u-cell-item>
-				
-				<view class="" style="padding-left: 16px;">
-					<u-checkbox-group  shape="square">
-				
-						<u-checkbox  
-						 	
-						 v-for="(item, index) in weekList" :key="index" :name="item.value"
-						 v-model="item.checked"  @change="checkboxChange(item,$event)" 
-							:disabled="item.disabled" active-color="#00b962">
-				
-							{{item.name}}
-				
-						</u-checkbox>
-					</u-checkbox-group>
-				
-				</view>
-				
-				<u-picker mode="time" @confirm="confirm"  v-model="show" 
-				:defaultTime="showTime"
-				:params="params"></u-picker>
-
-
-				<u-cell-item title="预约开始时段" :value="detail.shareStartTime" @click="showTimeBtn(0)" ></u-cell-item>
-				<u-cell-item title="预约结束时段" :value="detail.shareEndTime" @click="showTimeBtn(1)" ></u-cell-item>
-
-				<u-cell-item :arrow="false" class="time-cell border-bottom" title="预约时长选项">
-
-
-
-
-				</u-cell-item>
-
-
-
-				<view class="" style="padding-left: 16px;">
-					<u-checkbox-group  shape="square">
-
-						<u-checkbox   v-for="(item, index) in timeList"
-						 	v-model="item.checked"  @change="checkboxChange(item,$event)" 
-							:key="index" :name="item.value"
-							:disabled="item.disabled" active-color="#00b962">
-
-							{{item.name}}
-
-						</u-checkbox>
-					</u-checkbox-group>
-
-				</view>
-
-
-			</u-cell-group>
-
-		</view>
-		<!-- 底部按钮 -->
-		<view class="bottom">
-		<!-- 	<u-button shape='circle' class="refuse-btn">拒绝</u-button>
-			<u-button type="success" shape='circle'>确认</u-button> -->
-			<!-- 删除订单按钮 -->
-		 <u-button shape='circle' type="success" @click="submit"  >保存</u-button> 
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				showTimeType:"",
-				showTime:"",
-				show:false,
-				params: {
-									year: false,
-									month: false,
-									day: false,
-									hour: true,
-									minute: true,
-									second: false
-								},
-								
-				detail:{
-				
-				},
-				
-				list2: [{
-						value:"1",
-						name: "是"
-					},
-					{
-						value:"0",
-						name: "否"
-					}
-				],
-				weekList: [
-					{
-						value:"1",
-						name: "周一"
-					},
-					{
-						value:"2",
-						name: "周二"
-					},
-					{
-						value:"3",
-						name: "周三"
-					},
-				
-					{
-						value:"4",
-						name: "周四"
-					},
-					{
-						value:"5",
-						name: "周五"
-					},
-					{
-						value:"6",
-						name: "周六"
-					},
-				
-					{
-						value:"7",
-						name: "周日"
-					}
-				],
-				timeList: [
-					{
-						value:"10",
-						name: "10分钟"
-					},
-					{
-						value:"20",
-						name: "20分钟"
-					},
-					{
-						value:"30",
-						name: "30分钟"
-					}
-				]
-			}
-		},
-		onLoad(op){
-			
-			this.id=op.id;
-			this.getInfo()
-		},
-		methods: {
-			checkboxChange(item,e){
-				item.checked=e.value
-				this.$forceUpdate()
-				console.log(e)
-			},
-			confirm(e){
-				
-				var type=this.showTimeType;
-				var time=e.hour+":"+e.minute;
-				if(type==0){
-					
-					if(this.detail.shareEndTime){
-						var time1=new Date("2020-1-1 "+time)
-						var time2=new Date("2020-1-1 "+this.detail.shareEndTime)
-						if(time1>time2){
-							this.detail.shareEndTime=null;
-						}
-					}
-					this.detail.shareStartTime=time
-				}
-				if(type==1){
-					
-					if(this.detail.shareStartTime){
-						var time1=new Date("2020-1-1 "+time)
-						var time2=new Date("2020-1-1 "+this.detail.shareStartTime)
-						if(time1<time2){
-							uni.showToast({
-								title:"结束时间不可小于开始时间"
-							})
-							return
-						}
-					}
-					
-					this.detail.shareEndTime=time
-				}
-			},
-			showTimeBtn(type){
-				this.showTimeType=type;
-				console.log(type)
-				if(type=="0"){
-					this.showTime=this.detail.shareStartTime
-				}
-				if(type=="1"){
-					this.showTime=this.detail.shareEndTime
-				}
-				if(!this.showTime){
-					this.showTime=new Date().getHours()+":"+new Date().getMinutes()
-				}
-				this.show=true;
-			},
-			submit(){
-				
-				var sz=[]
-				for(var i in this.weekList){
-					var item=this.weekList[i]
-					if(item.checked){
-						sz.push(item.value)
-					}
-				}
-				var weekDay=sz.join();
-				
-				
-				var sz2=[]
-				for(var i in this.timeList){
-					var item=this.timeList[i]
-					if(item.checked){
-						sz2.push(item.value)
-					}
-				}
-				var reserveMinutes=sz2.join();
-				if(!this.detail.shareStartTime){
-					this.detail.shareStartTime=""
-				}
-				if(!this.detail.shareEndTime){
-					this.detail.shareEndTime=""
-				}
-				var weekTime=[this.detail.shareStartTime,this.detail.shareEndTime]
-				
-				if(this.detail.enableAppointment){
-					if(weekDay==""){
-						uni.showToast({
-							title:"开放预约功能需要选择预约日期"
-						})
-						return
-					}
-					
-					if(!weekTime[0]){
-						uni.showToast({
-							title:"开放预约功能需要预约开始时间"
-						})
-						return
-					}
-					if(!weekTime[1]){
-						uni.showToast({
-							title:"开放预约功能需要预约结束时间"
-						})
-						return
-					}
-					if(reserveMinutes==""){
-						uni.showToast({
-							title:"开放预约功能需要选择预约时长"
-						})
-						return
-					}
-					
-						console.log(	this.detail	)
-				}
-				this.detail.weekDay=weekDay
-				
-				this.detail.weekTime=weekTime.join();
-				
-				this.detail.reserveMinutes=reserveMinutes
-				uni.showLoading({
-					title:"加载中",mask:true,
-				})
-				API.saveGunShare(this.detail).then((res) => {
-					
-					uni.hideLoading()
-					uni.showModal({
-						title:"提示",
-						content:"操作成功",
-						showCancel:false,
-						success:()=>{
-							uni.navigateBack({
-								
-							})
-						}
-					})
-					
-				}).catch(error => {
-						uni.showToast({
-							
-							title:error
-						})
-				})
-			},
-			getInfo(){
-				uni.showLoading({
-					title:"加载中",mask:true,
-				})
-				API.gunShareDetail({
-					gunId:this.id
-				}).then((res) => {
-					this.detail={};
-					var obj=res.data.gunShare;
-					for(var i in obj){
-						
-						if(obj[i]===true){
-							this.detail[i]="1";
-						}else if(obj===false){
-							this.detail[i]="0";
-						}else {
-							this.detail[i]=obj[i];
-						}
-					}
-					if(this.detail.reserveMinutes){
-						var sz=this.detail.reserveMinutes.split(",")
-						for(var i in this.timeList){
-							var item=this.timeList[i]
-						
-							if(sz.indexOf(item.value)!=-1){
-								item.checked=true;
-							}
-						}
-					}
-					
-					if(this.detail.shareWeekDay){
-						var sz=this.detail.shareWeekDay.split(",")
-						for(var i in this.weekList){
-							var item=this.weekList[i]
-						
-							if(sz.indexOf(item.value)!=-1){
-								item.checked=true;
-							}
-						}
-					}
-					
-					console.log(this.detail)
-					uni.hideLoading()
-					 
-				}).catch(error => {
-						uni.showToast({
-							
-							title:error
-						})
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	/deep/.u-cell_title {
-
-		width: 30% !important;
-	}
-
-	/deep/ .u-cell {
-		line-height: 20px;
-		padding: 12px 20px 12px 0;
-		margin-left: 12px;
-	}
-
-	/deep/.u-radio-group {
-		justify-content: start !important;
-	}
-
-	/deep/.u-radio-group:last-child {
-
-		justify-content: space-between !important;
-		padding: 0 0 10px 0px;
-	}
-
-
-	/deep/.u-cell__value {
-
-		text-align: left;
-
-		color: #101010;
-
-		font-size: 16px
-	}
-
-	/deep/.u-radio-group {
-		line-height: 30px;
-		width: 100%;
-		display: flex;
-		justify-content: space-around;
-
-	}
-
-
-
-	/deep/.border-bottom:after {
-		border-bottom-width: 0px !important;
-
-
-
-	}
-	
-	
-// 按钮
-.bottom{
-	width: 100%;
-	height: 56px;
-	position: fixed;
-	bottom: 0;
-	background-color: #fff;
-	display: flex;
-	.refuse-btn{
-		background-color: #DBDBDB;
-	}
-	.u-btn{
-		width: 91.4%;
-		height: 40px;
-		margin: auto;
-		font-size: 18px;
-		
-	}
-	.cancel-btn{
-		width: 91.4%;
-		background-color: #dbdbdb;
-		color: #666666
-	}
-}
-</style>

pagesFinance/user/ownManagement.vue

@@ -1,199 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="车主管理">
-			<view slot="right" style="margin-right: 20px;">
-				<span 
-				@click="thisgotoUrl('pagesFinance/user/addOwnerInformation?p='+id+'&id=0')"
-				class="newly"  >新增</span>
-			</view>
-		</u-navbar>
-		<view class="main">
-			<view style="text-align: center;margin-top: 100px" v-if="!list.length">
-				<img src="@/assets/img/blankpage.png">
-				<view>查询为空</view>
-			</view>
-			<view class="userinfo"  v-for="(item ,index) in list" 
-			
-			
-			:key="item.id" >
-				<view class="infos">
-					<view class="name">
-						{{item.userName?item.userName:'未填写'}}
-					</view>
-					<view class="tel-plateNumber">
-						<view class="tel">
-							<view class="">
-								<i class="ri-smartphone-line"></i>
-							</view>
-							
-							<view class="num">{{item.phone?item.phone:'未填写'}}</view>
-						</view>
-						<view class="plateNumber">
-							<view class="">
-								<i class="ri-roadster-line"></i>
-							</view>
-							<view class="num">{{item.carNum?item.carNum:'未填写'}}</view>
-						</view>
-						
-					</view>
-					
-				</view>
-				<view 
-				@click="thisgotoUrl('pagesFinance/user/addOwnerInformation?p='+id+'&id='+item.id)"
-				class="edit">
-					编辑
-				</view>
-				
-			</view>
-			
-			<u-divider v-if="list.length&&list.length == recordsTotal" color="#B6BDC3" style="margin-top:20px;" bg-color="#f7f7f7">已经到底了</u-divider>
-			
-			
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				id:"",
-				pageIndex: 1,
-				recordsTotal: 0,
-				list:[],
-				uuid:""
-			}
-		},
-		onReachBottom() {
-			if (this.list.length < this.recordsTotal) {
-				this.myLoadmore();
-			}
-		},
-		onReady() {
-			// this.get
-			// EventChannel.on("aaa", function(){
-			// 	console.Log("1111111111")
-			// })
-			this.getList()			
-		},
-		onLoad(op) {
-			this.id=op.id
-		},
-		onShow(){
-			var obj=this.carhelp.get("addOwnerInformation")
-			if(obj&&obj.uuid==this.uuid){
-				if(obj.selectObj.vipUserId){
-					
-				}
-				this.list=[];
-				this.pageIndex = 1;
-				this.getList()
-			}
-		},
-		methods: {
-			thisgotoUrl(url){
-				
-				this.uuid=new Date().getTime()
-				var curl=url+"&uuid="+this.uuid;
-				uni.navigateTo({
-					url:"/"+curl
-				})
-
-			},
-			getList() {
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				
-				
-				API.vipUserLis({
-					platform:this.id,
-					pageIndex:this.pageIndex,
-					pageSize:20
-				}).then((res) => {
-			
-					this.list = [
-						...this.list,
-						...res.data.data
-					];
-					this.recordsTotal = res.data.recordsTotal
-					uni.hideLoading()
-			
-				}).catch(error => {
-					uni.showToast({
-			
-						title: error
-					})
-				})
-			},
-			myLoadmore() {
-			
-					this.pageIndex += 1;
-					this.getList()
-				},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page{
-		background-color: #f3f4f7;
-	}
-	.newly{
-		font-size: 16px;
-		color: rgba(0, 90, 217, 100);
-	}
-
-  .main{
-	  padding: 14px 16px;
-	  .userinfo{
-		  color: rgba(255, 255, 255, 100);
-		  padding: 14px 0 14px 20px;
-		  background: linear-gradient(to right,#7E8EB2,#C4CEE8);
-		  display: flex;
-		  justify-content: space-between;
-		  border-radius: 8px;
-		  margin-bottom: 8px;
-		  .infos{
-			  
-			  .name{
-				  font-size: 20px;
-			  }
-			  .tel-plateNumber{
-				  margin-top: 4px;	
-				  line-height: 20px;
-				  display: flex;
-				  .plateNumber{
-					  margin-left: 20px;
-					  display: flex;
-				  }
-				  .tel{
-					  display: flex;
-				  }
-				  .num{
-					  margin-left: 4px;
-				  }
-				  .ri-smartphone-line,.ri-roadster-line{
-					  font-size: 16px;
-					  
-					  
-				  }
-			  }
-		  }
-		  .edit{
-			  margin: auto 0;
-			  width: 60px;
-			  border-radius: 50px 0px 0px 50px;
-			  background-color: #97A7C7 ;
-			  text-align: center;
-			  line-height: 28px;
-		  }
-	  }
-  }
-</style>

pagesFinance/user/pileManagement.vue

@@ -1,522 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="电桩管理">
-		
-		</u-navbar>
-		<view class="details">
-			<view class="name">
-				{{detail.stationName}} | {{detail.name}}
-			</view>
-			
-			<view class="info">
-				<view class="info-text">
-					<p>{{detail.chargingType}} |<text class="dc-fast"> {{detail.interfaceType}} </text> | {{detail.chargingPower}}kW</p>
-					
-				</view>
-				<view class="info-img">
-					<img :src="detail.stationImage"
-					 style="
-					     width: 100px;
-					     height: 75px;
-					 "
-					 alt="">
-				</view>
-			</view>
-
-			<view class="station-address">
-				<img src="../../assets/img/Frame 201.png" alt="">
-				<view class="address-text">
-					{{detail.address}}
-				</view>
-
-				<view class="navigation" v-if="false">
-					<view class="iconfont address-font">
-						&#xe60c;
-
-					</view>
-					<view class="view-map">导航</view>
-
-				</view>
-
-			</view>
-			
-			<u-cell-group  >
-				<u-cell-item  v-if="price" title="电价" :arrow="false" :value="price.costPrice.toFixed(2)+'元/度('+price.firstTime+'-'+price.latestTime+')'"> </u-cell-item>
-				
-				<u-cell-item  v-if="deviceUser" title="联系人" :arrow="false" :value="deviceUser.realName+'  '+deviceUser.phone"></u-cell-item>
-				<view class="price-detail" v-if="price"
-				@click="gotoUrl('pagesFinance/user/chargingDetails?id='+detail.deviceNo)"
-				
-				>
-					价格详情
-				</view>
-<!-- 				<u-cell-item  title="停车费" :arrow="false" value="新能源车2小时停车费"></u-cell-item>
- -->			</u-cell-group>
-
-		</view>
-
-<!-- 充电枪选项 -->
-<view class="gun-options">
-	<u-tabs :list="list1" :is-scroll="false" :current="current" @change="change" bar-width="125" inactive-color="#777777" active-color="#101010"></u-tabs>
-	
-	<view class="tab-equipment" v-show="current==0"  v-for="(item,i) in gunList" :key="i" >
-		<view class="equipment-top">
-			<text class="name">{{item.sortNo}}号/充电枪{{item.channelNo}}</text>  
-			<!-- <text class="switch"><u-switch v-model="checked" size="40" active-color="#FF7300"></u-switch></text>
-			<text class="radio"> 	
-			开启共享</text> -->
-		</view>
-		<view class="state">
-			
-			<view class="state-item">
-				工作状态：{{item.workStatusText}} <text class="bot1 "
-				:class="{
-					bot2:!item.workStatus
-				}"
-				></text>
-			</view>
-			<view class="state-item">
-				联网状态：{{!detail.online?'离线':'在线'}} <text class="bot1"
-				:class="{
-					bot2:detail.online
-				}"
-				></text>
-			</view>
-			
-			<view class="state-item">
-				开放共享：{{!(item.enableShare&&item.enableShareWithinTime)?'关闭':'开启'}} <text class="bot1 "
-				:class="{
-					bot2:(item.enableShare&&item.enableShareWithinTime)
-				}"
-				></text>
-			</view>
-			<view class="state-item">
-				开放预约：{{!(item.enableAppointment&&item.enableAppointmentWithinTime)?'关闭':'开启'}} <text class="bot1 "
-				:class="{
-					bot2:(item.enableAppointment&&item.enableAppointmentWithinTime)
-				}"
-				></text>
-			</view>
-			
-			
-			<view class="iconfont more"  v-if="isAllow"	
-				 @click="gotoUrl('pagesFinance/user/chargingGunSetup?id='+item.id)" 
-			>
-				<text class="set" >设置</text>&#xe600;
-			</view>
-		</view>
-		
-	</view>	
-	
-	
-	<!-- 分润比例 -->
-	<view class="share" v-show="current==1">
-		<view class="title" >
-			<text class="line"></text>分润比列
-		</view>
-		<view class="item" v-for="(item,i) in sprList" :key="i" v-if="item.describe!='0%'" >
-			<view >
-				{{item.name}}
-			</view>
-			<view >
-				{{item.describe}}
-			</view>
-		</view>
-		 
-		
-	</view>
-	<!-- 设备信息 -->
-	<view class="equipment-info" v-show="current==2">
-	  <view class="title" >
-	  	<text class="line"></text>设备相关信息
-	  </view>
-	  <view class="item">
-		  <view class="">
-		  	设备型号
-		  </view>
-		  <view class="">
-		  	HCD0001-A
-		  </view>
-	  	
-	  </view>
-	  <view class="item">
-	  		  <view class="">
-	  		  	初次安装时间
-	  		  </view>
-	  		  <view class="">
-	  		  	2022-04-1
-	  		  </view>
-	  	
-	  </view>
-	  <view class="item">
-	  		  <view class="">
-	  		  	输出功率范围(瓦)
-	  		  </view>
-	  		  <view class="">
-	  		  	100-400
-	  		  </view>
-	  	
-	  </view>
-	
-
-	</view>
-	
-</view>
-
-
-	</view>
-</template>
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				gunList:[],
-				isAllow:false,
-				detail:{
-					
-
-				},
-				deviceUser:{
-					phone: "",
-					realName: ""
-				},
-				price:{
-					costPrice:"",
-					firstTime: "",
-					latestTime: ""
-				},
-				sprList:[],
-				
-				list1: [{
-					name: '设备列表'
-				}, {
-					name: '分润比例'
-				}],
-				list2: [{
-					name: '是'
-				}, {
-					name: '否'
-				}],
-				timeList:[{
-					name:"10分钟"
-				},
-				{
-					name:"20分钟"
-				},
-				{
-					name:"30分钟"
-				}],
-				current: 0,
-					checked: false,
-			}
-		},
-		onLoad(op){
-			
-			this.id=op.id;
-			
-		},
-		onShow() {
-			this.getInfo()
-		},
-		methods: {
-			change(index) {
-				this.current = index;
-			},
-			getInfo(){
-				uni.showLoading({
-					title:"加载中",mask:true,
-				})
-				API.carDeviceDetail({
-					deviceId:this.id
-				}).then((res) => {
-					this.isAllow=res.data.isAllow	 
-					this.detail=res.data.device	 
-					this.sprList=res.data.sprList
-					this.gunList=res.data.gunList
-					this.price=res.data.price;
-					if(res.data.stationPerson!=null|| res.data.stationPhone!=null ){
-						this.deviceUser={
-							realName:res.data.stationPerson?res.data.stationPerson:'',
-							phone:res.data.stationPhone?res.data.stationPhone:''
-						};
-					}else{
-						this.deviceUser=null
-					}
-				
-					uni.hideLoading()
-					 
-				}).catch(error => {
-						uni.showToast({
-							
-							title:error
-						})
-				})
-			}
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		padding-bottom: 233px;
-		background-color: #F6F8F8;
-		
-	}
-	.delete {
-		margin-left: 85.3%;
-		color: #cccccc;
-		font-size: 12px
-	}
-
-	.details {
-		width: 100%;
-		background-color: #fff;
-		padding: 16px 0 0px 16px;
-
-		.name {
-			height: 30px;
-			color: rgba(16, 16, 16, 100);
-			font-size: 20px;
-			font-weight: 600;
-			    overflow: hidden;
-			    text-overflow: ellipsis;
-			    white-space: nowrap;
-		}
-
-		.info {
-			height: 75px;
-			line-height: 16px;
-			color: rgba(102, 102, 102, 100);
-			font-size: 16px;
-			margin-top: 12px;
-			display: flex;
-
-			// justify-content: space-between;
-			.dc-fast {
-
-				color: #CDC0FF;
-				margin: 0 4px;
-			}
-
-			.info-text {
-				width: 69%;
-				height: 100%;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-
-				.tag-items {
-					display: flex;
-					// justify-content: space-between;
-				}
-
-				.tag {
-					line-height: 26px;
-					border-radius: 4px;
-					background-color: rgba(255, 255, 255, 100);
-					color: rgba(119, 119, 119, 100);
-					text-align: center;
-					border: 1px solid rgba(119, 119, 119, 100);
-					padding: 0 4px;
-					margin-right: 8px;
-
-				}
-			}
-
-			.info-img {
-				// margin-left: 35px;
-			}
-		}
-
-		.station-address {
-			width: 100%;
-
-			margin-top: 17px;
-			position: relative;
-
-			img {
-				width: 100%;
-				height: 100%;
-			}
-
-			.address-text {
-				line-height: 40px;
-				position: absolute;
-				top: 0px;
-				left: 0;
-				font-size: 16px
-			}
-
-			.navigation {
-				position: absolute;
-				top: 0;
-				right: 28px;
-			}
-
-			.address-font {
-				font-size: 28px;
-				color: #4e94ff;
-
-
-			}
-
-			.view-map {
-				font-size: 12px;
-				text-align: center;
-
-			}
-		}
-		/deep/.u-cell__value{
-			text-align: left;
-			//margin-left: 16px;
-			color: #101010;
-			 font-size: 32rpx;
-		}
-		/deep/.u-cell_title{
-			width: 15% !important;
-			min-width: 48px;
-		    font-size: 32rpx;
-			color: #777777;
-		}
-		.u-cell{
-			position: relative;
-			    padding: 13px 16px 13px 0 ;
-		}
-		.price-detail{
-			width: 56px;
-			height: 20px;
-			color: rgba(22, 119, 255, 100);
-			font-size: 14px;
-			position: absolute;
-			top: 15px;
-			right: 20px;
-		}
-	}
-
-
-// 充电枪选项
-.gun-options{
-	background-color: #fff;
-	margin-top: 12px;
-	.tab-equipment{
-		background-color: #fff;
-		padding: 16px 16px 16px 0;
-		margin-left: 16px ;
-		border-bottom: 1px solid #E5E7EA;
-		position: relative;
-		.equipment-top{
-			line-height: 27px;
-			position: relative;
-		}
-		.name{
-			line-height: 20px;
-			line-height: 20px;
-			font-weight: 600;
-			color: rgba(16, 16, 16, 100);
-		}
-		.radio{
-			margin-left: 54px;
-			
-			
-		}
-		.switch{
-			position:absolute;
-			top: 3px;
-			left: 21%;
-		}
-		.state{
-			margin-top: 12px;
-			display: flex;
-			justify-content: space-between;
-			width: 75%;
-			flex-wrap: wrap;
-			.state-item{
-				height: 20px;
-				line-height: 20px;
-				margin-top: 4px;
-				color: rgba(16, 16, 16, 100);
-				.bot1{
-					display: inline-block;
-					width: 12px;
-					height: 12px;
-					margin-left: 2px;
-					background-color: rgba(255, 115, 0, 100);
-					border-radius: 999px;
-					
-				}
-				.bot2{
-					background-color: rgba(0, 185, 98, 100);
-				}
-				
-				
-			}
-			.more{
-				
-				line-height: 24px;
-				font-size: 24px;
-				color: #b3b3b3;
-				position: absolute;
-				right: 20px;
-				top: 16px;
-			
-				.set{
-					display: inline-block;
-					width: 30px;
-					font-size: 14px;
-					color: #1677ff;
-			        position: absolute;
-					top: 0;
-					left: -29px;
-					
-				}
-			}
-			
-		}
-	}
-	/deep/.u-tab-bar{
-		background-color: #00B962 !important;
-	}
-.share{
-	padding: 16px;
-    
-}
-	
-.equipment-info{
-	padding: 16px;
-}
-.title{
-	font-size: 16px;
-	font-weight: 600;
-	.line{
-		display: inline-block;
-		height:12px;
-		width: 4px;
-		background-color: #00B962;
-		margin-right: 8px;
-	}
-	
-	}
-	.item{
-			display: flex;
-			justify-content: space-between;
-			margin-top: 20px;
-		}
-}
-.bottom{
-	width: 100%;
-	height: 64px;
-	background-color: #fff;
-	position: fixed;
-	bottom: 0;
-	display: flex;
-	.u-btn{
-		width: 91.4%;
-		height: 40px;
-		margin: auto;
-	}
-}
-
-</style>

pagesFinance/user/stationsList.vue

@@ -1,268 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="我的站点"></u-navbar>
-	 
-		<view class="deviceList" 	>
-		<view style="text-align: center;margin-top: 100px" v-if="!list.length">
-			<img src="@/assets/img/blankpage.png">
-			<view>查询为空</view>
-		</view>
-		
-		
-		
-			<view v-for="(item ,index) in list" :key="item.id"
-			@click="gotoUrl('pagesFinance/user/deviceList?id='+item.id)"
-		 
-			class="deviceList-item deviceList-bg1" >
-				<view class="deviceList-main">
-				 
-				<span class="btn12 " v-if="item.type=='1,2'" >快/慢</span>
-				<span class="btn12 btn2"  v-if="item.type=='1'"  >快充</span>
-				<span class="btn12 btn1" v-if="item.type=='2'" >慢充</span>
-				{{item.name}}</view>
- 				<view class="deviceList-head">{{item.address}}<span style="float: right;" class="iconfont more">&#xe600;</span></view>
-				<view class="deviceList-foot">
-					
-					<view class="deviceList-label" style="color: #333333;"  >总数<b>{{item.totalNum}}</b></view>
-					<view class="deviceList-label" style="color: #7a68f6;" v-if="item.fastNum"  >/直流快充<b>{{item.fastNum}}</b></view>
-					
-					<view class="deviceList-label" style="color: #5cbe7d;"  v-if="item.slowNum" >/交流慢充<b>{{item.slowNum}}</b></view>
-					
-					
-				<!-- 	<view class="deviceList-label">{{item.roleName}}</view> -->
-				</view>
-			</view>
-			<u-divider v-if="list.length&&list.length==recordsTotal" color="#B6BDC3" style="margin-top:20px;" bg-color="#f7f7f7">已经到底了</u-divider>
-			
-		 
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				form: {
-				
-				},
-				startDate:'',
-				endDate:'',
-				pageIndex: 1,
-				recordsTotal: 0,
-				list: [],
-				value1: -1,
-				value2: -1,
-				value3: -1,
-				stationList:[],
-				options0: [
-					{
-							label: '全部',
-							value: -1,
-						},
-					{
-						label: '自行车充电',
-						value: 0,
-					},
-					{
-						label: '交流慢充',
-						value: 2,
-					},
-					{
-						label: '直流快充',
-						value: 1,
-					}
-				],
-				options1: [{
-						label: '全部',
-						value: '-1',
-					},
-					{
-						label: '自行车充电',
-						value: 0,
-					},
-					{
-						label: '交流慢充',
-						value: 2,
-					},
-					{
-						label: '直流快充',
-						value: 1,
-					}
-				],
-				options2: [
-				],
-				options3: [
-					{
-						label: '全部',
-						value: -1,
-					},
-					{
-						label: '在线',
-						value: 1,
-					},
-					{
-						label: '离线',
-						value: 0,
-					},
-				],
-			}
-		},
-		onReachBottom() {
-			if (this.list.length < this.recordsTotal) {
-				this.myLoadmore();
-			}
-		},
-		methods: {
-			change1(e){
-				this.form.type=e
-				if(e==-1){
-					this.form.type=""
-				}
-				this.getList(true)
-			},
-			change2(e){
-				this.form.stationId=e
-				if(e==-1){
-					this.form.stationId=""
-				}
-				this.getList(true)
-			},
-			change3(e){
-				this.form.onlineStatus=e
-				if(e==-1){
-					this.form.onlineStatus=""
-				}
-				this.getList(true)
-			},
-			getStation() {
-				
-				API.stationList().then((res) => {
-					this.options2.push({
-						label: '全部',
-						value:-1,
-					})
-					this.stationList = res.data.stationList
-					this.stationList.forEach(item=>{
-						this.options2.push({
-							label: item.name,
-							value: item.id,
-						})
-					})
-					
-				}).catch(error => {
-					uni.showToast({
-					
-						title: error
-					})
-				})
-			},
-		myLoadmore() {
-
-				this.pageIndex += 1;
-				this.getList()
-			},
-			getList(bl) {
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				if (bl) {
-					this.list = [];
-					this.pageIndex = 1;
-				}
-				this.form.pageIndex= this.pageIndex
-				
-				API.stationsList(this.form).then((res) => {
-					
-					this.list = [
-						...this.list,
-						...res.data.data
-					];
-				 
-					uni.hideLoading()
-
-				}).catch(error => {
-					uni.showToast({
-
-						title: error
-					})
-				})
-			},
-			onReady() {
-				//this.getStation()
-				this.getList()
-				
-			}
-		}
-	}
-</script>
-<style>
-	page{
-		background-color: #F7F7F7;
-	}
-</style>
-<style lang="scss" scoped>
-	.btn12{
-		color: #fff;
-		background-color: #449ca8;
-		font-size: 16px;
-		    border-radius: 50px;
-		    padding: 1px 5px;
-	}
-	.btn1{
-	
-		background-color: #5cbe7d;
-		
-	}
-	.btn2{
-	
-		background-color: #7a68f6;
-		
-	}
-	.deviceDropdown{
-		background-color: #fff;
-	}
-	.deviceList-item{
-		margin: 16px;
-		border-radius: 8px;
-		.deviceList-head{
-			color: #9e9e9e;
-			font-size: 16px;
-			padding: 8px 16px;
-		}
-		.deviceList-main{
-			font-size: 20px/*  */;
-			padding:5px 16px 0px 16px;
-			font-weight: bold;
-		}
-		.deviceList-foot{
-			display: flex;
-			align-items: center;
-			flex-wrap: wrap;
-			padding: 0 16px 16px;
-			.deviceList-label{
-				// background-color: #F0F2F4 ;
-				// padding: 4px 10px;
-				margin: 1px;
-				border-radius: 4px;
-			}
-		}
-	}
-	.deviceList-bg1{
-		//background:url(../../assets/img/charging_type_fast.png) no-repeat #fff;
-		background-size:100%;
-		background-color: #ffffff ;
-	}
-	.deviceList-bg2{
-		background:url(../../assets/img/charging_type_slow.png) no-repeat #fff;
-		background-size:100%;
-	}
-	.deviceList-bg3{
-		background:url(../../assets/img/charging_type_bike.png) no-repeat #fff;
-		background-size:100%;
-	}
-</style>

pagesFinance/user/stationsListLine.vue

@@ -1,244 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="我的站点"></u-navbar>
-	 
-		<view class="deviceList" 	>
-		<view style="text-align: center;margin-top: 100px" v-if="!list.length">
-			<img src="@/assets/img/blankpage.png">
-			<view>查询为空</view>
-		</view>
-		
-		
-		
-			<view v-for="(item ,index) in list" :key="item.id"
-			@click="gotoUrl('pagesFinance/user/deviceListLine?id='+item.id)"
-		 
-			class="deviceList-item deviceList-bg1" >
-				<view class="deviceList-main">
-				 
-			<!-- 	<span class="btn12 " v-if="item.type=='1,2'" >快/慢</span>
-				<span class="btn12 btn1"  v-if="item.type=='1'"  >慢冲</span>
-				<span class="btn12 btn2" v-if="item.type=='2'" >快冲</span> -->
-				{{item.name}}</view>
- 				<view class="deviceList-head">{{item.address}}<span style="float: right;" class="iconfont more">&#xe600;</span></view>
-				<view class="deviceList-foot">
-					
-					<view class="deviceList-label" style="color: #333333;"  >摄像头总数<b>{{item.cameraNum}}</b></view>
-				
-					
-				<!-- 	<view class="deviceList-label">{{item.roleName}}</view> -->
-				</view>
-			</view>
-			<u-divider v-if="list.length&&list.length==recordsTotal" color="#B6BDC3" style="margin-top:20px;" bg-color="#f7f7f7">已经到底了</u-divider>
-			
-		 
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				form: {
-				
-				},
-				startDate:'',
-				endDate:'',
-				pageIndex: 1,
-				recordsTotal: 0,
-				list: [],
-				value1: -1,
-				value2: -1,
-				value3: -1,
-				stationList:[],
-				options0: [
-					{
-							label: '全部',
-							value: -1,
-						},
-					{
-						label: '自行车充电',
-						value: 0,
-					},
-					{
-						label: '交流慢充',
-						value: 2,
-					},
-					{
-						label: '直流快充',
-						value: 1,
-					}
-				],
-				options1: [{
-						label: '全部',
-						value: '-1',
-					},
-					{
-						label: '自行车充电',
-						value: 0,
-					},
-					{
-						label: '交流慢充',
-						value: 2,
-					},
-					{
-						label: '直流快充',
-						value: 1,
-					}
-				],
-				options2: [
-				],
-				options3: [
-					{
-						label: '全部',
-						value: -1,
-					},
-					{
-						label: '在线',
-						value: 1,
-					},
-					{
-						label: '离线',
-						value: 0,
-					},
-				],
-			}
-		},
-		onReachBottom() {
-			if (this.list.length < this.recordsTotal) {
-				this.myLoadmore();
-			}
-		},
-		methods: {
-			change1(e){
-				this.form.type=e
-				if(e==-1){
-					this.form.type=""
-				}
-				this.getList(true)
-			},
-			change2(e){
-				this.form.stationId=e
-				if(e==-1){
-					this.form.stationId=""
-				}
-				this.getList(true)
-			},
-			change3(e){
-				this.form.onlineStatus=e
-				if(e==-1){
-					this.form.onlineStatus=""
-				}
-				this.getList(true)
-			},
-			 
-		myLoadmore() {
-
-				this.pageIndex += 1;
-				this.getList()
-			},
-			getList(bl) {
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				if (bl) {
-					this.list = [];
-					this.pageIndex = 1;
-				}
-				this.form.pageIndex= this.pageIndex
-				
-				API.stationsListLine(this.form).then((res) => {
-					
-					this.list = [
-						...this.list,
-						...res.data.data
-					];
-				 
-					uni.hideLoading()
-
-				}).catch(error => {
-					uni.showToast({
-
-						title: error
-					})
-				})
-			},
-			onReady() {
-				//this.getStation()
-				this.getList()
-				
-			}
-		}
-	}
-</script>
-<style>
-	page{
-		background-color: #F7F7F7;
-	}
-</style>
-<style lang="scss" scoped>
-	.btn12{
-		color: #fff;
-		background-color: #449ca8;
-		font-size: 16px;
-		    border-radius: 50px;
-		    padding: 1px 5px;
-	}
-	.btn1{
-	
-		background-color: #5cbe7d;
-		
-	}
-	.btn2{
-	
-		background-color: #7a68f6;
-		
-	}
-	.deviceDropdown{
-		background-color: #fff;
-	}
-	.deviceList-item{
-		margin: 16px;
-		border-radius: 8px;
-		.deviceList-head{
-			color: #9e9e9e;
-			font-size: 16px;
-			padding: 8px 16px;
-		}
-		.deviceList-main{
-			font-size: 20px/*  */;
-			padding:5px 16px 0px 16px;
-			font-weight: bold;
-		}
-		.deviceList-foot{
-			display: flex;
-			align-items: center;
-			flex-wrap: wrap;
-			padding: 0 16px 16px;
-			.deviceList-label{
-				// background-color: #F0F2F4 ;
-				// padding: 4px 10px;
-				margin: 1px;
-				border-radius: 4px;
-			}
-		}
-	}
-	.deviceList-bg1{
-		//background:url(../../assets/img/charging_type_fast.png) no-repeat #fff;
-		background-size:100%;
-		background-color: #ffffff ;
-	}
-	.deviceList-bg2{
-		background:url(../../assets/img/charging_type_slow.png) no-repeat #fff;
-		background-size:100%;
-	}
-	.deviceList-bg3{
-		background:url(../../assets/img/charging_type_bike.png) no-repeat #fff;
-		background-size:100%;
-	}
-</style>

pagesFinance/user/withdraw.vue

@@ -1,491 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="提现"></u-navbar>
-		<view class="withdraw">
-			<view class="withdraw-head">
-				<b>提现至</b><span>{{code}}</span>
-			</view>
-			<view class="withdraw-head">
-				<b>选择提现站点</b>
-				<span  >
-					<picker @change="bindPickerChange" range-key="name" :range="stationList">
-							<view class="uni-input">{{stationObj.name?stationObj.name:'无站点'}}<text class="iconfont more">
-					&#xe600;
-				</text></view>
-					</picker>
-									
-				</span>
-			</view>
-			<view class="withdraw-head">
-				<b>上次提现时间</b><span>{{info.startTime}}</span>
-			</view>
-			<view class="withdraw-head">
-				<b>本次提现时间</b>
-					
-					<u-picker mode="time" v-model="showEndTime" :default-time="endTime" :params="params" @confirm="bindDateChange0"></u-picker>
-				<span @click="showEndTime=true">
-				
-				<view class="uni-input">{{info.endTime}} <text class="iconfont more">
-					&#xe600;
-				</text></view>
-			 
-				</span>
-			</view>
-			<view class="withdraw-head">
-				<b>此期间累计产生订单数</b><span>{{info.total}}笔</span>
-			</view>
-			<view class="withdraw-head">
-				<b>此期间总分润金额</b><span class="whthdraw-price">{{info.amount?info.amount.toFixed(2):0}}元</span>
-			</view>
-			<view class="withdraw-head">
-				<b>此期间累计产生月卡分润数</b><span>{{info.cardTotal}}笔</span>
-			</view>
-			<view class="withdraw-head">
-				<b>此期间累计月卡分润金额</b><span class="whthdraw-price">{{info.cardAmount.toFixed(2)}}元</span>
-			</view>
-			<view class="withdraw-head">
-				<b>分润提现明细表</b><span class="download" @click="ckdownload"><u-icon name="download"></u-icon> 下载</span>
-			</view>
-			
-			
-			
-			<view class="withdraw-main" v-if="false">
-				<p>申请提现金额(元)</p>
-				<view class="withdraw-input">
-					<span>￥</span>
-					<u-input v-model="value" :type="type" placeholder-style="font-size:28px;height:40px;line-height:40px;color:#ccc;" />
-				</view>
-			</view>
-			<view class="withdraw-head">
-				<b>是否开票</b><span  >
-				<u-radio-group v-model="invoiceRequired" >
-				
-					<u-radio  v-for="(item, index) in list2"
-					 
-					 style="margin-right: 16px;"
-					 
-					 :key="index+'a'" :name="item.value"
-						:disabled="item.disabled" active-color="#00b962">
-				
-						{{item.name}}
-				
-					</u-radio>
-				
-				</u-radio-group>
-				</span>
-			</view>
-			<view class="withdraw-head">
-				<b>发票类型</b><span  >
-				<u-radio-group v-model="invoiceType" >
-				
-					<u-radio  v-for="(item, index) in list1" :key="index+'a'" :name="item.value"
-						:disabled="item.disabled" active-color="#00b962">
-				
-						{{item.name}}
-				
-					</u-radio>
-				
-				</u-radio-group>
-				</span>
-			</view>
-			
-			<view class="withdraw-head" v-if="!isPt" >
-				<b>实际电量(度)<span style="color: red;    float: none;">*</span></b>
-					
-					<span class="withdraw-input">
-					<u-input
-					 height="20px"
-					  placeholder="请输入实际电量"
-										input-align="right"
-											type="digit"
-					  v-model="electricQuantity"
-									 
-					></u-input>
-				</span>
-			</view>
-			<view class="withdraw-head"  v-if="!isPt" >
-				<b>成本电价(元/度)<span style="color: red;    float: none;">*</span></b>
-					
-					<span class="withdraw-input">
-					<u-input
-					 height="20px"
-					  placeholder="请输入成本电价"
-										input-align="right"
-											type="digit"
-					  v-model="electricityPrice"
-									 
-					></u-input>
-				</span>
-			</view>
-			
-			
-			<view class="withdraw-head" >
-				<b>开票税率(%)</b>
-					
-					<span class="withdraw-input">
-					<u-input
-					 height="20px"
-					  placeholder="请输入开票税率"
-										input-align="right"
-											type="digit"
-					  v-model="taxRate"
-									 
-					></u-input>
-				</span>
-			</view>
-		</view>
-		
-		<view class="applyBtn">
-			<u-button :class="{
-				'applyBtn-btn':!info.amount&&!info.cardAmount
-			}" @click="submit()" type="primary">申请提现，等待财务转账</u-button>
-		</view>
-		<view class="withdraw-tips">
-			<h4>提现说明：</h4>
-			<p>由于银行清算，提现申请将于次日内到账。如遇高峰期，可能延时到账，请耐心等待。</p>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	import {
-		parseUnixTime,
-		substrMb
-	} from '@/utils'
-	export default {
-		data() {
-			return {
-				
-				params: {
-						year: true,
-						month: true,
-						day: true,
-						hour: true,
-						minute: true,
-						second: true,
-						timestamp: true, 
-				},
-						isPt:false,		
-				info:{},
-				electricityPrice:'',
-				electricQuantity:'',
-				code:"",
-				showEndTime:false,
-				value: '',
-				type: 'number',
-				nowTime:"",
-				taxRate:"",
-				invo:"",
-				invoiceRequired:"1",
-				invoiceType:"1",
-				stationList:[],
-				stationObj:{},
-				list1: [{
-					name: '普票',
-					value:"1"
-				}, {
-					name: '专票',
-					value:"2"
-				}],
-				list2: [{
-					name: '是',
-					value:"1"
-				}, {
-					name: '否  ',
-					value:"0"
-				}],
-				
-					home:{
-						accountBalance:0
-					},
-					endTime:null
-			}
-		},
-		onReady() {
-			this.endTime=parseUnixTime(new Date(),"{y}-{m}-{d} 00:00:00")
-		
-			//this.getHomePage()
-		},
-		onShow(){
-				this.nowTime=parseUnixTime(new Date())
-			this.getHomePage()
-		},
-		methods: {
-			bindDateChange0(e){
-				console.log(e)
-				var key=e.year+"/"+e.month+"/"+e.day+" "+e.hour+":"+e.minute+":"+e.second;
-				var endTime=parseUnixTime(new Date(key))
-				
-				if(endTime<this.nowTime){
-					this.endTime=parseUnixTime(new Date(key))
-					
-					this.info.endTime=this.endTime
-					this.queryWithdrawInfo(this.stationObj.id)
-				}else{
-					uni.showToast({
-						title:"结束时间不能大于当前时间"
-					})
-				}
-				
-			},
-			
-			ckdownload(){
-				//this.value=this.info.amount
-				if(!this.stationObj.id){
-						uni.showToast({
-							title: "请选择站点"
-						})
-				
-					return
-				}
-				
-				API.profitDetailsExcel({
-					stationId:this.stationObj.id,
-					startTime:this.info.startTime,
-					endTime:this.info.endTime
-				}).then((resDown) => {
-					// uni.downloadFile({
-					// 	url: resDown.data, //仅为示例，并非真实的资源
-					// 	success: (res) => {
-					// 		if (res.statusCode === 200) {
-					// 			console.log('下载成功');
-					// 		}
-					// 	}
-					// });
-					if(resDown.data){
-						window.location.href=resDown.data
-						
-					}else{
-						uni.showToast({
-							title:"无文件下载"
-						})
-					}
-				}).catch(error => {
-					
-					uni.showToast({
-						title:error
-					})
-				})
-				
-			},
-			bindPickerChange(e){
-				console.log(e)
-				if(this.stationList[e.detail.value]){
-					this.stationObj=this.stationList[e.detail.value];
-					this.queryWithdrawInfo(this.stationObj.id)
-				}
-			},
-			selectStation(){},
-			submit(){
-				
-			 
-				//this.value=this.info.amount
-				if(!this.stationObj.id){
-						uni.showToast({
-							title: "请选择站点"
-						})
-				
-					return
-				}
-				if(!this.isPt){
-					
-					if(!this.electricQuantity){
-							uni.showToast({
-								title: "请输入实际电量"
-							})
-					
-						return
-					}
-					if(!this.electricityPrice){
-							uni.showToast({
-								title: "请输入成本电价"
-							})
-					
-						return
-					}
-					this.info.electricQuantity=this.electricQuantity
-					this.info.electricityPrice=this.electricityPrice
-					
-				}
-				
-				var amount=0
-				if(!this.info.amount&&!this.info.cardAmount){
-						uni.showToast({
-							title: "可提现金额为0"
-						})
-					return
-				}
-				amount=(this.info.amount*100+this.info.cardAmount*100)/100;
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				this.info.invoiceRequired=this.invoiceRequired
-				this.info.invoiceType=this.invoiceType
-				this.info.taxRate=this.taxRate
-				this.info.stationId=this.stationObj.id;
-				
-				
-				API.applyWithdraw(this.info).then((res) => {
-					
-						uni.redirectTo({
-							url:"/pagesFinance/user/applyResult?value="+amount
-						})
-					
-				}).catch(error => {
-					uni.hideLoading()
-					uni.showModal({
-						title:"提示",
-						content:error,
-						showCancel:false
-					})
-				})
-			},
-			queryWithdrawInfo(id){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.queryWithdrawInfo({
-					stationId:id,
-					endTime:this.endTime
-				}).then((res) => {
-					this.info=res.data;
-					this.isPt=res.data.isPt;
-					uni.hideLoading()
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			getStationList(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.stationList().then((res) => {
-					this.stationList=res.data.stationList;
-					if(this.stationList.length){
-						this.stationObj=this.stationList[0];
-						this.queryWithdrawInfo(this.stationList[0].id)
-					}
-					uni.hideLoading()
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			getHomePage(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.homePage().then((res) => {
-					this.home = res.data
-					var bankCard="";
-				
-					if(this.home.bankCard){
-						
-						bankCard=substrMb(this.home.bankCard,0,4)+"****"+substrMb(this.home.bankCard,this.home.bankCard.length-4,4)
-					}
-					this.code=this.home.bank+":"+bankCard;
-					if(this.home.bank==null&&this.home.bankCard==null){
-						this.code="未绑定"
-					}
-					
-					uni.hideLoading()
-					this.getStationList()
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			}
-		}
-	}
-</script>
-<style>
-	page{
-		background-color: #F7F7F7;
-	}
-</style>
-<style lang="scss" scoped>
-	.download{
-		color: #185AC6 ;
-	}
-	.withdraw-tips{
-		margin:24px 16px;
-		p{
-			color:#999;
-			margin-top: 4px;
-		}
-	}
-	.withdraw{
-		margin: 16px;
-		background-color: #fff;
-		padding: 16px 16px 0 16px;
-		.withdraw-head{
-			// margin: 16px 0;
-			padding: 16px 0;
-		
-			border-bottom: 1px solid #f7f7f7;
-			line-height: 20px;
-			align-items: center;
-			.whthdraw-price{
-				font-size: 18px;
-				color: #101010;
-				font-weight: 600;
-			}
-			b{
-				color:#999;
-			}
-			span{
-				margin-left: 12px;
-				float: right;
-			}
-		}
-		.withdraw-main{
-			border-top: 1px solid #f7f7f7;
-		border-bottom: 1px solid #f7f7f7;
-		
-			margin: 16px 0;
-			padding: 16px 0;
-			.withdraw-input{
-				margin-top: 32px;
-				display: flex;
-				align-items: center;
-				font-size: 28px;
-				/deep/.uni-input-input{
-					font-size: 28px;
-				}
-			}
-		}
-		.withdraw-foot{
-			display: flex;
-			align-items: center;
-			p{
-				color:#999
-			}
-			span{
-				color:#2979FF;
-				margin-left: 16px;
-			
-			}
-		}
-	}
-	.applyBtn{
-		margin: 16px;
-	}
-	.applyBtn-btn{
-		background-color: #185AC6;
-		opacity: 0.5;
-		border-color:#185AC6 ;
-		border-radius: 8px;
-	}
-</style>

pagesFinance/user/withdrawRecord.vue

@@ -1,218 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="提现记录"></u-navbar>
-		<view class="detailed">
-			<view style="text-align: center;margin-top: 100px" v-if="!list.length">
-				<img src="@/assets/img/blankpage.png">
-				<view>没有提现记录</view>
-			</view>
-			<view class="detailed-list"  
-			:key="index" 
-			v-for="(item ,index) in list" >
-				<view class="detailed-time"  v-if="item.show">
-					<p>{{showTime(item.showtime)}}</p>
-					<p>共提现 {{showMap.get(item.showtime).toFixed(2)}}元</p>
-				</view>
-				<view class="detailed-item"  @click="gotoItem(item)" >
-					<view class="detailed-item-name">
-						<view class="u-flex">
-							<h4>{{item.applicationTypeText}}</h4>
-							 <span  :class="{
-								 success:item.status==1,
-								  error:item.status==2,
-								   error2:item.status==0
-							 }">({{item.statusText}})</span>
-							
-						</view>
-						<p>{{item.stationName}}</p>
-					</view>
-					<view class="detailed-item-num">
-						<h2>{{item.applicationAmount?item.applicationAmount.toFixed(2):'0'}}元</h2>
-						
-						<p>{{showTime2(info.createTime)}}</p>
-					</view>
-				</view>
-			
-			</view>
-			<u-divider v-if="list.length&&list.length == recordsTotal" color="#B6BDC3" style="margin-top:20px;" bg-color="#f7f7f7">已经到底了</u-divider>
-			
-		 
-		</view>
-		
-		<u-button  v-if="info.status" @click="uuid=new Date().getTime(),gotoUrl('pagesFinance/user/applicationForWithdrawal?uuid='+uuid)" >创建提现单</u-button>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/finance.js'
-	
-	export default {
-		data() {
-			return {
-				
-				pageIndex: 1,
-				recordsTotal: 0,
-				list: [],
-				info:{},
-				form: {
-					name: '',
-					intro: '',
-				},
-				showMap:null,
-				uuid:""
-			 
-			}
-		},
-		onLoad(){
-			this.info=this.carhelp.getPersonInfo("merchantUser")
-			
-		},
-		onReady() {
-			this.getList()
-		},
-		
-		onReachBottom() {
-			if (this.list.length < this.recordsTotal) {
-				this.myLoadmore();
-			}
-		},
-		onShow(){
-			var obj=this.carhelp.get("withdrawRecord")
-			if(obj&&obj.uuid==this.uuid){
-				
-				this.list=[];
-				this.pageIndex = 1;
-				this.getList()
-			}
-		},
-		methods: {
-			showTime(name){
-				if(!name){
-					return ''
-				}
-				return name.replace('-','年')+'月';
-			},
-			showTime2(name){
-				if(!name){
-					return ''
-				}
-				return name.substring(5);
-			},
-			gotoItem(item){
-				
-				this.uuid=new Date().getTime()
-				if(this.info.status&&item.status=='-1'){
-					this.gotoUrl('pagesFinance/user/applicationForWithdrawal?id='+item.id+"&uuid="+this.uuid)
-				}else{
-					this.gotoUrl('pagesFinance/user/applicationDetails?id='+item.id)
-				}
-			},
-			getList() {
-			
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				
-				API.withdrawRecord({
-					pageIndex:this.pageIndex
-				}).then((res) => {
-					
-					this.list = [
-						...this.list,
-						...res.data.data
-					];
-					
-					var showMap=new Map()
-					this.list.forEach(item=>{
-						var ktime=item.applicationMonth;
-						
-						if(showMap.has(ktime)){
-							item.show=false;
-							// var m=showMap.get(ktime)*100+item.applicationAmount*100;
-							// showMap.set(ktime,m/100)
-						}else{
-							showMap.set(ktime,item.totalApplicationAmount)
-							
-							item.show=true;
-							item.showtime=ktime;
-						}
-					})
-					this.showMap=showMap;
-					this.recordsTotal = res.data.recordsTotal
-					uni.hideLoading()
-					
-				}).catch(error => {
-					uni.showToast({
-					
-						title: error
-					})
-				})
-			},
-		}
-	}
-</script>
-<style>
-	page{
-		background-color: #F7F7F7;
-	}
-</style>
-<style lang="scss" scoped>
-	
-	.detailed-time{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 10px 20px;
-		p{
-			color:#666;
-		}
-	}
-	.detailed-item{
-		background-color: #fff;
-		display: flex;
-		justify-content: space-between;
-		padding: 10px 20px;
-		border-bottom: 1px solid #ededed;
-		.detailed-item-name{
-			font-size: 14px;
-			h4{
-				
-				font-weight: normal;
-			}
-			p{
-				font-size: 12px;
-				margin-top: 4px;
-				color:#666;
-			}
-			span{
-				margin-left: 10px;
-			}
-			.success{color:#27b148}
-			.error{color:#FF6200;}
-			.error2{color:#1ba7f4;}
-		}
-		.detailed-item-num{
-			text-align: right;
-			align-items: center;
-			h2{
-				
-				
-			}
-		}
-	}
-	
-	.u-btn{
-		margin: 0 16px;
-		position: fixed;
-		bottom: 12px;
-		left: 0;
-		right: 0;
-		height: 44px;
-		line-height: 44px;
-		border-radius: 8px;
-		background-color: rgba(24, 90, 198, 100);
-		color: rgba(255, 255, 255, 100);
-	}
-</style>

utils/request.js

@@ -52,19 +52,17 @@ const request = (options) => {
 			}
 		}).then((response) => {
  			let [error, res] = response;
- 		  
-			if (res.data.code == 200&&res.data.result) {
+			var userType=2
+			if(res.data.code == 200&&res.data.result){
+				userType=res.data.data.regUser.userType;
+			}
+			if (res.data.code == 200&&res.data.result&&userType==2) {
 				
 				var token = res ? res.data.data.token : '';
-				 if(options&&options.jp_identity){
-					 carhelp.setPersonInfo(res.data.data.user ,options.jp_identity );
-					 
-				 }else{
-					 carhelp.setPersonInfo(res.data.data.regUser );
-					 
-				 }
-				 carhelp.setPersonInfoPlus(res.data.data ,options.jp_identity )
-				carhelp.setToken(token,options.jp_identity);
+				 carhelp.setPersonInfo(res.data.data.regUser );
+				 
+				carhelp.setPersonInfoPlus(res.data.data  )
+				carhelp.setToken(token);
 				
 				options.token=token
 				
@@ -72,7 +70,7 @@ const request = (options) => {
 				//requestNum(options);
 				resolve(isson);
 				 
-			} else  if(res.data.code == 415||(res.data.code == 200&&!res.data.result)||res.data.code == 400){
+			} else  if(res.data.code == 415||(res.data.code == 200&&!res.data.result)||res.data.code == 400||userType==1){
 				
 				var backurl=window.location.href.split("#")[1]
 				var url="/pages/login/index"
@@ -81,7 +79,7 @@ const request = (options) => {
 				}
 				
 				url+="?message=请登录&back="+ backurl
-				if(options.data.phone){
+				if(options.data&&options.data.phone){
 					url+="&phone="+options.data.phone
 					
 				}