分润

pagesFinance/detailed/index.vue

@@ -11,7 +11,7 @@
 				<view class="screen">
 					<view class="screen-item">
 						<view class="screen-head">查询日期</view>
-						<view class="screen-main">
+						<view class="screen-main2">
 							
 							<u-calendar v-model="showdate" mode="range" @change="changedate"></u-calendar>
 							
@@ -65,7 +65,9 @@
 						
 						</view>
 					</view>
-					<view class="screen-item">
+					<view 
+						v-show="selectstationId"
+					class="screen-item">
 						<view class="screen-head">桩号</view>
 						<view class="screen-main">
 							 
@@ -349,7 +351,8 @@
 				font-size: 16px;
 			}
 			.screen-main{
-				display: flex;
+				//display: flex;
+				    display: -webkit-box;
 				flex-wrap: wrap;
 				justify-content: space-between;
 			}
@@ -360,6 +363,7 @@
 				text-align: center;
 				margin-bottom: 10px;
 				border-radius: 3px;
+				margin-right: 6px;
 			}
 			.screen-entry.active{
 				background-color: #185AC6;

pagesFinance/share/details.vue

@@ -4,7 +4,7 @@
 		<view class="details">
 			<view class="details-head">
 <!-- 				<u-icon name="charging-pile-fill" custom-prefix="custom-icon" color="#27B148" size="48"></u-icon>
- -->				<h4>{{data.shareProfitDate}}</h4>
+ -->				<h4>{{showDateMoth(data.shareProfitDate)}}月分润收益</h4>
 			</view>
 			<view class="details-main">
 				<view class="details-price">
@@ -77,6 +77,22 @@
 			this.getInfo()
 		},
 		methods: {
+			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;
+			},
 			getPercent(estimateMinute) {
 				var value="";
 				 

pagesFinance/share/index.vue

@@ -11,7 +11,7 @@
 				<view class="screen">
 					<view class="screen-item">
 						<view class="screen-head">查询年份</view>
-						<view class="screen-main">
+						<view class="screen-main2">
 							
 							<u-picker  v-model="showdate" mode="time" :start-year="endyear" :end-year="startyear" :params="params"  @confirm="changedate"></u-picker >
 							
@@ -65,7 +65,9 @@
 						
 						</view>
 					</view>
-					<view class="screen-item">
+					<view 
+					v-show="selectstationId"
+					class="screen-item">
 						<view class="screen-head">桩号</view>
 						<view class="screen-main">
 							 
@@ -106,7 +108,7 @@
 				
 					<view class="detailed-item">
 						<view class="detailed-item-name">
-							<h2>{{item.shareProfitDate}}分润收益</h2>
+							<h2>{{showDateMoth(item.shareProfitDate)}}月分润收益</h2>
 							<p>{{item.stationName}}/{{item.deviceName}}</p>
 						</view>
 						<view class="detailed-item-name"  style="
@@ -213,7 +215,6 @@
 		},
 		components: {
 			Tabbar
-		
 		},
 		onReachBottom() {
 			if (this.list.length < this.recordsTotal) {
@@ -233,6 +234,22 @@
 			
 		},
 		methods: {
+			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.year=e.year
@@ -345,7 +362,8 @@
 				font-size: 16px;
 			}
 			.screen-main{
-				display: flex;
+				  display: -webkit-box;
+				//display: flex;
 				flex-wrap: wrap;
 				justify-content: space-between;
 			}
@@ -356,6 +374,7 @@
 				text-align: center;
 				margin-bottom: 10px;
 				border-radius: 3px;
+				margin-right: 6px;
 			}
 			.screen-entry.active{
 				background-color: #185AC6;