发布测试版 2.5.0

app/Gdoo/Article/Controllers/WidgetController.php

@@ -22,6 +22,7 @@ class WidgetController extends DefaultController
             ->orderBy('created_at', 'desc');
 
             $rows = $model->limit(15)->get(['id', 'name', 'created_at']);
+            
             $json['total'] = sizeof($rows);
             $json['data'] = $rows;
             return $json;
@@ -44,7 +45,7 @@ class WidgetController extends DefaultController
             ->whereRaw('article_reader.article_id = article.id')
             ->where('article_reader.created_id', auth()->id());
         })->whereRaw('('.$config['sql'].')')->count();
-
+        
         $count2 = DB::table('article')
         ->permission('receive_id')
         ->whereNotExists(function ($q) {
@@ -56,18 +57,14 @@ class WidgetController extends DefaultController
 
         $rate = 0;
         if ($count2 > 0) {
-            $rate = $count / $count2 * 100;
+            $rate = ($count - $count2) / $count2 * 100;
+            $rate = number_format($rate, 2);
         }
         $res = [
             'count' => $count,
             'count2' => $count2,
             'rate' => $rate,
         ];
-
-        return $this->render([
-            'dates' => $config['dates'],
-            'info' => $config['info'],
-            'res' => $res,
-        ]);
+        return $this->json($res, true);
     }
 }

app/Gdoo/Article/config.php

@@ -8,17 +8,11 @@ return [
     ],
     'widgets' => [
         'widget_article_index' => [
-            'name' => '最新公告',
+            'name' => '新闻公告',
             'type' => 1,
             'url' => 'article/widget/index',
             'more_url' => 'article/article/index',
         ],
-        'info_article_index' => [
-            'name' => '未读公告',
-            'type' => 2,
-            'url' => 'article/widget/info',
-            'more_url' => 'article/article/index',
-        ],
     ],
     'badges' => [
         'article_article_index' => 'Gdoo\Article\Services\ArticleService::getBadge',

app/Gdoo/Article/views/widget/info.blade.php

@@ -1,15 +0,0 @@
-<div class="panel panel-shadow info-skin1">
-    <div class="info-l hidden-xs" style="background-color:{{$info['color']}}">
-        <i class="fa fa-2x {{$info['icon']}}"></i>
-    </div>
-    <div class="info-c">
-        <div class="info-name">{{$info['name']}}</div>
-        <a href="javascript:;" data-toggle="addtab" data-url="{{$info['more_url']}}" data-id="{{str_replace(['/', '?', '='], ['_', '_', '_'], $info['more_url'])}}" data-name="{{$info['name']}}">
-            <div class="text-info info-item" data-id="{{$info['id']}}" data-more_url="{{$info['more_url']}}">{{$res['count']}}</div>
-        </a>
-    </div>
-    <div class="info-r">
-        <div>比{{$dates[$info['params']['date']]}}</div>
-        <div class="rate @if($res['rate'] > 100) red @endif">{{$res['rate']}}%</div>
-    </div>
-</div>