From 047b8b3bd257cfcffd90da2cb1d90ba634085a71 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 24 Nov 2023 10:37:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=BB=8F=E9=94=80?=
 =?UTF-8?q?=E5=95=86=E6=96=87=E5=88=9B=E7=AD=89=E7=BA=A7=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4=E7=99=BB=E8=AE=B0?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/admin/TeamAgencyController.php        | 10 +++++---
 .../views/admin/team-agency.blade.php         | 25 +++++++++++++------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/plugins/team-dividend/src/admin/TeamAgencyController.php b/plugins/team-dividend/src/admin/TeamAgencyController.php
index b787a526..4c6c8c8d 100644
--- a/plugins/team-dividend/src/admin/TeamAgencyController.php
+++ b/plugins/team-dividend/src/admin/TeamAgencyController.php
@@ -89,6 +89,7 @@ class TeamAgencyController extends BaseController
             }
         }
         $level = TeamDividendLevelModel::getList()->get();
+        $culturalLevel = TeamDividendLevelModel::getList()->get();
         // 获取所有经销商的排名信息
         $rankList = TeamDividendLevelModel::getRanking();
         // 获取每个经销商的赠送名额
@@ -137,6 +138,7 @@ class TeamAgencyController extends BaseController
             'pager' => $pager,
             'title' => $title,
             'level' => $level,
+            'culturalLevel' => $culturalLevel,
             'request' => \YunShop::request(),
         ])->render();
     }
@@ -341,16 +343,16 @@ class TeamAgencyController extends BaseController
     {
         $id = \YunShop::request()->id;
         $levelId = \YunShop::request()->value;
+        $leveType = \YunShop::request()->leve_type;
         $agency = TeamDividendAgencyModel::find($id);
-        $levelInfo = TeamDividendLevelModel::find($levelId);
-        // 等级类型：0=普通等级，1=文创等级
-        if((int)$levelInfo->level_type == 1){
+        // 等级类型：''=普通等级，cultural=文创等级
+        if((string)$leveType == 'cultural'){
             $level = $agency->cultural_level_id;
             $agency->cultural_level_id = $levelId;
             $agency->cultural_upgrade_at = time();
         }else{
             $level = $agency->level;
-            $agency->level = \YunShop::request()->value;
+            $agency->level = $levelId;
             $agency->upgrade_at = time();
         }
 
diff --git a/plugins/team-dividend/views/admin/team-agency.blade.php b/plugins/team-dividend/views/admin/team-agency.blade.php
index 52a9c970..98df6145 100644
--- a/plugins/team-dividend/views/admin/team-agency.blade.php
+++ b/plugins/team-dividend/views/admin/team-agency.blade.php
@@ -49,7 +49,7 @@
                                 </div>
                             </div>
 
-                            <div class="col-xs-12 col-sm-3 col-md-3 col-lg-2">
+                            <div class="form-group col-xs-12 col-sm-2">
                                 <select class="form-control tpl-category-parent" id="level" name="level_id">
                                     <option value="0">经销商等级</option>
                                     @foreach($level as $item)
@@ -62,10 +62,18 @@
                                 </select>
                             </div>
 
-                            <div class="form-group col-xs-12 col-sm-12 col-md-12 col-lg-6">
+                            <div class="form-group col-xs-12 col-sm-2">
+                                <select class="form-control tpl-category-parent" id="cultural_level" name="cultural_level_id">
+                                    <option value="0">文创等级</option>
+                                    @foreach($culturalLevel as $item)
+                                        <option value="{{$item->id}}" @if($request['cultural_level_id']==$item->id) selected @endif>{{$item->level_name}}</option>
+                                    @endforeach
+                                </select>
+                            </div>
 
+
+                            <div class="form-group col-xs-12 col-sm-4">
                                 <div class="time">
-
                                     <select name='searchtime' class='form-control'>
                                         <option value=''>成为经销商时间</option>
                                         <option value='1'
@@ -88,7 +96,7 @@
                                 </div>
                             </div>
 
-                            <div class="form-group  col-xs-12 col-sm-7 col-lg-4">
+                            <div class="form-group col-xs-12 col-sm-6">
                                 <!--<label class="col-xs-12 col-sm-2 col-md-2 col-lg-2 control-label"></label>-->
                                 <div class="">
                                     <button type="button" name="export" value="1" id="export" class="btn btn-default excel back ">导出 Excel</button>
@@ -179,7 +187,7 @@
                                             <i class='fa fa-pencil' style="display:none"></i>
                                         </span>
                                         <div class="input-group level" style="display:none">
-                                            <select class="form-control tpl-agent-level" name="level_id" data-agencyid="{{$item['id']}}">
+                                            <select class="form-control tpl-agent-level" name="level_id" data-agencyid="{{$item['id']}}" data-leve_type="cultural">
                                                 <option>请选择等级</option>
                                                 @foreach($level as $value)
                                                     @if($value->level_type == 1)
@@ -320,14 +328,15 @@
         });
         $('.tpl-agent-level').change(function () {
             var agencyId = $(this).data('agencyid');
+            var leve_type = $(this).data('leve_type');
             var levelId = $(this).val();
-            fastChange(agencyId, levelId);
+            fastChange(agencyId, levelId, leve_type);
         });
-        function fastChange(id, value) {
+        function fastChange(id, value, leve_type) {
             $.ajax({
                 url: "{!! yzWebUrl('plugin.team-dividend.admin.team-agency.change') !!}",
                 type: "post",
-                data: {id: id, value: value},
+                data: {id: id, value: value, leve_type: leve_type},
                 cache: false,
                 success: function ($data) {
                     console.log($data);