theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
ghusermoon
2020-08-06 10:50:11 +08:00
parent 2cb8f90281 79d8f91769
commit 8bf42a75dd
46 changed files with 757 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/index/video-item/index.vue
View File

@@ -5,7 +5,7 @@
<view class="backes"></view>
<image class="head" :src="item.article_pic" ></image>
</view>
<view class="title" v-if="!isguanzhu">{{ item.article_title }}</view>
<view class="title" v-if="">{{ item.article_title }}</view>
<view class="jianjie">{{ item.article_content }}</view>
<view class="user">
<view class="info">
@@ -50,11 +50,11 @@
}
.title{
margin:0 auto;
margin-top: 20rpx;
margin-top: 4rpx;
font-size: 28rpx;
color: #333;
font-weight: 500;
line-height: 48rpx;
line-height: 40rpx;
width: 300rpx;
overflow:hidden;
text-overflow:ellipsis;
@@ -64,7 +64,7 @@
}
.jianjie{
margin:0 auto;
margin-top: 20rpx;
margin-top: 10rpx;
font-size: 22rpx;
color: #666;
line-height: 30rpx;

4
components/shop/group/index.vue
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;

8
components/shop/group/item.vue
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;

4
components/shop/list/index.vue
View File

@@ -129,8 +129,8 @@ export default {
};
.top {
font-size: 30rpx;
height: 90rpx;
line-height: 90rpx;
height: 74rpx;
line-height: 88rpx;
text-align: center;
color: #333;
}

2
components/shop/list/item.vue
View File

@@ -44,7 +44,7 @@ export default {
<style lang="scss" scoped>
.item{
width: 330rpx;
height: 510rpx;
height: 520rpx;
margin-bottom: 26rpx;
background-color: #f8f8f8;
border-radius: 10rpx 10rpx 0rpx 0rpx;

2
components/shop/recommend/pintuan.vue
View File

@@ -89,7 +89,7 @@ export default {
}
}
.connect{
padding: 30rpx;
padding:10rpx 30rpx 30rpx;
display: flex;
align-items: center;
.user {

2
components/shop/shop-item/index.vue
View File

@@ -26,7 +26,7 @@ export default {
align-items: center;
flex-direction: column;
width: 20%;
margin-bottom: 20rpx;
margin-bottom:34rpx;
>image{
width: 80rpx;
height: 80rpx;

4
components/shop/youhq/index.vue
View File

@@ -4,7 +4,7 @@
<view class="title">全部优惠券</view>
<view class="view-more" @click="toCouponPage">查看更多></view>
</view>
<u-tabs-swiper ref="coupon" :list="couponGroupList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="couponCurrent" font-size="24" :show-bar="false" @change="couponTabsChange" height="88" ></u-tabs-swiper>
<u-tabs-swiper ref="coupon" :list="couponGroupList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="couponCurrent" font-size="24" :show-bar="false" @change="couponTabsChange" height="60" ></u-tabs-swiper>
<!-- :style="{ height: swiperHeight }" -->
<swiper :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{height: swiperHeight}">
<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
@@ -97,7 +97,7 @@ export default {
margin-bottom: 40rpx;
.top {
padding: 0 30rpx;
height: 90rpx;
height: 80rpx;
display: flex;
align-items: center;
justify-content: space-between;