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

src/components/Hotel/HotelManagement.vue

@@ -163,7 +163,7 @@
   }
 
   .hotelmanagement .btnList {
-    margin-top: 16px;
+    margin-top: 12px;
     text-align: center;
   }
 
@@ -330,9 +330,9 @@
             </el-tooltip>
           </div>
         </div>
-        <div style="padding-left:15px">
+        <div style="padding-left:15px;padding-top:5px;">
           <i style="top:2px" class="iconfont icon-renyuanguanli"></i>
-          <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}/</span>
+          <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
           {{item.UpdateTimeStr}}
         </div>
         <div class="btnList">

src/components/Restaurant/restaurantList.vue

@@ -335,9 +335,9 @@
             <div>{{$t('restaurant.res_advanceDays')}}</div>
           </div>
         </div>
-         <div style="padding:0 0 10px 15px;margin-top: -5px;">
+         <div style="padding:0 0 15px 15px;margin-top: -5px;">
            <i class="iconfont icon-renyuanguanli"></i>
-           <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}/</span>
+           <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
            {{item.UpdateTimeStr}}
           
         </div>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -621,7 +621,8 @@
   .RL-opremarkTitle {
     display: inline-block;
     float: left;
-    width: 53px;
+    width: 78px;
+    text-align: right;
     white-space: nowrap;
     font-size: 14px;
   }
@@ -2362,7 +2363,8 @@
                 <div class="clearfix RL-MARK" style="width:75%;float:left;">
                   <span class="RL-opremarkTitle">{{$t('Operation.Op_remark')}}:</span>
                   <span class="RL-redType RL-remarkCon"
-                    style="width:80%;display:inline-block;">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span>
+                    style="width:74%;display:inline-block;">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span>
+                  <div><span style="display:inline-block;">备注人/时间</span>:{{childItem.OPRemarkUpdateName}}&nbsp;&nbsp;{{childItem.OPRemarkUpdateTimeStr}}</div>
                 </div>
                 <template v-if="isShow==true">
                   <div style="float:right;" v-if="childItem.IsCanClear==0">

src/components/scenicSpot/scenicSpotList.vue

@@ -14,7 +14,6 @@
 
   .scenicSpotList .resourceList {
     width: 215px;
-    height: 240px;
     background-color: #fff;
     border: 1px dashed #ededed;
     border-radius: 4px;
@@ -150,7 +149,7 @@
   }
 
   .scenicSpotList .btnList {
-    margin-top: 10px;
+    padding:10px 0 20px 0;
     text-align: center;
   }
 
@@ -313,11 +312,10 @@
         <el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start" popper-class="max-w250">
           <div class="hotelTitle">{{item.Name}}</div>
         </el-tooltip>
-        <div style="padding-left:15px">
+        <div style="padding-left:15px;margin:10px 0;">
           <i style="top: 1px;position: relative;" class="iconfont icon-renyuanguanli"></i>
-          <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}/</span>
+          <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
           {{item.UpdateTimeStr}}
-          
         </div>
         <div class="btnList">
           <button @click="goUrl('scenicSpotInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>