Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/components/Ticket/Pay.vue

@@ -4,24 +4,33 @@
       <el-col :span="18" :offset="3">
           <!-- 头部 -->
           <div class="head">
+           
+            <div style="box-sizing:border-box;">
+              <div v-show="!visa" style="float:left;">
                  <i class="iconfont icon-jinggao"></i>
-            <div style="padding-left:40px;box-sizing:border-box">
+                  <div style="margin-left:50px">
                     <p style="font-size:14px;font-weight:600">
                 
                       订单提交成功！剩余支付时间 
                         <span style="color:#FF680B;font-size:18px">{{time_15}}</span>
-                  <span style="text-align:center;float:right;"> 
-                    <span style="font-weight:200">应付金额</span>
-                  <span style="color:#FF680B;font-size:18px">￥{{Commoditydetails.preferPrice | priceFormat}}</span>
-              </span>
+                        
                         </p>
                     <p style="font-size:12px">请您在
                         <span style="color:#FF680B;">15分钟</span>
                           内完成支付，否则订单会自动取消</p>
                   </div>
+              </div>
+                
+              <div style="text-align:center;float:right"> 
+              <span style="font-weight:200">应付金额</span>
+              <span style="color:#FF680B;font-size:18px">￥{{Commoditydetails.preferPrice | priceFormat}}</span>
+          </div>  
+                  
+            </div>
               
           </div>
           
+
           <div class="payvue_content">
               
               <div class="ordernum">
@@ -120,6 +129,7 @@ import moment from 'moment'
 export default {
   data() {
     return {
+      visa:false,
       zfbpay_imgcode: false,
       wxpay_imgcode: false,
       time_15: 0,
@@ -131,7 +141,7 @@ export default {
         total_fee: "",
         payway: ""
       },
-      AirOrderId: this.$route.params.id,
+      AirOrderId:0,
       Commoditydetails: {},
       codeInfo:{},
 
@@ -153,11 +163,24 @@ export default {
       CodeVialdTime:0,
 
       payway:-1,
+      Visainfo:{},
     };
   },
   created() {
+    if(this.$route.params.id==-1){
+      this.visa=true;
+      let Visainfo=JSON.parse(sessionStorage.Visainfo);
+      this.Commoditydetails=Visainfo;
+      this.Commoditydetails.airOrderId=Visainfo.AirOrderId;
+      this.code.OrderSource=Visainfo.orderResourceId;
+      this.code.total_fee=Visainfo.preferPrice+'';
+      this.code.body=Visainfo.description;
+      this.code.attach=`${Visainfo.costType}|${Visainfo.customerName}|${Visainfo.AirOrderId}|${Visainfo.customerId}|${Visainfo.outBranchId}`
+    }else{
+      this.AirOrderId=this.$route.params.id;
       this.TimeDjs();
-    // this.Time15()
+    }
+    
   },
   methods: {
     TimeDjs() {
@@ -445,6 +468,7 @@ export default {
 .pay_vue .head {
   padding: 4px 0;
   position: relative;
+  overflow: auto;
 }
 .payvue_content {
     min-height:479px;

src/components/visa/VisaHomePage.vue

@@ -427,24 +427,23 @@ export default {
     .visa_flex .el-col .visa_title{
         color: #333333;
         font-size: 12px;
-        padding:10px 0;
     }
     
     .visa_flex .el-col img{
-        position: absolute;
+        /* position: absolute; */
         width: 74px;
         height: 48px;
+        border:1px solid #B3B3B3;
     }
     .visa_flex .visa_content{
-        padding-left: 85px;
+        padding-left: 10px;
         box-sizing: border-box;
         font-family: "PingFang";
-        min-height: 80px;
 
     }
     .visa_flex {
         display: flex;
-        justify-content: space-between;
+        justify-content: space-around;
         flex-wrap: wrap;
     }
     .visa_flex .el-col:hover{
@@ -493,7 +492,7 @@ export default {
     .row_flex{
         width: 100%;
         padding-top:20px;
-        justify-content: space-between;
+        justify-content: space-around;
         display: flex;
         flex-wrap: wrap;
     }
@@ -562,6 +561,7 @@ export default {
         display: inline-block;
         width: 73px;
         height: 48px;
+        border: 1px dashed #DDDDDD;
     }
     .visahome .Qzlist{
         display: flex;

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'
+import languageUtils from './assets/utils/languageUtils' //引入语言转换帮助类
 import moment from 'moment'
 import co from 'co'
 
@@ -30,6 +31,7 @@ Vue.use(ElementUI)
 Vue.use(plug)
 Vue.http = Vue.prototype.$http = axios
 Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils
+Vue.languageUtils=Vue.prototype.$languageUtils=languageUtils
 Vue.prototype.$echarts = echarts
 router.beforeEach((to, from, next) => {  
   // console.log("from",from.path)