Skip to content

N
newLive
Commit 0f4def94 authored by mengqr's avatar mengqr
Browse files
Options

Merge branch 'master' of http://git.douniu8.com/mengqr/newlive

parents 3ccc9839 6706a7b8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 14242 additions and 278 deletions
package-lock.json
View file @ 0f4def94
This diff is collapsed.
public/index.html
View file @ 0f4def94
......@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta name=”viewport” content=”width=device-width, initial-scale=1, maximum-scale=1″>
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<script src="./static/js/mqttws31.js" type="text/javascript"></script>
<title>斗牛财经</title>
......
src/axios/api.js
View file @ 0f4def94
......@@ -76,7 +76,34 @@ live: {
},
buy_code:function(data){
return service.post('/wx/code', data)
}
},
//我的用户反馈文本
feedback:function(data){
return service.post('/feedback/text', data)
},
deal:function(data){
return service.post('/feedback/deal', data)
},
userCenter:function(data){
return service.post('/douniu/userCenter', data)
},
sigurature:function(data){
return service.post('/upload/sigurature/'+11, data)
},
followAnchor:function(data){
return service.post('/app/live/followAnchor', data)
},
getLiveHistory:function(data){
return service.post('/app/live/getLiveHistory', data)
},
getFollowAnchor:function(data){
return service.post('/app/live/getFollowAnchor', data)
},
......
src/main.js
View file @ 0f4def94
......@@ -11,6 +11,12 @@ import VideoPlayer from 'vue-video-player'
import 'vue-video-player/src/custom-theme.css'
import common from '../static/js/common.js' //公共方法
import 'video.js/dist/video-js.css'
import VueClipboard from "vue-clipboard2";
//引入 hls,视频直播(m3u8)必须引入的
import 'videojs-contrib-hls'
......
src/views/fullScreen.vue
View file @ 0f4def94
......@@ -756,9 +756,12 @@ this.pten = false
this.ifFollow=res.data.data.followAnchor//关注主播状态
// res.data.data.seeDuration
localStorage.setItem('lvrUbId',this.lvrUbId);
let timer=res.data.data.seeDuration
console.log("萨芬", this.lvrUbId)
console.log(this.lvrUbId,'主播')
console.log("token",token)
console.log("头像",img)
if(token&&img){
......
src/views/live.vue
View file @ 0f4def94
......@@ -2,8 +2,10 @@
<div class="videoPlayer">
<!-- //分享卡片 -->
<share-card style=" z-index:99;" :headPortrait='udPhotoFileid' :udNickname='udNickname' :lvrName='lvrName' :lvrImgLargeUrl='lvrImgLargeUrl'> </share-card>
<!-- <img src="../assets/left.png" alt="" class="Lent_p" @click="go"> -->
<!-- <LivePlayer :videoUrl="url" /> -->
<div class='demo'>
<video-player class="video-player vjs-custom-skin"
ref="videoPlayer"
:playsinline="true"
......@@ -169,7 +171,7 @@
<div class="ov" :class="n==1?'active':''">
<div>
<img src="../assets/niu.png" alt="">
<span>金牛（账户余额：20金牛）</span>
<span>金牛（账户余额:{{dfNiubi}}金牛）</span>
</div>
<!--未选中-->
<img src="../assets/noxuanzhong.png" alt="" class="Ig" v-show="n != 1" @click="slect_one(1)">
......@@ -214,6 +216,7 @@
</div>
<div class="gr"><img src="../assets/login.png" alt="" class="Pl" @click="login_t"></div>
<img :src="'data:image/png;base64,'+ qrcodeSrc" alt="" >
</div>
......@@ -338,11 +341,14 @@ export default {
currentIndex:0,
isMobile: false,
wechatInfo:'',
ispay:'',
aliInfo:'',
//is_show_p:false //默认选中按钮隐藏
// orderType : 4, //pc浏览器环境
// orderType : 3, //h5环境
wxOrderType: this.common.isMobile() && this.common.isWX() ? 2 : (this.common.isMobile() ? 3 : 4),
zfbOrderType: this.common.isMobile() && this.common.isWX() ? 2 : (this.common.isMobile() ? 3 : 4),
};
},
......@@ -418,6 +424,10 @@ export default {
console.log('销毁成功')
},
methods: {
// go:function(){
// this.$router.push({name:'mine'})
// },
clickOpen(i){
if(i==1){
this.ifcli=true
......@@ -722,11 +732,12 @@ let temp=this.qs.stringify({
pmAppVersion: 868,
// applicationType: 3,
goodsType:3,
goodsId:429,//285
goodsId:285,//285 429
})
this.server.live.payinfo(temp).then(res=>{
this.udRealname=res.data.data.udRealname
this.text=res.data.data.text,
this.dfNiubi = res.data.data.dfNiubi,
this.Listfor =res.data.data.fees
// this.lvrStatus=res.data.data.lvrStatus
......@@ -738,7 +749,7 @@ let temp=this.qs.stringify({
// 订单
payorder(){
let temp=this.qs.stringify({
goodsId:429,
goodsId:285,
goodsType:3,
sxUbId:26,
pmoType:0,
......@@ -765,8 +776,105 @@ let temp=this.qs.stringify({
}else{
}
if(this.n ==1 ){
this.niubi()
}
if(this.n ==2 ){
this.paybuy()
}
if(this.n == 3){
this.z_pay()
}
}
})
},
niubi(){
//判断在微信内置浏览器jsapi支付
//jsapi
let temp=this.qs.stringify({
orderId:this.pmoId,
orderNo:this.pmoOrder,
payType:0,
orderType: this.zfbOrderType,
pmoType:0,
goodsType:3,
aliOrderType:1
})
this.server.live.buy(temp).then(res=>{
if(res.data.data.businessCode == 10){
alert('支付成功')
// window.location.href="/live"
}if(res.data.data.businessCode == 30){
alert('您已经购买，请查看')
}
this.aliInfo=res.data.data.aliInfo;
// this.wechatInfo=res.data.data.wechatInfo
//微信内置jsapi
if(this.wxOrderType == 2){
this.onBridgeReady();
}
//二维码
if(this.wxOrderType == 4){
//弹窗展示二维码
this.qrcodeSrc=res.data.data.wechatInfo.base64Img;
}
//移动端外部浏览器
if(this.wxOrderType == 3){
//跳转h5支付链接00 ll
// window.location.href=res.data.data.aliInfo;
}
})
},
//支付宝
z_pay(){
//判断在微信内置浏览器jsapi支付
//jsapi
let temp=this.qs.stringify({
orderId:this.pmoId,
orderNo:this.pmoOrder,
payType:2,
orderType: this.zfbOrderType,
pmoType:0,
goodsType:3,
aliOrderType:1
})
this.server.live.buy(temp).then(res=>{
this.aliInfo=res.data.data.aliInfo;
// this.wechatInfo=res.data.data.wechatInfo
//微信内置jsapi
if(this.wxOrderType == 2){
this.onBridgeReady();
}
//二维码
if(this.wxOrderType == 4){
//弹窗展示二维码
this.qrcodeSrc=res.data.data.wechatInfo.base64Img;
}
//移动端外部浏览器
if(this.wxOrderType == 3){
//跳转h5支付链接00 ll
window.location.href=res.data.data.aliInfo;
}
})
},
......@@ -793,6 +901,7 @@ let temp=this.qs.stringify({
this.qrcodeSrc=res.data.data.wechatInfo.base64Img;
this.wechatInfo=res.data.data.wechatInfo
//微信内置jsapi
if(this.wxOrderType == 2){
this.onBridgeReady();
......@@ -806,11 +915,13 @@ let temp=this.qs.stringify({
}
//移动端外部浏览器
if(this.wxOrderType == 3){
//跳转h5支付链接
//跳转h5支付链接00 ll
window.location.href=res.data.data.wechatInfo.payUrl
}
})
},
......@@ -857,6 +968,7 @@ let temp=this.qs.stringify({
},
slect_one(val){
this.n = val
},
pay_p(){
this.pten = true
......
src/views/mine/about.vue
View file @ 0f4def94
<template>
<div class="abont">
<div>关于我们</div>
<img src="../../assets/left.png" alt="" class="Lent_p" @click="go">
<div class="abt">关于我们</div>
<img src="../../assets/about.png" alt="">
</div>
</template>
......@@ -16,6 +18,10 @@ export default {
this.beforeCreate()
},
methods: {
go:function(){
this.$router.push({name:'mine'})
},
beforeCreate () {
document.querySelector('body').setAttribute('style', 'background-color:rgba(247, 247, 247, 1);')
},
......@@ -37,5 +43,18 @@ export default {
font-weight: 600;
color: #222222;
line-height: 22px;
position: relative;
}
.Lent_p{
width: 5.93333vw;
height: 5.33333vw;
position: absolute;
top: 1.06667vw;
left: 10px;
}
.abt{
margin-bottom: 20px;
}
</style>
src/views/mine/browse.vue
View file @ 0f4def94
This diff is collapsed.
src/views/mine/follow.vue
View file @ 0f4def94
<template>
<div class="flow">
<div class="sent">我的关注</div>
<div class="cont">
<div class="Img_p">
<img src="../../assets/toux.png" alt="">
<img src="../../assets/y.png" alt="" class="Y_p">
<img src="../../assets/left.png" alt="" class="Lent_p" @click="go">
<div class="brow">我的关注</div>
<div class="Pelo">
<div>林秋平</div>
<div class="wen">这是一段文字</div>
</div>
</div>
<div>
<img src="../../assets/vit.png" alt="" class="Y_two">
<div class="Flor" v-for="(item,index) in List_p" :key="index">
<div style="display:flex">
<img :src="item.udPhotoFileidNew" alt="" class="Pong">
<div class="name">
<div>{{item.udNickname}}</div>
<div class="Ti">{{item.udSxMemo}}</div>
</div>
</div>
<div class="cont">
<div class="Img_p">
<img src="../../assets/toux.png" alt="">
<img src="../../assets/y.png" alt="" class="Y_p">
<div class="J_go">
<div class="Pelo">
<div>林秋平</div>
<div class="wen">这是一段文字</div>
<img v-if='item.ifFllow==true' src="../../assets/vit.png" alt="" class="Img_s" @click="fotwo(index)" >
<img v-if='item.ifFllow==false' src="../../assets/follow.png" alt="" class="Img_s" @click="fo(index)" >
</div>
</div>
<div>
<img src="../../assets/vit.png" alt="" class="Y_two">
</div>
</div>
</div>
</template>
<script type="text/ecmascript-6">
import { shallowReactive } from 'vue'
export default {
data () {
return {}
return {
isactive:false,
isactiveTwo:true,
List_p:[],
lvrUbId :''
}
},
created () { },
mounted () {
this.beforeCreate()
this.getFollowAnchor()
// this.beforeCreate()
},
methods: {
fotwo:function(e){
this.List_p[e].ifFllow=false
this.isactiveTwo = false;
this.isactive = true;
this.followAnchor()
},
fo:function(e){
this.List_p[e].ifFllow=true
this.isactiveTwo = true;
this.isactive = false;
this.followAnchor()
},
go:function(){
this.$router.push({name:'mine'})
},
followAnchor(){
this.lvrUbId=localStorage.getItem('lvrUbId');//直播id
console.log(this.lvrUbId,'-=----------------')
let temp=this.qs.stringify({
lvrUbId:this.lvrUbId,
type:1,
applicationType:4
})
this.server.live.followAnchor(temp).then(res=>{
})
},
getFollowAnchor(){
let temp=this.qs.stringify({
// lvrUbId:26,
// type:1,
// applicationType:4
})
this.server.live.getFollowAnchor(temp).then(res=>{
let list=res.data.data.list
list.forEach(i => {
i.ifFllow=true
});
this.List_p= list
console.log(this.lvrUbId,'-=----------------')
})
},
beforeCreate () {
document.querySelector('body').setAttribute('style', 'background-color:#F7F7F7;')
document.querySelector('body').setAttribute('style', 'background-color:rgba(247, 247, 247, 1);')
},
beforeDestroy () {
document.querySelector('body').removeAttribute('style')
}
},
components: {}
}
}
</script>
<style scoped>
.flow .sent{
text-align: center;
margin-top: 5.33333vw;
font-size: 4.26667vw;
body{
width: 100%;
height: 100%;
background-color: #9c8888;
position: fixed;
}
.J_go{
line-height: 90px;
}
.Img_s{
width: 64px;
height: 23px;
margin-right: 15px;
}
.Lent_p{
width: 5.93333vw;
height: 5.33333vw;
position: absolute;
top: 6.06667vw;
}
.brow{
text-align:center;
margin-top: 10px;
font-size: 16px;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
position: relative;
color: #222222;
justify-content: space-around;
}
.cont .Img_p img{
line-height: 22px;
}
.time{
font-size: 4.26667vw;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
color: #2C2C2C;
line-height: 5.86667vw;
margin-left: 20px;
}
.timetwo{
font-size: 4.26667vw;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
color: #2C2C2C;
line-height: 5.86667vw;
margin-left: 5.33333vw;
margin-top: 20px;
}
.Pong{
width: 64px;
padding-right: 10px;
height: 64px;
padding-top: 12px;
}
.cont{
}
.Flor{
display: flex;
justify-content: space-around;
margin-top: 9.33333vw;
justify-content:space-between;
margin-left: 8.26667vw;
margin-top: 8.26667vw;
background: #FFFFFF;
width: 90.4vw;
height: 26.66667vw;
padding-top: 5.33333vw;
margin: 0 auto;
margin-top: 5.33333vw;
background: #ffffff;
}
.cont .Img_p .Y_p{
width: 11.73333vw;
height: 5.6vw;
position: absolute;
left: 2.2vw;
top: 14.4vw;
padding-left: 5.33333vw;
margin-top: 8.66667vw;
}
.Img_p{
display: flex;
position: relative;
}
.cont .Y_two{
width: 64px;
height: 23px;
margin-top: 9vw;
}
.Pelo{
margin-top: 5.66667vw;
margin-left: 10px;
.name div{
height: 22px;
font-size: 16px;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: #2C2C2C;
}
.Pelo .wen{
margin-top: 10px;
font-size: 12px;
.name .Ti{
font-size: 3.73333vw;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #656565;
line-height: 17px;
}
color: #666666;
line-height: 5.33333vw;
overflow: hidden;
height: 61px;
/* color: #999999; */
font-size: 24rpx;
text-overflow: ellipsis;
z-index: -1;
display: -webkit-box;
word-break: break-all;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3;
}
</style>
src/views/mine/index.vue
View file @ 0f4def94
......@@ -3,7 +3,7 @@
<div>
<div class="Plog">
<div>
<img class="portait-not" src="../../assets/title_logo.png" alt="">
<img class="portait-not" :src="avatar" alt="">
</div>
<div class="Login">
<span>登录</span><span>/注册</span>
......@@ -16,15 +16,15 @@
<div class="grounp_p">
<div class="grounp">
<span>*****</span>
<span>{{todayJifen}}</span>
<div>今日积分</div>
</div>
<div class="grounp">
<span>*****</span>
<span>{{totalJifen}} </span>
<div>累计积分</div>
</div>
<div class="grounp">
<span>*****</span>
<span>{{totalNiubi}}</span>
<div>我的金牛</div>
</div>
......@@ -84,14 +84,51 @@
export default {
data () {
return {
url:'https://activity.douniu8.com/yinsizhengce/html/privacy.html'
url:'https://activity.douniu8.com/yinsizhengce/html/privacy.html',
totalNiubi:'',
totalJifen:'',
todayJifen:'',
userInfo:'',
avatar:''
}
},
created () { },
mounted () {
this.beforeCreate()
// 调用判断ios与安卓方法
// this.appDown();
this.userCenter()
},
methods: {
// 判断是安卓还是ios
// appDown() {
// var u = navigator.userAgent;
// var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
// var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
// if(isiOS){
// this.isApple = true
// window.location.href="https://itunes.apple.com/cn/app/%E6%96%97%E7%89%9B%E8%B4%...8F/id1262900139?mt=8"
// }else if(isAndroid){
// this.isApple = false
// }
// },
userCenter(){
let temp=this.qs.stringify({
})
this.server.live.userCenter(temp).then(res=>{
if(res.code=200){
console.log(res.data.data.totalNiubi,'ppp')
this.totalNiubi = res.data.data.totalNiubi
// this.totalJifen = res.data.data.totalJifen
// this.todayJifen = res.data.data.todayJifen
this.avatar = res.data.data.userInfo.avatar
}
})
},
beforeCreate () {
document.querySelector('body').setAttribute('style', 'background-color:rgba(247, 247, 247, 1);')
},
......
src/views/mine/proposal.vue
View file @ 0f4def94
This diff is collapsed.
src/views/password.vue
View file @ 0f4def94
......@@ -162,6 +162,14 @@ export default {
this.go_get()
},
// // 通过域名返回对应接口路径
// getPath() {
// if (window.location.host.split('.')[0] == 'localhost:8080') {
// return 'web'
// } else {
// return window.location.host.split('.')[0];
// }
// },
getLive(){
let temp=this.qs.stringify({
pmAppVersion:884,
......@@ -203,19 +211,15 @@ export default {
})
},
go_get(){
let temp=this.qs.stringify({
let temp=this.qs.stringify({
urlTag:'nh5'
})
this.server.live.buy_code(temp).then(res=>{
//order成功判断内置浏览器，在微信就授权，内置微信还是浏览器 微信jsapi 浏览器h5
if(res.code=200){
//判断是否为在微信内置浏览器支付
if(this.common.isWX()){
}else{
}
// window.location.href=''
}
})
......
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