Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit 4f5f6f78 by mushishixian
Options

fix

parent efbbf00b
Inline Side-by-side
Showing with 15 additions and 10 deletions
app/Http/Controllers/Api/SupplierApiController.php
...@@ -420,7 +420,7 @@ class SupplierApiController extends Controller ...@@ -420,7 +420,7 @@ class SupplierApiController extends Controller
{ {
$supplierId = $request->get('supplier_id'); $supplierId = $request->get('supplier_id');
$blockReason = $request->get('block_reason'); $blockReason = $request->get('block_reason');
if (empty($blockReason)) { if (empty(trim($blockReason))) {
$this->response(-1, '必须填写拉黑原因'); $this->response(-1, '必须填写拉黑原因');
} }
if (mb_strlen($blockReason) > 200) { if (mb_strlen($blockReason) > 200) {
......
app/Http/Controllers/SupplierController.php
...@@ -180,7 +180,8 @@ class SupplierController extends Controller ...@@ -180,7 +180,8 @@ class SupplierController extends Controller
$supplier = $model->where('supplier_id', $supplierId)->first(); $supplier = $model->where('supplier_id', $supplierId)->first();
//获取最后一条非分配渠道员的日志 //获取最后一条非分配渠道员的日志
$logModel = new LogModel(); $logModel = new LogModel();
$auditContent = $logModel->where('supplier_id', $supplierId)->where('action', '!=', '分配渠道开发员') $auditContent = $logModel->where('supplier_id', $supplierId)
// ->where('action', '!=', '分配渠道开发员')
->where('action', '!=', '') ->where('action', '!=', '')
->where('type', '!=', 3) ->where('type', '!=', 3)
->orderBy('id', 'desc')->first(); ->orderBy('id', 'desc')->first();
......
resources/views/web/AuditSupplier.blade.php
...@@ -20,15 +20,19 @@ ...@@ -20,15 +20,19 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">审核内容 : </label> <label class="layui-form-label">审核内容 : </label>
<div class="layui-input-block block-42" style="padding-top: 7px"> <div class="layui-input-block block-42" style="padding-top: 7px">
<b>{{$auditContent['action'] .' : '}}</b> @if (!empty($auditContent))
@if(is_array($auditContent['content'])) <b>{{$auditContent['action'] .' : '}}</b>
@foreach($auditContent['content'] as $content) @if(is_array($auditContent['content']))
<p> @foreach($auditContent['content'] as $content)
{{$content}} <p>
</p> {{$content}}
@endforeach </p>
@endforeach
@else
{{$auditContent['content']}}
@endif
@else @else
{{$auditContent['content']}} 暂无
@endif @endif
</div> </div>
</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 sign in to comment