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

src/App.vue

@@ -101,7 +101,7 @@ export default {
 
 <style>
 @import './assets/global/font.css';
-@import '//at.alicdn.com/t/font_863923_vy92y4agl2.css';
+@import '//at.alicdn.com/t/font_863923_gfxa4q9jlne.css';
 @import './assets/global/global.css';
 @import './assets/css/common.css';
 body,html{

src/components/FreeTravel/OrderConfirmation.vue

 <template>
-  <div class="OrderCon commonF">
+  <div class="OrderCon commonF" style="padding-bottom:20px">
       <div class="w1200">
         
           <div class="Content basefix" style="margin-top:20px">
@@ -157,10 +157,10 @@
                             </div>
                         </div>
                      </el-form> 
-                        <el-button :loading="BtnLoading" @click="PayBtn" class="OrderConBtn">
+                        <!-- <el-button :loading="BtnLoading" @click="PayBtn" class="OrderConBtn">
 
                             下一步，支付
-                        </el-button>
+                        </el-button> -->
                     </div>
               </div>
               <div class="right" style="width:388px;box-sizing:border-box">
@@ -170,7 +170,7 @@
                     </div>
                     <div style="padding:15px">
                         <el-row class="cee f22">
-                            <el-col :span="10">{{rePlace(freeMsg.prod_name)}}</el-col>
+                            <el-col :span="10"><span v-if="freeMsg.prod_name">{{rePlace(freeMsg.prod_name)}}</span></el-col>
                             <el-col :span="14" style="text-align:right">
                                 <p class="cee f22 pfR" v-if="dataDetail.prod">
                                     <span v-if="dataDetail.prod.policy_no=='1'">不扣手续费，退全额</span>
@@ -299,7 +299,11 @@ export default {
     },
     methods: {
        rePlace(str){
-            return str.replace('KKday', '印象之旅');
+            if(str.indexOf('KKday')!=-1){
+                return str.replace('KKday', '印象之旅');
+            }else{
+                return str;
+            }
         },
         GenderSelect(){
             this.$forceUpdate()