Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mayi-mp-shop
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
程默
mayi-mp-shop
Commits
790ab01f
Commit
790ab01f
authored
Mar 12, 2020
by
李嘉林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
注释进店
parent
e6852237
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
6 deletions
+31
-6
src/pages/index/index.vue
+3
-0
src/pages/lived/index.vue
+28
-6
No files found.
src/pages/index/index.vue
View file @
790ab01f
...
@@ -88,6 +88,9 @@ export default {
...
@@ -88,6 +88,9 @@ export default {
key
:
"sessionid"
,
key
:
"sessionid"
,
data
:
params
.
sessionid
data
:
params
.
sessionid
});
});
}
else
if
(
options
.
from
&&
options
.
from
==
"livedToIndex"
)
{
//来自直播详情
this
.
page
=
decodeURIComponent
(
options
.
backpath
);
}
else
if
(
options
.
from
&&
options
.
from
==
"login"
)
{
}
else
if
(
options
.
from
&&
options
.
from
==
"login"
)
{
//来自小程序登录页面
//来自小程序登录页面
this
.
page
=
decodeURIComponent
(
options
.
backpath
);
this
.
page
=
decodeURIComponent
(
options
.
backpath
);
...
...
src/pages/lived/index.vue
View file @
790ab01f
...
@@ -8,15 +8,16 @@
...
@@ -8,15 +8,16 @@
<van-icon
name=
"arrow-left"
@
click=
"back"
/>
<van-icon
name=
"arrow-left"
@
click=
"back"
/>
</div>
</div>
<div
class=
"shopName flex"
>
<div
class=
"shopName flex"
>
<div
class=
"img"
>
<div
class=
"img"
v-if=
"shopLogo"
>
<img
:src=
"shopLogo"
alt=
""
>
<img
:src=
"shopLogo"
alt=
""
>
</div>
</div>
<div
class=
"info"
>
<div
class=
"info"
>
<p
class=
"name"
v-if=
"shopName"
>
{{
shopName
}}
</p>
<p
class=
"name
line-clamp1
"
v-if=
"shopName"
>
{{
shopName
}}
</p>
<p
class=
"num"
>
<p
class=
"num"
>
<span>
999
</span>
<span>
观看
</span>
<span>
999
</span>
<span>
观看
</span>
</p>
</p>
</div>
</div>
<!--
<div
class=
"toShop"
@
click=
"toShop"
>
进店
</div>
-->
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -41,6 +42,7 @@ export default {
...
@@ -41,6 +42,7 @@ export default {
livedUrl
:
'rtmp://58.200.131.2:1935/livetv/hunantv'
,
livedUrl
:
'rtmp://58.200.131.2:1935/livetv/hunantv'
,
shopName
:
''
,
shopName
:
''
,
shopLogo
:
''
,
shopLogo
:
''
,
backPath
:
''
,
};
};
},
},
components
:
{},
components
:
{},
...
@@ -72,6 +74,15 @@ export default {
...
@@ -72,6 +74,15 @@ export default {
delta
:
1
delta
:
1
})
})
},
},
toShop
(){
// 到商城首页
this
.
backPath
=
'/'
;
wx
.
reLaunch
({
url
:
`../index/main?from=livedToIndex&backpath=
${
this
.
backPath
}
`
})
},
}
}
};
};
</
script
>
</
script
>
...
@@ -126,7 +137,7 @@ export default {
...
@@ -126,7 +137,7 @@ export default {
position
:
absolute
;
position
:
absolute
;
top
:
30px
;
top
:
30px
;
left
:
12px
;
left
:
12px
;
width
:
6
0%
;
width
:
7
0%
;
align-items
:
center
;
align-items
:
center
;
.backIcon{
.backIcon{
color
:
#fff
;
color
:
#fff
;
...
@@ -135,10 +146,11 @@ export default {
...
@@ -135,10 +146,11 @@ export default {
.shopName
{
.shopName
{
margin-left
:
20px
;
margin-left
:
20px
;
background
:
rgba
(
0
,
0
,
0
,
0.6
);
background
:
rgba
(
0
,
0
,
0
,
0.6
);
border-radius
:
34px
;
border-radius
:
30px
;
align-items
:
center
;
.img{
.img{
width
:
3
4
px
;
width
:
3
0
px
;
height
:
3
4
px
;
height
:
3
0
px
;
border-radius
:
50%
;
border-radius
:
50%
;
overflow
:
hidden
;
overflow
:
hidden
;
img{
img{
...
@@ -152,6 +164,16 @@ export default {
...
@@ -152,6 +164,16 @@ export default {
flex
:
1
;
flex
:
1
;
font-size
:
14px
;
font-size
:
14px
;
}
}
.toShop
{
background
:
#FB566D
;
padding
:
0
4px
;
color
:
#fff
;
font-size
:
14px
;
display
:
inline-block
;
border-radius
:
6px
;
height
:
20px
;
line-height
:
20px
;
}
}
}
}
}
}
}
...
...
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