diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index 31e772bfa..7f81aa92f 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -747,12 +747,16 @@ text-align: center; padding: 12px 0 5px 0; - > button.ivu-btn-primary { - margin-right: 12px; - } - - > button.ivu-btn-small { - height: 32px; + > button { + &.ivu-btn { + flex: 1; + } + &.ivu-btn-primary { + margin-right: 12px; + } + &.ivu-btn-small { + height: 32px; + } } } } diff --git a/resources/views/push/bot.blade.php b/resources/views/push/bot.blade.php index ed9c10706..c49e07f9b 100755 --- a/resources/views/push/bot.blade.php +++ b/resources/views/push/bot.blade.php @@ -117,16 +117,16 @@ @endif 开始时间:{{$data->start_time}} 结束时间:{{$data->end_time}} -
+
@if ($action === 'pass') - + @elseif ($action === 'refuse') - + @elseif ($action === 'withdraw') - + @else - - + + @endif
@elseif ($type === 'approve_notifier') @@ -138,11 +138,11 @@ @endif 开始时间:{{$data->start_time}} 结束时间:{{$data->end_time}} -
+
@if ($is_finished == 1) - + @else - + @endif
@elseif ($type === 'approve_submitter') @@ -154,13 +154,13 @@ @endif 开始时间:{{$data->start_time}} 结束时间:{{$data->end_time}} -
+
@if ($action === 'pass') - + @elseif ($action === 'refuse') - + @elseif ($action === 'withdraw') - + @endif
@else