Commit 4f5f6f78 by mushishixian

fix

parent efbbf00b
...@@ -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) {
......
...@@ -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();
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<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">
@if (!empty($auditContent))
<b>{{$auditContent['action'] .' : '}}</b> <b>{{$auditContent['action'] .' : '}}</b>
@if(is_array($auditContent['content'])) @if(is_array($auditContent['content']))
@foreach($auditContent['content'] as $content) @foreach($auditContent['content'] as $content)
...@@ -30,6 +31,9 @@ ...@@ -30,6 +31,9 @@
@else @else
{{$auditContent['content']}} {{$auditContent['content']}}
@endif @endif
@else
暂无
@endif
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
......
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