Commit 62a232d2 authored by huangyuanyuan's avatar huangyuanyuan

更新

parent 144d5760
......@@ -58,7 +58,7 @@
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" placement="bottom-start">
<span slot="content" v-for="(guest,index) in scope.row.guestList" :key="guest.name">{{guest.name}}<span v-if="index<scope.row.guestList.length-1"></span></span>
<p>
<p style="cursor:pointer">
<span v-for="(guest,index) in scope.row.guestList" :key="guest.name" >
<span v-if="index<3">{{guest.name}}<span v-if="index<scope.row.guestList.length-1"></span> </span></span>
<span v-if="scope.row.guestList.length>2"><span style="text-decoration:underline">{{scope.row.guestList.length}}</span></span>
......@@ -214,7 +214,7 @@ export default {
this.form.endTime=this.form.time[1];
}
this.apiJavaPost('/api/dmc/airticket/GetB2BAirtickOrderPageList',this.form,res=>{
// console.log(res);
console.log(res);
this.loading=false;
if(res.data.resultCode==1){
this.tableData=res.data.data.pageData;
......
......@@ -76,7 +76,8 @@
</div>
</el-col>
<el-col class="w31" :span="6">
<p style="padding-top:20px">
<div style="padding:0 6px">
<p style="padding-top:20px">
<span>订单金额</span>
<span style="float:right;color:#FF680B;font-size:20px">{{personNum.preferPrice}}</span>
</p>
......@@ -92,6 +93,8 @@
老人票:
<span style="float:right;">{{getlistSigel.scatterB2BPrice }} x {{personNum.oldPeopleNum}}</span>
</P>
</div>
</el-col>
</div>
......@@ -180,19 +183,7 @@
<div style="margin:15px auto;text-align:center">
<el-button @click="submitForm('personNum')" v-if="personNum.status==3" class="status_3" size="small">确认付款</el-button>
</div>
<!-- 提交订单 -->
<!-- <div class='tjorder'> -->
<!-- <div style="width:80%;margin:0 auto;color:#cccccc;position:relative">
<p style="font-size:14px;padding:4px 50px;text-align:right;">条款和限制<span style="color:#49C0A1">《网上购票须知》</span> </p>
<p class="total" style="margin-top:12px">
<span>总价</span>
<span style="font-size:20px;font-weight:400;color:rgba(255,255,255,1);margin:0 15px;">{{personNum.preferPrice}}</span>
<span @click="submitForm('personNum')" style="cursor: pointer;;height:32px;background:rgba(238,68,84,1);border-radius:4px;color:#fff;padding:4px 15px">同意以上协议条款,提交订单</span>
</p>
</div> -->
<!-- </div> -->
</div>
</template>
......
......@@ -189,13 +189,12 @@ export default {
if (res.data.resultCode == 1) {
this.codeInfo=res.data.data;
console.log("codeInfo",this.codeInfo)
console.log("二维码过期时间",moment(this.codeInfo.ExpireDate).format('x'))
this.code_yxq=moment(this.codeInfo.ExpireDate).format('x')-moment(this.codeInfo.NowDate).format('x');
this.PayOrder=this.codeInfo.OrderID;
clearInterval(this.Pay_timer);
this.Time5();
// this.PayStatus();
this.PayStatus();
if (str == "1") {
//微信
this.wxpay_imgcode = true;
......
......@@ -279,6 +279,7 @@ export default {
}
.yh>div:hover{
box-shadow:0px 4px 8px 0px rgba(107,107,107,0.27);
transition: all linear 0.5s;
}
.yh>div>img{
position: absolute;
......
......@@ -392,9 +392,7 @@ export default {
let isLogin=this.$store.state.isLogin;
if(isLogin==0){
this.$message.error("请先登录!")
this.$router.push({
path: '/login'
})
this.$router.push({path: `/login?type=1`})
}else{
this.$store.commit('HomePage','ticket')
sessionStorage.setItem("Homepage",'ticket');
......@@ -739,6 +737,7 @@ li{
}
.month_circle:hover{
background:rgba(238,68,84,1);
transition: all linear 0.5s;
}
.month_circle{
width:22px;
......@@ -851,6 +850,10 @@ li{
font-weight:400;
color:rgba(51,51,51,1);
}
.list:hover{
transition: all linear 0.5s;
box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
}
.list{
padding:10px 6px;
box-sizing: border-box;
......
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