diff --git a/page_user/order_detail.vue b/page_user/order_detail.vue
index a0ef785..b3bf741 100644
--- a/page_user/order_detail.vue
+++ b/page_user/order_detail.vue
@@ -23,23 +23,29 @@
 					<view class="text" v-if="list.status == 6">
 						支付中 
 					</view>
-					<view class="num">
+					<view class="num" v-if="list.type == 1">
 						{{list.suitTime}} 分钟
 					</view>
-					<view class="text">
+					<view class="text" v-if="list.type == 1">
 						充值金额{{list.money}}
 					</view>
+					<view class="nums" v-if="list.type == 2">
+						提现金额{{list.money}}
+					</view>
 				</view>
 				<view class="card_bot">
 					<view class="info_li">
-						<view class="text">
+						<view class="text" v-if="list.type == 1">
 							到账日期
 						</view>
+						<view class="text" v-if="list.type == 2">
+							提现日期
+						</view>
 						<view class="text">
 							{{list.createTime}}
 						</view>
 					</view>
-					<view class="info_li">
+					<view class="info_li" v-if="list.type == 1">
 						<view class="text">
 							充值设备
 						</view>
@@ -48,17 +54,23 @@
 						</view>
 					</view>
 					<view class="info_li">
-						<view class="text">
+						<view class="text" v-if="list.type == 1">
 							充值类型
 						</view>
+						<view class="text" v-if="list.type == 2">
+							提现类型
+						</view>
 						<view class="text">
 							{{list.channelName}}
 						</view>
 					</view>
-					<view class="info_li">
-						<view class="text">
+					<view class="info_li"> 
+						<view class="text" v-if="list.type == 1">
 							充值用户
 						</view>
+						<view class="text" v-if="list.type == 2">
+							提现用户
+						</view>
 						<view class="text">
 							{{list.userName}}
 						</view>
@@ -131,13 +143,14 @@
 
 			.cardtop {
 				margin-top: 48rpx;
-
+                height: 190rpx;
 				// display: flex;
 				// flex-wrap: wrap;
 				// justify-content: center;
 				.text {
 					text-align: center;
 					width: 100%;
+					height: 20rpx;
 					font-weight: 400;
 					font-size: 28rpx;
 					color: #808080;
@@ -151,7 +164,15 @@
 					font-size: 60rpx;
 					color: #8883F0;
 				}
-
+                .nums {
+                	text-align: center;
+                	padding-top: 48rpx;
+                	font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+                	font-weight: 400;
+                	font-size: 60rpx;
+                	color: #8883F0;
+                }
+                
 			}
 
 			.card_bot {
diff --git a/page_user/shouzhi.vue b/page_user/shouzhi.vue
index e73224a..f11cd3c 100644
--- a/page_user/shouzhi.vue
+++ b/page_user/shouzhi.vue
@@ -6,13 +6,14 @@
 		
 		<view class="cards" v-for="(item,index) in wateringList" :key="index" @click="btndetail(item.billId)" @scrolltolower="onReachBottom">
 			<view class="card_left">
-				<view class="top">用户充值</view>
+				<view class="top" v-if="item.type == 1">用户充值</view>
+				<view class="top" v-if="item.type == 2">商户提现</view>
 				<view class="bot">
 					{{item.createTime}}
 				</view>
 			</view>
 			<view class="card_right">
-				<view class="top">{{item.suitTime}}分钟</view>
+				<view class="top" v-if="item.type == 1">{{item.suitTime}}分钟</view>
 				<view class="bot">
 					￥{{item.money}}
 				</view>
diff --git a/pages/tj.vue b/pages/tj.vue
index 925cb9e..36ca920 100644
--- a/pages/tj.vue
+++ b/pages/tj.vue
@@ -1,10 +1,10 @@
 <template>
-	<view class="page">
+	<view class="page" >
 		<u-navbar :is-back="false" title="统计" :border-bottom="false" :background="bgc" title-color='#fff'
 			title-size='44' height='48'  id="navbar">
 		</u-navbar>
 
-		<view v-if="userType=='01'">
+		<view v-if="userType=='01'" style="padding-top: 30rpx;">
 			<!-- 	<view class="title">
 				统计
 			</view> -->
@@ -467,7 +467,7 @@
 			padding-top: 32rpx;
 			margin-top: 10rpx;
 			width: 632rpx;
-			height: 586rpx;
+			height: 540rpx;
 			background: #8883F0;
 			box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
 			opacity: 1;
@@ -516,7 +516,8 @@
 
 		.list {
 			margin-top: 16rpx;
-
+            height: 600rpx;
+			overflow: auto;
 			//          height:280rpx;
 			// overflow-y: scroll;
 			.card_list {