diff --git a/app/Admin/Controllers/AgentController.php b/app/Admin/Controllers/AgentController.php index 87f5e32..6786c6f 100644 --- a/app/Admin/Controllers/AgentController.php +++ b/app/Admin/Controllers/AgentController.php @@ -9,6 +9,7 @@ use App\Admin\Extensions\Grid\MiniProgramUpload; use App\Admin\Repositories\Agent; use App\Common\AgentType; use App\Common\UserStatus; +use App\Models\MiniProgramTemplate; use App\Models\Supplier; use Dcat\Admin\Form; use Dcat\Admin\Grid; @@ -47,6 +48,7 @@ class AgentController extends AdminController $grid->column('rate')->editable()->help('分成百分比,如10%,则输入10'); $grid->column('created_at'); + $last_template_id = MiniProgramTemplate::max('template_id'); $grid->column('status', '状态') ->style('min-width:7em;') ->help('新用户入驻时,请先注册小程序。待企业法人认证通过之后,再上传小程序即可') @@ -65,13 +67,13 @@ class AgentController extends AdminController }) ->if(fn() => $this->status == UserStatus::NORMAL) ->display('') - ->then(function ($column) { + ->then(function ($column) use ($last_template_id) { if (empty($this->appid)) { //注册小程序 $column->append((new MiniProgramReg(null, 1))->setKey($this->id))->append(' '); $column->append((new MiniProgramReg(null, 2))->setKey($this->id)); - } else if (empty($this->miniUpload)) { + } else if (empty($this->miniUpload) || $this->miniUpload->template_id != $last_template_id) { $column->append((new MiniProgramUpload(null, 1))->setKey($this->id)); - } else if ($this->miniUpload->is_success == 0) { + } else if ($this->miniUpload->is_success == 0 && $this->miniUpload->template_id == $last_template_id) { $column->append("已发布(模板:{$this->miniUpload->template_id})"); } else { $column->append((new MiniProgramAuditStatus(null, 1))->setKey($this->id));