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
905a5786
Commit
905a5786
authored
Apr 22, 2020
by
程智春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
直播2.0
parent
b909156b
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
59 additions
and
6 deletions
+59
-6
src/api/liveing.js
+13
-0
src/components/livedModel/liveReplay.vue
+16
-0
src/components/livedModel/livedControls.vue
+1
-0
src/components/livedModel/livedExplainingCommodities.vue
+3
-0
src/components/livedModel/livedGoodsDia.vue
+1
-1
src/pages/index/index.vue
+1
-1
src/pages/live/index.vue
+15
-4
src/pages/liveList/index.vue
+0
-0
src/pages/lived/index.vue
+9
-0
static/images/chuangjian.png
+0
-0
No files found.
src/api/liveing.js
View file @
905a5786
...
@@ -36,5 +36,17 @@ export default {
...
@@ -36,5 +36,17 @@ export default {
//获取服务器时间戳
//获取服务器时间戳
queryServerTimeNow
(){
queryServerTimeNow
(){
return
requestGET
(
`
${
process
.
env
.
OLSHOP_URL
}
/liveBroadcastInfo/getServerTimeNow`
)
return
requestGET
(
`
${
process
.
env
.
OLSHOP_URL
}
/liveBroadcastInfo/getServerTimeNow`
)
},
// 根据号码查询主播创建直播权限状态
queryLivePermissions
(
options
){
return
requestPOST
(
`
${
process
.
env
.
OLSHOP_URL
}
/liveAnchor/getAuthorityByPhone`
,
options
)
},
//申请直播权限
applyAuthority
(
options
){
return
requestPOST
(
`
${
process
.
env
.
OLSHOP_URL
}
/liveAnchor/applyAuthority`
,
options
)
},
// 添加申请主播结果通知订阅消息
addLiveResultMsg
(
options
){
return
requestPOST
(
`
${
process
.
env
.
OLSHOP_URL
}
/broadcastReminderRecord/addLiveAnchorByCustomer`
,
options
)
}
}
}
}
\ No newline at end of file
src/components/livedModel/liveReplay.vue
0 → 100644
View file @
905a5786
<
template
>
<div
class=
"replay"
>
</div>
</
template
>
<
script
>
export
default
{
}
</
script
>
<
style
lang=
"scss"
scoped
>
</
style
>
\ No newline at end of file
src/components/livedModel/livedControls.vue
View file @
905a5786
...
@@ -447,6 +447,7 @@ export default {
...
@@ -447,6 +447,7 @@ export default {
overflow
:
hidden
;
overflow
:
hidden
;
bottom
:
0
;
bottom
:
0
;
right
:
-30px
;
right
:
-30px
;
pointer-events
:
none
;
.img
{
.img
{
position
:
absolute
;
position
:
absolute
;
bottom
:
0
;
bottom
:
0
;
...
...
src/components/livedModel/livedExplainingCommodities.vue
View file @
905a5786
...
@@ -51,6 +51,9 @@ export default {
...
@@ -51,6 +51,9 @@ export default {
watch
:
{
watch
:
{
updateGoods
()
{
updateGoods
()
{
console
.
log
(
this
.
goodsList
,
'---------------------------------46goodsList'
)
console
.
log
(
this
.
goodsList
,
'---------------------------------46goodsList'
)
this
.
goodsList
.
forEach
((
item
,
index
)
=>
{
this
.
$set
(
this
.
goodsList
[
index
],
'minPrice'
,
Number
(
item
.
minPrice
).
toFixed
(
2
))
})
console
.
log
(
this
.
firstCom
,
'this.firstCom----------'
)
console
.
log
(
this
.
firstCom
,
'this.firstCom----------'
)
if
(
this
.
firstCom
==
true
)
{
if
(
this
.
firstCom
==
true
)
{
this
.
list
=
[];
this
.
list
=
[];
...
...
src/components/livedModel/livedGoodsDia.vue
View file @
905a5786
...
@@ -83,7 +83,7 @@ export default {
...
@@ -83,7 +83,7 @@ export default {
updateGoods
(){
updateGoods
(){
this
.
list
=
this
.
goodsList
;
this
.
list
=
this
.
goodsList
;
this
.
list
.
forEach
((
item
,
index
)
=>
{
this
.
list
.
forEach
((
item
,
index
)
=>
{
item
.
minPrice
=
Number
(
item
.
minPrice
);
item
.
minPrice
=
Number
(
item
.
minPrice
)
.
toFixed
(
2
)
;
});
});
},
},
},
},
...
...
src/pages/index/index.vue
View file @
905a5786
...
@@ -312,7 +312,7 @@ export default {
...
@@ -312,7 +312,7 @@ export default {
let
params
=
''
let
params
=
''
if
(
querys
.
length
>
midNum
){
if
(
querys
.
length
>
midNum
){
if
(
querys
[
midNum
+
2
]){
if
(
querys
[
midNum
+
2
]){
params
+=
`&spokesmanGroupId=
${
querys
[
midNum
-
1
]}
&spokesmanShopId=
${
midNum
}
&spokesmanRelId=
${
midNum
+
1
}
&userId=
${
querys
[
midNum
+
2
]}
`
params
+=
`&spokesmanGroupId=
${
querys
[
midNum
-
1
]}
&spokesmanShopId=
${
querys
[
midNum
]}
&spokesmanRelId=
${
query
[
midNum
+
1
]
}
&userId=
${
querys
[
midNum
+
2
]}
`
}
else
{
}
else
{
params
+=
`&spokesmanGroupId=
${
querys
[
midNum
-
1
]}
&spokesmanShopId=
${
querys
[
midNum
]}
&spokesmanRelId=
${
querys
[
midNum
+
1
]}
`
params
+=
`&spokesmanGroupId=
${
querys
[
midNum
-
1
]}
&spokesmanShopId=
${
querys
[
midNum
]}
&spokesmanRelId=
${
querys
[
midNum
+
1
]}
`
}
}
...
...
src/pages/live/index.vue
View file @
905a5786
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
@
statechange=
"statechange"
@
statechange=
"statechange"
@
error=
"binderror"
@
error=
"binderror"
@
netstatus=
"bindnetstatus"
@
netstatus=
"bindnetstatus"
v-if=
"refreshLive"
/>
/>
<image
class=
"bg-img"
v-if=
"isBgImg"
:src=
"liveInfo.coverUrl"
mode=
"aspectFill"
alt=
""
></image>
<image
class=
"bg-img"
v-if=
"isBgImg"
:src=
"liveInfo.coverUrl"
mode=
"aspectFill"
alt=
""
></image>
<div
class=
"content"
:style=
"
{'padding-top':navHeight +'px'}">
<div
class=
"content"
:style=
"
{'padding-top':navHeight +'px'}">
...
@@ -160,7 +161,7 @@ export default {
...
@@ -160,7 +161,7 @@ export default {
clear
:
'HD'
,
clear
:
'HD'
,
devicePosition
:
'front'
,
//前置或者后置 back => 后置
devicePosition
:
'front'
,
//前置或者后置 back => 后置
enableMic
:
true
,
//麦克风是否开启
enableMic
:
true
,
//麦克风是否开启
remoteMirror
:
'
dis
able'
,
//镜像
remoteMirror
:
'
en
able'
,
//镜像
userInfo
:
null
,
userInfo
:
null
,
...
@@ -219,7 +220,11 @@ export default {
...
@@ -219,7 +220,11 @@ export default {
isDetailControlLock
:
true
,
isDetailControlLock
:
true
,
mirror
:
false
,
mirror
:
true
,
refreshLive
:
true
}
}
},
},
filter
(){
filter
(){
...
@@ -282,6 +287,7 @@ export default {
...
@@ -282,6 +287,7 @@ export default {
this
.
isTimeFirstReq
=
true
;
this
.
isTimeFirstReq
=
true
;
this
.
overOrStop
=
1
;
this
.
overOrStop
=
1
;
this
.
isDetailLock
=
true
;
this
.
isDetailLock
=
true
;
this
.
refreshLive
=
true
;
this
.
online
=
0
//在线
this
.
online
=
0
//在线
this
.
look
=
0
//观看
this
.
look
=
0
//观看
...
@@ -350,7 +356,12 @@ export default {
...
@@ -350,7 +356,12 @@ export default {
if
(
type
==
'record'
){
if
(
type
==
'record'
){
if
(
!
res
.
authSetting
[
"scope.record"
])
{
if
(
!
res
.
authSetting
[
"scope.record"
])
{
this
.
refreshLive
=
false
;
this
.
openConfirm
(
type
);
this
.
openConfirm
(
type
);
}
else
{
this
.
refreshLive
=
true
;
this
.
pusher
=
wx
.
createLivePusherContext
(
'pusher'
);
this
.
pusher
.
startPreview
()
}
}
}
else
if
(
type
==
'camera'
){
}
else
if
(
type
==
'camera'
){
if
(
!
res
.
authSetting
[
"scope.camera"
])
{
if
(
!
res
.
authSetting
[
"scope.camera"
])
{
...
@@ -1076,13 +1087,13 @@ export default {
...
@@ -1076,13 +1087,13 @@ export default {
top
:
0
;
top
:
0
;
left
:
0
;
left
:
0
;
width
:
39px
;
width
:
39px
;
height
:
1
2
px
;
height
:
1
6
px
;
color
:
white
;
color
:
white
;
background-color
:
#FF4240
;
background-color
:
#FF4240
;
border-bottom-right-radius
:
2px
;
border-bottom-right-radius
:
2px
;
font-size
:
11px
;
font-size
:
11px
;
text-align
:
center
;
text-align
:
center
;
line-height
:
1
2
px
;
line-height
:
1
6
px
;
}
}
.item-top
{
.item-top
{
height
:
78px
;
height
:
78px
;
...
...
src/pages/liveList/index.vue
View file @
905a5786
This diff is collapsed.
Click to expand it.
src/pages/lived/index.vue
View file @
905a5786
...
@@ -72,6 +72,15 @@
...
@@ -72,6 +72,15 @@
@
error=
"error"
@
error=
"error"
@
statechange=
"changes"
@
statechange=
"changes"
/>
/>
<!--
<video
style=
"width:100%;height:100vh;"
src=
"http://vjs.zencdn.net/v/oceans.mp4"
autoplay
:show-fullscreen-btn=
"false"
/>
-->
<!-- object-fit="fillCrop" -->
<!-- object-fit="fillCrop" -->
<!-- orientation="horizontal" -->
<!-- orientation="horizontal" -->
</div>
</div>
...
...
static/images/chuangjian.png
0 → 100644
View file @
905a5786
854 Bytes
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