Merge branch 'master' into feature/issue_coin

common/models/psources/ExploreApp.php

@@ -32,10 +32,24 @@ class ExploreApp extends BaseActiveRecord
         return [
             [['name', 'icon', 'app_url', 'slogan', 'type', 'sort', 'status', 'platform_id', 'app_category_id'], 'required'],
             [['type', 'sort', 'status', 'platform_id', 'app_category_id'], 'integer'],
+            ['slogan', 'string', 'max' => 50],
             [['icon'], 'url']
         ];
     }
 
+    public function attributeLabels()
+    {
+        return [
+            'name' => '应用名称',
+            'icon' => '应用图标',
+            'app_url' => 'H5链接',
+            'slogan' => '应用宣传语',
+            'type' => '应用类型',
+            'sort' => '应用排序',
+            'status' => '应用状态'
+        ];
+    }
+
     public function scenarios()
     {
         $scenarios = [

common/models/psources/ExploreAppCategory.php

@@ -59,7 +59,7 @@ class ExploreAppCategory extends BaseActiveRecord
 
     public function getApplications()
     {
-        return $this->hasMany(ExploreApp::className(), ['app_category_id' => 'id'])->select(['id', 'name', 'icon', 'app_url', 'slogan', 'type'])->orderBy('sort');
+        return $this->hasMany(ExploreApp::className(), ['app_category_id' => 'id'])->select(['id', 'name', 'icon', 'app_url', 'slogan', 'type'])->where(['status' => ExploreApp::STATUS_ON])->orderBy('sort');
     }
 
 }
\ No newline at end of file