update

src/App.vue

@@ -59,7 +59,7 @@ export default {
 
 <style>
 @import './assets/global/font.css';
-@import '//at.alicdn.com/t/font_863923_3d1f1rd9oj6.css';
+@import '//at.alicdn.com/t/font_863923_v9ubqse9sl.css';
 @import './assets/global/global.css';
 body,html{
   padding: 0px;

src/components/Ticket/AirlineTicketOrder.vue

@@ -5,7 +5,7 @@
             <el-form-item label="订单号">
                 <el-input size="small" v-model="form.id" placeholder="请输入订单号"></el-input>
             </el-form-item>
-            <el-form-item label="开始时间">
+            <el-form-item label="下单时间">
                  <el-date-picker size="small"
                     v-model="form.time"
                     value-format="yyyy-MM-dd"
@@ -35,8 +35,9 @@
             stripe
             style="width: 100%;box-sizing:border-box">
             <el-table-column
-        prop="id"
-        label="订单ID">
+             width="150"
+                prop="id"
+                label="订单ID">
         </el-table-column>
             <el-table-column
             label="机票信息">
@@ -83,6 +84,10 @@
         <el-table-column
         prop="refund"
         label="退款金额">
+        </el-table-column>
+         <el-table-column
+        prop="createTime"
+        label="下单时间">
         </el-table-column>
         
         <el-table-column
@@ -169,10 +174,13 @@ export default {
           type: 'warning'
         }).then(() => {
           this.apiJavaPost('/api/dmc/airticket/SetB2BAirtickOrderApplyForRefund',{AirOrderId:row.id},res=>{
-                // console.log(res);
+                
                 if(res.data.resultCode==1){
                     this.$message.success("请求成功！")
                     this.List();
+
+                }else{
+                    this.Error(res.data.message);
                 }
                 
                 
@@ -227,6 +235,8 @@ export default {
                 if(res.data.resultCode==1){
                     this.tableData=res.data.data.pageData;
                     this.total=res.data.data.count;
+                }else{
+                    this.Error(res.data.message);
                 }
                 
                 
@@ -259,8 +269,9 @@ export default {
 .AirlineTicketOrder .changestatus span{
     display: inline-block;
     width:97px;
-    height:36px;
-    line-height: 36px;
+    height:34px;
+    font-size: 12px;
+    line-height: 34px;
     text-align: center;
     margin:0 6px;
     background:rgba(255,255,255,1);

src/components/Ticket/EditTicketOrder.vue

@@ -249,7 +249,7 @@ export default {
         //获取机票订单详情
         GetTicketDes(){
             this.apiJavaPost('/api/dmc/airticket/GetB2BAirtickOrderInfo',{AirOrderId:this.AirOrderId},res=>{
-                console.log("获取机票订单详情",res)
+                // console.log("获取机票订单详情",res)
                 this.personNum=res.data.data;
                 
                 
@@ -257,7 +257,6 @@ export default {
         },
       
         submitForm(addMsg) {
-            console.log("this.personNum",this.personNum);
             this.$refs[addMsg].validate((valid) => {
                 if(valid) {
                     this.personNum.customerId=this.userInfo.accountId;
@@ -270,7 +269,6 @@ export default {
                         }else{
                             this.$message.error(res.data.message)
                         }
-                    console.log("下单",res);
                 
                 
                 },null)

src/components/Ticket/FillItinerary.vue

@@ -141,8 +141,8 @@
                             </div>
                             <div style="position:absolute;right:5px">
                                 <span>专员：</span>
-                                <el-select  size="small" v-model="personNum.enterID" filterable placeholder="请选择专员">
-                                <el-option v-for="(item,key) in SellInfoList" :key="key" :label="item.EmName" :value="item.EmployeeId"></el-option>
+                                <el-select size="small" v-model="personNum.enterID" filterable placeholder="请选择专员">
+                                <el-option v-for="item in SellInfoList" :key="item.EmployeeId" :label="item.EmName" :value="item.EmployeeId"></el-option>
                             </el-select>
                             </div>
                             
@@ -247,7 +247,7 @@ export default {
                 contactMobile:'',
                 contactEmail:'',
                 contactName:'',
-                
+                enterID:0,
             },
             AirTicketId:this.$route.params.id,
             ruleForm:{},
@@ -265,6 +265,11 @@ export default {
        this.SellInfo();
     },
     methods: {
+        // selectenterID(val){
+        //     console.log("val",val)
+        //     // this.personNum.enterID=val;
+        //     this.$set(this.personNum,val,this.personNum.enterID);
+        // },
         // 国籍
         GetCountroy(){
             this.apipost(
@@ -272,7 +277,7 @@ export default {
             res => {
                 // console.log(res)
                 if (res.data.resultCode == 1) {
-                this.countroylist = res.data.data;
+                    this.countroylist = res.data.data;
                 }
             },
             err => {
@@ -396,7 +401,7 @@ export default {
                         }else{
                             this.$message.error(res.data.message)
                         }
-                    console.log("下单",res);
+                    // console.log("下单",res);
                 
                 
                 },null)
@@ -412,10 +417,12 @@ export default {
             this.apipost(
             "sell_get_GetCustomerToSellInfo", {},
             res => {
-                console.log(res)
+                // console.log(res)
                 if (res.data.resultCode == 1) {
-                this.SellInfoList = res.data.data;
-                this.personNum.enterID=this.SellInfoList[0].EmployeeId;
+                    this.SellInfoList = res.data.data;
+                    this.personNum.enterID=this.SellInfoList[0].EmployeeId;
+                }else{
+                    this.Error(res.data.message);
                 }
             },
             err => {

src/components/Ticket/OrderDetails.vue

@@ -147,8 +147,8 @@
                                         </el-radio-group>
                                     </el-form-item>
                                     <el-form-item label="国籍">
-                                        <el-select :disabled="disabled" size="mini" v-model="item.nationality" filterable placeholder="请选择国籍">
-                                        <el-option v-for="(item,key) in countroylist" :key="key" :label="item.Name" :value="item.ID"></el-option>
+                                        <el-select :disabled="disabled" size="mini" v-model="item.nationality" filterable placeholder="请选择国籍" style="height:28px">
+                                            <el-option v-for="(item,key) in countroylist" :key="key" :label="item.Name" :value="item.ID"></el-option>
                                         </el-select>
                                     </el-form-item>
                                     <el-form-item label="手机号" :prop="'guestList.'+index+'.mobilePhone'" :rules="[{required: true, message: '电话号码不能为空', trigger: 'blur'}]">
@@ -208,6 +208,7 @@ export default {
                 contactMobile:'',
                 contactEmail:'',
                 contactName:'',
+                enterID:0,
                 
             },
             AirOrderId:this.$route.params.id,
@@ -220,7 +221,7 @@ export default {
             SellInfoList:[],
         }
     },
-    mounted () {
+    created () {
        this.GetDes();
        this.GetCountroy()
        this.GetTicketDes();
@@ -245,8 +246,13 @@ export default {
         GetDes(){
             this.apiJavaPost('/api/dmc/airticket/getB2BAirticketInfo',{AirOrderId:this.AirOrderId},res=>{
                 // console.log("机票详情",res)
-                this.getlistSigel=res.data.data;
-                this.getlistSigel.synum=this.getlistSigel.airTicketScatterNum-this.getlistSigel.useScatterNum;
+                if (res.data.resultCode == 1) {
+                    this.getlistSigel=res.data.data;
+                    this.getlistSigel.synum=this.getlistSigel.airTicketScatterNum-this.getlistSigel.useScatterNum;
+                }else{
+                    this.$message.error(res.data.message);
+                }
+                
              
                 
             },null)
@@ -254,16 +260,17 @@ export default {
         //获取机票订单详情
         GetTicketDes(){
             this.apiJavaPost('/api/dmc/airticket/GetB2BAirtickOrderInfo',{AirOrderId:this.AirOrderId},res=>{
-                
-                this.personNum=res.data.data;
-                console.log("获取机票订单详情",this.personNum)
-                
+                if (res.data.resultCode == 1) {
+                    this.personNum=res.data.data;
+                }
+                else{
+                    this.$message.error(res.data.message);
+                }
                 
             },null)
         },
       
         submitForm(addMsg) {
-            console.log("this.personNum",this.personNum);
             this.$refs[addMsg].validate((valid) => {
                 if(valid) {
                     this.personNum.customerId=this.userInfo.accountId;
@@ -276,7 +283,6 @@ export default {
                         }else{
                             this.$message.error(res.data.message)
                         }
-                    console.log("下单",res);
                 
                 
                 },null)
@@ -292,10 +298,11 @@ export default {
             this.apipost(
             "sell_get_GetCustomerToSellInfo", {},
             res => {
-                console.log(res)
                 if (res.data.resultCode == 1) {
                 this.SellInfoList = res.data.data;
                 this.personNum.enterID=this.SellInfoList[0].EmployeeId;
+                }else{
+                    this.$message.error(res.data.message);
                 }
             },
             err => {
@@ -308,6 +315,9 @@ export default {
 }
 </script>
 <style>
+.OrderDetails .el-input--mini .el-input__inner{
+    height: 28px!important;
+}
 .OrderDetails .el-radio__input.is-disabled+span.el-radio__label{
     color:#606266;
 }

src/components/Ticket/OrderPayOk.vue

-<template>
-  <div>
-      <div class="orderPay">
-          <div class="div_1">
-            <img src="../../assets/img/ticket/gou.png" alt="">
-            <div style="padding-left:80px;box-sizing: border-box;width:100%">
-              <p style="font-size:24px;color:#333;font-weight:700">订单支付成功！</p>
-              <p style="font-size:12px;color:#333">如有疑问 可致电028-565464646，点击
-                <a style="color:#ee4454;text-decoration:underline">查看订单>></a></p>
-            </div>
-          </div>
-          <div class="div_2">
-              <p>
-                <span>支付金额：￥12545</span>
-                <span>支付平台：支付宝</span>
-              </p>
-              <p>
-                <span>订单编号：584569846568</span>
-                <span>下单时间：2019-02-02</span>
-              </p>
-          </div>
-          <el-button size="mini" style="background:rgba(238,68,84,1);border-radius:4px;color:#fff">返回首页</el-button>
-          <img class="back" src="../../assets/img/ticket/back.png" alt="">
-      </div>
-  </div>
-</template>
-
-<script>
-export default {
-  
-}
-</script>
-
-<style>
-.orderPay .div_2 p span:nth-child(2){
-  float: right;
-}
-.orderPay .div_2 {
-  margin-top: 20px;
-  width: 320px;
-}
-.orderPay .div_2 p{
-  padding:6px 0;
-  margin:20px 0;
-  font-size: 12px;
-  color:#333;
-  border-bottom:1px solid rgba(221,221,221,1);
-}
-.orderPay .div_1 img{
-  width: 54px;
-  height:54px;
-  position: absolute;
-
-}
-.orderPay .div_1{
-  position: relative;
-  box-sizing: border-box;
-  
-}
-.orderPay{
-  padding-top:130px;
-  padding-left:150px;
-  margin:30px auto;
-    width:1039px;
-    height:553px;
-    position: relative;
-    box-shadow:0px 4px 38px 0px rgba(107,107,107,0.2);
-    box-sizing: border-box;
-}
-.back{
-  position: absolute;
-  width: 384px;
-  height: 289px;
-  right:10px;
-  top:110px;
-}
-</style>

src/components/Ticket/Pay.vue

@@ -156,7 +156,6 @@ export default {
         "/api/dmc/airticket/GetB2BAirtickOrderPayInfo",
         { AirOrderId: this.AirOrderId },
         res => {
-          console.log("huoqu", res);
           if (res.data.resultCode == 1) {
             this.Commoditydetails = res.data.data;
             this.code.OrderSource=this.Commoditydetails.orderResourceId;
@@ -170,7 +169,7 @@ export default {
           }
           else{
               
-              this.$message.error(res.data.message)
+              this.Error(res.data.message);
           }
         },
         null
@@ -189,11 +188,8 @@ export default {
           this.codeLoading=false;
           if (res.data.resultCode == 1) {
               this.codeInfo=res.data.data;
-              console.log("codeInfo",this.codeInfo)
               this.code_yxq=moment(this.codeInfo.ExpireDate).format('x')-moment(this.codeInfo.NowDate).format('x');
 
-              console.log((this.code_yxq/1000));
-              console.log(this.CodeVialdTime);
               if((this.code_yxq/1000)>this.CodeVialdTime){
                 this.CodeVialdTime=(this.code_yxq/1000);
               }
@@ -238,6 +234,7 @@ export default {
         this.CodeVialdTime--;
         if (this.CodeVialdTime <= 0) {
           clearInterval(this.timer);
+          clearInterval(this.Pay_timer);
           this.order_exit='2';
           this.order_exit_info="订单支付超时，请重新下单！"
         }
@@ -253,7 +250,6 @@ export default {
             "ticket_get_GetAirPayMoneyIsSuccess",
             {PayOrder:this.PayOrder},
             res => {
-            console.log("res支付状态",res)
             // res.data.resultCode =1;
             if (res.data.resultCode == 1) {
                 clearInterval(this.Pay_timer);

src/components/global/head.vue

@@ -87,7 +87,7 @@ color:rgba(51,51,51,1);
                                     <!-- <el-menu-item index="2-3">单团</el-menu-item>
                                     <el-menu-item index="2-4">私人订制</el-menu-item> -->
                                 </el-submenu>
-                                <!-- <el-menu-item index="3" @click="goUrl('TicketHome',true)"><a href="javascript:void(0);">机票</a></el-menu-item> -->
+                                <el-menu-item index="3" @click="goUrl('TicketHome',true)"><a href="javascript:void(0);">机票</a></el-menu-item>
 
 
                                 <!-- <el-menu-item index="5"><a href="javascript:void(0);">机票</a></el-menu-item>
@@ -117,7 +117,7 @@ color:rgba(51,51,51,1);
                         </el-col>
                         
                         <el-col :span="4" :offset="14" class="Info">
-                           <div class="ckxx">乘客信息</div>
+                           <div class="ckxx">乘客<br/>信息</div>
                            <div class="fg"></div>
                            <div class="zf">支付</div>
                         </el-col>
@@ -164,7 +164,6 @@ export default {
         }
     },
     created(){
-        console.log(this.defaultKey)
     },
     computed: {
         user(){
@@ -206,7 +205,6 @@ export default {
   methods: {
       
     handleSelect(key, keyPath) {
-        console.log(key)
         this.defaultKey=key;
         sessionStorage.setItem("defaultKey",this.defaultKey);
         this.$emit('forword', key)
@@ -234,8 +232,6 @@ export default {
         this.$store.commit('HomePage','true')
         localStorage.removeItem("userInfo");
         sessionStorage.setItem("Homepage",'true');
-        // localStorage.homePage = 'true';
-        // console.log(" this.homePage.", this.homePage) 
         this.$router.push({name:path,query:{'type':t}})
     },
     goUrl(path,bl){

src/components/global/pay.vue

@@ -162,7 +162,6 @@
 				msg.attach = this.payType + '|' +obj.contactName+'|'+ obj.orderId+'|'+obj.customerId+'|'+obj.outBranchId
 				msg.total_fee = this.payMoney
 				msg.payway = this.payWay
-				console.log(msg)
 				if(this.payType==''){
 					this.$message.warning('请选择费用类型！')
 					return

src/components/mall/newcalendar.vue

@@ -52,11 +52,11 @@
 	margin: 10px 0;
 	color: #ff4646;
 }
-.dayList:hover{
+.dayList.yesPrice:hover{
 	background: #FF680B;
 	color:#fff!important;
 }
-.dayList:hover .price{
+.dayList.yesPrice:hover .price{
 	color:#fff;
 }
 

src/main.js

@@ -12,6 +12,7 @@ import echarts from 'echarts'
 import VueLazyload from 'vue-lazyload'
 import htmlToPdf from './assets/utils/htmlToPdf'
 import commonUtils from './assets/utils/commonUtils'
+
 // 使用Vue.use()方法就会调用工具方法中的install方法
 Vue.use(htmlToPdf)
 Vue.use(VueLazyload)

src/plugins/index.js

@@ -13,9 +13,12 @@ export default {
         Vue.prototype.domainManager = function() {
             // var domainUrl = "http://test_reborn.oytour.com";//主域名
             //var domainUrl = "http://reborn.oytour.com"; //主域名
-             var domainUrl = "http://192.168.2.16:8083"//主域名
+            //  var domainUrl = "http://192.168.2.16:8083"//主域名
+             
             //  let domainUrl = "https://reborn.oytour.com"; //刘东主域名
             //  let domainUrl = "https://reborn.oytour.com";
+            var domainUrl = "http://test.viitto.com"
+            
             if (this.isOnline()) {
                 if(window.location.host.indexOf('viitto.com')!=-1)
                     domainUrl = "http://test.viitto.com"
@@ -27,7 +30,9 @@ export default {
                 DomainUrl: domainUrl,
                 //常用提交数据URL 
                 PostUrl: domainUrl + "/api/common/post",
-                javaUrl: "http://192.168.2.16:9000",
+                // javaUrl: "http://192.168.2.16:9000",
+                javaUrl: "http://47.96.12.235:9001",//测试接口
+
                 LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
             };
             return obj;