解决冲突 package-lock 和package.json

package.json

@@ -13,6 +13,7 @@
     "axios": "^1.1.3",
     "core-js": "^3.8.3",
     "element-ui": "^2.15.12",
+    "html2canvas": "^1.4.1",
     "jquery": "^3.6.1",
     "js-md5": "^0.7.3",
     "mint-ui": "^2.2.13",

src/axios/api.js

@@ -45,6 +45,10 @@ live: {
     tourist:function(data){
         return service.post('/auth/tourist', data)
     },
+    //关注接口
+    follow:function(data){
+        return service.post('/app/live/followAnchor', data)
+    },
     //更新试看时间
     updataTime:function(data){
         return service.post('/oapi/v1/H5/live/update/duration', data)

src/axios/request.js

@@ -9,9 +9,9 @@ const appName = "test5"
 
 const IS_PROD = ["production", "prod"].includes(process.env.NODE_ENV);
 // 接口路径
-const BASEURL_TEST = 'https://api.douniu8.com'
+const BASEURL_TEST = 'https://test6.douniu8.com'
 // const BASEURL_TEST = 'http://39.105.193.58:8081'
-const BASEURL_PROD = 'https://api.douniu8.com'
+const BASEURL_PROD = 'https://test6.douniu8.com'
 const CONTRACT_TEST = 'http://47.95.140.89:9090'
 const CONTRACT_PROD = 'http://ht.douniu8.com:9090'
 const baseURL =  IS_PROD ? BASEURL_PROD : BASEURL_TEST;

src/router/index.js

 import Vue from 'vue'
 import Router from 'vue-router'
 import store from '../store/index'
+import test from '../views/test.vue'
 import sign from '../views/sign'
 import password from '../views/password'
 import register from '../views/register'
@@ -27,7 +28,7 @@ Vue.use(Router)
 const  router = new Router({
   routes:[
     {
-      path: '/',
+      path: '/login',
       name: 'index',
       component: password,
       meta: {
@@ -54,7 +55,12 @@ const  router = new Router({
       component:sign,
       // 判断是否需要登录
     },
-   
+    {
+      path: '/test',
+      name: 'test',
+      component:test,
+      // 判断是否需要登录
+    },
     {
         path: '/password',
         name: 'password',
@@ -86,7 +92,7 @@ const  router = new Router({
 
       },
       {
-        path: '/list',
+        path: '/',
         name: 'list',
         component: list,
 

src/views/liveList.vue

@@ -4,7 +4,7 @@
              <span>斗牛财经</span> 
             <img v-if="ifLog==0" class="portait-not" src="../common/img/not-logged.png" alt="">
             <img v-if="ifLog==1" class="portait-not" src="../common/img/title_logo.png" alt="" @click="mine">
-            <img v-if="ifLog==2" class="portait-not" :src="userImg" alt="">
+            <img v-if="ifLog==2" class="portait-not" :src="userImg" alt="" @click="mine">
         </div>
         <div class="tab">
             <span :class="{free:ifFree,nonefree:!ifFree}" @click="clickFree()">免费</span>
@@ -13,9 +13,9 @@
         <div class="content">
             <div v-if="ifFree" @click="liveDetail(i)" v-for="i in freeList" :key="i.lvrId" class="moudle" >
                 <img class="recommed-img" v-if="i.ifrecom" src="../common/img/recommend.png" alt="">
-                <img class="head-img" src="../common/img/wechact.png" alt="">
+                <img class="head-img" :src="i.headPhoto" alt="">
                 <span class="head-name">{{i.udNickname}}</span>
-                <img class="count-img" src="https://customer-img.douniu8.com/1665380604617GPdvMCWnMN.jpg" alt="">
+                <img class="count-img" :src="i.imgLargeUrl" alt="">
                 <img class="liv-img" v-if="i.lvrStatus==1"  src="../common/img/living.png" alt="">
                 <span class="title-message">{{i.lvrName}}</span>
                 <img class="people-img" src="../common/img/people-num.png" alt="">
@@ -24,9 +24,9 @@
             </div>
             <div v-if="!ifFree" @click="liveDetail(i)" v-for="i in vipList" :key="i.lvrId" class="moudle">
                 <img class="recommed-img" v-if="i.ifrecom" src="../common/img/recommend.png" alt="">
-                <img class="head-img" src="../common/img/wechact.png" alt="">
+                <img class="head-img" :src="i.headPhoto" alt="">
                 <span class="head-name">{{i.udNickname}}</span>
-                <img class="count-img" src="https://customer-img.douniu8.com/1665380604617GPdvMCWnMN.jpg" alt="">
+                <img class="count-img" :src="i.imgLargeUrl" alt="">
                 <!-- <img class="liv-img" v-if="ifFree" src="../common/img/living.png" alt=""> -->
                 <span class="title-message">{{i.lvrName}}</span>
                 <img class="people-img" src="../common/img/people-num.png" alt="">
@@ -54,11 +54,16 @@ export default {
             vipList:[]
         };
     },
-
+    created(){
+        this.getState()
+    },
+    
     mounted() {
         this.getRecommendList()
         this.getList()
-        this.getState()
+        
+//判断是否有主播Id
+        this.ifUbId()
     },
 
     methods: {
@@ -131,6 +136,7 @@ export default {
                 })
         },
         getState(){
+            
             let token=sessionStorage.getItem("token")
             let img=sessionStorage.getItem("udPhotoFileid")
             console.log("就阿婆啊v发",token)
@@ -140,6 +146,7 @@ export default {
                         this.userImg=img
                 }else{
                     this.ifLog=1
+                   
                 }
             }else{
                 
@@ -147,6 +154,37 @@ export default {
                 this.visitorLog()
             }
         },
+        //判断是否有主播Id
+        ifUbId(){
+            let data = sessionStorage.getItem('ifLvrUbId');
+            let token=sessionStorage.getItem("token")    
+            let img=sessionStorage.getItem("isReg")
+            if(token&&img){
+                if(data){
+                console.log("有主播Id")
+                let temp=this.qs.stringify({
+                   pmAppVersion:'884',
+                    pmModel:'iPhone 12/13 (Pro)',
+                    pmSystem:'iOS 10.0.1',
+                    pmMac:'1',
+                    pmIp:1,
+                    lvrUbId:data,
+                    applicationType:4,
+                    type:2,
+                    pmOperator:'无运营商'
+                })
+                
+            
+                this.server.live.follow(temp).then(res=>{
+                   
+                    
+                })
+            }else{
+                console.log("没有主播Id")
+            }
+            }
+            
+        },
         //游客登录
         visitorLog(){
             let temp=this.qs.stringify({
@@ -161,8 +199,8 @@ export default {
                 this.server.live.tourist(temp).then(res=>{
                     let thisToken= res.data.data.token
                      window.sessionStorage.setItem('token', thisToken);//token
-                   this.$router.go(0)
-            
+                //    this.$router.go(0)
+                    window.location.reload();            
                 })
         },
         mine(){

src/views/password.vue

@@ -17,8 +17,8 @@
             <span class="privacy"  @click="privacy()">《隐私政策》</span>
             <img class="default-img" v-if="ifSend==false" src="../common/img/default-img.png" alt="">
             <img class="default-img" v-if="ifSend==true" @click="goTo()" src="../common/img/new-send.png" alt="">
-            <span class="third">第三方登录</span>
-            <img class="wechact" src="../common/img/wechact.png" alt="" @click="Wget">
+            <!-- <span class="third">第三方登录</span> -->
+            <!-- <img class="wechact" src="../common/img/wechact.png" alt="" @click="Wget"> -->
             <span v-if="errorPhone==true" class="errorTip">*手机号码错误</span>
             <!-- <span class="registerOne">没有账号,</span><span class="registerTwo" @click="register()">立即注册</span>
             <input type="number" v-model="userPhone"  placeholder="输入手机号" oninput="if(value.length>11)value=value.slice(0,11)" class="wbk1">
@@ -60,7 +60,8 @@ export default {
     },
 
     mounted() {
-        
+        //获取是否有主播id
+        this.getUbId()
     },
 
     methods: {
@@ -217,13 +218,37 @@ export default {
                     this.server.live.buy_code(temp).then(res=>{
                     
                     //order成功判断内置浏览器，在微信就授权，内置微信还是浏览器  微信jsapi   浏览器h5    
-                   if(res.code=200){
-                    //  window.location.href=''
+                    console.log(res.data)
+                   if(res.data.code==200){
+                       let url=res.data.data
+                     window.location.href=url
                           
                    }
                 })
 
          },
+
+         //获取主播id以及判断是否微信登录
+         getUbId(){
+             
+             console.log("主播id",this.$route.query.lvrUbId)
+             if(this.$route.query.lvrUbId){
+                 window.sessionStorage.setItem('ifLvrUbId', this.$route.query.lvrUbId);//token
+                 let data = sessionStorage.getItem('ifLvrUbId');
+                 console.log("haha真是哈哈",data)
+             }else{
+                 console.log("阿斯蒂芬")
+                 sessionStorage.removeItem('ifLvrUbId');
+             }
+    if(this.$route.query.appid){
+        this.$router.push(
+                {
+                    path:'/',
+                    
+            });
+    }
+             
+         }
         
     },
 };