diff --git a/component/sign-in/sign-in.js b/component/sign-in/sign-in.js index 286dc78..3bb65d8 100644 --- a/component/sign-in/sign-in.js +++ b/component/sign-in/sign-in.js @@ -1,5 +1,5 @@ const signTemplate = document.createElement("template"); -signTemplate.innerHTML = `
0
寄托币
签到规则
随机奖励
+{{ reward }}
额外奖励
+{{ extra_reward }}
`; +signTemplate.innerHTML = `
0
寄托币
签到规则
随机奖励
+{{ reward }}
额外奖励
+{{ extra_reward }}
`; class SignInBox extends HTMLElement { static get observedAttributes() { diff --git a/component/sign-in/sign-in.txt b/component/sign-in/sign-in.txt index 8aa9f7e..66e74e9 100644 --- a/component/sign-in/sign-in.txt +++ b/component/sign-in/sign-in.txt @@ -51,14 +51,14 @@ .signInBox-mask a { text-decoration: none; - color: unset; + color: unset; } .signInBox-mask .signInBox { - width: 1060px; + width: min(1060px, 95vw); background-color: #fff; border-radius: 20px; - position: relative; + position: relative; filter: drop-shadow(0 -5px 0 #f7c308); } @@ -97,11 +97,14 @@ .signInBox-mask .signInBox .signInBox-content { align-items: flex-start; - height: 595px; + height: auto; + gap: 16px; + flex-wrap: wrap; } .signInBox-mask .signInBox .signInBox-content .left-box { - width: 538px; + flex: 1 1 520px; + max-width: 560px; padding: 20px 30px 40px; border-right: 1px dotted #d7d7d7; } @@ -252,8 +255,8 @@ } .signInBox-mask .signInBox .signInBox-content .left-box .calendar-box { - width: 477px; - height: 479px; + width: 100%; + height: auto; background-color: #fbfbfb; border-radius: 12px; flex-direction: column; @@ -277,14 +280,16 @@ .signInBox-mask .signInBox .signInBox-content .left-box .calendar-box .calendar { margin: 0 0 14px; - flex-wrap: wrap; + display: grid; + grid-template-columns: repeat(7, minmax(32px, 1fr)); + column-gap: 12px; + row-gap: 10px; } .signInBox-mask .signInBox .signInBox-content .left-box .calendar-box .calendar .calendar-item { - width: 40px; - height: 40px; + width: 100%; + aspect-ratio: 1 / 1; border-radius: 50%; - margin-bottom: 10px; font-size: 17px; color: #aaaaaa; position: relative; @@ -292,7 +297,7 @@ } .signInBox-mask .signInBox .signInBox-content .left-box .calendar-box .calendar .calendar-item:not(:nth-child(7n)) { - margin-right: 25px; + margin-right: 0; } .signInBox-mask .signInBox .signInBox-content .left-box .calendar-box .calendar .calendar-item.formerly { @@ -324,7 +329,7 @@ } .signInBox-mask .signInBox .signInBox-content .left-box .calendar-box .sign-in-btn { - height: 48px; + min-height: 48px; border-radius: 219px; background-color: #f7c308; color: #fff; @@ -346,10 +351,31 @@ color: #555555; font-size: 15px; flex-direction: column; - height: inherit; + flex: 1 1 420px; + min-height: 320px; + height: auto; overflow: auto; } + @media (max-width: 768px) { + .signInBox-mask .signInBox { + width: 95vw; + } + .signInBox-mask .signInBox .signInBox-content { + flex-direction: column; + gap: 12px; + } + .signInBox-mask .signInBox .signInBox-content .left-box { + max-width: 100%; + border-right: none; + border-bottom: 1px dotted #d7d7d7; + } + .signInBox-mask .signInBox .signInBox-content .sign-in-box { + margin: 0; + border-radius: 12px; + } + } + .signInBox-mask .signInBox .signInBox-content .sign-in-box .sign-in-header { padding: 24px 30px 9px; font-size: 14px; @@ -710,4 +736,4 @@ - \ No newline at end of file + diff --git a/css/public.css b/css/public.css index 4e214ab..fe8396f 100644 --- a/css/public.css +++ b/css/public.css @@ -1777,11 +1777,6 @@ body { display: none; padding: 5px; } -@media screen and (max-width: 480px) { - .head-top .head-more { - display: flex; - } -} .hot-tag { background-color: #ffffff; border: 1px solid #e9eef2; @@ -1970,6 +1965,7 @@ td { } .head-pop.head-pop-show { left: 0; + display: block !important; } .head-pop.head-pop-show .head-more-pop { animation: slide-in-left 0.5s ease-out forwards; @@ -2097,3 +2093,208 @@ td { margin: 0 auto; box-sizing: content-box; } +@media (max-width: 1200px) { + .head-pop .head-more-pop { + width: 80vw; + } + .head-pop .head-more-pop .head-more-userinfo { + margin-left: 20px; + padding-right: 20px; + } + .head-pop .head-more-pop .tab-list { + padding-right: 20px; + margin-left: 20px; + } + .head-pop .head-more-pop .tab-list .tab-item { + height: 50px; + padding-left: 20px; + font-size: 14px; + } + .head-pop .head-more-pop .head-more-post { + margin: 40px 0 90px; + } + .head-pop .head-more-pop .cross-icon { + left: calc(50% + 40px); + } +} +@media (max-width: 768px) { + .head-pop .head-more-pop { + width: 100vw; + height: 100vh; + } + .head-pop .head-more-pop .head-more-userinfo { + margin-left: 16px; + padding-right: 16px; + } + .head-pop .head-more-pop .head-more-userinfo .head-more-right { + width: auto; + height: auto; + } + .head-pop .head-more-pop .tab-list { + padding-right: 16px; + margin-left: 16px; + } + .head-pop .head-more-pop .tab-list .tab-item { + height: 46px; + padding-left: 16px; + font-size: 13px; + } + .head-pop .head-more-pop .head-more-post { + margin: 36px 0 80px; + font-size: 16px; + } + .head-pop .head-more-pop .head-more-post .head-more-post-icon { + width: 18px; + height: 18px; + margin-right: 6px; + } + .head-pop .head-more-pop .cross-icon { + left: 50%; + transform: translateX(-50%); + bottom: 15px; + } +} +@media (max-width: 480px) { + .head-pop .head-more-pop .head-more-userinfo { + margin-left: 12px; + padding-right: 12px; + } + .head-pop .head-more-pop .head-more-userinfo .head-more-left .head-more-userinfo-avatar { + width: 36px; + height: 36px; + margin-right: 8px; + } + .head-pop .head-more-pop .head-more-userinfo .head-more-left .head-more-userinfo-username { + font-size: 12px; + } + .head-pop .head-more-pop .head-more-userinfo .head-more-right .information-box { + width: 14px; + height: 14px; + } + .head-pop .head-more-pop .head-more-userinfo .head-more-right .information-box .information-icon { + width: 14px; + height: 14px; + } + .head-pop .head-more-pop .head-more-userinfo .head-more-right .loginBtn { + width: 72px; + height: 28px; + font-size: 12px; + } + .head-pop .head-more-pop .tab-list { + padding-right: 12px; + margin-left: 12px; + } + .head-pop .head-more-pop .tab-list .tab-item { + height: 42px; + padding-left: 14px; + font-size: 12px; + } + .head-pop .head-more-pop .head-more-post { + margin: 24px 0 60px; + font-size: 14px; + } + .head-pop .head-more-pop .head-more-post .head-more-post-icon { + width: 16px; + height: 16px; + margin-right: 6px; + } + .head-pop .head-more-pop .head-more-post .head-more-post-icon .head-more-post-img { + width: 8px; + height: 8px; + } + .head-pop .head-more-pop .cross-icon { + width: 10px; + height: 10px; + padding: 12px; + bottom: 12px; + left: 50%; + transform: translateX(-50%); + } +} +@media screen and (max-width: 1200px) { + header.page-header { + min-width: auto !important; + } + header.page-header .box { + width: 100vw; + } + .head-top.flexacenter { + max-width: 1200px !important; + width: initial !important; + margin: 20px 10px 30px !important; + } + .head-top.flexacenter .input-box { + margin-right: 10px; + } + .index-footer { + min-width: inherit !important; + } +} +@media screen and (max-width: 768px) { + header.page-header { + display: none !important; + } + .head-top .head-more { + display: flex; + } + .index-footer { + display: none !important; + } + .head-top .post-list { + display: none !important; + } + #search .search-box { + width: auto !important; + margin: 0 10px 20px; + height: 40px !important; + } + #search .classify { + margin-left: 10px; + margin-right: 10px; + } + #search .matter .matter-content { + margin: 0 10px; + } + #search .matter .sidebar-box { + display: none; + } + #search .matter .search-box { + margin-left: 10px; + margin-right: 10px; + } + .item-box { + padding: 18px 10px 0; + } + .item-box .comment .text { + width: calc(100vw - 122px); + } + .item-box .bottom .bottom-item:not(:last-child) { + margin-right: 30px; + } +} +@media screen and (max-width: 500px) { + #search .classify .item { + min-width: inherit; + font-size: 13px; + height: 28px; + line-height: 28px; + border-radius: 8px; + } +} +@media screen and (max-width: 480px) { + .head-top.flexacenter { + margin-bottom: 10px !important; + } + .item-box .bottom { + height: 55px; + justify-content: space-between; + } + .item-box .bottom .bottom-item:not(:last-child) { + margin-right: 0; + } +} +@media screen and (max-width: 450px) { + #search .classify .item { + padding: 0 5px; + } +} diff --git a/css/public.less b/css/public.less index 028e67c..ca29050 100644 --- a/css/public.less +++ b/css/public.less @@ -2140,14 +2140,6 @@ body { } } -@media screen and (max-width: 480px) { - .head-top { - .head-more { - display: flex; - } - } -} - .hot-tag { background-color: rgba(255, 255, 255, 1); border: 1px solid rgba(233, 238, 242, 1); @@ -2369,6 +2361,7 @@ td { &.head-pop-show { left: 0; + display: block !important; .head-more-pop { animation: slide-in-left 0.5s ease-out forwards; @@ -2515,5 +2508,238 @@ td { margin: 0 auto; box-sizing: content-box; } + + // 响应式断点：1200 / 768 / 480 + @media (max-width: 1200px) { + width: 80vw; + .head-more-userinfo { + margin-left: 20px; + padding-right: 20px; + } + .tab-list { + padding-right: 20px; + margin-left: 20px; + .tab-item { + height: 50px; + padding-left: 20px; + font-size: 14px; + } + } + .head-more-post { + margin: 40px 0 90px; + } + .cross-icon { + left: calc(50% + 40px); + } + } + + @media (max-width: 768px) { + width: 100vw; + height: 100vh; + .head-more-userinfo { + margin-left: 16px; + padding-right: 16px; + .head-more-right { + width: auto; + height: auto; + } + } + .tab-list { + padding-right: 16px; + margin-left: 16px; + .tab-item { + height: 46px; + padding-left: 16px; + font-size: 13px; + } + } + .head-more-post { + margin: 36px 0 80px; + font-size: 16px; + .head-more-post-icon { + width: 18px; + height: 18px; + margin-right: 6px; + } + } + .cross-icon { + left: 50%; + transform: translateX(-50%); + bottom: 15px; + } + } + + @media (max-width: 480px) { + .head-more-userinfo { + margin-left: 12px; + padding-right: 12px; + .head-more-left { + .head-more-userinfo-avatar { + width: 36px; + height: 36px; + margin-right: 8px; + } + .head-more-userinfo-username { + font-size: 12px; + } + } + .head-more-right { + .information-box { + width: 14px; + height: 14px; + .information-icon { + width: 14px; + height: 14px; + } + } + .loginBtn { + width: 72px; + height: 28px; + font-size: 12px; + } + } + } + .tab-list { + padding-right: 12px; + margin-left: 12px; + .tab-item { + height: 42px; + padding-left: 14px; + font-size: 12px; + } + } + .head-more-post { + margin: 24px 0 60px; + font-size: 14px; + .head-more-post-icon { + width: 16px; + height: 16px; + margin-right: 6px; + .head-more-post-img { + width: 8px; + height: 8px; + } + } + } + .cross-icon { + width: 10px; + height: 10px; + padding: 12px; + bottom: 12px; + left: 50%; + transform: translateX(-50%); + } + } + } +} + +@media screen and (max-width: 1200px) { + header.page-header { + min-width: auto !important; + .box { + width: 100vw; + } + } + + .head-top.flexacenter { + max-width: 1200px !important; + width: initial !important; + margin: 20px 10px 30px !important; + + .input-box { + margin-right: 10px; + } + } + + .index-footer { + min-width: inherit !important; + } +} + +// 媒体查询 最大宽度 768px 时 +@media screen and (max-width: 768px) { + header.page-header { + display: none !important; + } + + .head-top { + .head-more { + display: flex; + } + } + + .index-footer { + display: none !important; + } + + .head-top .post-list { + display: none !important; + } + + #search { + .search-box { + width: auto !important; + margin: 0 10px 20px; + height: 40px !important; + } + .classify { + margin-left: 10px; + margin-right: 10px; + } + + .matter { + .matter-content { + margin: 0 10px; + } + .sidebar-box { + display: none; + } + + .search-box { + margin-left: 10px; + margin-right: 10px; + } + } + } + + .item-box { + padding: 18px 10px 0; + .comment .text { + width: calc(100vw - 122px); + } + .bottom .bottom-item:not(:last-child) { + margin-right: 30px; + } + } +} + +@media screen and (max-width: 500px) { + #search .classify .item { + min-width: inherit; + font-size: 13px; + height: 28px; + line-height: 28px; + border-radius: 8px; + } +} + +@media screen and (max-width: 480px) { + .head-top.flexacenter { + margin-bottom: 10px !important; + } + + .item-box .bottom { + height: 55px; + justify-content: space-between; + + .bottom-item:not(:last-child) { + margin-right: 0; + } + } +} + +@media screen and (max-width: 450px) { + #search .classify .item { + padding: 0 5px; } } diff --git a/css/search.css b/css/search.css index a3407e3..2e77054 100644 --- a/css/search.css +++ b/css/search.css @@ -1,5 +1,5 @@ #search { - width: 1200px; + max-width: 1200px; margin: 0 auto; } #search .search-box { diff --git a/css/search.less b/css/search.less index 55a378b..3fae62f 100644 --- a/css/search.less +++ b/css/search.less @@ -1,5 +1,5 @@ #search { - width: 1200px; + max-width: 1200px; margin: 0 auto; .search-box { diff --git a/homepage-other.html b/homepage-other.html index 5e14295..98f56dc 100644 --- a/homepage-other.html +++ b/homepage-other.html @@ -156,6 +156,7 @@ + \ No newline at end of file diff --git a/index.html b/index.html index 34ec77c..75fd10e 100644 --- a/index.html +++ b/index.html @@ -20,62 +20,13 @@
- -
- - - -
-
- -
-
- -
-
- - -
-
历史搜索
-
-
-
-
- -
- - -
- - - - +
- - - - - - +
{:html_entity_decode($ad['headerbanner'])}
+
{:html_entity_decode($ad['subnavbanner'])}
@@ -84,12 +35,14 @@
话题
-
-
{{ ongoingbj.title }}
-
{{ ongoingbj.description }}
+
+ + {{ ongoingbj.title }} +
-
{{ ongoingbj.comments }}
+
+
{{ ongoingbj.comments }}
人正在讨论
@@ -100,9 +53,9 @@
- + -
{{ item.title }}
+
@@ -113,131 +66,187 @@
精选
- +
-
{{ item.title }}
+
- - 26Fall祈福，求offer得offer！ + + {$operation['bbsindexslide']['title']}
-
+ {foreach :array_slice($operation['bbsindexarticle'],0,4) as $key=>$vo } +
- 26Fall-香港理工大学 MSc Offer + {$vo['title']}
+ {/foreach}
-
+ {foreach :array_slice($operation['bbsindexarticle'],4,8) as $key=>$vo } +
- 26Fall-香港科技大学 MSc Offer + {$vo['title']}
+ {/foreach}
-
我要发帖
+ 我要发帖
- - + +
+ +
报Offer - - + +
+ +
写总结 - - + +
+ +
写面经 - - + +
+ +
发起投票
- - - - - + {if $ad['custom_2']} +
{:html_entity_decode($ad['custom_2'])}
+ {/if}
-
-
{{ item.title }}
-
{{ item.subtitle }}
+
+
26FALL
+
申请群
- +
微信扫码
+
+
申请求助
+
寄托院校君
+
+ +
微信扫码
+
+
+
+
香港租房
+
交流群
+
+ +
微信扫码
+
+
+
+
香港租房顾问
+
寄托方同学
+
+ +
微信扫码
+
+
+
-
-
+ +
+ + +
Hello Admission Officer
+ +
+ {foreach $OfficerToEnrolNewStudents as $key=>$item} +
+ + {$item['name']} + +
+ {/foreach} +
+
+ +
- +
论坛版块
-
- -
加载中
-
- -
-
- - 26Fall祈福，求offer得offer！ - - - 26Fall祈福，求offer得offer！ - + + + + +
+
+ {if $ad['custom_1']}
{:html_entity_decode($ad['custom_1'])}
{/if} + {if $ad['custom_3']}
{:html_entity_decode($ad['custom_3'])}
{/if}
- +
Offer
more - +
-
{{ item.data['schoolname'] }}
+
+
{{ item.data['schoolname'] }}
{{ item.data['professional'] }}
{{ item.data['degree'] }} @@ -248,8 +257,8 @@
- - + +
报Offer
 @@ -260,21 +269,21 @@
- +
投票
more - +
- +
{{item['title']}}
-
{{ item['message'] }}
+
{{ item['content'] }}
 - - + +
发起投票
 @@ -285,25 +294,25 @@
- +
面经
more - +
- +
{{ item.data['schoolname'] }}
-
{{ item.data['profession'] }}
+
{{ item.data['profession'] || item.data['project'] }}
{{ item['content'] }}
- - + +
写面经
 @@ -484,7 +493,11 @@ startCarousel(); + + + + \ No newline at end of file diff --git a/js/edit.js b/js/edit.js index 45d11f8..597ffed 100644 --- a/js/edit.js +++ b/js/edit.js @@ -65,7 +65,6 @@ const editApp = createApp({ isLogin.value = true; } - }); let imageLength = 10; @@ -173,7 +172,6 @@ const editApp = createApp({ info.value = infoTarget; token.value = data.token; - initEditor(); }) .catch((err) => { @@ -211,6 +209,7 @@ const editApp = createApp({ onInsertedImage(imageNode) { const { src, alt, url, href } = imageNode; }, + async parseImageSrc(src) { // 如果图片链接中已经包含了 ?aid= ，则说明是本站图片，直接返回，无需处理 if (src.includes("?aid=")) return src; @@ -233,8 +232,15 @@ const editApp = createApp({ } } catch (e) { console.error("Transform network image failed", e); + return ""; } }, + checkImage: (src, alt, url) => { + if (src.indexOf("http") !== 0) { + return "图片网址必须以 http/https 开头"; + } + return true; + }, // 也支持 async 函数 }, ["uploadImage"]: { @@ -251,6 +257,8 @@ const editApp = createApp({ async customUpload(file, insertFn) { try { const img = await uploading(file, file.name, "image"); + console.log("img", img); + insertFn(`${img.url}?aid=${img.aid}`); } catch (err) { console.error("上传出错：", err); @@ -261,7 +269,6 @@ const editApp = createApp({ ["insertVideo"]: { onInsertedVideo(videoNode) { if (videoNode == null) return; - // console.log(videoNode); const { src } = videoNode; // console.log("inserted video", src); @@ -423,6 +430,7 @@ const editApp = createApp({ // 定义图片处理函数 const processImg = (aid, width, height, href) => { + console.log("processImg", aid, width, height, href); const image = imageList.find((img) => String(img.aid) === String(aid)); if (!image) return ""; @@ -433,7 +441,7 @@ const editApp = createApp({ let style = ""; const formatStyleVal = (val) => { if (!val) return null; - if (String(val).endsWith('%')) return val; + if (String(val).endsWith("%")) return val; const num = Number(val); return num > 0 ? `${num}px` : null; }; @@ -445,7 +453,7 @@ const editApp = createApp({ if (wStyle) styleParts.push(`width: ${wStyle}`); if (hStyle) styleParts.push(`height: ${hStyle}`); - if (styleParts.length > 0) style = `style="${styleParts.join('; ')};"`; + if (styleParts.length > 0) style = `style="${styleParts.join("; ")};"`; let dataHref = href ? ` data-href="${href}"` : ""; return ``; @@ -464,6 +472,41 @@ const editApp = createApp({ return imgTag || match; }); + html = html.replace(/\[url=([^\]]+)\]\[img(?:=([0-9.%]+)(?:,([0-9.%]+))?)?\]([^\]]+)\[\/img\]\[\/url\]/gi, (match, href, w, h, inner) => { + if (/^\d+$/.test(inner)) return match; + const formatStyleVal = (val) => { + if (!val) return null; + if (String(val).endsWith("%")) return val; + const num = Number(val); + return num > 0 ? `${num}px` : null; + }; + const wStyle = formatStyleVal(w); + const hStyle = formatStyleVal(h); + let styleParts = []; + if (wStyle) styleParts.push(`width: ${wStyle}`); + if (hStyle) styleParts.push(`height: ${hStyle}`); + const styleAttr = styleParts.length > 0 ? ` style="${styleParts.join("; ")};"` : ""; + const dataHref = href ? ` data-href="${href}"` : ""; + return ``; + }); + + html = html.replace(/\[img(?:=([0-9.%]+)(?:,([0-9.%]+))?)?\]([^\]]+)\[\/img\]/gi, (match, w, h, inner) => { + if (/^\d+$/.test(inner)) return match; + const formatStyleVal = (val) => { + if (!val) return null; + if (String(val).endsWith("%")) return val; + const num = Number(val); + return num > 0 ? `${num}px` : null; + }; + const wStyle = formatStyleVal(w); + const hStyle = formatStyleVal(h); + let styleParts = []; + if (wStyle) styleParts.push(`width: ${wStyle}`); + if (hStyle) styleParts.push(`height: ${hStyle}`); + const styleAttr = styleParts.length > 0 ? ` style="${styleParts.join("; ")};"` : ""; + return ``; + }); + // 6. [attachimg] (兼容旧格式) html = html.replace(/\[attachimg\](\d+)\[\/attachimg\]/gi, (match, aid) => { const imgTag = processImg(aid, 0, 0, null); @@ -507,16 +550,16 @@ const editApp = createApp({ __c.innerHTML = html; // 确保所有顶层元素都是块级元素 (Slate/WangEditor 要求) - const blockTags = ['P', 'DIV', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'BLOCKQUOTE', 'UL', 'OL', 'PRE', 'TABLE', 'FIGURE', 'HR']; - const newContainer = document.createElement('div'); + const blockTags = ["P", "DIV", "H1", "H2", "H3", "H4", "H5", "H6", "BLOCKQUOTE", "UL", "OL", "PRE", "TABLE", "FIGURE", "HR"]; + const newContainer = document.createElement("div"); let currentInlineNodes = []; let lastWasBlock = false; const flushInlines = () => { if (currentInlineNodes.length > 0) { if (currentInlineNodes.length > 0) { - const p = document.createElement('p'); - currentInlineNodes.forEach(node => p.appendChild(node)); + const p = document.createElement("p"); + currentInlineNodes.forEach((node) => p.appendChild(node)); newContainer.appendChild(p); } currentInlineNodes = []; @@ -532,7 +575,7 @@ const editApp = createApp({ newContainer.appendChild(node); // 记录最后添加的是块级元素 lastWasBlock = true; - } else if (node.nodeName === 'BR') { + } else if (node.nodeName === "BR") { if (currentInlineNodes.length > 0) { flushInlines(); lastWasBlock = false; // 刚刚结束了一个段落，不算紧挨着块级 @@ -542,8 +585,8 @@ const editApp = createApp({ // 忽略 lastWasBlock = false; // 消耗掉块级后的换行状态，避免连续 BR 被吞 } else { - const p = document.createElement('p'); - p.innerHTML = '
'; + const p = document.createElement("p"); + p.innerHTML = "
"; newContainer.appendChild(p); lastWasBlock = false; } @@ -585,7 +628,7 @@ const editApp = createApp({ // 提交 const submit = (status) => { - if (location.hostname == "127.0.0.1") status = 0 + if (location.hostname == "127.0.0.1") status = 0; if (realname.value == 0 && userInfoWin.value?.uin > 0) { openAttest(); @@ -600,7 +643,12 @@ const editApp = createApp({ const infoTarget = { ...info.value } || {}; let content = editor.getHtml(); + const obj = formatContent(content); + + content = obj.content; + const images = extractImages(editorRef.value); + // const images = obj.images; const videos = extractVideos(editorRef.value); infoTarget.attachments = infoTarget.attachments || {}; @@ -611,16 +659,11 @@ const editApp = createApp({ info.value["attachments"]["images"] = images; info.value["attachments"]["videos"] = videos; - // console.log("原始html", content); - content = formatContent(content); - // console.log("最终html", content); const data = { ...infoTarget, content, }; - // console.log("data", data); - ajax("/v2/api/forum/postPublishTopic", { info: data, token: token.value, @@ -643,6 +686,8 @@ const editApp = createApp({ }; const formatContent = (html) => { + let images = []; + if (!html) return ""; //


转换为单个换行符 html = html.replace(/


<\/p>/gi, "\n"); @@ -671,63 +716,65 @@ const editApp = createApp({ // 4. 处理图片 [img] html = html.replace(/]*>/gi, (imgTag) => { let aid = ""; - // 尝试从 src 中获取 aid const srcMatch = imgTag.match(/src="([^"]+)"/i); - if (srcMatch) { - const aidMatch = srcMatch[1].match(/[?&]aid=(\d+)/); - if (aidMatch) aid = aidMatch[1]; - } - // 尝试从 data-aid 中获取 aid - if (!aid) { - const dataAid = imgTag.match(/data-aid="(\d+)"/i); - if (dataAid) aid = dataAid[1]; - } + if (!srcMatch) return ""; + const srcUrl = srcMatch[1]; + const cleanUrl = srcUrl.split("?")[0]; + const aidMatch = srcUrl.match(/[?&]aid=(\d+)/); + if (aidMatch) aid = aidMatch[1]; - if (!aid) return ""; // 无法获取 aid，跳过 - - // 获取宽高 (支持 px 和 %) let w = 0, h = 0; const styleMatch = imgTag.match(/style="([^"]+)"/i); if (styleMatch) { - // 匹配数字+单位 (px或%) const wMatch = styleMatch[1].match(/width:\s*([\d.]+(?:px|%)?)/i); const hMatch = styleMatch[1].match(/height:\s*([\d.]+(?:px|%)?)/i); if (wMatch) { - // 如果是百分比，直接保留字符串；如果是纯数字默认视为 px；如果是 px 去掉单位 let val = wMatch[1]; - if (val.endsWith('%')) w = val; // 保留百分比字符串 - else w = parseFloat(val); // 转为数字 (px) + if (val.endsWith("%")) w = val; + else w = parseFloat(val); } if (hMatch) { let val = hMatch[1]; - if (val.endsWith('%')) h = val; + if (val.endsWith("%")) h = val; else h = parseFloat(val); } } - // 兼容 width/height 属性 (通常只有数字) if (!w) { const wAttr = imgTag.match(/\swidth="(\d+)"/i); if (wAttr) w = Number(wAttr[1]); } + if (!h) { const hAttr = imgTag.match(/\sheight="(\d+)"/i); if (hAttr) h = Number(hAttr[1]); } + const inner = aid ? aid : cleanUrl; let result = ""; - if (w || h) { // 只要有一个有值 + if (w || h) { const formatVal = (val) => { - if (typeof val === 'string' && val.endsWith('%')) return val; + if (typeof val === "string" && val.endsWith("%")) return val; return val ? parseFloat(Number(val).toFixed(2)) : 0; }; - result = `[img=${formatVal(w)},${formatVal(h)}]${aid}[/img]`; + result = `[img=${formatVal(w)},${formatVal(h)}]${inner}[/img]`; + + if (aid) { + images.push({ url: cleanUrl, aid: Number(aid) }); + } else { + images.push({ url: cleanUrl }); + } } else { - result = `[img]${aid}[/img]`; + result = `[img]${inner}[/img]`; + + if (aid) { + images.push({ url: cleanUrl, aid: Number(aid) }); + } else { + images.push({ url: cleanUrl }); + } } - // 处理 data-href，包裹在 [url] 中 const hrefMatch = imgTag.match(/data-href="([^"]+)"/i); if (hrefMatch && hrefMatch[1]) result = `[url=${hrefMatch[1]}]${result}[/url]`; @@ -785,9 +832,13 @@ const editApp = createApp({ """: '"', "'": "'", }; + html = html.replace(/&[a-z]+;/gi, (match) => entities[match] || match); - return html.trim(); + return { + content: html.trim(), + images, + }; }; const extractImages = (dom) => { @@ -802,11 +853,12 @@ const editApp = createApp({ const aid = urlObj.searchParams.get("aid"); const queryIndex = url.indexOf("?"); const cleanUrl = queryIndex !== -1 ? url.substring(0, queryIndex) : url; - - images.push({ - url: cleanUrl, - aid: Number(aid), - }); + if (Number(aid)) { + images.push({ + url: cleanUrl, + aid: Number(aid), + }); + } }); return images; diff --git a/js/index.js b/js/index.js index 2d38fcb..6adb58b 100644 --- a/js/index.js +++ b/js/index.js @@ -1,12 +1,23 @@ const { createApp, ref, onMounted, nextTick, onUnmounted, computed, watch, provide } = Vue; -import { headTop } from "../component/head-top/head-top.js"; -import { itemForum } from "../component/item-forum/item-forum.js"; -import { latestList } from "../component/latest-list/latest-list.js"; -import { loadBox } from "../component/load-box/load-box.js"; + +const { itemForum } = await import(withVer("../component/item-forum/item-forum.js")); +const { itemOffer } = await import(withVer("../component/item-offer/item-offer.js")); +const { itemSummary } = await import(withVer("../component/item-summary/item-summary.js")); +const { itemVote } = await import(withVer("../component/item-vote/item-vote.js")); +const { itemMj } = await import(withVer("../component/item-mj/item-mj.js")); +const { itemTenement } = await import(withVer("../component/item-tenement/item-tenement.js")); +const { headTop } = await import(withVer("../component/head-top/head-top.js")); +const { loadBox } = await import(withVer("../component/load-box/load-box.js")); +const { itemProject } = await import(withVer("../component/item-project/item-project.js")); +const { latestList } = await import(withVer("../component/latest-list/latest-list.js")); const appIndex = createApp({ setup() { - onMounted(() => getUserInfoWin()); + onMounted(() => { + getUserInfoWin(); + // const preLoader = document.getElementById("pre-loader"); + // if (preLoader) preLoader.style.display = "none"; + }); let isLogin = ref(false); let realname = ref(0); // 是否已经实名 @@ -62,6 +73,8 @@ const appIndex = createApp({ getTalkingRecommend(); getTopicHandpicked(); getTopicLatest(); + + document.querySelectorAll(".vuehide").forEach((item) => (item.style.display = "none")); }); let ongoingbj = ref({}); // 话题数据 @@ -70,14 +83,21 @@ const appIndex = createApp({ ajaxGet("/v2/api/forum/talkingRecommend").then((res) => { if (res.code != 200) return; let data = res["data"] || []; + const ongoing = data.ongoing || []; + + ongoing.forEach((item) => { + if (Array.isArray(item.commentUser)) item.commentUser = item.commentUser.slice(0, 4); + }); const getTargetItem = (arr) => { const target = arr.find((item) => item.state === 1); - return target !== undefined ? target : arr.length > 0 ? arr[0] : null; + return target !== undefined ? target : arr.length > 0 ? arr[Math.floor(Math.random() * arr.length)] : null; // 随机返回一个 }; - ongoingbj.value = getTargetItem(data.ongoing || []); - pastList.value = data.past || []; + ongoingbj.value = getTargetItem(ongoing || []) || {}; + console.log("ongoingbj", ongoingbj.value); + const past = data.past || []; + pastList.value = past.sort(() => Math.random() - 0.5).slice(0, 5); }); }; @@ -138,11 +158,11 @@ const appIndex = createApp({ // 处理 offer 列表滚动 const offerListScrolling = (data) => { - ajax("https://forum.gter.net/api/index/dynamic").then((res) => { + ajaxGet("https://api.gter.net/v2/api/forum/getDynamic").then((res) => { if (res.code == 200) { let data = res["data"] || []; - data.forEach((item) => (item.date = strtimeago(item.date))); + data.forEach((item) => (item.date = strtimeago(item.created_at))); let targetValue = []; targetValue = [...data, ...data.slice(0, 6)]; @@ -168,7 +188,7 @@ const appIndex = createApp({ if (scrollup) return; scrollup = new ScrollText("offer-box"); - scrollup.LineHeight = 55; + scrollup.LineHeight = 56; scrollup.Amount = 1; scrollup.Delay = 1; scrollup.Start(); @@ -185,29 +205,6 @@ const appIndex = createApp({ if (!event.relatedTarget || !event.currentTarget.contains(event.relatedTarget)) autoOfferListScroll(); }; - const popList = [ - { - title: "26FALL", - subtitle: "申请群", - img: "https://o.x-php.com/Zvt57TuJSUvkyhw-xG7Y2l-c-5kpcnzqqsgFptxhcq_cQnrlJKN1WgxCBq_D-81qNDQyOQ~~", - }, - { - title: "申请求助", - subtitle: "寄托院校君", - img: "https://u.gter.net/assistantwxqrcode.png", - }, - { - title: "香港租房", - subtitle: "交流群", - img: "https://o.x-php.com/Zvt57TuJSUvkyhw-xG7Y2l-c-5kpcnzqqsgFptxhcq_cQnrlJKN1WgxCBq_D-81qNDQyOQ~~", - }, - { - title: "香港租房顾问", - subtitle: "寄托方同学", - img: "https://o.x-php.com/Zvt57TuJSUvkyhw-xG7Y2l-d_JkpcHnqqsgFptxhcq_cQnrlcaF2WQQQBq_D-81qNDQyOQ~~", - }, - ]; - let sectionList = ref([]); const getSectionList = () => { ajaxGet("/v2/api/forum/getSectionList").then((res) => { @@ -238,7 +235,7 @@ const appIndex = createApp({ const getList = () => { if (loading.value || page.value == 0) return; loading.value = true; - ajaxGet(`/v2/api/forum/topicLists?type=thread&page=${page.value || 1}`) + ajaxGet(`/v2/api/forum/topicLists?page=${page.value || 1}`) .then((res) => { if (res.code != 200) return; let data = res.data; @@ -259,12 +256,34 @@ const appIndex = createApp({ let sidebarHeight = ref(0); - return { sidebarHeight, matterRef, sidebarFixed, sidebarRef, loading, interviewexperience, vote, offer, topicHandpickedList, list, sectionList, popList, custom_2AdvRef, ongoingbj, pastList, offerMouseover, offerMouseout, offerlist, offerListRef }; + const handleCheckAttest = (e) => { + if (!isLogin.value) { + goLogin(); + e.preventDefault(); // 阻止默认跳转（即使 href 为链接，也强制拦截） + return; + } + if (realname.value === 0 && userInfoWin.value?.uin > 0) { + openAttest(); + e.preventDefault(); // 阻止默认跳转（即使 href 为链接，也强制拦截） + } + }; + + onMounted(() => { + SignInComponent.initComponent() + }) + + return { handleCheckAttest, sidebarHeight, matterRef, sidebarFixed, sidebarRef, loading, interviewexperience, vote, offer, topicHandpickedList, list, sectionList, custom_2AdvRef, ongoingbj, pastList, offerMouseover, offerMouseout, offerlist, offerListRef }; }, }); appIndex.component("headTop", headTop); appIndex.component("itemForum", itemForum); +appIndex.component("itemOffer", itemOffer); +appIndex.component("itemSummary", itemSummary); +appIndex.component("itemVote", itemVote); +appIndex.component("itemMj", itemMj); +appIndex.component("itemTenement", itemTenement); +appIndex.component("itemProject", itemProject); appIndex.component("latestList", latestList); appIndex.component("load-box", loadBox);