Merge branch 'phoenix' into develop

app/Admin/Controllers/v3/CategoryController.php

@@ -32,7 +32,7 @@ class CategoryController extends AdminController
                     $logo = "<img src='$src' style='margin-left: 20px; max-width:35px;max-height:35px' class='img'/>";
 
                     $actions = '';
-                    $actions = (in_array($branch['id'],$select)) ?'<a href="/admin/category/'.$branch['id'].'/tie" style="margin-left: 20px;">已绑定</a>':$actions;
+                    $actions = (in_array($branch['id'],$select)) ?'<span style="margin-left: 20px;">已绑定</span>':$actions;
 
                     return "{$branch['id']} - {$branch['title']}  $logo  $actions";
                 });

app/Admin/Forms/CategoryTieForm.php

@@ -31,6 +31,9 @@ class CategoryTieForm extends Form
                     'name' => $value->title
                 ]);
             }
+            if(count($data) > 0){
+                $this->ssdb->client()->hclear('applet_index_category');
+            }
         }
 
         $category = $this->ssdb->client()->multi_hset('applet_index_category',$data);