Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mallapp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
viitto
mallapp
Commits
d4cb3a43
Commit
d4cb3a43
authored
Jun 30, 2020
by
zhangjianguo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
d83fbcdc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
5 deletions
+20
-5
goods.vue
pages/goods/goods.vue
+3
-3
index.vue
pages/live/index.vue
+17
-2
No files found.
pages/goods/goods.vue
View file @
d4cb3a43
...
...
@@ -165,7 +165,7 @@
<u-divider
:margin-top=
"20"
:margin-bottom=
"20"
bg-color=
"transparent"
>
商品详情
</u-divider>
<view
class=
"details"
>
<!-- <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>
<u-divider
:margin-top=
"20"
:margin-bottom=
"20"
bg-color=
"transparent"
>
或许你喜欢
</u-divider>
<view
style=
"width: calc(100vw - 20px); margin-left: 10px; overflow: hidden;"
>
...
...
@@ -215,7 +215,7 @@ import goodsaction from "./components/goodsaction";
import
goodsku
from
"@/components/goods/goodsku"
;
import
auth
from
"@/components/auth/index"
;
import
share
from
"./components/share/share"
;
import
u
Parse
from
"./components/u-parse/parse.vue"
import
h
Parse
from
"./components/u-parse/parse.vue"
export
default
{
data
()
{
return
{
...
...
@@ -256,7 +256,7 @@ export default {
goodsku
,
auth
,
share
,
u
Parse
h
Parse
},
onLoad
(
option
)
{
this
.
opTionObj
=
option
;
...
...
pages/live/index.vue
View file @
d4cb3a43
...
...
@@ -29,6 +29,9 @@
:src=
"cx.cover_img"
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
class=
"good-name"
>
{{
cx
.
name
}}
</view>
<view
class=
"good-info"
>
...
...
@@ -36,6 +39,8 @@
<Text
style=
"font-size: 12px;margin-left: 5px;"
>
{{
cx
.
anchor_name
}}
</Text>
</view>
<!-- 直播的状态 -->
<view
class=
"liveState"
>
<view
style=
"width: 6px;height: 6px;border-radius: 3px;background: #f5f5f5;"
></view>
...
...
@@ -133,7 +138,7 @@ export default {
});
this
.
request2
(
{
url
:
'/api/
AppletUser
/GetLiveHouseList'
,
url
:
'/api/
LiveHouse
/GetLiveHouseList'
,
data
:
this
.
msg
},
res
=>
{
...
...
@@ -179,6 +184,7 @@ export default {
width
:
calc
(
50vw
);
height
:
calc
(
50vw
);
display
:
block
;
position
:
relative
;
}
.liveStyle
.u-good-list
.good
.good-name
{
overflow
:
hidden
;
...
...
@@ -219,5 +225,14 @@ export default {
font-size
:
14px
;
margin-left
:
5px
;
}
.liveStyle
.livebtn
{
position
:
absolute
;
left
:
0
;
top
:
0
;
width
:
100%
;
height
:
100%
;
background
:
#999999
;
opacity
:
0.3
;
}
</
style
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment