From 467a8c661697cc6005b1f7c60e65748bf5db9801 Mon Sep 17 00:00:00 2001
From: zzlgreat <zzlgreat@gmail.com>
Date: Mon, 12 Jan 2026 07:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=AD=E5=BF=83=E7=9A=84?=
 =?UTF-8?q?=E6=B6=A8=E5=81=9C=E5=8E=9F=E5=9B=A0=E9=87=8C=E9=9D=A2=E5=92=8C?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 __pycache__/prediction_api.cpython-310.pyc    | Bin 24068 -> 24164 bytes
 prediction_api.py                             |   6 +++
 .../layouts/MainlineTimelineView.js           |   2 +-
 src/views/Community/components/HeroPanel.js   |  40 ++++++++++++++++--
 .../components/PredictionMarket/index.tsx     |   6 +--
 5 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/__pycache__/prediction_api.cpython-310.pyc b/__pycache__/prediction_api.cpython-310.pyc
index d0920a595b360c26ed1a9a23b57a89e866a7e4e8..048e14388b96ead5863aac760adaf30a5f9ea593 100644
GIT binary patch
delta 1072
zcmYjQNoW&M7=HguX0lGw)TT+SwoTK0v8^I*pdzi{hDDJsR*U$$WLlD#juiEcQQ|>F
zr7++@Bc|YT5D|R`F9k1FF9pSmC-I=52k(Ma@PDthH1Oy9=38Fg%)DHihi~%`%ov7`
z;HP~nO=aJ`2o8rmcU3}W;o@B<7k2WUOrfDkB{#^ll5V-L6VqFOIk2^K9Xe&`j0p#I
zU&%j5q!U3WjL!6GC$Q4-tSZK`!Zb6;ROX`Pblol0)|qaGZ1*^^J<Q!hPW{c>UgkB+
zaKcey`<RbbOuBOSrRJ+5G*Us*Kr3xODn2`4m9qei7L?pe7BJV**m;nwg2rh47T5ty
z8Mc8bL#7s(v62$(f68E<QY1y_dQ9gl9iUZ6qKF$1V~8qZ91#%LBW|=rVnYFtS4+N8
z@)}gjP^(1@BPOhB=BMt0g1k=V@VOvQqF*x$xrjisQhtk0jhV>LLN>HUsH62o7v8bh
zMg!_etaS;LwWKL(Ni%`1R>_vH*R~p206RNbpj1C6o}E}pV+LwH%vhr}Vc+BAfi@#)
zaKyceSJ8;mgy9i^@`p}KR*OrutauYrsS}H@C|9K-?yN~}ak+VE&GqUQX=_n?geMHh
zxf@n<p0+WMI3Rd1T5wu%+Hl%wdr_wyMYRC^<T!B=t78@}ECR8EKrYr(e3w(3?2y$-
zH(6aQSb%%vzEZ$Ntxgsyb<YvWn`!y7OFN6`(ylS3pXg+e(3l;(96U~_Uy>P^AuZj`
z$BGA4L;le;O{K?2rZbuJP+%f8J~29Njbt;KDSj^U8ep^29o^yY#lO^$dS?1;?yxf!
zO**%uhn&7d-1!y#2|t`~v4qD1<%$?biywBomUPgej1R=48XVx+>iqzg^Qz`4oabk2
z?*Mf0--#*>p7Y8kFTe+0+x!*aCU>>=dtr$WZ@J-uC;a<1ONGyTcvnh=?fmWTJplEN
zzIOq7`QqLk070(rd#u0-{;X#}gFM#{sv_?@@<xROf8Xa;;1B<FY(|4YesrKqg%|wF
M$%g=0r{UC>f2ct&LI3~&

delta 969
zcmYjPO-NKx6u#%ZdGqJIH;&Ga<LEdu+Km5NElLV3&4RF`T&R@<b)E1TIt{Nxxz7p4
zA_75p5J3|uR1hvI?xw{+i*!-6XxB2S7A@LELAdGMr-={F{l5F1@0@q;d-r=87R#W`
zsH&IX^S<xu<kyYY+NFT|icH8d%r98^fK>=FiTbCc{1{VKoQCTj(LF_21yh-J?<(GH
zg(-RklbM57(!i2zI+;`VnXYTZbTiipGQMScm`7JJv<NZ1%uB1L9QmTHd1HiD2gx+h
zpjm;6-}D)k%tu3oqLhEge0qR}Z-ULLXqZNp!1STbYpQ5dX$W0wOx<w__TQy4_e%97
zp*83ZT0o<SA;en5FrthYK?KAa#F!x*wM9T)hrHm?WA>&VWfjFZqK4RD)UgWcDoV%`
zc2T|UOJY8r|0`BKXs-?Sn#ldyvrE!c$$_U8BQ&C(T86xEr|g=PE^1PGVi^iK&8FMJ
z-m)g<!=gCztu(HR4<}kFOhv7kse812SntMM8nMX|=M=v|sA=@}3luNP_1UZeJ7soq
zgNTK+o)pb@qzT(3CQaKjZkJx(v)>(&HkXuVcvFDf$Qc>h!rbC+;GJm3Xu)X3Xrrwq
zCv7XqMHnH&#6gVqWte*f#MFSyH_@u|G<?0o^c$VD-RNRk5gw7pQW2XPoy@<|y-IAJ
zp_SWN+EKzR?aWFe#7V{o4V&76HoSwgFiTpxEN|!uUk|+n*l#UHdaRF;1}Q&a{fL~k
z){=2+sOBeZT1TTvYa%-6lD3@S1dYFmMil7hpW-J0rmaX~4QBYe!~=i~zmSS4@PgmU
zcmO`|+s)qq?sD2X;(_11eDJ;lR{5#Jh76y1`N*UU2Y9--7a(qBk8MCNZ$I7x;O5!B
z=MoHYbzoG1Ii5W&3%`D5U4|I%I_Hw$4?i?KtH3aSIod758sEJ56hOD`jDPtDB~%gb

diff --git a/prediction_api.py b/prediction_api.py
index a00c7a74..aa2988fc 100644
--- a/prediction_api.py
+++ b/prediction_api.py
@@ -209,6 +209,12 @@ def init_prediction_api(db, beijing_now):
                 query = query.order_by(desc(PredictionTopic.views_count))
             elif sort_by == 'participants':
                 query = query.order_by(desc(PredictionTopic.participants_count))
+            elif sort_by == 'ending_soon':
+                # 即将截止：按截止时间升序，最快截止的在前面（只显示未结算的）
+                query = query.order_by(PredictionTopic.deadline.asc())
+            elif sort_by == 'highest_pool':
+                # 奖池最高：按总奖池降序
+                query = query.order_by(desc(PredictionTopic.total_pool))
             else:
                 query = query.order_by(desc(PredictionTopic.created_at))
 
diff --git a/src/views/Community/components/DynamicNews/layouts/MainlineTimelineView.js b/src/views/Community/components/DynamicNews/layouts/MainlineTimelineView.js
index dafc14e3..389c17c9 100644
--- a/src/views/Community/components/DynamicNews/layouts/MainlineTimelineView.js
+++ b/src/views/Community/components/DynamicNews/layouts/MainlineTimelineView.js
@@ -523,7 +523,7 @@ const MainlineTimelineViewComponent = forwardRef(
     const [mainlineData, setMainlineData] = useState(null);
     const [expandedGroups, setExpandedGroups] = useState({});
     // 概念级别选择: 'lv1' | 'lv2' | 'lv3' | 具体概念ID（如 L1_TMT, L2_AI_INFRA, L3_AI_CHIP）
-    const [groupBy, setGroupBy] = useState("lv2");
+    const [groupBy, setGroupBy] = useState("lv3");
     // 层级选项（从 API 获取）
     const [hierarchyOptions, setHierarchyOptions] = useState({ lv1: [], lv2: [], lv3: [] });
     // 排序方式: 'event_count' | 'change_desc' | 'change_asc'
diff --git a/src/views/Community/components/HeroPanel.js b/src/views/Community/components/HeroPanel.js
index 94b925ce..6663b4b9 100644
--- a/src/views/Community/components/HeroPanel.js
+++ b/src/views/Community/components/HeroPanel.js
@@ -2056,10 +2056,44 @@ const DetailModal = ({ isOpen, onClose, selectedDate, ztDetail, events, loading
               fontSize="md"
               lineHeight="1.8"
               sx={{
-                '& p': { mb: 4 },
+                // 确保所有文本元素都使用浅色
+                '& *': { color: 'inherit' },
+                '& p': { mb: 4, color: 'whiteAlpha.900' },
                 '& h1, & h2, & h3': { color: 'gold', mb: 3 },
-                '& ul, & ol': { pl: 6 },
-                '& li': { mb: 2 },
+                '& h4, & h5, & h6': { color: 'whiteAlpha.900', mb: 2 },
+                '& ul, & ol': { pl: 6, color: 'whiteAlpha.900' },
+                '& li': { mb: 2, color: 'whiteAlpha.900' },
+                '& a': { color: 'cyan.300', textDecoration: 'underline' },
+                '& strong, & b': { color: 'gold', fontWeight: 'bold' },
+                '& em, & i': { color: 'whiteAlpha.800' },
+                '& code': {
+                  color: 'orange.300',
+                  bg: 'whiteAlpha.100',
+                  px: 1,
+                  borderRadius: 'sm',
+                  fontSize: 'sm',
+                },
+                '& pre': {
+                  bg: 'whiteAlpha.100',
+                  p: 3,
+                  borderRadius: 'md',
+                  overflow: 'auto',
+                  '& code': { bg: 'transparent', p: 0 },
+                },
+                '& blockquote': {
+                  borderLeft: '3px solid',
+                  borderColor: 'gold',
+                  pl: 4,
+                  ml: 0,
+                  color: 'whiteAlpha.700',
+                  fontStyle: 'italic',
+                },
+                '& table': {
+                  width: '100%',
+                  '& th': { color: 'gold', borderBottom: '1px solid rgba(255,215,0,0.3)', p: 2 },
+                  '& td': { color: 'whiteAlpha.900', borderBottom: '1px solid rgba(255,255,255,0.1)', p: 2 },
+                },
+                '& hr': { borderColor: 'whiteAlpha.200', my: 4 },
               }}
             >
               <ReactMarkdown>
diff --git a/src/views/StockCommunity/components/PredictionMarket/index.tsx b/src/views/StockCommunity/components/PredictionMarket/index.tsx
index 8d513137..414c32f6 100644
--- a/src/views/StockCommunity/components/PredictionMarket/index.tsx
+++ b/src/views/StockCommunity/components/PredictionMarket/index.tsx
@@ -85,10 +85,10 @@ const PredictionMarket: React.FC = () => {
       }
 
       const response = await getTopics({
-        status: filterBy === 'all' ? undefined : filterBy,
-        sort: sortBy,
+        status: filterBy === 'all' ? '' : filterBy,
+        sort_by: sortBy === 'latest' ? 'created_at' : sortBy,
         page: 1,
-        pageSize: 30,
+        per_page: 30,
       });
 
       if (response.success) {