调整

App.vue

@@ -46,10 +46,19 @@
 		text-align: center;
 		border-radius: 1px;
 	}
-	@media screen and (max-width: 320px) {
+	@media screen and (min-width: 320px) {
 	   /deep/.u-tabbar__content {
 			height: 42px!important;
 	   }
+	}
+	@media screen and (min-width: 375px) {
+	   /deep/.u-tabbar__content {
+			height: 52px!important;
+	   }
 	}
-	
+	@media screen and (min-width: 425px) {
+	   /deep/.u-tabbar__content {
+			height: 62px!important;
+	   }
+	}
 </style>

main.js

@@ -5,6 +5,7 @@ import App from './App'
 import  getOpenId from './utils/init.js'
 getOpenId.init()
 
+
 import  mixin from './utils/mixin.js'
 
 Vue.config.ignoredElements.push("wx-open-subscribe") ;
@@ -14,6 +15,7 @@ import Vconsole from 'vconsole'
  //import './router' // 引入路由
 import router from './bobo-router'
 
+window.wx = {}
 
 // main.js
 import uView from "uview-ui";

package.json

@@ -7,7 +7,7 @@
  },
  "dependencies": {
   "compression-webpack-plugin": "^8.0.1",
-  "echarts": "^3.8.4",
+  "echarts": "^5.3.2",
   "uni-crazy-router": "0.0.31",
   "uni-simple-router": "^2.0.1",
   "uview-ui": "^1.8.4",

pagesFinance/detailed/details.vue

@@ -36,31 +36,67 @@
 		
 			<view class="details-row" ><p>桩号</p><span>{{detail.deviceNo}}</span></view>
  		</view>
+		
+	
+	<view class="details">
+		<view class="details-title">
+			<h4>用电明细</h4>
+		</view>
+		<view class="details-row" >
+			<p>总充电量</p>
+			<span>{{detail.electricQuantity/10000}}度</span>
+		</view>
+				
+			<view v-for="(item,i) in chargeDetails" :key="i">
+				<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;">{{(item.electricityPrice*100+item.servicePrice*100)/100}}元/度</span>
+						
+					</p>
+						<span class="details-row-sum">{{item.electricityPrice}}元/度(电费)+{{item.servicePrice}}元/度(服务费) </span>
+										
+				</view>
+			</view>
+	</view>
+		
+		
 		<view class="details">
 			<view class="details-title">
-				<h4>分润比例</h4>
+				<h4>分润明细</h4>
 			</view>
 			<view class="details-row" v-for="(item,i) in sprList" :key="i" v-if="item.disProportion">
-			<p>{{item.merchantAccountName}}</p>
-			<span>{{item.disProportion}}%</span>
+				<p>{{item.merchantAccountName}}({{(item.disProportion*100).toFixed(2)}}%)</p>
+				<span>{{item.shareProfitAmount}}元</span>
 			</view>
 		
 		</view>
 		
+		
 		<view class="details">
 			<view class="details-title">
-				<h4>充电详情</h4>
+				<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.electricQuantity/10000}}度</span></view>
 			<view class="details-row"><p>开始时间</p><span>{{detail.startTime}}</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>
+		
+		
+		
+		
+		
 		<view class="detailsBtn">
 			<u-button class="detailsBtn-btn" @click="back" type="primary" plain>返回</u-button>
 		</view>
@@ -73,6 +109,7 @@
 	export default {
 		data() {
 			return {
+				chargeDetails:[],
 				id:'',
 				sprList:[
 					
@@ -117,8 +154,10 @@
 					recordId:this.id
 				}).then((res) => {
 					this.detail=res.data	 
-					this.sprList=res.data.cdmList	
+					//this.sprList=res.data.cdmList	
 					this.couponObj=res.data.userCoupon;
+					this.chargeDetails=JSON.parse(res.data.ChargeDetails)
+					this.sprList=res.data.detailList	
 					uni.hideLoading()
 					 
 				}).catch(error => {
@@ -169,7 +208,11 @@
 		justify-content: space-between;
 		align-items: center;
 		margin-top: 15px;
-		p{color:#888}
+		
+		p{
+			color: #37393c;
+			font-weight: bold;	
+		}
 	}
 	.details{
 		margin: 16px;
@@ -213,4 +256,10 @@
 			}
 		}
 	}
+	.details-row-sum{
+		float: right;
+		color: #888;
+		font-size: 12px;
+	
+	}
 </style>

pagesFinance/detailed/index.vue

@@ -118,7 +118,7 @@
 						">
 						
 						<h2 style="   text-align: end;">{{item.actualFee}}元</h2>
-						<p style="   text-align: end;" >{{item.createTime?item.createTime.slice(10):''}}</p>
+						<p style="   text-align: end;" >{{item.createTime?item.createTime.slice(11,16):''}}</p>
 					</view>
 				</view>
 				
@@ -432,8 +432,10 @@
 		justify-content: space-between;
 		align-items: center;
 		padding: 10px 20px;
+		font-size: 16px;
 		p{
 			color:#666;
+			
 		}
 	}
 	.detailed-item{
@@ -447,9 +449,10 @@
 				font-weight: normal;
 			}
 			p{
-				font-size: 12px;
+				font-size: 15px;
 				margin-top: 4px;
 				color:#A2A9B5;
+				  
 			}
 		}
 		.detailed-item-num{

pagesFinance/share/details.vue

@@ -60,9 +60,9 @@
 					
 					<view class="details-row" style="display: block;" >
 						<p>
-							<span style="    color: #888;">区间定价</span>
+							<span style="    color: #37393c;">区间定价</span>
 							
-							<span style="float: right; color: #333;">{{(item.electricityPrice*100+item.servicePrice*100)/100}}元/度</span>
+							<span style="float: right; color: #333;font-weight: normal;">{{(item.electricityPrice*100+item.servicePrice*100)/100}}元/度</span>
 							
 						</p>
 							<span class="details-row-sum">{{item.electricityPrice}}元/度(电费)+{{item.servicePrice}}元/度(服务费) </span>
@@ -216,7 +216,12 @@
 		justify-content: space-between;
 		align-items: center;
 		margin-top: 15px;
-		p{color:#888}
+	
+				p{
+					color: #37393c;
+					font-weight: bold;	
+				}
+
 	}
 	.details-row-sum{
 		float: right;

pagesFinance/share/index.vue

@@ -462,6 +462,7 @@
 		justify-content: space-between;
 		align-items: center;
 		padding: 10px 20px;
+		font-size: 16px;
 		p{
 			color:#666;
 		}
@@ -477,7 +478,7 @@
 				font-weight: normal;
 			}
 			p{
-				font-size: 12px;
+				font-size: 15px;
 				margin-top: 4px;
 				color:#A2A9B5;
 			}

pagesFinance/statistics/index.vue

@@ -20,7 +20,7 @@
 					</view>
 					<view class="statisticsData-foot">
 						<p>昨日流水</p>
-						<h4>{{indexData.yesterdayAmount}}元</h4>
+						<h2 style="margin-left: 10px;">{{indexData.yesterdayAmount}}元</h2>
 					</view>
 				</view>
 				<view class="statisticsData-item">
@@ -35,7 +35,7 @@
 					</view>
 					<view class="statisticsData-foot">
 						<p>本月流水</p>
-						<h4>{{indexData.thisMonthAmount}}元</h4>
+						<h2 style="margin-left: 10px;">{{indexData.thisMonthAmount}}元</h2>
 					</view>
 				</view>
 			</view>
@@ -152,9 +152,9 @@
 						
 				 
 		
-				<view id="pieEcharts" style="min-height:250px;">
+				<cover-view id="pieEcharts" style="min-height:250px;">
 
-				</view>
+				</cover-view>
 			</view>
 		</view>
 			<Tabbar :current="0"  ref="tabbarMain" ></Tabbar>
@@ -165,9 +165,10 @@
 <script>
 	import Tabbar from '@/components/TabbarFinance.vue'
 	import * as API from '@/apis/finance.js'
-	
-	import * as echarts from "echarts";
-	import {
+	 import * as echarts from "echarts";
+	//require("@/apis/echarts-5-3.min.js")
+	//import * as echarts from "@/apis/echarts-5-3.min.js";
+	 import {
 		beforeTimeStamp,
 		currentTimeStamp,
 		parseUnixTime
@@ -317,8 +318,8 @@
 				API.spIncomeStatistics(this.form).then((res) => {
 					 
 					this.indexData = res.data
-					
 					this.getPie()
+				
 					
 					uni.hideLoading()
 					
@@ -347,10 +348,13 @@
 				var unit=this.current?'笔':'元'
 				list.forEach(item=>{
 					 var value=this.current?item.eqNum:item.amount
-					getData.push({
-						value: value,
-						name: item.deviceName
-					})
+					 if(value){
+						 getData.push({
+						 	value: value,
+						 	name: item.deviceName
+						 })
+					 }
+					
 				})
 				
 				if (!this.myChart) {
@@ -359,7 +363,6 @@
 				}
 				// 指定图表的配置项和数据
 				var option = {
-					
 					tooltip: {
 						trigger: 'item',
 					  formatter: '{b} <br/> {c}'+unit,
@@ -368,15 +371,11 @@
 						}
 
 					},
-					legend: {
-
-						bottom: '0%',
-						left: 'center'
-					},
+					
 					series: [{
 						//name: 'Access From',
 						type: 'pie',
-						radius: '50%',
+						radius: '40%',
 						data: getData,
 						emphasis: {
 							itemStyle: {
@@ -385,28 +384,11 @@
 								shadowColor: 'rgba(0, 0, 0, 0.5)'
 							}
 						},
-						itemStyle:{
-							normal:{
-								color:function(colors){
-									
-									var list = [
-										"#F2BD42",
											"#5087EC",
											"#68BBC4",
											"#58A55C",
											"#EE752F",
											"#D95040",
-									           '#fc8251',
-									           '#5470c6',
-									           '#91cd77',
-									           '#ef6567',
-									           '#f9c956',
-									           '#75bedc',
-											   '#fc8251',
-											   '#5470c6',
-											   '#91cd77',
-											   '#ef6567',
-											   '#f9c956',
-											   '#75bedc'
-									         ]
-									return list[colors.dataIndex]
-								}
-							}
+						
+						label:{
+					
+							fontWeight:"bold",
+							fontSize:14,
 						}
 					}]
 				};
@@ -422,7 +404,8 @@
 		background: url(../../assets/img/index_header_bg.png) no-repeat top center #f7f7f7;
 		background-size: 100%;
 	}
-</style>
+</style>
+
 <style lang="scss" scoped>
 	
 	 
@@ -496,8 +479,9 @@
 
 	.statisticsData {
 		background-color: #fff;
-		margin: 16px;
-		padding: 16px;
+		margin: 12px;
+	
+		padding: 12px;
 		border-radius: 8px;
 	
 		margin-top: 80px;

pagesFinance/user/chargingDetails.vue

@@ -156,7 +156,10 @@
 		top: 0;
 
 	}
-
+	.title-left,.title-right{
+			font-size: 18px;
+	}
+	
 	// 主体
 	.main {
 		width: 100%;
@@ -214,15 +217,16 @@
 					justify-content: space-between;
 					padding: 16px;
 
-					.time {
+					.time {
+						font-weight: bold;
 						color: rgba(16, 16, 16, 100);
-						font-size: 16px;
+						font-size: 18px;
 					}
 
 					.price {
 						.price-number {
 							color: rgba(255, 61, 0, 100);
-							font-size: 18px;
+							font-size: 24px;
 							text-align: right;
 							font-family: Roboto-regular;
 							display: inline-block;
@@ -232,7 +236,7 @@
 
 						.price-unit {
 							color: rgba(102, 102, 102, 100);
-							font-size: 14px;
+							font-size: 16px;
 							text-align: right;
 							margin-left: 4px;
 							display: inline-block;
@@ -245,7 +249,7 @@
 					.unitPrice-servicePrice {
 						eight: 18px;
 						color: rgba(136, 136, 136, 100);
-						font-size: 12px;
+						font-size: 18px;
 						text-align: right;
 						padding-right: 16px;
 						padding-bottom: 18px;
@@ -268,7 +272,7 @@
 	// 尾部
 	.bottom {
 		background-color: #fff;
-		;
+		 
 		width: 100%;
 		height: 64px;
 		line-height: 64px;

pagesFinance/user/deviceDetails.vue

@@ -24,7 +24,7 @@
 			<view class="details-title">
 				<h4>分润明细</h4>
 			</view>
-			<view class="details-row" v-for="(item,i) in sprList" :key="i">
+			<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>
@@ -146,7 +146,10 @@
 		justify-content: space-between;
 		align-items: center;
 		margin-top: 15px;
-		p{color:#888}
+		p{
+			color: #37393c;
+			font-weight: bold;	
+		}
 	}
 	.details{
 		margin: 16px;

pagesFinance/user/index.vue

@@ -20,7 +20,10 @@
 			<u-line color="#d9e0ec" length="60" direction="col" margin="10px"/>
 			<view class="userData-item">
 				<view class="userData-name">银行账户</view>
-				<view class="userData-foot" @click="showModel"  >提现账户</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>