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{
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

@ -5,7 +5,7 @@
<text @click="viewMore">查看更多></text>
</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">
@ -79,7 +79,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

@ -85,7 +85,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;

3
pageA/login/login.vue
View File

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

4
pageB/sdetails/index.vue
View File

@ -135,14 +135,14 @@
</u-popup>
<!-- 普通商品 tool -->
<view class="tloos" v-if="type == 1">
<view class="navs" @click="toOthersPage('pageC/merchant/index?id=' + storeInfo.store_id)">
<view class="navs" @click="toOthersPage('pageC/merchant/index?id=' + storeInfo.store_id)">
<image src="/static/image/common/18.png"></image>
店铺
</view>
<view class="navs" style="margin-right:30rpx">
<image src="/static/image/common/19.png"></image>
客服
</view>
</view>
<view class="button" style="background:rgba(253,211,96,0.6);" v-if="goodsInfo.goods_try == 1" @click="tryDress">试穿试送</view>
<view class="button" style="background:rgba(253,211,96,1);" @click="addCart">加入购物车</view>
<view class="button" style="background:rgba(255,120,15,1);" @click="settlementOrder">立即购买</view>

1
pageC/cart/index.vue
View File

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

4
pageC/classify/goods.vue
View File

@ -170,7 +170,7 @@ export default {
align-items: center;
> image {
width: 220rpx;
height: 170rpx;
height: 200rpx;
flex-shrink: 0;
margin-right: 30rpx;
}
@ -184,7 +184,7 @@ export default {
.briefing {
font-size: 28rpx;
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));
background: #ECECEC;
padding: 20rpx 35rpx 0;
line-height: 45rpx;
}
</style>

2
pages.json
View File

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

6
pages/mine/index.vue
View File

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

4
pages/shop/index.vue
View File

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