Merge remote-tracking branch 'origin/dev' into dev

pagesB/ProductList/ProductList.vue

@@ -11,6 +11,7 @@
 					placeholder-class="placeholder">
 			</view>
 		</u-navbar>
+		<view class="top">
 			<u-tabs :list="GoodsCategorychildrenlist" :current="tabIndex" @change="toggleTab" active-color='#26A888'
 				v-if="GoodsCategorychildrenlist.length>=2"></u-tabs>
 			<view class="fenlei" @tap='toggleTab(1111111111111)' v-if="GoodsCategorychildrenlist.length>=2">
@@ -19,6 +20,9 @@
 					分类
 				</view>
 			</view>
+
+		</view>
+
 		<!-- <view class="inputs">
 			<i class="icon"></i>
 			<input v-model="goodsName" type="text" name="" id="" class="input" placeholder="请输入商品名称">
@@ -228,8 +232,10 @@
 
 <style lang="scss">
 	::v-deep .u-tabs {
-		width: 100%;
+		position: absolute;
+		width: 80%;
 		padding-left: 20rpx;
+		// background: red;
 	}
 
 	.app {
@@ -240,7 +246,7 @@
 		}
 
 		.u-navbar {
-			display: block;
+			display: inline-block;
 			// height: 200rpx;
 
 			image {
@@ -294,6 +300,10 @@
 			}
 		}
 
+
+		.top{
+			position: relative;
+			width: 100%;
 			.fenlei {
 				width: 20%;
 				display: inline-block;
@@ -305,7 +315,8 @@
 				color: #000000;
 				position: absolute;
 				right: 0;
-			top: 0;
+				    // top: 67px;
+				    z-index: 11111;
 				font-size: 32rpx;
 
 				view {
@@ -323,6 +334,9 @@
 				}
 			}
 
+		}
+
+
 		.inputs {
 			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
 			border: 1px solid #f0f0f0;