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

src/components/FreeTravel/OrderConfirmation.vue

 <template>
   <div class="OrderCon commonF" style="padding-bottom:20px">
-      <div class="w1200">
+      <div v-loading="Orderloading" class="w1200">
         
           <div class="Content basefix" style="margin-top:20px">
               <div class="left" style="width:795px;margin-right:17px">
@@ -46,7 +46,7 @@
                                                 </el-option>
                                             </el-select>
                                         </el-form-item>
-                                        <el-form-item  v-show="guide_langList.length>0" label="导览语系">
+                                        <el-form-item v-if="guide_langList.length>0" label="导览语系">
                                                 <el-select @change="GenderSelect" size="mini" style="margin-right:8px" v-model="freeMsg.guide_lang" filterable placeholder="请选择">
                                                     <el-option
                                                     v-for="item in guide_langList"
@@ -170,15 +170,13 @@
                     </div>
                     <div style="padding:15px">
                         <el-row class="cee f22">
-                            <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>
-                                    <span v-if="dataDetail.prod.policy_no=='2'">无法退费</span>
-                                    <span v-if="dataDetail.prod.policy_no=='3'">指定手续费</span>
-                                </p>
-                            </el-col>
+                            <span v-if="freeMsg.prod_name">{{rePlace(freeMsg.prod_name)}}</span>
                         </el-row>
+                        <div style="margin-top:10px" class="cee f22 pfR" v-if="dataDetail.prod">
+                            <span v-if="dataDetail.prod.policy_no=='1'">不扣手续费，退全额</span>
+                            <span v-if="dataDetail.prod.policy_no=='2'">无法退费</span>
+                            <span v-if="dataDetail.prod.policy_no=='3'">指定手续费</span>
+                        </div>
                         
                         <p style="margin:15px 0" class="f14"><span class="c99" style="margin-right:20px">日期</span><span class="c66">{{freeMsg.dateStr}}</span></p>
                         <!-- <p class="f14"><span class="c99" style="margin-right:20px">人数</span>
@@ -231,6 +229,7 @@ import moment from 'moment'
 export default {
     data () {
         return {
+            Orderloading:false,
             defaultImg: 'this.src="' + require('assets/img/juan/error.png') + '"',
             BtnLoading:false,
            dataDetail:{},
@@ -277,7 +276,7 @@ export default {
         this.freeMsg = JSON.parse(sessionStorage.getItem("freeMsg"));
         let id = this.$route.query.id;
         this.freeMsg.buyer_country="CN";
-        this.freeMsg.guide_lang="zh-tw";
+        this.freeMsg.guide_lang="zh-cn";
         this.freeMsg.custom=[];
         this.freeMsg.pay={};
         this.freeMsg.buyer_tel_country_code="86";
@@ -324,6 +323,12 @@ export default {
             if(!freeformval&&!listformval){
                 return;
             }
+            // if(this.guide_langList.length>0){
+            //     if(this.freeMsg.guide_lang==""){
+            //         this.Error("导览语系不能为空！");
+            //         return;
+            //     }
+            // }
             if(this.freeMsg.buyer_last_name==""||!this.freeMsg.buyer_last_name){
                 this.Error("请输入预订人的名");
                 return;
@@ -410,6 +415,7 @@ export default {
           this.$forceUpdate()
         },
         getDetails(id){
+            this.Orderloading=true;
             // http://efficient.oytour.com/api/kkday/QueryProduct
             this.apiJavaPost(
                 "/api/kkday/QueryProduct",
@@ -418,7 +424,9 @@ export default {
                 "locale":"zh-cn" 
                 },
                 res => {
-                if (res.data.resultCode === 1) {
+                this.Orderloading=false;
+
+                if (res.data.data.result === "00") {
                     this.DomainUrl=res.data.data.KkdayDomain;
                     let data = res.data.data;
                     this.dataDetail = data;