Commit d4cb3a43 authored by zhangjianguo's avatar zhangjianguo

1

parent d83fbcdc
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<u-divider :margin-top="20" :margin-bottom="20" bg-color="transparent">商品详情</u-divider> <u-divider :margin-top="20" :margin-bottom="20" bg-color="transparent">商品详情</u-divider>
<view class="details"> <view class="details">
<!-- <rich-text :nodes="detailContent" @click="clickDescription"></rich-text> --> <!-- <rich-text :nodes="detailContent" @click="clickDescription"></rich-text> -->
<u-parse :content="detailContent" @navigate="clickDescription"></u-parse> <h-parse :content="detailContent" @navigate="clickDescription"></h-parse>
</view> </view>
<u-divider :margin-top="20" :margin-bottom="20" bg-color="transparent">或许你喜欢</u-divider> <u-divider :margin-top="20" :margin-bottom="20" bg-color="transparent">或许你喜欢</u-divider>
<view style="width: calc(100vw - 20px); margin-left: 10px; overflow: hidden;"> <view style="width: calc(100vw - 20px); margin-left: 10px; overflow: hidden;">
...@@ -215,7 +215,7 @@ import goodsaction from "./components/goodsaction"; ...@@ -215,7 +215,7 @@ import goodsaction from "./components/goodsaction";
import goodsku from "@/components/goods/goodsku"; import goodsku from "@/components/goods/goodsku";
import auth from "@/components/auth/index"; import auth from "@/components/auth/index";
import share from "./components/share/share"; import share from "./components/share/share";
import uParse from "./components/u-parse/parse.vue" import hParse from "./components/u-parse/parse.vue"
export default { export default {
data() { data() {
return { return {
...@@ -256,7 +256,7 @@ export default { ...@@ -256,7 +256,7 @@ export default {
goodsku, goodsku,
auth, auth,
share, share,
uParse hParse
}, },
onLoad(option) { onLoad(option) {
this.opTionObj = option; this.opTionObj = option;
......
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
:src="cx.cover_img" :src="cx.cover_img"
style="width: 100%; height: 100%;" style="width: 100%; height: 100%;"
/> />
<!-- 播放按钮 -->
<view class="livebtn" v-if='cx.live_status==103'></view>
<u-icon name="play-circle-o" v-if='cx.live_status==103' color="#fff" size="100" style='position: absolute;left: 50%;top:50%;margin-left: -50rpx;margin-top: -50rpx;'></u-icon>
</view> </view>
<view class="good-name">{{ cx.name }}</view> <view class="good-name">{{ cx.name }}</view>
<view class="good-info"> <view class="good-info">
...@@ -36,6 +39,8 @@ ...@@ -36,6 +39,8 @@
<Text style="font-size: 12px;margin-left: 5px;">{{cx.anchor_name}}</Text> <Text style="font-size: 12px;margin-left: 5px;">{{cx.anchor_name}}</Text>
</view> </view>
<!-- 直播的状态 --> <!-- 直播的状态 -->
<view class="liveState"> <view class="liveState">
<view style="width: 6px;height: 6px;border-radius: 3px;background: #f5f5f5;"></view> <view style="width: 6px;height: 6px;border-radius: 3px;background: #f5f5f5;"></view>
...@@ -133,7 +138,7 @@ export default { ...@@ -133,7 +138,7 @@ export default {
}); });
this.request2( this.request2(
{ {
url: '/api/AppletUser/GetLiveHouseList', url: '/api/LiveHouse/GetLiveHouseList',
data: this.msg data: this.msg
}, },
res => { res => {
...@@ -179,6 +184,7 @@ export default { ...@@ -179,6 +184,7 @@ export default {
width: calc(50vw); width: calc(50vw);
height: calc(50vw); height: calc(50vw);
display: block; display: block;
position: relative;
} }
.liveStyle .u-good-list .good .good-name { .liveStyle .u-good-list .good .good-name {
overflow: hidden; overflow: hidden;
...@@ -219,5 +225,14 @@ export default { ...@@ -219,5 +225,14 @@ export default {
font-size: 14px; font-size: 14px;
margin-left: 5px; margin-left: 5px;
} }
.liveStyle .livebtn{
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
background: #999999;
opacity: 0.3;
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment