Merge branch 'master' into newlive_jyh

src/views/fullScreen.vue

@@ -559,6 +559,52 @@ this.pten = false
                 })
 
          },
+         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;
+                    }
+                
+                  
+                    
+                })
+
+         },
     //点击是否登录关注主播
     ifUcheck(e){
 
@@ -1086,11 +1132,11 @@ let temp=this.qs.stringify({
     z-index: 100;
 }
 .home-number{
-    font-size: 1vw;
-    transform: scale(0.75);
+    font-size: 3vw;
+    transform: scale(0.8);
     position: absolute;
     top: 6vw;
-    left: 18.5vw;
+    left: 18.9vw;
     z-index: 99;
     color: white;
 }

src/views/live.vue

@@ -1149,11 +1149,11 @@ this.pten = false
     z-index: 89;
 }
 .home-number{
-       font-size: 1vw;
-    transform: scale(0.75);
+       font-size: 3vw;
+    transform: scale(0.8);
     position: absolute;
     top: 63vw;
-    left: 59.5vw;
+    left: 59.9vw;
     z-index: 89;
     color: white;
 }