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

src/components/Restaurant/restaurantList.vue

@@ -355,21 +355,28 @@
           <div class="hotelTitle">{{$t('ground.zhenshimingcheng')}}:<font class="F1">{{item.RealName}}</font>
           </div>
         </el-tooltip>
-        <template v-if="item.OpenPlatformList&&item.OpenPlatformList.length>0">
+        <div class="hotelTitle" v-if="item.Country==651">
+          {{$t('hotel.hotel_detailinfo')}}:{{item.ProvinceName}}{{item.CityName}}{{item.DistrictName}}
+        </div>
+        <div v-else class="hotelTitle">
+          {{$t('hotel.hotel_detailinfo')}}:{{item.Address}}
+        </div>
+        <!-- <template v-if="item.OpenPlatformList&&item.OpenPlatformList.length>0">
           <div class="hotelTitle fz12">{{$t('objFill.v101.Rest.shangjiapit')}}:<span v-for="(items,index) in item.OpenPlatformList"
               :class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}"
               :key="`pl_`+index" style="margin-left:1.5px;">{{items.Name}}</span>
           </div>
-        </template>
+        </template> -->
         <el-tooltip class="item" effect="dark" :content="item.UseTypeListStr" placement="top-start"
           popper-class="max-w250">
-          <div class="hotelTitle fz12">{{$t('objFill.v101.traveltrip.shiyonglex')}}:<font class="F2" v-for="(subItem,subIndex) in item.UseTypeList"
-              :key="`ut_`+index+subIndex">
+          <div class="hotelTitle fz12">{{$t('objFill.v101.traveltrip.shiyonglex')}}:<font class="F2"
+              v-for="(subItem,subIndex) in item.UseTypeList" :key="`ut_`+index+subIndex">
               {{subItem}}
             </font>
           </div>
         </el-tooltip>
-        <div class="hotelTitle fz12">{{$t('objFill.v101.Rest.zuidicanb')}}: <font class="F3">{{item.UnitPrice>0?item.UnitPrice:"/"}}</font>
+        <div class="hotelTitle fz12">{{$t('objFill.v101.Rest.zuidicanb')}}: <font class="F3">
+            {{item.UnitPrice>0?item.UnitPrice:"/"}}</font>
         </div>
         <div style="padding:0 0 15px 15px;margin-top: 5px;">
           <i class="iconfont icon-renyuanguanli"></i>
@@ -380,8 +387,7 @@
           <button v-if="IsEditDmcSource==1" @click="goSubInfo('restaurantInfoManage',item.ID)"
             class="hotelBtn">{{$t('pub.updateMsg')}}</button>
 
-          <button  @click="goUrl('RestaurantPackage',item.ID)"
-            class="hotelBtn">{{$t('restaurant.res_package')}}</button>
+          <button @click="goUrl('RestaurantPackage',item.ID)" class="hotelBtn">{{$t('restaurant.res_package')}}</button>
 
           <button @click="goSubInfo('restaurantInfoDetail',item.ID)" class="hotelBtn">{{$t('fnc.xiangqing')}}</button>
         </div>