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

src/assets/common/lang/EN/fill.js

@@ -2503,6 +2503,7 @@ export const obj = {
   btbqtcd: 'B2B Front Desk Menu',
   gerenzxcd: 'Personal Central Menu',
   yibaohan: 'Included',
+  bubaohan: 'Not Included',
   daohangcaid: 'Navigation Menu',
   erjicaid: 'Secondary Menu',
   sanjicaid: 'Three-level menu',

src/assets/common/lang/zhCN/fill.js

@@ -2503,6 +2503,7 @@ export const obj = {
     btbqtcd: 'B2B前台菜单',
     gerenzxcd: '个人中心菜单',
     yibaohan: '已包含',
+    bubaohan: '不包含',
     daohangcaid: '导航菜单',
     erjicaid: '二级菜单',
     sanjicaid: '三级菜单',

src/assets/common/lang/zhTW/fill.js

@@ -2503,6 +2503,7 @@ export const obj = {
   btbqtcd: 'B2B前臺菜單',
   gerenzxcd: '個人中心菜單',
   yibaohan: '已包含',
+  bubaohan: '不包含',
   daohangcaid: '導航菜單',
   erjicaid: '二級菜單',
   sanjicaid: '三級菜單',

src/components/Hotel/DiDa/HotelDetails.vue

@@ -708,7 +708,8 @@
           {{$t('objFill.v101.hote.fuhetjdfx')}}</div>
         <div style="display: flex;justify-content: flex-start;margin-top:10px; ">
           <template v-if="qRoomTypeList&&qRoomTypeList.length>0">
-            <el-select placeholder="房型" v-model="qMsg.RoomTypeName" style="width:130px;" clearable filterable @clear="qMsg.RoomTypeName=''">
+            <el-select placeholder="房型" v-model="qMsg.RoomTypeName" style="width:130px;" clearable filterable
+              @clear="qMsg.RoomTypeName=''">
               <el-option label="房型(全部)" value=""></el-option>
               <el-option v-for="(item,index) in qRoomTypeList" :label="item.RoomName_CN" :value="item.RoomName_CN"
                 :key="`ry_`+index"></el-option>
@@ -764,9 +765,9 @@
             </div>
           </div>
         </div>
-        <template
-          v-if="DidaHotelRoomDetails&&DidaHotelRoomDetails.HotelList&&DidaHotelRoomDetails.HotelList.length>0&&DidaHotelRoomDetails.HotelList[0].GroupRoomTypeList&&DidaHotelRoomDetails.HotelList[0].GroupRoomTypeList.length>0 ">
-          <div v-loading="loading">
+        <div v-loading="loading">
+          <template
+            v-if="DidaHotelRoomDetails&&DidaHotelRoomDetails.HotelList&&DidaHotelRoomDetails.HotelList.length>0&&DidaHotelRoomDetails.HotelList[0].GroupRoomTypeList&&DidaHotelRoomDetails.HotelList[0].GroupRoomTypeList.length>0 ">
             <div class="q-card row  q-cardradius " v-for="(item, index) in getQueryData" :key="`dh_`+index">
               <div class="col q-pa-sm q-pr-lg col-3 row no-wrap justify-between"
                 style="border-right: 1px solid rgb(238, 238, 238);width:15%;height:auto;">
@@ -952,12 +953,12 @@
                 </div>
               </div>
             </div>
-          </div>
-        </template>
-        <template v-else>
-          <div class="q-my-md q-px-lg" style="text-align:center;margin-top:15px;">{{$t('system.content_noData')}}
-          </div>
-        </template>
+          </template>
+          <template v-else>
+            <div class="q-my-md q-px-lg" style="text-align:center;margin-top:15px;">{{$t('system.content_noData')}}
+            </div>
+          </template>
+        </div>
       </div>
       <!-- 价格循环结束 -->
       <div class="rounded-borders bg-white row items-center q-pb-md" style="margin-top:20px;width: 1300px;">
@@ -1170,6 +1171,7 @@
         get() {
           var _this = this;
           var tempData = [];
+          _this.loading = true;
           if (_this.DidaHotelRoomDetails && _this.DidaHotelRoomDetails.HotelList && _this.DidaHotelRoomDetails
             .HotelList
             .length > 0 && _this.DidaHotelRoomDetails.HotelList[0].GroupRoomTypeList) {
@@ -1203,6 +1205,7 @@
               tempData = newDataArray;
             }
           }
+          _this.loading = false;
           return tempData;
         },
       }
@@ -1311,6 +1314,7 @@
           this.msg.CheckInDate = '';
           this.msg.CheckOutDate = '';
         }
+        this.DidaHotelRoomDetails = {};
         var that = this;
         this.apipost('dmc_post_GetDiDaPriceSearchList', this.msg, res => {
           this.loading = false