Skip to content

N
newLive
Commit 0a12ce10 authored by jiaoyahui's avatar jiaoyahui
Browse files
Options

Merge branch 'master' into newlive_jyh

parents 5090e061 aa32dd43
Show whitespace changes
Inline Side-by-side
Showing with 110 additions and 94 deletions
package-lock.json
View file @ 0a12ce10
...@@ -10655,9 +10655,9 @@ ...@@ -10655,9 +10655,9 @@
"dev": true "dev": true
}, },
"vue-video-player": { "vue-video-player": {
"version": "5.0.2", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/vue-video-player/-/vue-video-player-5.0.2.tgz", "resolved": "https://registry.npmjs.org/vue-video-player/-/vue-video-player-5.0.1.tgz",
"integrity": "sha512-IZXeRGGSX4YIp54G0Q5cB7iqh6Ok6Dpa2jRkjdyvMWw7MShJuh54/d5QNb1CZ+CvZUzX/TH7osnpir7mBNcFvQ==", "integrity": "sha512-8p+WrMH8wTPbTkBsILeRELAocDeC3oCzuBI9Zpk3B8fQcSFh6Bvz461J22sx0dU+Bsk6sLWvIU/Cc52A8v1rSg==",
"requires": { "requires": {
"object-assign": "^4.1.1", "object-assign": "^4.1.1",
"video.js": "^6.6.0", "video.js": "^6.6.0",
......
package.json
View file @ 0a12ce10
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
"vue-pdf": "^4.3.0", "vue-pdf": "^4.3.0",
"vue-qr": "^4.0.9", "vue-qr": "^4.0.9",
"vue-router": "^3.5.2", "vue-router": "^3.5.2",
"vue-video-player": "^5.0.2", "vue-video-player": "^5.0.1",
"vuex": "^4.1.0" "vuex": "^4.1.0"
}, },
"devDependencies": { "devDependencies": {
......
src/axios/request.js
View file @ 0a12ce10
...@@ -9,9 +9,9 @@ const appName = "test5" ...@@ -9,9 +9,9 @@ const appName = "test5"
const IS_PROD = ["production", "prod"].includes(process.env.NODE_ENV); 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_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_TEST = 'http://47.95.140.89:9090'
const CONTRACT_PROD = 'http://ht.douniu8.com:9090' const CONTRACT_PROD = 'http://ht.douniu8.com:9090'
const baseURL = IS_PROD ? BASEURL_PROD : BASEURL_TEST; const baseURL = IS_PROD ? BASEURL_PROD : BASEURL_TEST;
......
src/store/index.js
View file @ 0a12ce10
...@@ -6,11 +6,11 @@ import Vuex from 'vuex' ...@@ -6,11 +6,11 @@ import Vuex from 'vuex'
// 获取随机数 // 获取随机数
// function getRandom(){ // function getRandom(){
// if(window.sessionStorage.getItem('random')){ // if(window.localStorage.getItem('random')){
// return window.sessionStorage.getItem('random'); // return window.localStorage.getItem('random');
// }else{ // }else{
// var random = (new Date()).valueOf() + common.randomString(5); // var random = (new Date()).valueOf() + common.randomString(5);
// window.sessionStorage.setItem('random', random); // window.localStorage.setItem('random', random);
// return random; // return random;
// } // }
// } // }
...@@ -18,47 +18,47 @@ import Vuex from 'vuex' ...@@ -18,47 +18,47 @@ import Vuex from 'vuex'
Vue.use(Vuex) Vue.use(Vuex)
// 初始化时用sessionStore.getItem('token'),这样子刷新页面就无需重新登录 // 初始化时用sessionStore.getItem('token'),这样子刷新页面就无需重新登录
const state = { const state = {
ID: window.sessionStorage.getItem('ID'), ID: window.localStorage.getItem('ID'),
user: window.sessionStorage.getItem('user'), user: window.localStorage.getItem('user'),
admitPath: JSON.parse(window.sessionStorage.getItem('admitPath')), //菜单路由 admitPath: JSON.parse(window.localStorage.getItem('admitPath')), //菜单路由
addPath: JSON.parse(window.sessionStorage.getItem('addPath')), //新增路由 addPath: JSON.parse(window.localStorage.getItem('addPath')), //新增路由
routeList: JSON.parse(window.sessionStorage.getItem('routeList')), routeList: JSON.parse(window.localStorage.getItem('routeList')),
// random: getRandom(), //图片验证码随机数 // random: getRandom(), //图片验证码随机数
token: window.sessionStorage.getItem('token'), token: window.localStorage.getItem('token'),
refreshToken: window.sessionStorage.getItem('refreshToken'), refreshToken: window.localStorage.getItem('refreshToken'),
contractToken: window.sessionStorage.getItem('contractToken'), contractToken: window.localStorage.getItem('contractToken'),
contractRefreshToken: window.sessionStorage.getItem('contractRefreshToken'), contractRefreshToken: window.localStorage.getItem('contractRefreshToken'),
} }
const mutations = { const mutations = {
//将token保存到sessionStorage里，token表示登陆状态 //将token保存到localStorage里，token表示登陆状态
SET_TOKEN: (state, data) => { SET_TOKEN: (state, data) => {
state.token = data; state.token = data;
window.sessionStorage.setItem('token', data); window.localStorage.setItem('token', data);
}, },
// 刷新token // 刷新token
SET_REFRESH_TOKEN: (state, data) => { SET_REFRESH_TOKEN: (state, data) => {
state.refreshToken = data; state.refreshToken = data;
window.sessionStorage.setItem('refreshToken', data); window.localStorage.setItem('refreshToken', data);
}, },
//合同token //合同token
SET_CONTRACT_TOKEN: (state, data) => { SET_CONTRACT_TOKEN: (state, data) => {
state.contractToken = data; state.contractToken = data;
window.sessionStorage.setItem('contractToken', data); window.localStorage.setItem('contractToken', data);
}, },
// 合同刷新token // 合同刷新token
SET_CONTRACT_REFRESH_TOKEN: (state, data) => { SET_CONTRACT_REFRESH_TOKEN: (state, data) => {
state.contractRefreshToken = data; state.contractRefreshToken = data;
window.sessionStorage.setItem('contractRefreshToken', data); window.localStorage.setItem('contractRefreshToken', data);
}, },
// 设置路由列表 // 设置路由列表
SET_ROUTR_LIST: (state, data) => { SET_ROUTR_LIST: (state, data) => {
state.routeList=data; state.routeList=data;
window.sessionStorage.setItem('routeList', JSON.stringify(data)); window.localStorage.setItem('routeList', JSON.stringify(data));
}, },
// 设置可进入路由 // 设置可进入路由
SET_ADMIT_PATH: (state, data) => { SET_ADMIT_PATH: (state, data) => {
state.admitPath=data; state.admitPath=data;
window.sessionStorage.setItem('admitPath', JSON.stringify(data)); window.localStorage.setItem('admitPath', JSON.stringify(data));
}, },
// 添加可进入路由 // 添加可进入路由
ADD_ADMIT_PATH: (state, data) => { ADD_ADMIT_PATH: (state, data) => {
...@@ -73,7 +73,7 @@ const mutations = { ...@@ -73,7 +73,7 @@ const mutations = {
} }
temp.push(data); temp.push(data);
state.addPath=temp; state.addPath=temp;
window.sessionStorage.setItem('addPath', JSON.stringify(temp)); window.localStorage.setItem('addPath', JSON.stringify(temp));
}, },
// 删除可进入路由 // 删除可进入路由
DEL_ADMIT_PATH: (state, data) => { DEL_ADMIT_PATH: (state, data) => {
...@@ -85,15 +85,15 @@ const mutations = { ...@@ -85,15 +85,15 @@ const mutations = {
} }
} }
state.addPath=temp; state.addPath=temp;
window.sessionStorage.setItem('addPath', JSON.stringify(temp)); window.localStorage.setItem('addPath', JSON.stringify(temp));
}, },
//获取用户名 //获取用户名
SET_USER: (state, data) => { SET_USER: (state, data) => {
// 把用户名存起来 // 把用户名存起来
state.user = data.name; state.user = data.name;
state.ID = data.id; state.ID = data.id;
window.sessionStorage.setItem('user', data.name) window.localStorage.setItem('user', data.name)
window.sessionStorage.setItem('ID', data.id) window.localStorage.setItem('ID', data.id)
}, },
//登出 //登出
LOGOUT: (state) => { LOGOUT: (state) => {
...@@ -106,7 +106,7 @@ const mutations = { ...@@ -106,7 +106,7 @@ const mutations = {
state.refreshToken= null, state.refreshToken= null,
state.contractToken= null, state.contractToken= null,
state.contractRefreshToken= null, state.contractRefreshToken= null,
window.sessionStorage.clear(); window.localStorage.clear();
// if(callServer && callServer.state){ // if(callServer && callServer.state){
// callServer.logout(); //客服坐席登出 // callServer.logout(); //客服坐席登出
// } // }
......
src/views/fullScreen.vue
View file @ 0a12ce10
...@@ -304,7 +304,7 @@ export default { ...@@ -304,7 +304,7 @@ export default {
aspectRatio: '16:9', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"） aspectRatio: '16:9', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"）
fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。 fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
sources: [{ sources: [{
type: "video/mp4", // 类型 type: "application/x-mpegURL", // 类型
src: '' // url地址 src: '' // url地址
}], }],
poster: '', // 封面地址 poster: '', // 封面地址
...@@ -616,6 +616,8 @@ this.pten = false ...@@ -616,6 +616,8 @@ this.pten = false
}, },
//跳转登录页面 //跳转登录页面
jumpLogin(){ jumpLogin(){
let videoUrl=window.location.href
window.localStorage.setItem('videoUrl', videoUrl);
if(this.ifSignFollow==true){ if(this.ifSignFollow==true){
...@@ -650,7 +652,7 @@ this.pten = false ...@@ -650,7 +652,7 @@ this.pten = false
//获取token //获取token
getState(){ getState(){
let token=sessionStorage.getItem("token") let token=localStorage.getItem("token")
if(!token){ if(!token){
...@@ -671,7 +673,7 @@ this.pten = false ...@@ -671,7 +673,7 @@ this.pten = false
}) })
this.server.live.tourist(temp).then(res=>{ this.server.live.tourist(temp).then(res=>{
let thisToken= res.data.data.token let thisToken= res.data.data.token
window.sessionStorage.setItem('token', thisToken);//token window.localStorage.setItem('token', thisToken);//token
this.liveList() this.liveList()
this.videoList() this.videoList()
this.getHeight() this.getHeight()
...@@ -693,8 +695,8 @@ this.pten = false ...@@ -693,8 +695,8 @@ this.pten = false
type:1, type:1,
pmOperator:'无运营商' pmOperator:'无运营商'
}) })
let token=sessionStorage.getItem("token") let token=localStorage.getItem("token")
let img=sessionStorage.getItem("isReg") let img=localStorage.getItem("isReg")
this.server.live.follow(temp).then(res=>{ this.server.live.follow(temp).then(res=>{
if(res.data.code==200){ if(res.data.code==200){
...@@ -718,8 +720,8 @@ this.pten = false ...@@ -718,8 +720,8 @@ this.pten = false
applicationType:4, applicationType:4,
pmOperator:'无运营商' pmOperator:'无运营商'
}) })
let token=sessionStorage.getItem("token") let token=localStorage.getItem("token")
let img=sessionStorage.getItem("isReg") let img=localStorage.getItem("isReg")
this.server.live.follow(temp).then(res=>{ this.server.live.follow(temp).then(res=>{
if(res.data.code==200){ if(res.data.code==200){
...@@ -766,8 +768,8 @@ this.pten = false ...@@ -766,8 +768,8 @@ this.pten = false
}) })
this.server.live.setMessage(temp).then(res=>{ this.server.live.setMessage(temp).then(res=>{
// $('.tips').show().delay(3000).hide(300) // $('.tips').show().delay(3000).hide(300)
let name=sessionStorage.getItem("name") let name=localStorage.getItem("name")
let ubId=sessionStorage.getItem("ubId") let ubId=localStorage.getItem("ubId")
console.log("阿道夫",name) console.log("阿道夫",name)
console.log("撒旦给",ubId) console.log("撒旦给",ubId)
$('.tips').show().delay(3000).hide(300) $('.tips').show().delay(3000).hide(300)
...@@ -791,7 +793,7 @@ this.pten = false ...@@ -791,7 +793,7 @@ this.pten = false
// let thisToken= res.data.data.token // let thisToken= res.data.data.token
// window.sessionStorage.setItem('token', thisToken); // window.localStorage.setItem('token', thisToken);
// this.$router.push( // this.$router.push(
// { // {
// path:'/live', // path:'/live',
...@@ -825,8 +827,8 @@ this.pten = false ...@@ -825,8 +827,8 @@ this.pten = false
}, },
//获取直播详情接口 //获取直播详情接口
liveList(){ liveList(){
let token=sessionStorage.getItem("token") let token=localStorage.getItem("token")
let img=sessionStorage.getItem("isReg") let img=localStorage.getItem("isReg")
this.getState() this.getState()
let temp=this.qs.stringify({ let temp=this.qs.stringify({
pmAppVersion:'884', pmAppVersion:'884',
...@@ -992,7 +994,7 @@ this.pten = false ...@@ -992,7 +994,7 @@ this.pten = false
} }
// let thisToken= res.data.data.token // let thisToken= res.data.data.token
// window.sessionStorage.setItem('token', thisToken); // window.localStorage.setItem('token', thisToken);
// this.$router.push( // this.$router.push(
// { // {
// path:'/live', // path:'/live',
...@@ -1038,7 +1040,7 @@ let temp=this.qs.stringify({ ...@@ -1038,7 +1040,7 @@ let temp=this.qs.stringify({
} }
} }
// let thisToken= res.data.data.token // let thisToken= res.data.data.token
// window.sessionStorage.setItem('token', thisToken); // window.localStorage.setItem('token', thisToken);
// this.$router.push( // this.$router.push(
// { // {
// path:'/live', // path:'/live',
......
src/views/live.vue
View file @ 0a12ce10
...@@ -322,7 +322,7 @@ export default { ...@@ -322,7 +322,7 @@ export default {
aspectRatio: '16:9', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"） aspectRatio: '16:9', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"）
fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。 fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
sources: [{ sources: [{
type: "video/mp4", // 类型 type: "application/x-mpegURL", // 类型
src: '' // url地址 src: '' // url地址
}], }],
poster: '', // 封面地址 poster: '', // 封面地址
...@@ -473,8 +473,8 @@ export default { ...@@ -473,8 +473,8 @@ export default {
pmOperator:'无运营商' pmOperator:'无运营商'
}) })
this.server.live.setMessage(temp).then(res=>{ this.server.live.setMessage(temp).then(res=>{
let name=sessionStorage.getItem("name") let name=localStorage.getItem("name")
let ubId=sessionStorage.getItem("ubId") let ubId=localStorage.getItem("ubId")
console.log("阿道夫",name) console.log("阿道夫",name)
console.log("撒旦给",ubId) console.log("撒旦给",ubId)
$('.tips').show().delay(3000).hide(300) $('.tips').show().delay(3000).hide(300)
...@@ -498,7 +498,7 @@ export default { ...@@ -498,7 +498,7 @@ export default {
// let thisToken= res.data.data.token // let thisToken= res.data.data.token
// window.sessionStorage.setItem('token', thisToken); // window.localStorage.setItem('token', thisToken);
// this.$router.push( // this.$router.push(
// { // {
// path:'/live', // path:'/live',
...@@ -531,8 +531,8 @@ export default { ...@@ -531,8 +531,8 @@ export default {
applicationType:4, applicationType:4,
pmOperator:'无运营商' pmOperator:'无运营商'
}) })
let token=sessionStorage.getItem("token") let token=localStorage.getItem("token")
let img=sessionStorage.getItem("isReg") let img=localStorage.getItem("isReg")
this.server.live.follow(temp).then(res=>{ this.server.live.follow(temp).then(res=>{
if(res.data.code==200){ if(res.data.code==200){
...@@ -557,8 +557,8 @@ export default { ...@@ -557,8 +557,8 @@ export default {
applicationType:4, applicationType:4,
pmOperator:'无运营商' pmOperator:'无运营商'
}) })
let token=sessionStorage.getItem("token") let token=localStorage.getItem("token")
let img=sessionStorage.getItem("isReg") let img=localStorage.getItem("isReg")
this.server.live.follow(temp).then(res=>{ this.server.live.follow(temp).then(res=>{
if(res.data.code==200){ if(res.data.code==200){
...@@ -571,7 +571,8 @@ export default { ...@@ -571,7 +571,8 @@ export default {
}, },
//跳转登录页面 //跳转登录页面
jumpLogin(){ jumpLogin(){
let videoUrl=window.location.href
window.localStorage.setItem('videoUrl', videoUrl);
this.$router.push( this.$router.push(
{ {
path:'/login', path:'/login',
...@@ -622,8 +623,8 @@ export default { ...@@ -622,8 +623,8 @@ export default {
pmOperator:'无运营商', pmOperator:'无运营商',
applicationType:4 applicationType:4
}) })
let token=sessionStorage.getItem("token") let token=localStorage.getItem("token")
let img=sessionStorage.getItem("isReg") let img=localStorage.getItem("isReg")
if(!token){ if(!token){
this.buttonType=0 this.buttonType=0
...@@ -696,7 +697,7 @@ export default { ...@@ -696,7 +697,7 @@ export default {
// let thisToken= res.data.data.token // let thisToken= res.data.data.token
// window.sessionStorage.setItem('token', thisToken); // window.localStorage.setItem('token', thisToken);
// this.$router.push( // this.$router.push(
// { // {
// path:'/live', // path:'/live',
...@@ -740,7 +741,7 @@ let temp=this.qs.stringify({ ...@@ -740,7 +741,7 @@ let temp=this.qs.stringify({
} }
} }
// let thisToken= res.data.data.token // let thisToken= res.data.data.token
// window.sessionStorage.setItem('token', thisToken); // window.localStorage.setItem('token', thisToken);
// this.$router.push( // this.$router.push(
// { // {
// path:'/live', // path:'/live',
...@@ -1078,6 +1079,7 @@ this.pten = false ...@@ -1078,6 +1079,7 @@ this.pten = false
line-height: 2em !important; line-height: 2em !important;
margin-top: -1em !important; margin-top: -1em !important;
} }
</style> </style>
<style scoped> <style scoped>
......
src/views/liveList.vue
View file @ 0a12ce10
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<img class="head-img" :src="i.headPhoto" alt=""> <img class="head-img" :src="i.headPhoto" alt="">
<span class="head-name">{{i.udNickname}}</span> <span class="head-name">{{i.udNickname}}</span>
<img class="count-img" :src="i.imgLargeUrl" alt=""> <img class="count-img" :src="i.imgLargeUrl" alt="">
<img class="liv-img" v-if="i.lvrStatus==1" src="../common/img/living.png" alt=""> <img class="liv-img" v-if="i.lvrStatus==1" src="../common/img/living.gif" alt="">
<span class="title-message">{{i.lvrName}}</span> <span class="title-message">{{i.lvrName}}</span>
<img class="people-img" src="../common/img/people-num.png" alt=""> <img class="people-img" src="../common/img/people-num.png" alt="">
<span class="people-num">{{i.hotNum}}</span> <span class="people-num">{{i.hotNum}}</span>
...@@ -138,8 +138,8 @@ export default { ...@@ -138,8 +138,8 @@ export default {
}, },
getState(){ getState(){
let token=sessionStorage.getItem("token") let token=localStorage.getItem("token")
let img=sessionStorage.getItem("udPhotoFileid") let img=localStorage.getItem("udPhotoFileid")
console.log("就阿婆啊v发",token) console.log("就阿婆啊v发",token)
if(token){ if(token){
if(img){ if(img){
...@@ -157,9 +157,9 @@ export default { ...@@ -157,9 +157,9 @@ export default {
}, },
//判断是否有主播Id //判断是否有主播Id
ifUbId(){ ifUbId(){
let data = sessionStorage.getItem('ifLvrUbId'); let data = localStorage.getItem('ifLvrUbId');
let token=sessionStorage.getItem("token") let token=localStorage.getItem("token")
let img=sessionStorage.getItem("isReg") let img=localStorage.getItem("isReg")
if(token&&img){ if(token&&img){
if(data){ if(data){
console.log("有主播Id") console.log("有主播Id")
...@@ -199,7 +199,7 @@ export default { ...@@ -199,7 +199,7 @@ export default {
}) })
this.server.live.tourist(temp).then(res=>{ this.server.live.tourist(temp).then(res=>{
let thisToken= res.data.data.token let thisToken= res.data.data.token
window.sessionStorage.setItem('token', thisToken);//token window.localStorage.setItem('token', thisToken);//token
// this.$router.go(0) // this.$router.go(0)
window.location.reload(); window.location.reload();
}) })
......
src/views/mine/browse.vue
View file @ 0a12ce10
...@@ -66,7 +66,7 @@ export default { ...@@ -66,7 +66,7 @@ export default {
}, },
methods: { methods: {
deleteLiveHistory(id){ deleteLiveHistory(id){
let token=sessionStorage.getItem("token") let token=localStorage.getItem("token")
console.log(id,'有没有id') console.log(id,'有没有id')
let temp=this.qs.stringify({ let temp=this.qs.stringify({
token:token, token:token,
...@@ -91,7 +91,7 @@ export default { ...@@ -91,7 +91,7 @@ export default {
}, },
getLiveHistory(){ getLiveHistory(){
let token=sessionStorage.getItem("token") let token=localStorage.getItem("token")
let temp=this.qs.stringify({ let temp=this.qs.stringify({
token:token, token:token,
applicationType:4 applicationType:4
......
src/views/mine/index.vue
View file @ 0a12ce10
...@@ -108,10 +108,10 @@ export default { ...@@ -108,10 +108,10 @@ export default {
}, },
mounted () { mounted () {
// let token=sessionStorage.getItem("token") // let token=localStorage.getItem("token")
// console.log(token,'===oooo') // console.log(token,'===oooo')
// sessionStorage.setItem("isReg") // localStorage.setItem("isReg")
if(!sessionStorage.getItem('isReg')){ if(!localStorage.getItem('isReg')){
this.Token_true=true; this.Token_true=true;
this.Token_truetwo=false this.Token_truetwo=false
......
src/views/mine/proposal.vue
View file @ 0a12ce10
...@@ -57,11 +57,11 @@ export default { ...@@ -57,11 +57,11 @@ export default {
uploadData:{ uploadData:{
token:sessionStorage.getItem("token"), token:localStorage.getItem("token"),
}, },
headers:{ headers:{
"Authorization": 'Bearer ' + sessionStorage.getItem("token") "Authorization": 'Bearer ' + localStorage.getItem("token")
}, },
test:'' , test:'' ,
dialogImageUrl: '', dialogImageUrl: '',
...@@ -248,7 +248,7 @@ export default { ...@@ -248,7 +248,7 @@ export default {
//签名 //签名
sigurature(){ sigurature(){
let token=sessionStorage.getItem("token") let token=localStorage.getItem("token")
console.log(token,'----') console.log(token,'----')
let temp=this.qs.stringify({ let temp=this.qs.stringify({
flag:11, flag:11,
......
src/views/password.vue
View file @ 0a12ce10
...@@ -145,10 +145,10 @@ export default { ...@@ -145,10 +145,10 @@ export default {
this.server.login.loginByPwd(temp).then(res=>{ this.server.login.loginByPwd(temp).then(res=>{
let thisToken= res.data.data.token let thisToken= res.data.data.token
let name=res.data.data.udNickname let name=res.data.data.udNickname
sessionStorage.setItem("name", name); localStorage.setItem("name", name);
let ubId=res.data.data.ubId let ubId=res.data.data.ubId
sessionStorage.setItem("ubId", ubId); localStorage.setItem("ubId", ubId);
window.sessionStorage.setItem('token', thisToken); window.localStorage.setItem('token', thisToken);
store.commit("SET_TOKEN", thisToken); store.commit("SET_TOKEN", thisToken);
// this.$router.push( // this.$router.push(
// { // {
...@@ -230,17 +230,21 @@ export default { ...@@ -230,17 +230,21 @@ export default {
//获取主播id以及判断是否微信登录 //获取主播id以及判断是否微信登录
getUbId(){ getUbId(){
let videoUrl=localStorage.getItem("videoUrl")
console.log("主播id",this.$route.query.lvrUbId) console.log("主播id",this.$route.query.lvrUbId)
if(this.$route.query.lvrUbId){ if(this.$route.query.lvrUbId){
window.sessionStorage.setItem('ifLvrUbId', this.$route.query.lvrUbId);//token window.localStorage.setItem('ifLvrUbId', this.$route.query.lvrUbId);//token
let data = sessionStorage.getItem('ifLvrUbId'); let data = localStorage.getItem('ifLvrUbId');
console.log("haha真是哈哈",data) console.log("haha真是哈哈",data)
}else{ }else{
console.log("阿斯蒂芬") console.log("阿斯蒂芬")
sessionStorage.removeItem('ifLvrUbId'); localStorage.removeItem('ifLvrUbId');
} }
if(this.$route.query.appid){ if(this.$route.query.appid){
if(videoUrl){
window.location.href = videoUrl
}else{
this.$router.push( this.$router.push(
{ {
path:'/', path:'/',
...@@ -250,6 +254,8 @@ export default { ...@@ -250,6 +254,8 @@ export default {
} }
}
}, },
}; };
</script> </script>
......
src/views/register.vue
View file @ 0a12ce10
...@@ -103,10 +103,10 @@ export default { ...@@ -103,10 +103,10 @@ export default {
let thisToken= res.data.data.token let thisToken= res.data.data.token
let name=res.data.data.udNickname let name=res.data.data.udNickname
let ubId=res.data.data.ubId let ubId=res.data.data.ubId
sessionStorage.setItem("ubId", ubId); localStorage.setItem("ubId", ubId);
sessionStorage.setItem("name", name); localStorage.setItem("name", name);
window.sessionStorage.setItem('token', thisToken); window.localStorage.setItem('token', thisToken);
store.commit("SET_TOKEN", thisToken); store.commit("SET_TOKEN", thisToken);
this.getLive() this.getLive()
// this.$router.push( // this.$router.push(
......
src/views/sign.vue
View file @ 0a12ce10
...@@ -381,14 +381,14 @@ export default { ...@@ -381,14 +381,14 @@ export default {
let ubId = res.data.data.ubId; let ubId = res.data.data.ubId;
let isReg = res.data.data.isReg; let isReg = res.data.data.isReg;
let openId = res.data.data.openId; let openId = res.data.data.openId;
sessionStorage.setItem("ubId", ubId); //用户id localStorage.setItem("ubId", ubId); //用户id
sessionStorage.removeItem("token"); localStorage.removeItem("token");
window.sessionStorage.setItem("token", thisToken); //token window.localStorage.setItem("token", thisToken); //token
window.sessionStorage.setItem("udPhotoFileid", udPhotoFileid); //头像 window.localStorage.setItem("udPhotoFileid", udPhotoFileid); //头像
sessionStorage.setItem("name", name); //用户昵称 localStorage.setItem("name", name); //用户昵称
sessionStorage.setItem("isReg", isReg); //是否注册 localStorage.setItem("isReg", isReg); //是否注册
sessionStorage.setItem("openId", openId); //opendid localStorage.setItem("openId", openId); //opendid
store.commit("SET_TOKEN", thisToken); store.commit("SET_TOKEN", thisToken);
// this.getLive() // this.getLive()
// this.go_get() // this.go_get()
...@@ -396,10 +396,16 @@ export default { ...@@ -396,10 +396,16 @@ export default {
if (this.isweixin) { if (this.isweixin) {
this.go_get(); this.go_get();
} else { } else {
let videoUrl=localStorage.getItem("videoUrl")
if(videoUrl){
window.location.href = videoUrl
}else{
this.$router.push({ this.$router.push({
path: "/", path: "/",
}); });
} }
}
}); });
}, },
getLive() { getLive() {
...@@ -499,9 +505,9 @@ export default { ...@@ -499,9 +505,9 @@ export default {
// let thisToken= res.data.data.token // let thisToken= res.data.data.token
// let name=res.data.data.udNickname // let name=res.data.data.udNickname
// let ubId=res.data.data.ubId // let ubId=res.data.data.ubId
// sessionStorage.setItem("ubId", ubId); // localStorage.setItem("ubId", ubId);
// window.sessionStorage.setItem('token', thisToken); // window.localStorage.setItem('token', thisToken);
// sessionStorage.setItem("name", name); // localStorage.setItem("name", name);
// store.commit("SET_TOKEN", thisToken); // store.commit("SET_TOKEN", thisToken);
// this.getLive() // this.getLive()
......
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