From 74123ea7db8019d5c61b0ab6feb0ee29fadcd430 Mon Sep 17 00:00:00 2001 From: Vinjor Date: Thu, 10 Apr 2025 14:41:14 +0800 Subject: [PATCH] 1 --- pages.json | 27 +- pages/components/my-notice-item-tg.vue | 170 +++++++++++++ pages/components/my-notice-tg.vue | 158 ++++++++++++ pages/index.vue | 28 ++- pages/mine/card/my-card.vue | 3 - pages/mine/mine-index.vue | 9 +- pages/notice/card-item.vue | 233 +++++++++++++++++ pages/notice/detail.vue | 40 ++- pages/notice/report-list.vue | 330 +++++++++++++++++++++++++ 9 files changed, 979 insertions(+), 19 deletions(-) create mode 100644 pages/components/my-notice-item-tg.vue create mode 100644 pages/components/my-notice-tg.vue create mode 100644 pages/notice/card-item.vue create mode 100644 pages/notice/report-list.vue diff --git a/pages.json b/pages.json index 882d1e6..b76c371 100644 --- a/pages.json +++ b/pages.json @@ -8,7 +8,8 @@ "mine-index": "view", "notice-index": "view", "subscribe": "view", - "my-notice": "view" + "my-notice": "view", + "my-notice-tg": "view" } } }, { @@ -55,6 +56,18 @@ "navigationBarTitleText": "报名", "navigationStyle": "custom" } + }, + { + "path": "report-list", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "card-item", + "style": { + "navigationBarTitleText": "" + } } ] }, { @@ -81,11 +94,23 @@ "navigationBarTitleText": "我的通告" } }, + { + "path": "my-notice-tg", + "style": { + "navigationBarTitleText": "我的通告" + } + }, { "path": "my-notice-item", "style": { "navigationBarTitleText": "我的通告组件" } + }, + { + "path": "my-notice-item-tg", + "style": { + "navigationBarTitleText": "我的通告组件" + } } ] }, { diff --git a/pages/components/my-notice-item-tg.vue b/pages/components/my-notice-item-tg.vue new file mode 100644 index 0000000..8f1f572 --- /dev/null +++ b/pages/components/my-notice-item-tg.vue @@ -0,0 +1,170 @@ + + + + + \ No newline at end of file diff --git a/pages/components/my-notice-tg.vue b/pages/components/my-notice-tg.vue new file mode 100644 index 0000000..56398cd --- /dev/null +++ b/pages/components/my-notice-tg.vue @@ -0,0 +1,158 @@ + + + + + \ No newline at end of file diff --git a/pages/index.vue b/pages/index.vue index 24157ab..aa5ec65 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -3,11 +3,11 @@ - - - - + + + + + @@ -25,6 +25,7 @@ import subscribe from '@/pages/components/subscribe.vue' import mineIndex from '@/pages/mine/mine-index.vue' import myNotice from '@/pages/components/my-notice.vue' + import myNoticeTg from '@/pages/components/my-notice-tg.vue' import { getSiteConfig } from '@/api/system/config.js' @@ -38,7 +39,8 @@ noticeIndex, subscribe, mineIndex, - myNotice + myNotice, + myNoticeTg }, data() { return { @@ -57,6 +59,19 @@ menuCode: "home", } }, + watch: { + nowUserType(newVal, oldVal) { + console.log(newVal, "newVal") + console.log(oldVal, "oldVal") + this.nowUserType = newVal; + }, + }, + mounted() { + this.nowUserType = getUserType() + }, + onShow() { + this.nowUserType = getUserType() + }, onLoad: function() { this.nowUserType = getUserType() this.selectSiteConfig("platform_tel") @@ -74,6 +89,7 @@ * @param {Object} code */ changeMenu(code) { + this.nowUserType = getUserType() this.menuCode = code }, /** diff --git a/pages/mine/card/my-card.vue b/pages/mine/card/my-card.vue index 0bf148a..22de4db 100644 --- a/pages/mine/card/my-card.vue +++ b/pages/mine/card/my-card.vue @@ -42,9 +42,6 @@ 粉丝:{{ formatNumberWithUnits(item.fansNum) }} - - - diff --git a/pages/mine/mine-index.vue b/pages/mine/mine-index.vue index 69d4b94..22cda66 100644 --- a/pages/mine/mine-index.vue +++ b/pages/mine/mine-index.vue @@ -215,12 +215,8 @@ popupImgUrl: "", } }, - onShow() { - - }, - onLoad() { - - }, + onShow() {}, + onLoad() {}, mounted() { if (null != getJSONData(constant.userInfo)) { this.userInfo = getJSONData(constant.userInfo) @@ -256,7 +252,6 @@ changeUserType(type) { changeUserType(type) this.localUserType = type - this.$emit('update:nowUserType', this.localUserType) this.getDetail() this.$forceUpdate() }, diff --git a/pages/notice/card-item.vue b/pages/notice/card-item.vue new file mode 100644 index 0000000..c9e84a1 --- /dev/null +++ b/pages/notice/card-item.vue @@ -0,0 +1,233 @@ + + + + + \ No newline at end of file diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue index 8c860b9..1d8f853 100644 --- a/pages/notice/detail.vue +++ b/pages/notice/detail.vue @@ -1,8 +1,23 @@