调整

.env.dev.js

@@ -1,6 +1,6 @@
 const UNI_APP = {  
-	BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
-	//BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
+	//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/' ,
 	
 	ProjectName :"运管中心",

App.vue

@@ -22,6 +22,54 @@
 	}
 </script>
 <style lang="scss">
+	
+	.tooltip {
+		position: relative;
+	    display: inline-flex;
+		width: 36rpx;
+		height: 36rpx;
+	}
+	.tooltiplong .tooltiptext{
+		
+		left: -60px !important;
+	}
+	.tooltiplong .tooltiptext:before{
+		left: 60px !important;
+	}
+	.tooltip .tooltiptext {
+		 min-width: 180px;
+		 min-height: 20px;
+			
+		position: absolute;
+		 visibility: hidden;
+		top: -30px;
+		left: -10px;
+		padding: 1px 20rpx;
+		line-height: 20px;
+		font-size: 24rpx;
+		color: #fff;
+		
+		 background-color: #333333;
+	
+		border-radius: 10px;
+		text-align: center;
+		 z-index: 1;
+	}
+	.tooltip:hover .tooltiptext {
+	    visibility: visible;
+	}
+	.tooltiptext:before {
+		 z-index: 1;
+		content: "";
+		position: absolute;
+		
+		top: 20px;
+		//right: 5px;
+		left: 10px;
+		border-top: 5px solid #333333;
+		border-right: 5px solid transparent;
+		border-left: 5px solid transparent;
+	}
 	/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
 	@import "uview-ui/index.scss";
 	//

pagesFinance/user/withdrawal/applicationDetails.vue

@@ -129,14 +129,14 @@
 			<view class="withdraw">
 
 				<view class="withdraw-head">
-					<b>合伙人总收入</b>
+					<b>桩主/站主总收入</b>
 					<span>
 						{{info.totalIncome}}元
 
 					</span>
 				</view>
 				<view class="withdraw-head border-n">
-					<b>合伙人总收益</b>
+					<b>桩主/站主收益</b>
 					<span>
 						{{info.totalProfitAmount}}元
 

pagesFinance/user/withdrawal/businessView.vue

@@ -51,48 +51,56 @@
 					</span>
 				</view>
 
-				<view class="withdraw-head border-n" v-if="info.applicationType==2" >
-					<b>合伙人总收益</b>
-					
-					<span class="download" @click="ckdownload">
+			<!--	 <view class="withdraw-head border-n" v-if="info.applicationType==2" >
+					<b>桩主/站主收益</b>
+					
+					<span class="download" @click="ckdownload">
 						<view class="uni-input">{{info.totalProfitAmount?info.totalProfitAmount.toFixed(2):0}}元<span class="download" style="width: 220rpx;" ><u-icon  name="download"></u-icon> 下载收益明细</span> </view>
 					</span>
+				</view> -->
+				<view class="withdraw-head border-n" >
+					<b>分润提现明细表</b><span class="download" 
+					@click="ckdownload">
+						<u-icon name="download"></u-icon> 下载
+					</span>
+				</view>
+				
+				<view class="withdraw-head border-n" v-if="info.applicationType==2">
+					<b>市场奖励比例
+					
+					</b>
+					<span>
+						<view class="uni-input">{{info.rewardProportion}}%</view>
+				
+					</span>
+				</view>
+				<view class="withdraw-head border-n"   v-if="info.applicationType==2" >
+					<b>奖励金额
+					<view class="tooltip">
+						<u-icon name="info-circle"></u-icon>
+						  <view class="tooltiptext" style="width: 220px;">奖励金额=总收益*市场奖励比例</view>
+					
+					</view>
+					</b>
+					<span>
+						<view class="uni-input">
+							{{info.applicationAmount}}元
+						</view>
+				
+					</span>
+				</view>
+				<view class="withdraw-head border-n"  v-if="info.applicationType==2" >
+					<b>大写金额</b>
+				
+					<span>
+						<view class="uni-input">{{applicationAmountDX}}</view>
+					</span>
+				
 				</view>
-				<view class="withdraw-head border-n" v-else>
-					<b>分润提现明细表</b><span class="download" 
-					@click="ckdownload">
-						<u-icon name="download"></u-icon> 下载
-					</span>
-				</view>
-				
-				<view class="withdraw-head border-n" v-if="info.applicationType==2">
-					<b>市场奖励比例</b>
-					<span>
-						<view class="uni-input">{{info.rewardProportion}}%</view>
-				
-					</span>
-				</view>
-				<view class="withdraw-head border-n"   v-if="info.applicationType==2" >
-					<b>奖励金额</b>
-					<span>
-						<view class="uni-input">
-							{{info.applicationAmount}}元
-						</view>
-				
-					</span>
-				</view>
-				<view class="withdraw-head border-n"  v-if="info.applicationType==2" >
-					<b>大写金额</b>
-				
-					<span>
-						<view class="uni-input">{{applicationAmountDX}}</view>
-					</span>
-				
-				</view>
 				
 			</view>
 
-			<view class="withdraw"  v-if="(onReadyId&&info.applicationType==3)||!onReadyId"   >
+			<view class="withdraw"     >
 				<view class="withdraw-head">
 					<b>电单价</b>
 					<span>
@@ -107,13 +115,19 @@
 					</span>
 				</view>
 				<view class="withdraw-head border-n">
-					<b>电费成本</b>
+					<b>电费成本
+					<view class="tooltip">
+						<u-icon name="info-circle"></u-icon>
+						  <view class="tooltiptext">电费成本=电单价*实际电量</view>
+					
+					</view>
+					</b>
 					<span>
 						<view class="uni-input">{{info.electricityCost}}元</view>
 					</span>
 				</view>
 			</view>
-			<view class="withdraw"   v-if="(onReadyId&&info.applicationType==3)||!onReadyId"  >
+			<view class="withdraw"    >
 				<view class="withdraw-head ">
 					<b>充电分成比例</b>
 					<span>
@@ -127,25 +141,28 @@
 					</span>
 				</view>
 				<view class="withdraw-head border-n">
-					<b>充电服务收益</b>
+					<b>充电服务收益
+					<view class="tooltip tooltiplong">
+						<u-icon name="info-circle"></u-icon>
+						  <view class="tooltiptext"  style="width: 220px;" >充电服务收益=充电分成-电费成本</view>
+					
+					</view>
+					</b>
 					<span>
-						<view class="uni-input">
-						{{info.chargingServiceProfitAmount?info.chargingServiceProfitAmount.toFixed(2):0}}元
+						<view class="uni-input">
+						{{info.chargingServiceProfitAmount?info.chargingServiceProfitAmount.toFixed(2):0}}元
 						</view>
 					</span>
 				</view>
 
 
 			</view>
-			<view class="withdraw"  v-if="(onReadyId&&info.applicationType==3)||!onReadyId" >
+			<view class="withdraw"   >
 
 				<view class="withdraw-head">
 					<b>月卡分润笔数</b>
 					<span>
 						<view class="uni-input">{{info.monthlyCardTotal}}笔</view>
-
-
-
 					</span>
 				</view>
 				<view class="withdraw-head border-n">
@@ -160,43 +177,53 @@
 
 
 			</view>
-			<view class="withdraw"  v-if="info.applicationType!=2" >
+			<view class="withdraw"   >
 
 				<view class="withdraw-head">
-					<b>合伙人总收入</b>
-					<span>
-						<view class="uni-input">{{info.totalIncome?info.totalIncome.toFixed(2):0}}元</view>
-						
-						
-
+					<b>桩主/站主总收入
+					<view class="tooltip tooltiplong">
+						<u-icon name="info-circle"></u-icon>
+						  <view class="tooltiptext"  >总收入=充电分成+月卡收益</view>
+					
+					</view>
+					</b>
+					<span>
+						<view class="uni-input">{{info.totalIncome?info.totalIncome.toFixed(2):0}}元</view>
+					
 					</span>
 				</view>
 				<view class="withdraw-head border-n">
-					<b>合伙人总收益</b>
+					<b>桩主/站主收益
+					<view class="tooltip tooltiplong ">
+						<u-icon name="info-circle"></u-icon>
+						  <view class="tooltiptext">收益=总收入-电费成本</view>
+					
+					</view>
+					</b>
 					<span>
-						<view class="uni-input">{{info.totalProfitAmount?info.totalProfitAmount.toFixed(2):0}}元</view>
+						<view class="uni-input">{{info.totalProfitAmount?info.totalProfitAmount.toFixed(2):0}}元</view>
 						
 					</span>
 				</view>
 			
-			</view>
-			<view class="withdraw" v-if="info.applicationType==3&&(info.applyAmount1||info.applyAmount2)" >
-			
-				<view class="withdraw-head" v-if="info.applyAmount1">
-					<b>物业可提现金额</b>
-					<span>
-						<view class="uni-input">{{info.applyAmount1}}元</view>
-			
-					</span>
-				</view>
-				<view class="withdraw-head border-n" v-if="info.applyAmount2">
-					<b>市场可提现金额</b>
-					<span>
-						<view class="uni-input">{{info.applyAmount2}}元</view>
-			
-			
-					</span>
-				</view>
+			</view>
+			<view class="withdraw" v-if="info.applicationType==3&&(info.applyAmount1||info.applyAmount2)" >
+			
+				<view class="withdraw-head" v-if="info.applyAmount1">
+					<b>物业可提现金额</b>
+					<span>
+						<view class="uni-input">{{info.applyAmount1}}元</view>
+			
+					</span>
+				</view>
+				<view class="withdraw-head border-n" v-if="info.applyAmount2">
+					<b>市场可提现金额</b>
+					<span>
+						<view class="uni-input">{{info.applyAmount2}}元</view>
+			
+			
+					</span>
+				</view>
 				</view>
 			<view class="withdraw" v-if="info.applicationType==1">
 
@@ -394,10 +421,10 @@
 			onReadyId: '',
 		},
 		created() {
-		
-			if (this.onReadyId) {
-				this.id = this.onReadyId;
-				this.getInfo()
+		
+			if (this.onReadyId) {
+				this.id = this.onReadyId;
+				this.getInfo()
 			}
 			//this.getInfo()
 		},
@@ -450,31 +477,31 @@
 			}
 
 		},
-		methods: {
-			showTime2(name) {
-				if (!name) {
-					return ''
-				}
-			
-					return parseUnixTime(new Date(name), '{y}年{m}月{d}日{h}:{i}');
-				
-				
-			},
-			showTime(name) {
-				if (!name) {
-					return ''
-				}
-				return name.replace('-', '年') + '月';
+		methods: {
+			showTime2(name) {
+				if (!name) {
+					return ''
+				}
+			
+					return parseUnixTime(new Date(name), '{y}年{m}月{d}日{h}:{i}');
+				
+				
+			},
+			showTime(name) {
+				if (!name) {
+					return ''
+				}
+				return name.replace('-', '年') + '月';
 			},
 			ckdownload() {
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
 				})
-				API.profitDetailsExcelByAccounting({
-					recordId:this.info.id,
-					stationId:this.info.stationId,
-					startDate:this.info.startTime2+":00",
+				API.profitDetailsExcelByAccounting({
+					recordId:this.info.id,
+					stationId:this.info.stationId,
+					startDate:this.info.startTime2+":00",
 					endDate:this.info.endTime2+":00",
 				}).then((resDown) => {
 					uni.hideLoading()
@@ -512,7 +539,7 @@
 				})
 			},
 			change(index) {
-				this.current = index;
+				this.current = index;
 				this.$emit("changetabs_app",index)
 			}
 
@@ -575,7 +602,11 @@
 		font-size: 16px;
 		color: #333333;
 
-
+	}
+	@media screen and (max-width:320px) {
+		.uni-input {
+			font-size: 36rpx;
+		}
 	}
 
 	.withdraw {
@@ -602,20 +633,23 @@
 			b {
 				font-weight: normal;
 				color: rgba(119, 119, 119, 100);
-				font-size: 36rpx;
+				font-size: 36rpx;
+				min-width: 40%;
 			}
 
 			span {
-				width: 60%;
+				max-width: 60%;
+				min-width: 55%;
 				float: right;
 				text-align: left;
 				font-size: 32rpx;
 				color: #333333;
 			}
 
-			@media screen and (max-width:320px) {
+			@media screen and (max-width:319px) {
 				span {
-					width: 60%;
+					max-width: 60%;
+					min-width: 50%;
 				}
 			}
 
@@ -824,25 +858,25 @@
 		border-top: 5px solid #333333;
 		border-right: 5px solid transparent;
 		border-left: 5px solid transparent;
-	}
-	.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;
-			}
+	}
+	.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>
+</style>