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

Merge branch 'zmr' of http://git.luyuan.tk/luyuan/deming into xbx

Browse Source
This commit is contained in:
luyuan 2020-08-06 10:45:03 +08:00
commit 9872770472
Signed by: theluyuan
GPG Key ID: A7972FD973317FF3
16 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,11 +50,11 @@
} }
.title{ .title{
margin:0 auto; margin:0 auto;
margin-top: 20rpx; margin-top: 4rpx;
font-size: 28rpx; font-size: 28rpx;
color: #333; color: #333;
font-weight: 500; font-weight: 500;
line-height: 48rpx; line-height: 40rpx;
width: 300rpx; width: 300rpx;
overflow:hidden; overflow:hidden;
text-overflow:ellipsis; text-overflow:ellipsis;
@ -64,7 +64,7 @@
} }
.jianjie{ .jianjie{
margin:0 auto; margin:0 auto;
margin-top: 20rpx; margin-top: 10rpx;
font-size: 22rpx; font-size: 22rpx;
color: #666; color: #666;
line-height: 30rpx; line-height: 30rpx;

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

@ -5,7 +5,7 @@
<text @click="viewMore">查看更多></text> <text @click="viewMore">查看更多></text>
</view> </view>
<view class="label"> <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> </view>
<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 260rpx"> <swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 260rpx">
<swiper-item class="swiper-item list" v-for="(_, i) in classifyList" :key="i"> <swiper-item class="swiper-item list" v-for="(_, i) in classifyList" :key="i">
@ -79,7 +79,7 @@ export default {
background-color: #ffffff; background-color: #ffffff;
.top { .top {
padding: 0 30rpx; padding: 0 30rpx;
height: 90rpx; height:80rpx;
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;

8
components/shop/group/item.vue
View File

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

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

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

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

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

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

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

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

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

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

@ -4,7 +4,7 @@
<view class="title">全部优惠券</view> <view class="title">全部优惠券</view>
<view class="view-more" @click="toCouponPage">查看更多></view> <view class="view-more" @click="toCouponPage">查看更多></view>
</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 }" --> <!-- :style="{ height: swiperHeight }" -->
<swiper :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{height: swiperHeight}"> <swiper :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{height: swiperHeight}">
<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i"> <swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
@ -97,7 +97,7 @@ export default {
margin-bottom: 40rpx; margin-bottom: 40rpx;
.top { .top {
padding: 0 30rpx; padding: 0 30rpx;
height: 90rpx; height: 80rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;

3
pageA/login/login.vue
View File

@ -20,7 +20,7 @@
<!-- 服务协议 --> <!-- 服务协议 -->
<view class="pact" v-if="0"> <view class="pact" v-if="0">
<view> <view>
<view></view> <view style="padding-bottom: 10px;"></view>
<text>我已详细阅读并同意</text> <text>我已详细阅读并同意</text>
<text class="pact_text" v-for="(item,index) in pact_text" :key="index" @click="pact_click(index)"> {{item.text}} <text class="pact_text" v-for="(item,index) in pact_text" :key="index" @click="pact_click(index)"> {{item.text}}
</text> </text>
@ -432,6 +432,7 @@
position: relative; position: relative;
padding-left: 40rpx; padding-left: 40rpx;
overflow: hidden; overflow: hidden;
padding-bottom:10px
// overflow: hidden; //超出的文本隐藏 // overflow: hidden; //超出的文本隐藏
// text-overflow: ellipsis; //溢出用省略号显示 // text-overflow: ellipsis; //溢出用省略号显示
// white-space: nowrap; //溢出不换行 // white-space: nowrap; //溢出不换行

1
pageC/cart/index.vue
View File

@ -292,6 +292,7 @@ export default {
.info { .info {
width: 418rpx; width: 418rpx;
height: 160rpx; height: 160rpx;
line-height: 48rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;

4
pageC/classify/goods.vue
View File

@ -170,7 +170,7 @@ export default {
align-items: center; align-items: center;
> image { > image {
width: 220rpx; width: 220rpx;
height: 170rpx; height: 200rpx;
flex-shrink: 0; flex-shrink: 0;
margin-right: 30rpx; margin-right: 30rpx;
} }
@ -184,7 +184,7 @@ export default {
.briefing { .briefing {
font-size: 28rpx; font-size: 28rpx;
color: rgba(102,102,102,1); color: rgba(102,102,102,1);
line-height: 36rpx; line-height: 42rpx;
} }
} }
} }

1
pageE/mine/ArticleDetails.vue
View File

@ -58,5 +58,6 @@ export default {
min-height: calc(100vh - var(--window-top)); min-height: calc(100vh - var(--window-top));
background: #ECECEC; background: #ECECEC;
padding: 20rpx 35rpx 0; padding: 20rpx 35rpx 0;
line-height: 45rpx;
} }
</style> </style>

2
pages.json
View File

@ -1054,7 +1054,7 @@
], ],
"tabBar": { "tabBar": {
"color": "#999999", "color": "#999999",
"selectedColor": "#FFC023", "selectedColor": "#FF780F",
"borderStyle": "white", "borderStyle": "white",
"backgroundColor": "#ffffff", "backgroundColor": "#ffffff",
"list": [{ "list": [{

6
pages/mine/index.vue
View File

@ -46,7 +46,7 @@
<view class="title"> <view class="title">
<view class="title-text">我的订单</view> <view class="title-text">我的订单</view>
<view class="more" @click="toOtherPage('/order/Index')"> <view class="more" @click="toOtherPage('/order/Index')">
<view>查看全部订单</view> <view class="title-text">查看全部订单</view>
<image src="/static/image/mine/21.png"></image> <image src="/static/image/mine/21.png"></image>
</view> </view>
</view> </view>
@ -355,7 +355,7 @@ export default {
} }
.tool { .tool {
@include common-mine( @include common-mine(
$content-padding-top: 8rpx, $content-padding-top: 24rpx,
$content-padding-bottom: 25rpx, $content-padding-bottom: 25rpx,
$image-height: 71rpx, $image-height: 71rpx,
$image-width: 71rpx $image-width: 71rpx
@ -368,7 +368,7 @@ export default {
} }
.more-tool { .more-tool {
@include common-mine( @include common-mine(
$content-padding-top: 8rpx, $content-padding-top: 24rpx,
$content-padding-bottom: 48rpx, $content-padding-bottom: 48rpx,
$image-height: 71rpx, $image-height: 71rpx,
$image-width: 71rpx $image-width: 71rpx

4
pages/shop/index.vue
View File

@ -276,7 +276,7 @@
} }
.chengnuo { .chengnuo {
padding: 30rpx; padding:20rpx 30rpx;
background-color: #ffffff; background-color: #ffffff;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -302,7 +302,7 @@
.fenlei { .fenlei {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
padding: 30rpx; padding: 10rpx 30rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
background-color: #ffffff; background-color: #ffffff;
} }