Commit d14f6453 by 程智春

云送礼海报

parent 83e55891
......@@ -16,7 +16,7 @@
<div class="logining-info" v-if="status">
<div class="info-left">
<div class="login-name text-overflow">{{liveInfo.title}}</div>
<div class="login-name text-overflow">{{liveInfo.shopName}}</div>
<div class="login-time">{{time}}</div>
</div>
......@@ -164,6 +164,7 @@ export default {
liveBroadcastState : val
}).then(res => {
if(res.data.code == '200'){
this.$set(this.liveInfo,'liveBroadcastState',2);
if(val == 2){
// console.log(this.queryDataTimer + '2222222')
console.log('over')
......@@ -176,6 +177,7 @@ export default {
this.$set(this.liveInfo,'boStream','')
this.$set(this.liveInfo,'tuiStream','')
wx.navigateTo({url:`../liveOver/main?id=${this.id}&liveInfo=${JSON.stringify(this.liveInfo)}`})
// wx.reLaunch({url:`../liveList/main`})
}
......@@ -219,6 +221,7 @@ export default {
display: flex;
justify-content: flex-start;
align-items: center;
padding-left: 2px;
}
height: 30px;
line-height: 30px;
......
......@@ -40,6 +40,7 @@
</div>
</div>
</div>
<van-divider customStyle="height:1px;margin:0"></van-divider>
</div>
</div>
......@@ -110,7 +111,7 @@ export default {
display: flex;
justify-content: space-between;
padding: 16px 16.5px;
border-bottom: 1px solid #EEEEED;
border-bottom: 1rpx solid #EEEEED;
position: relative;
.item-index{
position: absolute;
......
......@@ -137,16 +137,17 @@ export default {
if (querys[0] == "pid") {
//商品详情 pid_123
this.page = `/goods/${querys[1]}`;
if(querys.length > 3){
if(querys[5]){
this.params += `&spokesmanGroupId=${querys[2]}&spokesmanShopId=${querys[3]}&spokesmanRelId=${querys[4]}&userId=${querys[5]}`
}else{
this.params += `&spokesmanGroupId=${querys[2]}&spokesmanShopId=${querys[3]}&spokesmanRelId=${querys[4]}`
}
this.params += this.paramsHander(querys,3)
// if(querys.length > 3){
// if(querys[5]){
// this.params += `&spokesmanGroupId=${querys[2]}&spokesmanShopId=${querys[3]}&spokesmanRelId=${querys[4]}&userId=${querys[5]}`
// }else{
// this.params += `&spokesmanGroupId=${querys[2]}&spokesmanShopId=${querys[3]}&spokesmanRelId=${querys[4]}`
// }
}else if(querys.length == 3){
this.params += `&userId=${querys[2]}`
}
// }else if(querys.length == 3){
// this.params += `&userId=${querys[2]}`
// }
} else if (querys[0] == "activty") {
......@@ -155,32 +156,48 @@ export default {
} else if (querys[0] == "spokesman") {
//分销员 小程序码
this.page = `/personalCenter/spokesmanCenter`;
if(querys.length > 2){
if(querys[4]){
this.params += `&spokesmanGroupId=${querys[1]}&spokesmanShopId=${querys[2]}&spokesmanRelId=${querys[3]}&userId=${querys[4]}`
}else{
this.params += `&spokesmanGroupId=${querys[1]}&spokesmanShopId=${querys[2]}&spokesmanRelId=${querys[3]}`
}
this.params += this.paramsHander(querys,2)
// if(querys.length > 2){
// if(querys[4]){
// this.params += `&spokesmanGroupId=${querys[1]}&spokesmanShopId=${querys[2]}&spokesmanRelId=${querys[3]}&userId=${querys[4]}`
// }else{
// this.params += `&spokesmanGroupId=${querys[1]}&spokesmanShopId=${querys[2]}&spokesmanRelId=${querys[3]}`
// }
}else if(querys.length == 2){
this.params += `&userId=${querys[1]}`
}
// }else if(querys.length == 2){
// this.params += `&userId=${querys[1]}`
// }
}else if(querys[0] == "home"){
this.page = `/`;
if(querys.length > 2){
if(querys[4]){
this.params += `&spokesmanGroupId=${querys[1]}&spokesmanShopId=${querys[2]}&spokesmanRelId=${querys[3]}&userId=${querys[4]}`
}else{
this.params += `&spokesmanGroupId=${querys[1]}&spokesmanShopId=${querys[2]}&spokesmanRelId=${querys[3]}`
}
this.params += this.paramsHander(querys,2)
// if(querys.length > 2){
// if(querys[4]){
// this.params += `&spokesmanGroupId=${querys[1]}&spokesmanShopId=${querys[2]}&spokesmanRelId=${querys[3]}&userId=${querys[4]}`
// }else{
// this.params += `&spokesmanGroupId=${querys[1]}&spokesmanShopId=${querys[2]}&spokesmanRelId=${querys[3]}`
// }
}else if(querys.length == 2){
this.params += `&userId=${querys[1]}`
}
// }else if(querys.length == 2){
// this.params += `&userId=${querys[1]}`
// }
}else if(querys[0] == "coupon"){
this.page = `/personalCenter/coupon/getCoupon`;
this.params+=`&couponId=${querys[1]}`
}else if(querys[0] == "a"){
this.page = "/activty/receivingGift"
this.params += `&orderId=${querys[1]}`
this.params += this.paramsHander(querys,3)
// if(querys.length > 3){
// if(querys[5]){
// this.params += `&orderSn=${querys[1]}&spokesmanGroupId=${querys[2]}&spokesmanShopId=${querys[3]}&spokesmanRelId=${querys[4]}&userId=${querys[5]}`
// }else{
// this.params += `&orderSn=${querys[1]}&spokesmanGroupId=${querys[2]}&spokesmanShopId=${querys[3]}&spokesmanRelId=${querys[4]}`
// }
// }else if(querys.length == 3){
// this.params += `&orderSn=${querys[1]}&userId=${querys[2]}`
// }
}
}
console.log(querys, "scene");
......@@ -305,6 +322,23 @@ export default {
}
}
return false;
},
//增加params参数
paramsHander(querys,midNum){
let params = ''
if(querys.length > midNum){
if(querys[midNum + 2]){
params += `&spokesmanGroupId=${querys[midNum - 1]}&spokesmanShopId=${midNum}&spokesmanRelId=${midNum+1}&userId=${querys[midNum+2]}`
}else{
params += `&spokesmanGroupId=${querys[midNum - 1]}&spokesmanShopId=${querys[midNum]}&spokesmanRelId=${querys[midNum+1]}`
}
}else if(querys.length == midNum){
params += `&userId=${querys[midNum - 1]}`
}
return params;
}
},
onUnload() {
......
{
"navigationStyle":"custom",
"usingComponents": {
"van-popup": "/static/vant/popup/index"
"van-popup": "/static/vant/popup/index",
"van-divider": "/static/vant/divider/index"
}
}
\ No newline at end of file
......@@ -13,7 +13,7 @@
<div class="history-wrap">
<div class="history-box" @click="toHistory">
<img class="history-img" src="../../../static/images/history.png" alt="">
<img class="history-img" src="../../../static/images/lishi.png" alt="">
<span class="history-text">直播历史</span>
</div>
......@@ -455,7 +455,7 @@ export default {
background-color: white;
display: flex;
justify-content: flex-end;
border-top: 1px solid #efefef;
border-top: 1rpx solid #efefef;
box-sizing: border-box;
.history-box{
width: 40%;
......@@ -466,13 +466,13 @@ export default {
justify-content: flex-end;
align-items: center;
.history-img{
width: 21px;
height: 21px;
margin-right: 6px;
width: 16px;
height: 16px;
margin-right: 4.5px;
}
.history-text{
font-size: 16px;
color: #666;
font-size: 15px;
color: #333333;
}
}
......
{
"enablePullDownRefresh":true,
"navigationBarTitleText":"直播计划"
"navigationBarTitleText":"直播计划",
"usingComponents": {
"van-divider": "/static/vant/divider/index"
}
}
\ No newline at end of file
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