zhengkaixin 3 years ago
parent
commit
c6cb65edbc

+ 1 - 1
pagesFinance/detailed/details.vue

@@ -40,7 +40,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.disProportion">
 			<p>{{item.merchantAccountName}}</p>
 			<span>{{item.disProportion}}%</span>
 			</view>

+ 1 - 1
pagesFinance/share/details.vue

@@ -75,7 +75,7 @@
 			<view class="details-title">
 				<h4>分润明细</h4>
 			</view>
-			<view class="details-row" v-for="(item,i) in frmxList" :key="i">
+			<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}}元</span>
 			</view>

+ 3 - 1
pagesFinance/statistics/index.vue

@@ -31,7 +31,7 @@
 						<p>今日充电笔数</p>
 					</view>
 					<view class="statisticsData-main">
-						<h2>{{indexData.todayEQNum}}</h2>
+						<h2>{{indexData.todayEQNum}}</h2>
 					</view>
 					<view class="statisticsData-foot">
 						<p>本月流水</p>
@@ -424,6 +424,8 @@
 	}
 </style>
 <style lang="scss" scoped>
+	
+	 
 	.popup-screen{
 		padding: 20px;
 		position: relative;

+ 6 - 8
pagesFinance/user/deviceList.vue

@@ -77,22 +77,20 @@
 				value3: -1,
 				stationList:[],
 				options0: [
-					{
-							label: '全部',
-							value: -1,
-						},
+				
 					{
 						label: '自行车充电',
 						value: 0,
 					},
-					{
-						label: '交流慢充',
-						value: 2,
-					},
 					{
 						label: '直流快充',
 						value: 1,
+					},
+					{
+						label: '交流慢充',
+						value: 2,
 					}
+					
 				],
 				options1: [{
 						label: '全部',

+ 1 - 1
pagesFinance/user/index.vue

@@ -14,7 +14,7 @@
 		</view>
 		<view class="userData">
 			<view class="userData-item">
-				<view class="userData-data">{{home.deviceNumbers}}</view>
+				<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"/>