merge master

pages/tabbar/home/home.vue

@@ -106,42 +106,18 @@
 				</view>
 			</view>
 		</view>
-		<!-- 宫格菜单开始 -->
-		<!-- <view class="bg-white padding pagestartthree">
-			<view class="grid col-5 text-center ">
-				<view class="text-xxl " v-for="(item,index) in cuIconList" @tap="shadoumeiyou(index)" :key="index"
-					:class="index<5?'margin-bottom':''">
-					! <view :class="['cuIcon-'+item.icon,'text-' +item.color]">
-					</view> 
-					<view class="text-center">
-						<view class="my-icon-sm">
-							<image :src="imgURL +item.iconUrl" mode="widthFix"></image>
-						</view>
-						<view class="text-sm">
-							<text class="text-sm color-333">
-								{{item.name}}
-							</text>
-						</view>
-
-					</view>
-
-
-				</view>
-
-			</view>
-		</view> -->
 		<!-- 广告图片开始 -->
 		<view class="my-bg padding">
 			<view class="" >
-				<swiper autoplay interval='5000' style="width: 100%;height: 204rpx;" class="swiper" circular >
+				<!-- <swiper autoplay interval='5000' style="width: 100%;height: 204rpx;" class="swiper" circular >
 					<swiper-item @click="swiperClick(item,index)" v-for="(item,index) in swiperArray">
 						<image :src="item.src" style="width: 100%;"  mode="widthFix"></image>
 					</swiper-item>
 					<swiper-item>
 						<ad unit-id="adunit-fae65289bc72095d" ad-intervals="30"></ad>
 					</swiper-item>
-				</swiper>
-				<!-- <image :src="starUrl+'banner.png'" style="width: 100%;" mode="widthFix"></image> -->
+				</swiper> -->
+				<image :src="starUrl+'banner.png'" style="width: 100%;" mode="widthFix"></image>
 			</view>
 		</view>
 		<!-- 筛选开始 -->
@@ -517,6 +493,7 @@
 					currentPage: 1,
 					pageSize: 10,
 					params: { //类型：Object  必有字段  备注：// 筛选对象
+					    clientBelong:'ZHONGPIN',
 						sort: "juli", //类型：String  必有字段  备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
 						// longitude: 117.157817, //  必有字段  备注：// 当前位置经度
 						// latitude: 31.802472, //  必有字段  备注：// 当前位置维度