Merge branch 'master' of http://192.168.40.220/dmc/jz_applet into master

pages/user/user.vue

@@ -126,35 +126,34 @@
 							<text>通行消费</text>
 							<text>总消费</text>
 						</view>
-					<!-- 	<view class="amount m-top">
+						<view class="amount m-top">
 							<text>¥
 								{{(state.monthFlowingVo.flowingNum ? state.monthFlowingVo.flowingNum : 0) /100}}</text>
 							<text>¥
 								{{(state.monthFlowingVo.flowingNum ? state.monthFlowingVo.flowingNum : 0)/100}}</text>
-						</view> -->
+						</view>
 						<view class="line m-top">
-							<!-- <view class="line1"
+							<view class="line1"
 								:style="{width: (state.monthFlowingVo.flowingNum ? state.monthFlowingVo.flowingNum : 0)*100/state.monthFlowingVo.money+'%'}">
-							</view> -->
+							</view>
 							<view class="line2"></view>
 						</view>
 						<view class="mileage">
 							<view class="txt">
 								<text class="tit">通行里程</text>
-								<!-- <text class="val">{{state.monthFlowingVo.mileage}}km</text> -->
+								<text class="val">{{state.monthFlowingVo.mileage}}km</text>
 							</view>
 							<view class="txt">
 								<text class="tit">通行时长</text>
-								<!-- <text class="val">{{state.monthFlowingVo.duration}}</text> -->
+								<text class="val">{{state.monthFlowingVo.duration}}</text>
 							</view>
 							<view class="txt">
 								<text class="tit ">通行次数</text>
-								<!-- <text class="val">{{state.monthFlowingVo.num}}次</text> -->
+								<text class="val">{{state.monthFlowingVo.num}}次</text>
 							</view>
 						</view>
 						<view class="detail" @click="goTrajectory()">查看通行轨迹
 						</view>
-						<!-- <view class="detail">查看通行轨迹</view> -->
 					</view>
 				</view>
 				<view class="cars box">