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

This commit is contained in:
luyuan 2020-08-24 14:23:22 +08:00
commit 3e87a5aaf5
Signed by: theluyuan
GPG Key ID: A7972FD973317FF3
2 changed files with 37 additions and 2 deletions

View File

@ -7,7 +7,7 @@
<view v-for="(item, index) in evalueList" :key="index" class="itme">
<comment :reply="true" :content="item"></comment>
</view>
<u-empty text="暂无评" mode="list" v-if="!evalueList.length" margin-top="120" color="#333"></u-empty>
<u-empty text="暂无评" mode="list" v-if="!evalueList.length" margin-top="120" color="#333"></u-empty>
</view>
<!-- 加载更多 -->
<u-loadmore :status="loadStatus" bgColor="#EEEBEE" margin-top="20" margin-bottom="20" v-if="evalueList.length >= 12"></u-loadmore>

View File

@ -121,6 +121,11 @@
<view class="heng"></view>
</view>
<view class="rich">
<view class="goods-video" v-if="list.length && goodsInfo.video" @click="playVideo">
<image class="video-play" src="/static/videoPlay.png"></image>
<view class="blacks"></view>
<image class="video-img" :src="list[0].image" mode="aspectFill"></image>
</view>
<rich-text :nodes="goodsInfo.mobile_body"></rich-text>
</view>
<!-- 选择规格数量 -->
@ -425,7 +430,7 @@ export default {
},
//
pinTuanDetails() {
console.log(this.id);
// console.log(this.id);
this.$u.api.getPinTuanDetails({
pintuan_id: this.pintuan_id,
goods_id: this.id,
@ -676,6 +681,12 @@ export default {
id: id
});
},
playVideo() {
console.log(this.goodsInfo.video);
this.$u.route('/pageB/playVideo/index', {
url: this.goodsInfo.video
});
}
},
}
</script>
@ -1085,6 +1096,30 @@ export default {
}
.rich {
width: 100%;
.goods-video {
position: relative;
.video-img {
width: 100%;
}
.blacks {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
background-color: rgba(0, 0, 0, 0.35);
z-index: 8;
}
.video-play {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: 100rpx;
height: 100rpx;
z-index: 9;
}
}
}
.group-tool {
position: fixed;