diff --git a/component/head-top/head-top.js b/component/head-top/head-top.js index 048a9bc..4b6b498 100644 --- a/component/head-top/head-top.js +++ b/component/head-top/head-top.js @@ -5,17 +5,35 @@ const { defineComponent, ref, onMounted, nextTick } = Vue; // 定义组件(直接使用模板) export const headTop = defineComponent({ name: "headTop", - props: { - itemdata: { - type: Object, - default: () => {}, - }, - }, + props: {}, setup(props) { onMounted(() => {}); - let signInAlreadyState = ref(false); + let state = ref(0); // 是否已经签到 + + let userInfoWinTimerCount = 0; + const userInfoWinTimer = setInterval(() => { + if (todaysignedState) { + state.value = todaysigned; + clearInterval(userInfoWinTimer); + } + userInfoWinTimerCount++; + if (userInfoWinTimerCount >= 3000) clearInterval(userInfoWinTimer); + }, 50); + + const signIn = () => { + ajax("/v2/api/forum/sign").then((res) => { + if (res.code != 200) { + creationAlertBox("error", res.message); + return; + } + + let data = res.data; + state.value = 1; + creationAlertBox("success", res.message || "签到成功"); + }); + }; let input = ref(""); let defaultSearchText = ref("屯特"); @@ -23,8 +41,9 @@ export const headTop = defineComponent({ const searchText = input.value || defaultSearchText.value; redirectToExternalWebsite("/search/" + searchText); }; - return { input, defaultSearchText, goSearch, signInAlreadyState }; + + return { state, signIn, input, defaultSearchText, goSearch }; }, - template: `
已签到,明天再来
签到领寄托币
GO
`, + template: `
签到领寄托币
GO
已签到,明天再来
`, }); diff --git a/component/head-top/head-top.txt b/component/head-top/head-top.txt index 0cb4d61..8a29215 100644 --- a/component/head-top/head-top.txt +++ b/component/head-top/head-top.txt @@ -8,11 +8,7 @@ -
- - 已签到,明天再来 -
-
+
@@ -25,4 +21,8 @@
+
+ + 已签到,明天再来 +
\ No newline at end of file diff --git a/component/item-head/item-head.js b/component/item-head/item-head.js index e9dca42..feb4675 100644 --- a/component/item-head/item-head.js +++ b/component/item-head/item-head.js @@ -28,7 +28,7 @@ export const itemHead = defineComponent({ sectionn.value = item.value.sectionn || []; const sectionNameSet = new Set(sectionn.value.map((item) => item.name)); - tags.value = item.value.tags.filter((tagName) => !sectionNameSet.has(tagName)); + tags.value = item.value?.tags?.filter((tagName) => !sectionNameSet.has(tagName)) || []; // const sectionSet = new Set(sectionn.value); // tags.value = item.value.tags?.filter((tag) => !sectionSet.has(tag)); @@ -49,8 +49,7 @@ export const itemHead = defineComponent({ onMounted(() => { setTimeout(() => { permissions.value = window["permissions"] || []; - // ismanager.value = permissions.value.indexOf("topic:manager") >= 0; - ismanager.value = true; + ismanager.value = permissions.value.indexOf("topic:manager") >= 0; }, 1000); }); @@ -124,5 +123,5 @@ export const itemHead = defineComponent({ report, }, - template: `
{{ item?.user?.nickname || item.nickname || "匿名用户" }}
{{ timestamp }}
{{ item.views }}
举报
{{ item.name }} {{ item }}
`, + template: `
{{ item?.user?.nickname || item.nickname || "匿名用户" }}
{{ timestamp }}
{{ item.views }}
举报
{{ item.name }} {{ item }}
`, }); diff --git a/component/item-head/item-head.txt b/component/item-head/item-head.txt index bd15cbb..82b5e31 100644 --- a/component/item-head/item-head.txt +++ b/component/item-head/item-head.txt @@ -13,7 +13,7 @@
{{ item.views }}
-
+
diff --git a/component/item-tenement/item-tenement.js b/component/item-tenement/item-tenement.js index 6d8294d..3a27555 100644 --- a/component/item-tenement/item-tenement.js +++ b/component/item-tenement/item-tenement.js @@ -61,11 +61,22 @@ export const itemTenement = defineComponent({ let item = ref({ ...props.itemdata }); // console.log("item", item.value); item.value = handleHousing(item.value); - item.value['url'] = '/details/' + item.value.uniqid; + item.value["url"] = "https://fang.gter.net/detail?id=" + item.value.uniqid; + let sectionn = ref([]); + let tags = ref([]); + + if (item.value.type == "tenement") { + const tabList = item.value?.tabList || []; + sectionn.value = ["香港租房", tabList[0]]; + tags.value = tabList.slice(1) || []; + } + + if (item.value.images?.length > 4) item.value.images = item.value.images.slice(0, 4); + console.log("item.value", item.value); - return { item }; + return { sectionn, tags, item }; }, components: { @@ -73,5 +84,5 @@ export const itemTenement = defineComponent({ itemHead, }, - template: `
{{ item.title }}
{{ item.location || '' }}
HK$
{{ item.rent }}
/月
[ 租期{{ item.rentalduration }} ]
`, + template: `
{{ item }}
{{ item }}
{{ item.subject }}
{{ item.location || '' }}
HK$
{{ item.rent }}
/月
[ 租期{{ item.rentalduration }} ]
`, }); diff --git a/component/item-tenement/item-tenement.txt b/component/item-tenement/item-tenement.txt index 9e4073a..c91840f 100644 --- a/component/item-tenement/item-tenement.txt +++ b/component/item-tenement/item-tenement.txt @@ -1,6 +1,13 @@
- {{ item.title }} +
+ + +
{{ item }}
+
{{ item }}
+
+ + {{ item.subject }}