Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy

This commit is contained in:
2020-08-06 10:50:11 +08:00
46 changed files with 757 additions and 43 deletions

View File

@@ -8,7 +8,7 @@
</view>
</view>
<view class="label">
<u-tabs-swiper ref="group" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="88"></u-tabs-swiper>
<u-tabs-swiper ref="group" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper>
</view>
<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 260rpx">
<swiper-item class="swiper-item list" v-for="(_, i) in classifyList" :key="i">
@@ -82,7 +82,7 @@ export default {
background-color: #ffffff;
.top {
padding: 0 30rpx;
height: 90rpx;
height:80rpx;
width: 100%;
display: flex;
align-items: center;

View File

@@ -47,9 +47,9 @@ export default {
width: 210rpx;
overflow: hidden;
.head{
width: 150rpx;
height: 150rpx;
border-radius: 10rpx;
width: 100%;
height: 180rpx;
border-radius: 6rpx;
}
.title{
display: inline-block;
@@ -66,7 +66,7 @@ export default {
> view:first-child{
font-size: 26rpx;
color: #FF3131;
margin-bottom: 4rpx;
margin-bottom: 12rpx;
}
> view:last-child{
font-size: 22rpx;