update

common/business/ApplicationBusiness.php

@@ -27,19 +27,32 @@ class ApplicationBusiness
        $data = CoinApplicateRecommend::getRecommendList();
        $icon_Items = array_column($data,'icon');
        $icon_Infos = CoinImage::getItemsByIds($icon_Items);
-       foreach ($data as &$value){
+       $disabe_applicate_Ids = CoinApplication::getDisableIds();
+       $disabe_applicate_category_Ids = CoinApplicationCategory::getDisableIds();
+       foreach ($data as $key => &$value){
+           if($value['type'] == 1){
+               if(in_array($value['app_cate_id'],$disabe_applicate_category_Ids)){
+                   unset($data[$key]);
+                   continue;
+               }
+           }else if($value['type'] == 2){
+               if(in_array($value['app_cate_id'],$disabe_applicate_Ids)){
+                   unset($data[$key]);
+                   continue;
+               }
+           }
            if($value['icon']){
                $value['icon'] = $icon_Infos[$value['icon']]['base_url'].$icon_Infos[$value['icon']]['file_url'];
            }else{
                $value['icon'] = '';
            }
        }
-       return $data;
+       return array_values($data);
     }
 
     public static function getCategoryAppList($limit=0)
     {
-        $data = CoinApplicationCategory::getAllList();
+        $data = CoinApplicationCategory::getAllList(['enable' => 1]);
         $cate_app_data = [];
         $icon_Items = array_column($data,'icon');
         $banner_Items = array_column($data,'banner');
@@ -85,6 +98,7 @@ class ApplicationBusiness
         foreach ($condition as $item) {
             $query = $query->andWhere($item);
         }
+        $query->andWhere(['enable' => 1]);
         $data = $query->asArray()->all();
         $icon_Items = array_column($data,'icon');
         $icon_Items = array_unique($icon_Items);

common/models/psources/CoinApplicateRank.php

@@ -47,7 +47,7 @@ class CoinApplicateRank extends BaseActiveRecord
         $applicate_rank_model = self::find();
         $data = $applicate_rank_model->JoinWith(['application'], false)
             ->select('relate_id as app_id,sort,name,icon,advertise,native_url,native_login_url,h5_url,android_url,ios_url,app_store_url,redirect_type,'.CoinApplication::tableName().".type")
-            ->orderBy(self::tableName().'.sort asc')->where([self::tableName().'.type' => $type])->asArray()->all();
+            ->orderBy(self::tableName().'.sort asc')->where([self::tableName().'.type' => $type,'enable' => 1])->asArray()->all();
         return $data;
     }
 

common/models/psources/CoinApplication.php

@@ -152,7 +152,7 @@ class CoinApplication extends BaseActiveRecord
     public static function getAppItemsByName($name)
     {
         return array_column(self::find()->select('id as app_id,name,icon,advertise,native_url,native_login_url,h5_url,android_url,ios_url,app_store_url,redirect_type,type')
-                                        ->where(['like','name',$name])->asArray()->all(),null,'app_id');
+                                        ->where(['like','name',$name,'enable' => 1])->asArray()->all(),null,'app_id');
     }
 
     public static function getH5ApplicateById($id)
@@ -162,5 +162,10 @@ class CoinApplication extends BaseActiveRecord
                            ->asArray()->one();
     }
 
+    public static function getDisableIds()
+    {
+        return array_column(self::find()->where(['enable' => 0])->select('id')->asArray()->all(),'id');
+    }
+
 
 }
\ No newline at end of file

common/models/psources/CoinApplicationCategory.php

@@ -97,9 +97,14 @@ class CoinApplicationCategory extends BaseActiveRecord
         return self::find()->asArray()->all();
     }
 
-    public static function getAllList()
+    public static function getAllList($condition=[])
     {
-        return self::find()->orderBy('sort asc')->asArray()->all();
+        if($condition){
+            return self::find()->andWhere($condition)->orderBy('sort asc')->asArray()->all();
+        }else{
+            return self::find()->orderBy('sort asc')->asArray()->all();
+        }
+
     }
 
     public static function getCateItemsByIds($ids)
@@ -107,6 +112,10 @@ class CoinApplicationCategory extends BaseActiveRecord
         return array_column(self::find()->where(['in','id',$ids])->asArray()->all(),null,'id');
     }
 
+    public static function getDisableIds()
+    {
+        return array_column(self::find()->where(['enable' => 0])->select('id')->asArray()->all(),'id');
+    }