Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
techbook
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
front-end-dev
techbook
Commits
94ba4008
Commit
94ba4008
authored
Dec 18, 2020
by
zhangyanni
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
直播h5
parent
8c125f7c
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
87 additions
and
10 deletions
+87
-10
live.html
public/live.html
+14
-4
detail.vue
src/views/mobile/activityApply/detail.vue
+20
-0
list.vue
src/views/mobile/activityApply/list.vue
+22
-3
index.vue
src/views/mobile/index/index.vue
+23
-1
live.vue
src/views/mobile/live.vue
+2
-2
mine.vue
src/views/mobile/mine.vue
+3
-0
mineOrOther.vue
src/views/mobile/mineOrOther.vue
+3
-0
No files found.
public/live.html
View file @
94ba4008
...
...
@@ -3,9 +3,9 @@
<meta
name=
"viewport"
content=
"width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"
/>
<script
src=
'https://cnstatic01.e.vhall.com/static/js/iframeSolu.js'
></script>
</head>
<body
style=
"height:100%;margin: 0;"
>
<body
style=
"height:100%;margin: 0;"
class=
"iframeBody"
onload=
"loadFunc()"
>
<!--<iframe border="0" src="https://live.vhall.com/528253505" style="width: 100%;height: calc(100vh - 3rem);"></iframe>-->
<
iframe
allow=
"camera *;microphone *;"
name=
"vcallIframe"
id=
"vcallIframe"
src=
"https://live4.vhall.com/webinar/inituser/528253505"
allowfullscreen=
"true"
style=
"width: 100%;height: calc(100vh - 3rem);border: medium none;"
></iframe
>
<
!--<iframe allow="camera *;microphone *;" name="vcallIframe" id="vcallIframe" src="https://live4.vhall.com/webinar/inituser/528253505" allowfullscreen="true" style="width: 100%;height: calc(100vh - 3rem);border: medium none;"></iframe>--
>
</body>
<script>
//获取cookie
...
...
@@ -22,7 +22,18 @@
}
}
return
""
};
function
loadFunc
(){
setTimeout
(
function
(){
var
body
=
document
.
getElementsByTagName
(
"body"
);
var
div
=
document
.
createElement
(
"div"
);
div
.
innerHTML
=
'<iframe allow="camera *;microphone *;" name="vcallIframe" id="vcallIframe" allowfullscreen="true" style="width: 100%;height: calc(100vh - 3rem);border: medium none;"></iframe>'
;
document
.
body
.
appendChild
(
div
);
document
.
getElementById
(
"vcallIframe"
).
src
=
getCookie
(
"liveUrl"
).
replace
(
"https://live.vhall.com"
,
"https://live4.vhall.com"
)
+
"?email="
+
window
.
sessionStorage
.
getItem
(
"liveEmail"
)
+
"&name="
+
window
.
sessionStorage
.
getItem
(
"liveName"
);
},
100
)
}
document
.
getElementsByTagName
(
"iframe"
)[
0
].
src
=
getCookie
(
"liveUrl"
).
replace
(
"https://live.vhall.com"
,
"https://live4.vhall.com"
)
+
"?email="
+
getCookie
(
"liveEmail"
)
+
"&name="
+
getCookie
(
"liveName"
);
</script>
\ No newline at end of file
src/views/mobile/activityApply/detail.vue
View file @
94ba4008
...
...
@@ -91,6 +91,7 @@
import
commonApi
from
'../../../common/commonApi'
;
import
applyLoginCmpt
from
'../../../components/mobile/applyLogin'
;
import
itegralCmpt
from
'../../../components/mobile/getIntegral'
;
import
personApi
from
'../personaluser/api/api'
;
export
default
{
name
:
"detail"
,
...
...
@@ -155,10 +156,29 @@
},
//获取用户昵称
getNickName
()
{
let
params
=
{
empId
:
this
.
userInfo
.
empId
,
};
personApi
.
selectByEmpId
(
params
).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
var
email
=
this
.
userInfo
.
empAccount
.
indexOf
(
"@"
)
>
-
1
?
this
.
userInfo
.
empAccount
:
this
.
userInfo
.
empAccount
+
"@techcode.com"
;
sessionStorage
.
setItem
(
"liveEmail"
,
email
);
sessionStorage
.
setItem
(
"liveName"
,
res
.
result
.
nickName
);
}
else
{
console
.
log
(
res
.
msg
);
}
}).
catch
(
err
=>
{
console
.
log
(
err
)
})
},
//是否显示登录
isShowLoginDialogFunc
(
data
,
data1
)
{
this
.
isLogin
=
data
;
this
.
userInfo
=
this
.
publicFun
.
getUserInfoCookieType
()
?
JSON
.
parse
(
this
.
Base64
.
decode
(
this
.
publicFun
.
getUserInfoCookieType
()))
:
null
;
if
(
this
.
userInfo
)
this
.
getNickName
();
this
.
getDetailInfo
();
},
...
...
src/views/mobile/activityApply/list.vue
View file @
94ba4008
...
...
@@ -56,7 +56,7 @@
<span>
{{
item
.
channelCityStr
}}
</span></p>
<p
class=
"activityBtn"
v-if=
"((userInfo&&userInfo.empId!=item.createdBy)||!userInfo)&&item.channelType!=5"
>
<span
@
click
.
native
=
"handleToDetail(item)"
v-if=
"item.channelLabel"
>
{{
item
.
channelLabel
.
split
(
","
)[
0
]
}}
</span>
<span
@
click=
"handleToDetail(item)"
v-if=
"item.channelLabel"
>
{{
item
.
channelLabel
.
split
(
","
)[
0
]
}}
</span>
<el-button
size=
"mini"
plain
type=
"primary"
@
click=
"handleApply(item)"
:disabled=
"item.disabledFlag>0"
v-if=
"item.activityState==2&&item.isJoin==2"
>
...
...
@@ -77,7 +77,7 @@
</p>
<p
class=
"activityBtn"
v-if=
"item.channelType==5"
>
<span
@
click
.
native
=
"handleToDetail(item)"
class=
"redColor"
>
{{
$t
(
"activityInfo.redMoneyType"
)
}}
<i
<span
@
click=
"handleToDetail(item)"
class=
"redColor"
>
{{
$t
(
"activityInfo.redMoneyType"
)
}}
<i
class=
"iconfont icon-hongbao-"
></i></span>
<el-button
size=
"mini"
plain
type=
"primary"
@
click=
"handleToDetail(item)"
:disabled=
"item.disabledFlag>0"
v-if=
"item.activityState==2"
>
...
...
@@ -129,7 +129,7 @@
import
{
Toast
}
from
'mint-ui'
;
import
applyLoginCmpt
from
'../../../components/mobile/applyLogin'
import
commonApi
from
'../../../common/commonApi'
;
import
personApi
from
'../personaluser/api/api'
;
export
default
{
name
:
"list"
,
components
:
{
...
...
@@ -438,6 +438,25 @@
this
.
isLogin
=
data
;
this
.
userInfo
=
this
.
publicFun
.
getUserInfoCookieType
()
?
JSON
.
parse
(
this
.
Base64
.
decode
(
this
.
publicFun
.
getUserInfoCookieType
()))
:
null
;
this
.
getInitFunc
(
this
.
page
,
1
);
if
(
this
.
userInfo
)
this
.
getNickName
();
},
//获取用户昵称
getNickName
()
{
let
params
=
{
empId
:
this
.
userInfo
.
empId
,
};
personApi
.
selectByEmpId
(
params
).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
var
email
=
this
.
userInfo
.
empAccount
.
indexOf
(
"@"
)
>
-
1
?
this
.
userInfo
.
empAccount
:
this
.
userInfo
.
empAccount
+
"@techcode.com"
;
sessionStorage
.
setItem
(
"liveEmail"
,
email
);
sessionStorage
.
setItem
(
"liveName"
,
res
.
result
.
nickName
);
}
else
{
console
.
log
(
res
.
msg
);
}
}).
catch
(
err
=>
{
console
.
log
(
err
)
})
},
//直播
...
...
src/views/mobile/index/index.vue
View file @
94ba4008
...
...
@@ -551,7 +551,7 @@
import
shareCmpt
from
'../../../components/shareIndustryCmpt'
import
applyLoginCmpt
from
'../../../components/mobile/applyLogin'
;
import
itegralCmpt
from
'../../../components/mobile/getIntegral'
;
import
personApi
from
'../personaluser/api/api'
export
default
{
name
:
"mobileindex"
,
components
:
{
...
...
@@ -893,6 +893,7 @@
//直播
handleLive
(
data
)
{
if
(
this
.
userInfo
)
this
.
getNickName
()
if
(
data
.
baseLive
.
liveState
==
1
||
(
data
.
baseLive
.
liveState
==
2
&&
data
.
baseLive
.
liveBack
==
0
))
{
this
.
liveOperatorFunc
(
data
);
}
...
...
@@ -1742,6 +1743,24 @@
},
//获取用户昵称
getNickName
()
{
let
params
=
{
empId
:
this
.
userInfo
.
empId
,
};
personApi
.
selectByEmpId
(
params
).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
var
email
=
this
.
userInfo
.
empAccount
.
indexOf
(
"@"
)
>
-
1
?
this
.
userInfo
.
empAccount
:
this
.
userInfo
.
empAccount
+
"@techcode.com"
;
sessionStorage
.
setItem
(
"liveEmail"
,
email
);
sessionStorage
.
setItem
(
"liveName"
,
res
.
result
.
nickName
);
}
else
{
console
.
log
(
res
.
msg
);
}
}).
catch
(
err
=>
{
console
.
log
(
err
)
})
},
//是否显示登录
isShowLoginDialogFunc
(
data
,
data1
)
{
this
.
isLogin
=
data
;
...
...
@@ -1751,6 +1770,9 @@
this
.
getEnActivityData
();
this
.
getEnIndustryData
();
}
if
(
this
.
loginType
==
64
&&
this
.
userInfo
){
this
.
getNickName
();
}
},
},
mounted
()
{
...
...
src/views/mobile/live.vue
View file @
94ba4008
...
...
@@ -31,8 +31,8 @@
api
.
selectByEmpId
(
params
).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
var
email
=
this
.
userInfo
.
empAccount
.
indexOf
(
"@"
)
>
-
1
?
this
.
userInfo
.
empAccount
:
this
.
userInfo
.
empAccount
+
"@techcode.com"
;
this
.
publicFun
.
setUserInfoCookie
(
"liveEmail"
,
email
);
this
.
publicFun
.
setUserInfoCookie
(
"liveName"
,
res
.
result
.
nickName
);
sessionStorage
.
setItem
(
"liveEmail"
,
email
);
sessionStorage
.
setItem
(
"liveName"
,
res
.
result
.
nickName
);
}
else
{
console
.
log
(
res
.
msg
);
}
...
...
src/views/mobile/mine.vue
View file @
94ba4008
...
...
@@ -279,6 +279,9 @@
api
.
selectByEmpId
(
params
).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
this
.
empuser
=
res
.
result
;
var
email
=
this
.
userInfo
.
empAccount
.
indexOf
(
"@"
)
>
-
1
?
this
.
userInfo
.
empAccount
:
this
.
userInfo
.
empAccount
+
"@techcode.com"
;
sessionStorage
.
setItem
(
"liveEmail"
,
email
);
sessionStorage
.
setItem
(
"liveName"
,
res
.
result
.
nickName
);
this
.
mineList
.
push
({
id
:
5
,
name
:
"myComment"
,
...
...
src/views/mobile/mineOrOther.vue
View file @
94ba4008
...
...
@@ -826,6 +826,9 @@
if
(
res
.
code
==
0
)
{
if
(
this
.
$route
.
query
.
empId
)
this
.
getStatusFunc
();
this
.
empuser
=
res
.
result
;
var
email
=
this
.
userInfo
.
empAccount
.
indexOf
(
"@"
)
>
-
1
?
this
.
userInfo
.
empAccount
:
this
.
userInfo
.
empAccount
+
"@techcode.com"
;
sessionStorage
.
setItem
(
"liveEmail"
,
email
);
sessionStorage
.
setItem
(
"liveName"
,
res
.
result
.
nickName
);
this
.
mineList
.
push
({
id
:
5
,
name
:
"comment"
,
...
...
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