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

src/components/Hotel/HotelProductManage.vue

@@ -599,7 +599,11 @@
           HasWindow: 1,
           IsCancel: 1,
           CancelTime: '',
-          RoomImage:[]
+          RoomImage:[],
+          RoomSize:'', // 房间大小
+          Floor:'', //楼层
+          IsSmoking:0, //是否禁烟 1禁烟 0不禁
+          IsWifi:1 //是否有wifi 1有 0无
         };
         this.addMsg = newMsg;
       },

src/components/scenicSpot/domesticTicketManagement.vue

@@ -147,6 +147,11 @@
     >
       <tr>
         <th width="200">{{ $t("scen.sc_name") }}</th>
+        <th >门票副标题</th>
+        <th >是否闪入园</th>
+        <th>闪入园最晚购买时间</th>
+        <th >是否无忧退款</th>
+        <th >可定时间</th>
         <th width="200">{{ $t("scen.sc_bjts") }}</th>
         <th>{{ $t("scen.sc_dj") }}</th>
         <th>{{ $t("scen.sc_gj") }}</th>
@@ -165,6 +170,11 @@
             <span class="roomName">{{ item.TicketName }}</span>
           </el-tooltip>
         </td>
+        <td>{{item.TicketSubName}}</td>
+        <td>{{item.IsSameDayBuy}}</td>
+        <td>{{item.DayBuyTime}}</td>
+        <td>{{item.IsWorryFreeRefund}}</td>
+        <td>{{item.SubscribeTime}}</td>
         <td class="DaysInfo">
           <span
             ><i class="iconfont icon-kaoqintongji"></i>{{ item.Days
@@ -228,7 +238,7 @@
               <el-button
                 type="primary"
                 icon="iconfont icon-ico_shezhi"
-                @click="goUrl('scenicSpotPackagePrice', item.Id)"
+                @click="goUrl('domesticScenicSpotPackagePrice', item.Id)"
               ></el-button>
             </el-tooltip>
             <el-tooltip
@@ -298,14 +308,16 @@
           <el-radio v-model="addMsg.IsSameDayBuy" :label="0">否</el-radio>
         </el-form-item>
         <el-form-item label="闪入园最晚购买时间" prop="DayBuyTime">
-          <el-date-picker
-            v-model="addMsg.DayBuyTime"
-            type="date"
-            placeholder="闪入园最晚购买时间"
-            format="MM - dd "
-            value-format="MM-dd"
-          >
-          </el-date-picker>
+          <el-time-select
+                v-model="addMsg.DayBuyTime"
+                :picker-options="{
+                  start: '00:00',
+                  step: '00:15',
+                  end: '23:45',
+                }"
+                placeholder="闪入园最晚购买时间"
+              >
+            </el-time-select>
         </el-form-item>
         <el-form-item label="是否无忧退款" prop="IsWorryFreeRefund">
           <el-radio v-model="addMsg.IsWorryFreeRefund" :label="1"

src/router/config.js

@@ -1600,6 +1600,14 @@ export default {
                 title: '新增修改国内景区'
               },
             }, 
+            {
+              path: '/domesticScenicSpotPackagePrice', //国内景区报价管理
+              name: 'domesticScenicSpotPackagePrice',
+              component: resolve => require(['@/components/scenicSpot/domesticScenicSpotPackagePrice'], resolve),
+              meta: {
+                title: '国内景区报价管理'
+              },
+            }, 
             {
               path: '/TicketManager', //机票列表
               name: 'TicketManager',