Panda 3 месяцев назад
Родитель
Сommit
9d95f78c73

+ 1 - 1
application/admin/lang/zh-cn/hotel_room.php

@@ -26,7 +26,7 @@ return [
     'Facility'       => '客房设施',
     'Bathroom'       => '卫浴',
     'Tips'           => '特别提示',
-    'Cancel_explan'  => '限时取消',
+    'Cancel_explain'  => '限时取消',
     'Weigh'          => '排序值(越大越靠前)',
     'Status'         => '状态',
     'Status 1'       => '正常',

+ 2 - 2
application/admin/view/hotel_room/add.html

@@ -149,9 +149,9 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Cancel_explan')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Cancel_explain')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-cancel_explan" data-rule="required" class="form-control" name="row[cancel_explan]" type="text" value="">
+            <input id="c-cancel_explain" data-rule="required" class="form-control" name="row[cancel_explain]" type="text" value="">
         </div>
     </div>
     <div class="form-group">

+ 2 - 2
application/admin/view/hotel_room/edit.html

@@ -149,9 +149,9 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Cancel_explan')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Cancel_explain')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-cancel_explan" data-rule="required" class="form-control" name="row[cancel_explan]" type="text" value="{$row.cancel_explan|htmlentities}">
+            <input id="c-cancel_explain" data-rule="required" class="form-control" name="row[cancel_explain]" type="text" value="{$row.cancel_explan|htmlentities}">
         </div>
     </div>
     <div class="form-group">

+ 0 - 1
application/api/controller/Hotel.php

@@ -97,7 +97,6 @@ class Hotel extends Api
         $params = $this->request->param();
         $info = HotelRoomModel::where('id',$params['id'])->where('status',1)->find();
         $info['business_license'] = cdnurl(config('site.business_license'));
-        $info['cancel_explain'] = '入住当天12点前可取消';
         return $this->success('success', $info);
     }
 

+ 1 - 1
public/assets/js/backend/hotel_room.js

@@ -46,7 +46,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'facility', title: __('Facility'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'bathroom', title: __('Bathroom'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'tips', title: __('Tips'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'cancel_explan', title: __('Cancel_explan'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'cancel_explain', title: __('Cancel_explain'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'weigh', title: __('Weigh'), operate: false},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0')}, formatter: Table.api.formatter.status},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},