Merge branch 'master' of ssh://106.55.174.214:222/weixiari-124/agent-app

agentApp/pages/queuing-information/queuing-information.vue

@@ -8,16 +8,19 @@
 		    }"></u-tabs>
 		<u-gap height="10rpx" bgColor="#F7F7F7"></u-gap>
 		<view class="his-content">
-			<view class="his-item u-border-bottom" v-for="item in queueList" :key="item.id">
-				<view class="hit-left">
-					<view class="his-name">
-						{{item.merchant.name}}
+			<view class="u-border-bottom" v-for="item in queueList" :key="item.id">
+				<view class="his-item">
+					<view class="hit-left">
+						<view class="his-name">
+							{{item.merchant.name}}
+						</view>
+					</view>
+					<view class="hit-right">
+						购买时排队<span class="text-style">{{item.buy_queue_index}}</span> ，当前<span
+							class="text-style">{{item.now_queue_index}}</span>
 					</view>
 				</view>
-				<view class="hit-right">
-					购买时排队<span class="text-style">{{item.buy_queue_index}}</span> ，当前<span class="text-style">{{item.now_queue_index}}</span>
-				</view>
-				<view>当前排队第一位已经获得231元收益</view>
+				<view class="first-got">当前排队第一位已经获得{{ item.first_queue_got }}元收益</view>
 			</view>
 
 			<view class="load-more" @click="getQueueList">{{ hasMore ? '加载更多数据...' : '已加载完毕' }}</view>
@@ -86,7 +89,7 @@
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
-			border-bottom: 1rpx solid #eee;
+			//border-bottom: 1rpx solid #eee;
 
 			.hit-left {
 				font-size: 24rpx;
@@ -95,8 +98,8 @@
 			}
 
 			.hit-right {
-				height: 130rpx;
-				line-height: 130rpx;
+				height: 60rpx;
+				line-height: 60rpx;
 				font-size: 24rpx;
 				color: #666;
 			}
@@ -109,12 +112,17 @@
 			}
 		}
 
+		.first-got {
+			margin-bottom: 30rpx;
+			font-size: 24rpx;
+		}
+
 		.u-border-bottom,
 		.u-border-top {
 			border-color: #eee !important;
 		}
 	}
-	
+
 	.load-more {
 		text-align: center;
 		font-size: 14px;