Commit 1b643ad2 authored by jiaoyahui's avatar jiaoyahui

解决冲突

parents 5c8342f3 6ee27c26
import Vue from 'vue' import Vue from 'vue'
import Router from 'vue-router' import Router from 'vue-router'
import store from '../store/index' import store from '../store/index'
import index from '../views/sign' import sign from '../views/sign'
import password from '../views/password' import password from '../views/password'
import register from '../views/register' import register from '../views/register'
import live from '../views/live' import live from '../views/live'
import pdf from '../views/pdf' import pdf from '../views/pdf'
import fullScreen from '../views/fullScreen' import fullScreen from '../views/fullScreen'
import list from '../views/liveList'
// import bullet from '../views/bullet' // import bullet from '../views/bullet'
...@@ -24,6 +25,9 @@ const router = new Router({ ...@@ -24,6 +25,9 @@ const router = new Router({
path: '/', path: '/',
name: 'index', name: 'index',
component: password, component: password,
path: '/login',
name: 'list',
component: list,
meta: { meta: {
requireAuth: true, requireAuth: true,
...@@ -36,7 +40,17 @@ const router = new Router({ ...@@ -36,7 +40,17 @@ const router = new Router({
component: index, component: index,
meta: { meta: {
requireAuth: true requireAuth: true
} // 判断是否需要登录 }, // 判断是否需要登录
path: '/',
name: 'password',
component: password,
// 判断是否需要登录
},
{
path: '/sign',
name: 'sign',
component:sign,
// 判断是否需要登录
}, },
// { // {
// path: '/', // path: '/',
......
<template>
<div>
直播列表页
</div>
</template>
<script>
export default {
name: 'NewliveLivelist',
data() {
return {
};
},
mounted() {
},
methods: {
},
};
</script>
<style scoped>
</style>
\ No newline at end of file
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
this.ifRed=false this.ifRed=false
this.$router.push( this.$router.push(
{ {
path:'/login', path:'/sign',
query:{phone:this.userPhone}, query:{phone:this.userPhone},
}); });
...@@ -109,7 +109,7 @@ export default { ...@@ -109,7 +109,7 @@ export default {
sign(){ sign(){
this.$router.push( this.$router.push(
{ {
path:'/login', path:'/sign',
}); });
}, },
......
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
<span class="registerOne">短信已发送至:</span> <span class="registerOne">短信已发送至:</span>
<span class="registerPhone">+86 {{userPhone}}</span> <span class="registerPhone">+86 {{userPhone}}</span>
<span class="registerTwo">手机验证码</span> <span class="registerTwo">手机验证码</span>
<input type="number" id="firstNumber" @blur="searchChangeTwo(0)" @focus="searchChange(0)" v-model="numberOne" oninput="if(value.length>1)value=value.slice(0,1)" :class="{wbk11:!ifRed0,wbkRed:ifRed0}"> <input type="number" id="firstNumber" @input="changeInput(0)" @blur="searchChangeTwo(0)" @focus="searchChange(0)" v-model="numberOne" oninput="if(value.length>1)value=value.slice(0,6)" :class="{wbk11:!ifRed0,wbkRed:ifRed0}">
<input type="number" id="secondNumber" @blur="searchChangeTwo(1)" style="left:20vw" @focus="searchChange(1)" v-model="numberTwo" oninput="if(value.length>1)value=value.slice(0,1)" :class="{wbk11:!ifRed1,wbkRed:ifRed1}"> <input type="number" id="secondNumber" @input="changeInput(1)" @blur="searchChangeTwo(1)" style="left:20vw" @focus="searchChange(1)" v-model="numberTwo" oninput="if(value.length>1)value=value.slice(0,1)" :class="{wbk11:!ifRed1,wbkRed:ifRed1}">
<input type="number" id="threeNumber" @blur="searchChangeTwo(2)" style="left:35vw" @focus="searchChange(2)" v-model="numberThree" oninput="if(value.length>1)value=value.slice(0,1)" :class="{wbk11:!ifRed2,wbkRed:ifRed2}"> <input type="number" id="threeNumber" @input="changeInput(2)" @blur="searchChangeTwo(2)" style="left:35vw" @focus="searchChange(2)" v-model="numberThree" oninput="if(value.length>1)value=value.slice(0,1)" :class="{wbk11:!ifRed2,wbkRed:ifRed2}">
<input type="number" id="fourNumber" @blur="searchChangeTwo(3)" style="left:50vw" @focus="searchChange(3)" v-model="numberFour" oninput="if(value.length>1)value=value.slice(0,1)" :class="{wbk11:!ifRed3,wbkRed:ifRed3}"> <input type="number" id="fourNumber" @input="changeInput(3)" @blur="searchChangeTwo(3)" style="left:50vw" @focus="searchChange(3)" v-model="numberFour" oninput="if(value.length>1)value=value.slice(0,1)" :class="{wbk11:!ifRed3,wbkRed:ifRed3}">
<input type="number" id="fiveNumber" @blur="searchChangeTwo(4)" style="left:65vw" @focus="searchChange(4)" v-model="numberFive" oninput="if(value.length>1)value=value.slice(0,1)" :class="{wbk11:!ifRed4,wbkRed:ifRed4}"> <input type="number" id="fiveNumber" @input="changeInput(4)" @blur="searchChangeTwo(4)" style="left:65vw" @focus="searchChange(4)" v-model="numberFive" oninput="if(value.length>1)value=value.slice(0,1)" :class="{wbk11:!ifRed4,wbkRed:ifRed4}">
<input type="number" id="sixNumber" @blur="searchChangeTwo(5)" style="left:80vw" @focus="searchChange(5)" v-model="numberSix" oninput="if(value.length>1)value=value.slice(0,1)" :class="{wbk11:!ifRed5,wbkRed:ifRed5}"> <input type="number" id="sixNumber" @input="changeInput(5)" @blur="searchChangeTwo(5)" style="left:80vw" @focus="searchChange(5)" v-model="numberSix" oninput="if(value.length>1)value=value.slice(0,1)" :class="{wbk11:!ifRed5,wbkRed:ifRed5}">
<img class="default-img" v-if="ifClick==false" src="../common/img/default-img.png" alt=""> <img class="default-img" v-if="ifClick==false" src="../common/img/default-img.png" alt="">
<img class="default-img" v-if="ifClick==true" @click="goTo()" src="../common/img/new-send.png" alt=""> <img class="default-img" v-if="ifClick==true" @click="goTo()" src="../common/img/new-send.png" alt="">
...@@ -92,6 +92,65 @@ export default { ...@@ -92,6 +92,65 @@ export default {
}); });
}, },
changeInput(e){
console.log("安抚",e)
if(e==0&&this.numberOne!=''){
console.log("哈哈")
document.getElementById('secondNumber').focus();
this.ifRed1=true
}else if(e==1&&this.numberTwo!=''){
document.getElementById('threeNumber').focus();
this.ifRed2=true
}else if(e==2&&this.numberThree!=''){
document.getElementById('fourNumber').focus();
this.ifRed3=true
}else if(e==3&&this.numberFour!=''){
document.getElementById('fiveNumber').focus();
this.ifRed4=true
}else if(e==4&&this.numberFive!=''){
document.getElementById('sixNumber').focus();
this.ifRed5=true
}else if(e==5&&this.numberSix!=''){
// document.getElementById('threeNumber').focus();
// this.ifRed5=true
this.ifClick=true
}
if(e==0&&this.numberOne.length==6){
let stmp=this.numberOne
console.log('啊',stmp.slice(1,2))
this.numberOne=stmp.slice(0,1)
this.numberTwo=stmp.slice(1,2)
this.numberThree=stmp.slice(2,3)
this.numberFour=stmp.slice(3,4)
this.numberFive=stmp.slice(4,5)
this.numberSix=stmp.slice(5,6)
document.getElementById('sixNumber').focus();
this.ifRed5=true
this.ifclick=true
}
// if(this.numberOne==''){
// document.getElementById('firstNumber').focus();
// this.ifRed0=true
// }else if(this.numberTwo==''){
// document.getElementById('secondNumber').focus();
// this.ifRed1=true
// }else if(this.numberThree==''){
// document.getElementById('threeNumber').focus();
// this.ifRed2=true
// }else if(this.numberFour==''){
// document.getElementById('fourNumber').focus();
// this.ifRed3=true
// }else if(this.numberFive==''){
// document.getElementById('fiveNumber').focus();
// this.ifRed4=true
// }
// else{
// this.ifRed5=true
// }
},
searchChange(e){ searchChange(e){
// let verification= this.numberOne +this.numberTwo+this.numberThree+this.numberFour+this.numberFive+this.numberSix // let verification= this.numberOne +this.numberTwo+this.numberThree+this.numberFour+this.numberFive+this.numberSix
// console.log("岸上观光",verification) // console.log("岸上观光",verification)
...@@ -173,6 +232,21 @@ export default { ...@@ -173,6 +232,21 @@ export default {
} }
} }
if(e==0&&this.numberOne.length==6){
let stmp=this.numberOne
console.log('啊',stmp.slice(1,2))
this.numberOne=stmp.slice(0,1)
this.numberTwo=stmp.slice(1,2)
this.numberThree=stmp.slice(2,3)
this.numberFour=stmp.slice(3,4)
this.numberFive=stmp.slice(4,5)
this.numberSix=stmp.slice(5,6)
document.getElementById('sixNumber').focus();
this.ifRed5=true
this.ifclick=true
}
// console.log("dss双方都是",this.userPhone) // console.log("dss双方都是",this.userPhone)
// if(this.userPhone &&this.ifCheck==true){ // if(this.userPhone &&this.ifCheck==true){
// this.ifSend=true // this.ifSend=true
...@@ -223,7 +297,12 @@ export default { ...@@ -223,7 +297,12 @@ export default {
window.sessionStorage.setItem('token', thisToken); window.sessionStorage.setItem('token', thisToken);
sessionStorage.setItem("name", name); sessionStorage.setItem("name", name);
store.commit("SET_TOKEN", thisToken); store.commit("SET_TOKEN", thisToken);
this.getLive() // this.getLive()
this.$router.push(
{
path:'/',
});
}) })
}, },
......
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