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

src/components/Hotel/hotelSpider.vue

@@ -35,21 +35,22 @@
     <div>
       <div style="color:red;margin-bottom:5px;">价格实时变动,以下价格仅供参考。</div>
       <el-table :data="processedData" border style="width: 100%" v-loading='loading' :span-method="objectSpanMethod"
-        :header-cell-style="{background: '#f5f7fa', fontWeight: 'bold'}" max-height="690px" highlight-current-row>
+        :header-cell-style="{background: '#f5f7fa', fontWeight: 'bold'}" max-height="670px" highlight-current-row>
         <el-table-column prop="DiDaHotelName" label="酒店名称" width="200" align="center" fixed></el-table-column>
         <el-table-column prop="priceType" label="类型" width="70" align="center" fixed></el-table-column>
         <el-table-column v-for="(header, index) in dateHeaders" :key="index" :label="header.label" align="center"
           min-width="75">
           <template slot-scope="scope">
+            <el-tooltip content="点击查看详情">
               <span v-if="scope.row.priceType === '直客价'"
                 :style="{color: scope.row.SubList[index].Price <scope.row.SubList[index].TeamPrice ? 'red' : ''}"
-              @click="gotoPage(1,scope.row.SubList[index])" style="cursor:pointer; text-decoration: underline">
+                @click="gotoPage(1,scope.row.SubList[index])" style="cursor:pointer;">
                 {{ scope.row.SubList[index].Price }}
               </span>
-            <span v-else @click="gotoPage(2,scope.row.SubList[index])"
-              style="cursor:pointer;text-decoration: underline">
+              <span v-else @click="gotoPage(2,scope.row.SubList[index])" style="cursor:pointer;">
                 {{ scope.row.SubList[index].TeamPrice}}
               </span>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -147,8 +148,6 @@
             .CheckInDate + "&EndDate=" + item.CheckOutDate;
           window.open(dlUrl);
         }
-        console.log("type", type);
-        console.log("row", row);
       },
       // 单元格合并方法
       objectSpanMethod({
@@ -225,6 +224,7 @@
         // }
       }
       let myDate = new Date();
+      myDate.setDate(myDate.getDate() + 14);
       let nowDate =
         myDate.getFullYear() +
         "-" +
@@ -232,11 +232,10 @@
         "-" +
         myDate.getDate();
       this.msg.QStartDate = nowDate;
-      var currentDate = new Date(); // 获取当前时间
-      currentDate.setMonth(currentDate.getMonth() + 1); // 将当前时间的月份加1
-      this.msg.QEndDate = currentDate.getFullYear() + "-" + parseInt(currentDate.getMonth() + 1) + "-" + currentDate
-        .getDate();
       
+      myDate.setMonth(myDate.getMonth() + 1); // 将当前时间的月份加1
+      this.msg.QEndDate = myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 1) + "-" + myDate
+        .getDate();
       this.getHotelList();
     },
     mounted() {