lilei 3 months ago
parent
commit
bfbecc5f9e
2 changed files with 14 additions and 15 deletions
  1. 11 12
      pages/shelfOrder/listComponent.vue
  2. 3 3
      pages/vinAnalyse/shelfList.vue

+ 11 - 12
pages/shelfOrder/listComponent.vue

@@ -4,16 +4,16 @@
 			<view class="sales-list-main">
 				<view class="sales-list-item" v-for="(item, index) in listData" :key="item.id" @click="getDetail(item)">
 					<view class="list-item-tit align_center flex justify_between">
-						<view class="buyer flex ellipsis-one">
-							{{item.orderBillNo||'--'}}
-						</view>
-						<view>
-							<text :style="{color:item.billState=='CLOSE'?'#ff0000':'#00aa00'}">{{item.billStateDictValue}}</text> 
+						<view class="buyer flex">
+							{{item.shelfName||'--'}}
 						</view>
 					</view>
 					<view class="list-item-stit align_center flex justify_between">
 						<view class="flex">
-							{{item.shelfName||'--'}}
+							{{item.orderBillNo||'--'}}
+						</view>
+						<view>
+							<text :style="{color:item.billState=='CLOSE'?'#ff0000':'#00aa00'}">{{item.billStateDictValue}}</text> 
 						</view>
 					</view>
 					<view class="detail-list">
@@ -184,9 +184,13 @@
 						padding: 10rpx 0 0;
 						.buyer{
 							flex-grow: 1;
-							font-weight: bold;
 							color: #666;
 						}
+					}
+					.list-item-stit{
+						padding: 10rpx 0 15rpx;
+						border-bottom: 1px solid #eee;
+						color: #666;
 						>view{
 							&:last-child{
 								text-align: right;
@@ -194,11 +198,6 @@
 							}
 						}
 					}
-					.list-item-stit{
-						padding: 10rpx 0 15rpx;
-						border-bottom: 1px solid #eee;
-						color: #666;
-					}
 					.detail-list{
 						> view{
 							padding: 20upx 0;

+ 3 - 3
pages/vinAnalyse/shelfList.vue

@@ -15,7 +15,7 @@
 			</u-search>
 		</view>
 		<view class="moreShelfPart-body">
-			<view class="nav-right">
+			<scroll-view class="nav-right" scroll-y @scrolltolower="onReachBottom">
 				<view 
 				class="nav-right-item" 
 				v-for="(item, index) in shelfList" 
@@ -40,7 +40,7 @@
 				<view style="padding: 20upx;" v-if="shelfList.length">
 					<u-loadmore :status="status" />
 				</view>
-			</view>
+			</scroll-view>
 		</view>
 	</view>
 </template>
@@ -160,7 +160,7 @@
 		.nav-right{
 			padding: 0 30upx;
 			box-sizing: border-box;
-			overflow: auto;
+			height: calc(100vh - 100rpx);
 			.nav-right-item{
 				padding:20upx;
 				border: 2rpx solid #f5f5f5;