diff --git a/plugins/team-dividend/src/models/TeamDividendAgencyModel.php b/plugins/team-dividend/src/models/TeamDividendAgencyModel.php index 913c0276..bc4063bb 100644 --- a/plugins/team-dividend/src/models/TeamDividendAgencyModel.php +++ b/plugins/team-dividend/src/models/TeamDividendAgencyModel.php @@ -418,13 +418,19 @@ class TeamDividendAgencyModel extends BackendModel $agency->upgrade_at = time(); } + // 升级后等级 + $c_level = TeamDividendLevelModel::with(['hasOneUpgradeSet'])->find($leveType == 'cultural' ? $agency->cultural_level_id : $agency->level); + // 升级前等级 + $o_level = TeamDividendLevelModel::with(['hasOneUpgradeSet'])->find($level); + + + if($c_level && $o_level && $c_level->level_type != $o_level->level_type ){ + // 非默认等级 且 类型不一致,升级失败 + return false; + } + if ($agency->save()) { - // 升级后等级 - $c_level = TeamDividendLevelModel::with(['hasOneUpgradeSet'])->find($agency->level); - // 升级前等级 - $o_level = TeamDividendLevelModel::with(['hasOneUpgradeSet'])->find($level); - // 升级日志 Uplog::addLog($agency, $o_level, $c_level); diff --git a/plugins/team-dividend/views/admin/team-agency.blade.php b/plugins/team-dividend/views/admin/team-agency.blade.php index 4e066982..b10373be 100644 --- a/plugins/team-dividend/views/admin/team-agency.blade.php +++ b/plugins/team-dividend/views/admin/team-agency.blade.php @@ -320,13 +320,25 @@ $('.fa-edit-item').click(function () { $(this).closest('span').hide(); $(this).next('.level').show(); - }); + + $('.level').mouseover(function () { + // console.log('mouseover'); + }).mouseout(function () { + $(this).prev('.fa-edit-item').show(); + $(this).closest('.level').hide(); + }); + + let is_submit = true; $('.tpl-agent-level').change(function () { var agencyId = $(this).data('agencyid'); var leve_type = $(this).data('leve_type'); var levelId = $(this).val(); - fastChange(agencyId, levelId, leve_type); + + if(is_submit){ + is_submit = false; + fastChange(agencyId, levelId, leve_type); + } }); function fastChange(id, value, leve_type) { $.ajax({