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

Merge pull request '修改样式2020.0804' (#116) from zmr into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/116
This commit is contained in:
gyh 2020-08-04 22:41:58 +08:00
commit c035566fe4
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/index/daren-item/index.vue
View File

@ -3,8 +3,8 @@
<image class="head" :src="info.member_avatar"></image>
<text class="name">{{ info.member_nickname }}</text>
<text class="zhuangtai">状态: {{ info.live_status == 1 ? '正在直播' : '未开播' }}</text>
<view class="guanzhu" @tap="changeType(info.member_id)" v-if="info.is_attention == 1">关注</view>
<view class="guanzhu action" @tap="changeType(info.member_id)" v-else >未关注</view>
<view class="guanzhu action" @tap="changeType(info.member_id)" v-if="info.is_attention == 1">已关注</view>
<view class="guanzhu" @tap="changeType(info.member_id)" v-else >未关注</view>
</view>
</template>
<script>
@ -80,6 +80,7 @@ export default {
}
.action{
background: #f3f3f3;
color: #FF780F;
}
}
</style>

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

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

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

@ -93,8 +93,9 @@ export default {
},
setSwiperHeight() {
// height: 230px, margin-bottom: 13
const height = Math.ceil(this.goodsList.length / 2) * (510 + 26);
this.swiperHeight = height == 0 ? '230rpx' : height + 'rpx';
// const height = Math.ceil(this.goodsList.length / 2) * (510 + 26);
// this.swiperHeight = height == 0 ? '230rpx' : height + 'rpx';
this.swiperHeight = Math.ceil(this.goodsList.length / 2) * (270 + 13) + 'px';
},
// tabs通知swiper切换
tabsChange(index) {

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

@ -44,7 +44,7 @@ export default {
<style lang="scss" scoped>
.item{
width: 330rpx;
height: 510rpx;
height: 510rpx;
margin-bottom: 26rpx;
background-color: #f8f8f8;
border-radius: 10rpx 10rpx 0rpx 0rpx;
@ -62,7 +62,7 @@ export default {
flex-direction: column;
justify-content: space-around;
.title{
line-height: 34rpx;
line-height: 40rpx;
font-size: 30rpx;
color: #333;
margin-bottom: 13rpx;
@ -71,6 +71,7 @@ export default {
font-size: 26rpx;
color: #666;
margin-bottom: 20rpx;
line-height: 38rpx;
}
.price{
color: #FF3131;

5
pageB/photo/index.vue
View File

@ -124,7 +124,7 @@
font-size: 24rpx;
color: #fff;
border-radius: 10rpx;
background-color: #999;
background:rgba(153,153,153,.5);
>view{
width: 12rpx;
height: 12rpx;
@ -139,8 +139,9 @@
}
.title{
font-size: 26rpx;
font-size: 28rpx;
color: #333;
line-height: 46rpx;
}
.info{
margin: 20rpx 0;

3
pages/shop/index.vue
View File

@ -9,7 +9,7 @@
<image src="/static/image/shop/2.png"></image>
</view>
<view @click="sousuo">
<u-search placeholder="" v-model="keyword" :show-action="false" bg-color="#fff" border-color="#999999" :disabled="true"></u-search>
<u-search placeholder="输入您喜欢的宝贝" v-model="keyword" :show-action="false" bg-color="#fff" border-color="#999999" :disabled="true"></u-search>
</view>
<image src="/static/image/shop/3.png" class="mnue" @click="toClassifyPage"></image>
</view>
@ -234,6 +234,7 @@
height: 88rpx;
display: flex;
align-items: center;
justify-content: space-between;
.local {
width: 31rpx;