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

This commit is contained in:
闫晓茹 2023-11-08 09:54:40 +08:00
commit aef7cf87a4

View File

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