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

src/components/Hotel/reservation/OrderList.vue

@@ -529,7 +529,7 @@
         </el-table-column>
       </el-table>
       <div class="row justify-sb mt mb20" v-if="item.OrderStatus!=3">
-        <div class="row pt20" style="margin-right: 10px;" v-if="item.GuestFileList.length > 0||((item.CustomerPayType==1 || item.CustomerPayType==3)&&pagesTitle)">
+        <div class="row pt20" style="margin-right: 10px;width: 300px;" v-if="item.GuestFileList.length > 0||((item.CustomerPayType==1 || item.CustomerPayType==3)&&pagesTitle)">
           <!-- <i class="el-icon-warning cF57A98 fz15 mr"></i> -->
           <div class="column">
             <!-- <div class="wrap fz12 c9e" v-if="x.CustomerPayType == 2 || x.CustomerPayType == 3">

src/components/Hotel/singleProduct/components/OrderList.vue

@@ -523,7 +523,7 @@
         </el-table-column>
       </el-table>
       <div class="row justify-sb mt mb20" v-if="item.OrderStatus!=3">
-        <div class="row pt20" v-if="item.GuestFileList.length > 0">
+        <div class="row pt20"  style="width: 300px;" v-if="item.GuestFileList.length > 0">
           <!-- <i class="el-icon-warning cF57A98 fz15 mr"></i> -->
           <div class="column">
             <!-- <div class="wrap fz12 c9e">

src/components/Hotel/singleProduct/components/hotelDetails.vue

@@ -43,7 +43,7 @@
                         <div class="Img-right-box" v-if="images.length>2">
                             <div class="Img-right-num" v-if="images.length>3" @click="showImageHandler">
                                 <span class="fz20 text-weight-bold">+</span>
-                                <span class="text-h5 text-weight-bold">{{ h.List.length - 3 }}</span>
+                                <span class="text-h5 text-weight-bold">{{ images.length - 3 }}</span>
                             </div>
                             <el-image 
                             style="width: 100%; height: 100%"

src/components/busManagement/BookAcar/CharterPreview.vue

@@ -78,6 +78,7 @@
         display: flex;
         flex-direction: row;
         margin-bottom: 15px;
+        border: 0;
       }
       .time-box.center{
         align-items: center;
@@ -225,15 +226,29 @@
         font-size: 14px;
       }
       .right-form-list{
+        display: flex;
+        flex-direction: column;
         padding: 20px 0;
       }
       .right-list{
         display: flex;
+        flex-direction: row;
         justify-content: space-between;
         align-items: center;
         margin-bottom: 6px;
       }
+      .right-list-left{
+        flex: 1;
+        display: flex;
+        flex-wrap: wrap;
+      }
+      .leftText{
+        width: 150px;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
       .right-list-right{
+        flex-shrink: 0;
         font-size: 13px;
         color: #181C32;
       }
@@ -338,7 +353,7 @@
                     <el-tag class="time-box-width" :type="x.checked?'':'info'" style="margin-right: 10px;cursor: pointer;" 
                     @click="msg.OrderId?changeDetailListHandler(x,4,msg.OrderId):changeDetailListHandler(x,4,msg.OrderId)">
                       <a>{{ x.Address }}</a>
-                      <span>{{ x.Range }}km范围</span>
+                      <span>{{ x.Range }}m范围</span>
                     </el-tag>
                   </template>
                 </div>
@@ -537,8 +552,8 @@
               <template  v-if="isCheck">
               <template v-for="x in types">
                 <div class="right-list" v-if="x.checked">
-                  <div>
-                    <el-tag size="mini" type="danger">{{x.CarName}}</el-tag>
+                  <div class="right-list-left">
+                    <el-tag class="leftText" size="mini" type="danger">{{x.CarName}}</el-tag>
                   </div>
                   <div class="right-list-right">
                     {{x.B2BPrice.toFixed(2)}} x {{x.num}} 辆

src/components/busManagement/BookAcar/components/Details.vue

@@ -43,7 +43,7 @@
                         <div class="Img-right-box" v-if="images.length>2">
                             <div class="Img-right-num" v-if="images.length>3" @click="showImageHandler">
                                 <span class="fz20 text-weight-bold">+</span>
-                                <span class="text-h5 text-weight-bold">{{ t.PicPathList.length - 3 }}</span>
+                                <span class="text-h5 text-weight-bold">{{ images.length - 3 }}</span>
                             </div>
                             <el-image 
                             style="width: 100%; height: 100%"

src/components/busManagement/BookAcar/list.vue

@@ -351,7 +351,7 @@
         },
         // 详情
         showCardHandler(x){
-            this.detailsObj=x
+            this.detailsObj=JSON.parse(JSON.stringify(x))
             this.showDetails=true
         },
         getAirportList() {

src/components/public/echoMap.vue

@@ -5,7 +5,7 @@
       :center="center" :zoom="zoom" :scroll-wheel-zoom="true"
         @click="getClickInfo" @moving="syncCenterAndZoom" @moveend="syncCenterAndZoom" @zoomend="syncCenterAndZoom">
         <bm-view style="width: 100%; height:300px;"></bm-view>
-        <bm-marker :position="{lng: center.lng, lat: center.lat}"
+        <bm-marker :position="center"
         :dragging="true"
         animation="BMAP_ANIMATION_BOUNCE">
             <bm-label v-if="radius>0" content="接送点范围" :position="center" :labelStyle="{color: 'red', fontSize : '16px','border':'0px','margin-top':'20px'}" title="Hover me"/>

src/components/public/leftNav.vue

@@ -214,7 +214,7 @@
                 // http://testb2b.oytour.com
                 // http://www.oytour.com
                 // window.open("http://testb2b.oytour.com/#/"+ pageName +"?uid="+encodeURIComponent(this.EnCodeWord), "_blank");
-                window.open("http://www.oytour.com/#/"+ pageName +"?uid="+encodeURIComponent(this.EnCodeWord), "_blank");
+                window.open("http://t.oytour.com/#/"+ pageName +"?uid="+encodeURIComponent(this.EnCodeWord), "_blank");
               } else {
                   this.Error(res.data.message);
               }

src/components/scenicSpot/Singleticket/components/OrderDetails.vue

@@ -63,7 +63,7 @@
                         <div class="Img-right-box" v-if="images.length>2">
                             <div class="Img-right-num" v-if="images.length>3" @click="showImageHandler">
                                 <span class="fz20 text-weight-bold">+</span>
-                                <span class="text-h5 text-weight-bold">{{ t.PicPathList.length - 3 }}</span>
+                                <span class="text-h5 text-weight-bold">{{ images.length - 3 }}</span>
                             </div>
                             <el-image 
                             style="width: 100%; height: 100%"

src/components/scenicSpot/reservation/OrderList.vue

@@ -616,7 +616,7 @@
       </el-table>
       
       <div class="row justify-sb mt mb20">
-        <div class="column px15 bjFFF3E0 radius5 flex-g pa relative">
+        <div class="column px15 bjFFF3E0 radius5 flex-g pa relative" style="width: 300px;">
           <div class="fz12 row justify-sb" v-if="item.MailingState != 4">
             <span>{{ item.MailingState > 1 ? '收货地址：' : '自取地址：' }}</span>
             <div :class="{ 'cF1416C': item.MailingState == 2, 'c02C854': item.MailingState == 3 }">