From 5ad3091def8f6245b9ebc61bf23b8d0c869ef1d2 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 11 Dec 2023 12:00:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E7=BB=8F=E9=94=80?=
 =?UTF-8?q?=E5=95=86=E5=8D=87=E7=BA=A7=E5=90=8E=E7=AD=89=E7=BA=A7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E9=94=99=E8=AF=AF=EF=BC=8C=E5=AF=BC=E8=87=B4=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E7=BB=8F=E9=94=80=E5=95=86=E6=9C=AA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=96=87=E5=88=9B=E7=A9=BA=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/models/TeamDividendAgencyModel.php       | 16 +++++++++++-----
 .../views/admin/team-agency.blade.php            | 16 ++++++++++++++--
 2 files changed, 25 insertions(+), 7 deletions(-)

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({