合并

pages/index/index.vue

@@ -55,11 +55,7 @@
 							<text>{{item.text}}</text>
 						</view>
 					</view>
-<<<<<<< HEAD
-					<view class="gridRows secondRows" :style="{'height': catagoryList.length>0?'160rpx':'auto'}">
-=======
 					<view class="gridRows secondRows" :style="{'height': isToggle == false?catagoryList.length >0?'160rpx':'auto':'auto'}">
->>>>>>> 6e373bfa00736a89d269cd841552ba87aef59342
 						<view class="gridItem" v-for="(item,index) in catagoryList" :key="index"
 							@click="goJump('/pages/goods/list?categoryId=' + item.category_id)">
 							<view class="imageC">
@@ -1069,18 +1065,11 @@
 		.tabs {
 			width: 100%;
 			height: 80rpx;
-<<<<<<< HEAD
 			align-items: center;
 			white-space: nowrap;
 			width: 100%;
 			overflow-x: auto;
 			overflow-y: hidden;
-
-=======
-			line-height: 80rpx;
-			white-space: nowrap;
-			overflow: hidden;
->>>>>>> 6e373bfa00736a89d269cd841552ba87aef59342
 			.tabItem {
 			    margin-right: 30rpx;
 				position: relative;