Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

pages/goods/list.vue

@@ -70,7 +70,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="blank"></view>
+			<view class="blank" :style="{'height': blheight+'px'}"></view>
 			<!-- 商品列表 -->
 			<view class="goods-list clearfix" :class="['column-' + (showView ? '1' : '2')]">
 				<view v-if="showView">
@@ -233,6 +233,7 @@
 </template>
 
 <script>
+	let selectorQuery = uni.createSelectorQuery();
 	import WxofficialMixin from '@/core/mixins/wxofficial'
 	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins'
 	import * as GoodsApi from '@/api/goods'
@@ -299,6 +300,7 @@
 					name: 'ZC'
 				}],
 				multiIndex: -1,
+				blheight: 0,
 			}
 		},
 
@@ -315,6 +317,8 @@
 			this.setWxofficialShareData()
 			if (options.categoryId != 'undefined') {
 				this.getGoodsTypeList(options.categoryId)
+			}else{
+				this.mescroll.resetUpScroll()
 			}
 
 		},
@@ -450,6 +454,10 @@
 				return new Promise((resolve, reject) => {
 					GoodsApi.list(param)
 						.then(result => {
+							selectorQuery.selectAll('.head').boundingClientRect((rects) => {
+								console.log("rects",rects)
+								app.blheight = rects[0].height
+							}).exec();
 							// 合并新数据
 							console.log(app.list)
 							const newList = result.data.list
@@ -570,7 +578,7 @@
 	}
 
 	.blank {
-		height: 416rpx;
+		height: 26rpx;
 	}
 
 	// 页面头部