苹果手机bug， 合计

pagesFinance/detailed/index.vue

@@ -123,11 +123,13 @@
 						">
 						<h2 class="showName">{{item.stationName}}/{{item.deviceName}}</h2>
 						<!-- <p>{{item.flowNo?item.flowNo:'无充电单号'}}</p> -->
-						<span :style="{
+						<span
+						
+						 :style="{
 							color:colorList[item.platform%3]
 						}">{{item.platformText}}</span>
 						
-						<span v-if="item.userCardId" style="color:#FF8B00  ;margin-left: 10px">月卡订单</span>
+						<span v-if="item.userCardId" style="color:#FF8B00  ;margin-left: 10px;">月卡订单</span>
 					</view>
 					<view class="detailed-item-name"  style="
 						
@@ -651,6 +653,9 @@
 			h4{
 				font-weight: normal;
 			}
+			span{
+				font-size: 15px;
+			}
 			p{
 				font-size: 15px;
 				margin-top: 4px;

pagesFinance/statistics/index.vue

@@ -78,8 +78,11 @@
 					 <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  :headStyle="{
+ 					<u-collapse  :style="changeitemBl?' border-Bottom: 1px solid #000205':''"
+					 
+					 :headStyle="{
 								color:'#101010',
 								 fontWeight: 'bold',
 								 padding:'12px 0',
@@ -87,8 +90,8 @@
 								 
 							}"
 					v-if="stationFlowList.length">
-							<u-collapse-item  
-							v-for="(item, index) in stationFlowList" :open="index==0" :title="item.stationName+' 总收入'+item.actualMoney.toFixed(2)+'元'" :key="index">
+							<u-collapse-item   @change="changeitem" 
+							v-for="(item, index) in stationFlowList"  :index="index" :open="index==0" :title="item.stationName+' 总收入'+item.actualMoney.toFixed(2)+'元'" :key="index">
 							<!-- -->
 							 <view class="detailsline">
 							 
@@ -155,7 +158,19 @@
 							</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>
@@ -263,7 +278,7 @@
 				indexData: {},
 			
 				indexData2: null,
-			
+				changeitemBl:false,
 
 				myChart: null,
 				myChartReady: false,
@@ -275,7 +290,9 @@
 						name: '笔数'
 					}
 				],
-				stationFlowList: [],
+				stationFlowList: [],
+				serviceMoneySum:0,
+				allMoneySum:0,
 				stationList: [],
 				stationListSon: [],
 				tabbarList: [{
@@ -363,6 +380,13 @@
 			
 		},
 		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 ''
@@ -476,7 +500,15 @@
 				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 => {

pagesFinance/user/chargingGunSetup.vue

@@ -397,7 +397,9 @@
 			checkoverflow(){
 				
 				function getTime(time){
-					return new Date("2020/01/01 "+time).getTime();
+					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=[];
@@ -565,7 +567,9 @@
 					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"){
 					
 				
@@ -620,6 +624,7 @@
 					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){