Merge branch 'master' of http://121.196.213.68:3000/caoliancun/MP_XOIL_company_new into caolc

pages/tabbar/home/home.vue

@@ -132,7 +132,7 @@
 			</view>
 		</view>
 		<!-- 广告图片开始 -->
-		<view class=" padding" style="    background-color: #f1f1f1;">
+		<!-- <view class=" padding" style="    background-color: #f1f1f1;">
 			<view class="">
 				<swiper autoplay interval='5000' style="width: 100%;height: 204rpx;" class="swiper" circular>
 					<swiper-item @click="swiperClick(item,index)" v-for="(item,index) in swiperArray" :key='index'>
@@ -140,7 +140,7 @@
 					</swiper-item>
 				</swiper>
 			</view>
-		</view>
+		</view> -->
 		<!-- 筛选开始 -->
 		<view class="screentop bg-white  " @tap="scrollScreen">
 			<!-- <view class="">

pages/tabbar/station/stationList.vue

@@ -395,7 +395,6 @@
 					if (res.code == 20000) {
 						uni.setStorageSync('productCodeList', res.data.productCodeList)
 						uni.setStorageSync('areaCodeList', res.data.areaCodeList)
-						this.areaCodeList = uni.getStorageSync('areaCodeList')
 						if(uni.getStorageSync('areaCodeList')){
 							this.areaCodeList = uni.getStorageSync('areaCodeList')
 						}else{
@@ -448,7 +447,7 @@
 						// // console.log(channelCodes, productCodes, siteBrands)
 						// this.$refs.slFilter.resetMenuList(this.menuList)
 					}
-					console.log(this.menuList,'----')
+					console.log(this.menuList,uni.getStorageSync('areaCodeList'),'----')
 				})
 			},
 			onSelected(e) {