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

src/components/Complaints/ComplaintsManage.vue

@@ -453,6 +453,8 @@
                 if (res.data.resultCode == 1) {
                   that.Success(res.data.message);
                   that.getList();
+                }else{
+                  that.Error(res.data.message);
                 }
               },
               null

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -180,6 +180,11 @@
     border: 1px solid #d1d1d1;
   }
 
+  ._TravelPriceDetails .jiDiv{
+    width:800px;
+    height:400px;
+    overflow: auto;
+  }
   ._TravelPriceDetails table {
     padding: 10px 0 0 20px;
     background-color: #ededed;
@@ -187,7 +192,7 @@
     border: 1px solid #d2d2d2;
     font-size: 12px;
     margin: 0 20px 5px 0;
-    min-width: 800px;
+    width: 100%;
   }
 
   ._TravelPriceDetails table ._color_666 {
@@ -198,7 +203,7 @@
 
   ._TravelPriceDetails table td {
     background-color: #ffffff;
-    padding: 9px 30px;
+    padding: 9px 0;
     color: #333333;
     text-align: center;
     border: 1px solid #d2d2d2;
@@ -672,7 +677,7 @@
                           </el-date-picker>
                           <button class="normalBtn" @click.stop="getSelectFilght()">查询</button>
                         </div>
-
+                        <div class="jiDiv">
                           <table width="100%" border="0" cellspacing="0" cellpadding="0">
                             <tr>
                               <td class="_color_666">选择</td>
@@ -704,6 +709,7 @@
                             </tr>
                           </table>
                         </div>
+                      </div>
                       <div slot="reference" class="SimulateDrop-box">
                         <span class="SD_flight" v-for="item in FinfoList">{{item.name}} {{item.date}}</span>
                         <i class="iconfont icon-arrow-down SimulaDrop"></i>