Skip to content

S
SuperMan
Commit 4cd1ffde authored by 黄奎's avatar 黄奎
Browse files
Options

111

parents 90a702f1 ed2f6166
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1503 additions and 2 deletions
src/components/Restaurant/restaurantInfoDetail.vue 0 → 100644
View file @ 4cd1ffde
This diff is collapsed.
src/components/Restaurant/restaurantList.vue
View file @ 4cd1ffde
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
} }
.restaurantList .hotelBtn { .restaurantList .hotelBtn {
width: 80px; width: 55px;
height: 28px; height: 28px;
background: #f76f6f; background: #f76f6f;
border-radius: 14px; border-radius: 14px;
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
} }
.restaurantList .hotelBtn:first-child { .restaurantList .hotelBtn:first-child {
margin-right: 19px; /* margin-right: 19px; */
} }
.restaurantList .w150 .el-input { .restaurantList .w150 .el-input {
...@@ -374,7 +374,12 @@ ...@@ -374,7 +374,12 @@
</div> </div>
<div class="btnList"> <div class="btnList">
<!--v-if="IsEditDmcSource==1"--> <!--v-if="IsEditDmcSource==1"-->
<<<<<<< HEAD
<button @click="goSubInfo('restaurantInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button> <button @click="goSubInfo('restaurantInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
=======
<button @click="goSubInfo('restaurantInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
<button @click="goSubInfo('restaurantInfoDetail',item.ID)" class="hotelBtn">{{$t('fnc.xiangqing')}}</button>
>>>>>>> ed2f6166e0309b39474529311f2132520fff4845
<button v-if="IsHotelPriceStock==1" @click="goUrl('RestaurantPackage',item.ID)" <button v-if="IsHotelPriceStock==1" @click="goUrl('RestaurantPackage',item.ID)"
class="hotelBtn">{{$t('restaurant.res_package')}}</button> class="hotelBtn">{{$t('restaurant.res_package')}}</button>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment