diff --git a/app/Rpc/v1/NewsService.php b/app/Rpc/v1/NewsService.php
index 0c20fee..242e720 100755
--- a/app/Rpc/v1/NewsService.php
+++ b/app/Rpc/v1/NewsService.php
@@ -6,6 +6,7 @@ use App\Model\AppNews;
use App\Model\AppNewsColumn;
use App\Model\AppNewsSecondColumn;
use App\Rpc\BaseService;
+use Hyperf\DbConnection\Db;
use Hyperf\RpcServer\Annotation\RpcService;
#[RpcService(name: "news", server: "jsonrpc-http", protocol: "jsonrpc-http")]
@@ -113,14 +114,25 @@ class NewsService extends BaseService
}
}
+ // 热门文章
$hot = AppNews::formatQuery(['created_at'])
->where('platform', $id)
->where('is_delete', 0)
->select(['title', 'id', 'cover', 'created_at'])
->limit(5)
- ->orderBy('id', 'desc')
+ ->orderBy(Db::raw('RAND()'))
->get()
->toArray();
- return $this->getResponse()->setExtra('hot', $hot)->setExtra('total', ceil($total / $limit))->setData($value)->setCode(0)->send();
+
+ // 猜你喜欢
+ $guess = AppNews::formatQuery(['created_at'])
+ ->where('platform', $id)
+ ->where('is_delete', 0)
+ ->select(['title', 'id', 'cover', 'created_at'])
+ ->limit(10)
+ ->orderBy(Db::raw('RAND()'))
+ ->get()
+ ->toArray();
+ return $this->getResponse()->setExtra('guess', $guess)->setExtra('hot', $hot)->setExtra('total', ceil($total / $limit))->setData($value)->setCode(0)->send();
}
}
\ No newline at end of file
diff --git a/storage/view/news/index.blade.php b/storage/view/news/index.blade.php
index e34a498..6e64f8a 100755
--- a/storage/view/news/index.blade.php
+++ b/storage/view/news/index.blade.php
@@ -1,3 +1,8 @@
+where('is_delete', 0)->get()->groupBy('id')->toArray());
+});
+?>
@@ -115,6 +120,7 @@
let $ = layui.$;
let common = layui.common;
let util = layui.util;
+ let platform = JSON.parse('')
// 表头参数
let cols = [
@@ -123,6 +129,11 @@
}, {
title: "文章标题",
field: "title",
+ templet: function(d){
+ let domain = platform[d.platform][0]['app_domain']
+ console.log(domain)
+ return `` + d.title + '';
+ },
}, {
field:'is_record', title: '是否收录', templet: function(d){
if(d.is_record == '0'){
diff --git a/storage/view/website/index.blade.php b/storage/view/website/index.blade.php
index 49f5a28..83e4673 100644
--- a/storage/view/website/index.blade.php
+++ b/storage/view/website/index.blade.php
@@ -70,8 +70,7 @@
@@ -84,7 +83,6 @@
// 相关常量
const PRIMARY_KEY = "id";
- const RESEARCH_API = '/admin/api/keywords/monitor/research';
const DELETE_API = '/admin/api/website/config/delete';
const INDEX_API = '/admin/api/website/config';
const VIEW_API = "/admin/api/website/config/view";
@@ -266,31 +264,6 @@
});
}
- let research = function (obj) {
- layer.confirm("确定重查?", {
- icon: 3,
- title: "提示"
- }, function (index) {
- layer.close(index);
- let loading = layer.load();
- layui.$.ajax({
- url: RESEARCH_API,
- type: "POST",
- dateType: "json",
- data: {
- id: obj.data.id
- },
- success: function (res) {
- layer.close(loading);
- if (res.code) {
- return layui.popup.failure(res.msg);
- }
- return layui.popup.success("操作成功", refreshTable);
- }
- })
- });
- }
-
// 删除一行
let remove = function (obj) {
return doRemove(obj.data[PRIMARY_KEY]);