Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/SalesVisa/components/visaOrderList.vue

@@ -610,6 +610,13 @@
           <template slot="append" >
             <div class="row justify-sb" style="padding:10px;">
               <div class="cF1416C">
+                <div class="row flex-wrap mb" style="min-width: 200px;max-width: 300px;" v-if="item.guestList&&item.guestList.length>0">
+                  <span>旅客名单：</span>
+                  <div class="row wrap orderNo fz12 ml">
+                    <span class="cursor-pointer radius5 mr px5 bgf5 c3FC4FF" style="margin: 3px;" v-for="(x, i) in item.guestList"
+                      @click="goUrl2('VisapassengerList',item.id,'旅客名单')">{{ x.userName }}</span>
+                  </div>
+                </div>
                 <div v-if="item.remark" style="min-width: 200px;max-width: 300px;">
                 {{$t('pub.pubRemark')}}：{{ item.remark }}
                   <el-tooltip  class="item" effect="dark" :content="$t('salesModule.UpRemarks')"

src/plug/index.js

@@ -118,9 +118,9 @@ export default {
                 let lxymallUrl = ''; //国内游api
                 let crmUrl = ""; //crm API
                 let locationName = window.location.hostname;
-                domainUrl = "http://192.168.10.128";
-                // domainUrl = "http://192.168.10.11:8083" // 刘东电脑
-                // domainUrl = "http://192.168.10.226:8015";
+                // domainUrl = "http://192.168.10.128";
+                domainUrl = "http://192.168.10.9:8083" // 刘东电脑
+                //  domainUrl = "http://192.168.10.206:8015";
                 // domainUrl = "http://reborn.oytour.com";
                 let crmLocalFileStreamDownLoadUrl = "";
                 crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";