lilei 2 years ago
parent
commit
ffa72edd0e
2 changed files with 8 additions and 6 deletions
  1. 2 2
      pages/index/index.vue
  2. 6 4
      pagesA/digitalShelf/choosePart.vue

+ 2 - 2
pages/index/index.vue

@@ -351,7 +351,7 @@
 			},
 			// 获取上方滚动扫描记录
 			getScrollLog(){
-				scanVinLogQueryRoll({pageNo:1,pageSize:100}).then(res => {
+				scanVinLogQueryRoll({pageNo:1,pageSize:50}).then(res => {
 					console.log(res)
 					this.list = res.data.list || []
 					this.list.map(item => {
@@ -391,7 +391,7 @@
 				})
 			},
 			getRedScroll(){
-				getRewardRollList({pageNo:1,pageSize:100}).then(res => {
+				getRewardRollList({pageNo:1,pageSize:50}).then(res => {
 					this.slist = res.data || []
 					this.slist.map(item => {
 						item.placeText = item.userName + '刚刚得到了'+item.totalRewardAmount+'元 红包奖励'

+ 6 - 4
pagesA/digitalShelf/choosePart.vue

@@ -87,7 +87,7 @@
 						 </view>
 					</view>
 					<!-- 其它配件 -->
-					<view class="nav-right-title flex align_center justify_between" @click="showOther=!showOther" style="margin-top: 20rpx;">
+					<view class="nav-right-title flex align_center justify_between" @click="showOther=!showOther">
 						其它配件
 						<text>{{showOther?'隐藏':'展开'}}</text>
 					</view>
@@ -133,7 +133,7 @@
 					<view v-if="partList&&partList.length==0">
 						<u-empty v-if="status!='loading'" :src="`/static/nodata.png`" icon-size="180" :text="noDataText" mode="list" :margin-top="150"></u-empty>
 					</view>
-					<view style="padding: 20upx;">
+					<view style="padding: 20upx;" v-if="showOther">
 						<u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
 					</view>
 				</scroll-view>
@@ -487,7 +487,7 @@
 			},
 			// 加载更多
 			onreachBottom () {
-				if(this.partList.length < this.total ){
+				if(this.partList.length < this.total && this.showOther){
 					this.pageNo++
 					this.getShelfProductList()
 				}else{
@@ -752,6 +752,7 @@
 			}
 		}
 		.right-list{
+			position: relative;
 			flex-grow: 1;
 			background: #fff;
 			height: 100%;
@@ -760,7 +761,8 @@
 				height: 100%;
 				.nav-right-title{
 					font-weight: bold;
-					padding: 5upx 25upx;
+					padding: 20upx 25upx;
+					border-bottom: 2rpx solid #eee;
 					> text{
 						color: #9E9E9E;
 						font-weight: normal;