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

src/components/Supplier/roomQuery2.vue

@@ -62,28 +62,25 @@
             </td>
             <td>
               <el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start">
-                <el-popover placement="bottom" width="900" trigger="click">
+                <el-popover placement="bottom" width="800" trigger="click">
                   <table>
                     <tr>
                       <th width="100">
                         时间
                       </th>
-                      <th width="150">
+                      <th width="170">
                         酒店
                       </th>
-                      <th width="150">
+                      <th width="170">
                         更换名称
                       </th>
-                      <th width="300">
+                      <th width="350">
                         价格
                       </th>
-                      <th width="150">
-                        备注
-                      </th>
                     </tr>
                     <template v-for="(subItem,subIndex) in HotelList">
-                       <tbody>
-                          <tr v-for="(childItem,childIndex) in subItem.HotelOrderList">
+                       <tbody  v-for="(childItem,childIndex) in subItem.HotelOrderList">
+                          <tr>
                              <td v-if="childIndex==0" :rowspan="subItem.HotelOrderList.length">
                                第{{subIndex+1}}天<br/>
                                {{subItem.UseTimeStr}}
@@ -108,9 +105,10 @@
                                     <br/>
                                  </template>
                              </td>
-                             <td>
-                               {{childItem.Remarks}}
-                             </td>
+                          </tr>
+                          <tr >
+                            <td>备注:</td>
+                            <td colspan="3"> {{childItem.Remarks}}</td>
                           </tr>
                        </tbody>
                     </template>

src/components/scenicSpot/scenicSpotList.vue

@@ -309,7 +309,7 @@
             class="hollowFixedBtn"
             type="button"
             @click="DownLoadFile()"
-          >导出</button>
+          >下载</button>
         </li>
       </ul>
     </div>