diff --git a/HSLink-app/pages.json b/HSLink-app/pages.json index 62ae7b5..fa4c836 100644 --- a/HSLink-app/pages.json +++ b/HSLink-app/pages.json @@ -63,35 +63,7 @@ "navigationBarBackgroundColor": "#333",//顶部背景色 "navigationBarTextStyle": "white" //文字颜色，目前只支持white和black这两种颜色（小程序） } - }, - { - "path": "pages/release-detial/release-release/release-release", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "发图文",//顶部名称 - "navigationBarBackgroundColor": "#333",//顶部背景色 - "navigationBarTextStyle": "white" //文字颜色，目前只支持white和black这两种颜色（小程序） - } - }, - { - "path": "pages/release-detial/release-video/release-video", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "发视频",//顶部名称 - "navigationBarBackgroundColor": "#333",//顶部背景色 - "navigationBarTextStyle": "white" //文字颜色，目前只支持white和black这两种颜色（小程序） - } - }, - { - "path": "pages/release-detial/release-qa/release-qa", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "提问",//顶部名称 - "navigationBarBackgroundColor": "#333",//顶部背景色 - "navigationBarTextStyle": "white" //文字颜色，目前只支持white和black这两种颜色（小程序） - } } - ,{ "path" : "pages/tabbar/my/my-article/my-article", "style": { @@ -132,6 +104,33 @@ "navigationBarTextStyle": "white" //文字颜色，目前只支持white和black这两种颜色（小程序） } } + ,{ + "path" : "pages/person-info-page/person-info-page", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "个人主页",//顶部名称 + "navigationBarBackgroundColor": "#333",//顶部背景色 + "navigationBarTextStyle": "white" //文字颜色，目前只支持white和black这两种颜色（小程序） + } + } + ,{ + "path" : "pages/tabbar/follow/follow-list", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "关注列表",//顶部名称 + "navigationBarBackgroundColor": "#333",//顶部背景色 + "navigationBarTextStyle": "white" //文字颜色，目前只支持white和black这两种颜色（小程序） + } + } + ,{ + "path" : "pages/tabbar/follow/fans-list", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "粉丝列表",//顶部名称 + "navigationBarBackgroundColor": "#333",//顶部背景色 + "navigationBarTextStyle": "white" //文字颜色，目前只支持white和black这两种颜色（小程序） + } + } ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/HSLink-app/pages/release-detial/release-qa/release-qa.vue b/HSLink-app/pages/release-detial/release-qa/release-qa.vue deleted file mode 100644 index da383dc..0000000 --- a/HSLink-app/pages/release-detial/release-qa/release-qa.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - - - diff --git a/HSLink-app/pages/release-detial/release-release/release-release.vue b/HSLink-app/pages/release-detial/release-release/release-release.vue deleted file mode 100644 index 0d62a3b..0000000 --- a/HSLink-app/pages/release-detial/release-release/release-release.vue +++ /dev/null @@ -1,29 +0,0 @@ - - - - - diff --git a/HSLink-app/pages/release-detial/release-video/release-video.vue b/HSLink-app/pages/release-detial/release-video/release-video.vue deleted file mode 100644 index 753d66f..0000000 --- a/HSLink-app/pages/release-detial/release-video/release-video.vue +++ /dev/null @@ -1,29 +0,0 @@ - - - - - diff --git a/HSLink-app/pages/tabbar/follow/follow.vue b/HSLink-app/pages/tabbar/follow/follow.vue index db094c1..10978e6 100644 --- a/HSLink-app/pages/tabbar/follow/follow.vue +++ b/HSLink-app/pages/tabbar/follow/follow.vue @@ -1,437 +1,168 @@ - diff --git a/HSLink-app/pages/tabbar/homepage/data-details.vue b/HSLink-app/pages/tabbar/homepage/data-details.vue index 4b81ce5..3dd3a4e 100644 --- a/HSLink-app/pages/tabbar/homepage/data-details.vue +++ b/HSLink-app/pages/tabbar/homepage/data-details.vue @@ -8,7 +8,7 @@ {{noticeInfo.label}} - + {{noticeInfo.real_name}} @@ -109,6 +109,20 @@ uni.startPullDownRefresh(); }, methods: { + /** + * @param {Object} item + */ + goToUserInfo(item) { + if (item.user_id === uni.getStorageSync("userInfo").user_id) { + uni.switchTab({ + url: '/pages/tabbar/my/my' + }); + } else { + uni.navigateTo({ + url: `/pages/person-info-page/person-info-page?userId=${item.user_id}` + }) + } + }, /** * 点击留言弹出输入框确定 */ diff --git a/HSLink-app/pages/tabbar/homepage/homepage.vue b/HSLink-app/pages/tabbar/homepage/homepage.vue index b780e1f..b8b6331 100644 --- a/HSLink-app/pages/tabbar/homepage/homepage.vue +++ b/HSLink-app/pages/tabbar/homepage/homepage.vue @@ -28,7 +28,7 @@ 文章标签： {{item.label}} - + 发表人： {{item.real_name}} @@ -81,6 +81,20 @@ export default { this.getAllData(); }, methods: { + /** + * @param {Object} item + */ + goToUserInfo(item) { + if (item.user_id === uni.getStorageSync("userInfo").user_id) { + uni.switchTab({ + url: '/pages/tabbar/my/my' + }); + } else { + uni.navigateTo({ + url: `/pages/person-info-page/person-info-page?userId=${item.user_id}` + }) + } + }, /** * 跳转详情页面 * @param {Object} item diff --git a/HSLink-app/pages/tabbar/message/chat-page.vue b/HSLink-app/pages/tabbar/message/chat-page.vue index 4d32016..06ed88c 100644 --- a/HSLink-app/pages/tabbar/message/chat-page.vue +++ b/HSLink-app/pages/tabbar/message/chat-page.vue @@ -2,7 +2,7 @@ - + {{messageInfo.userInfo.real_name.slice(0,1)}} @@ -10,7 +10,7 @@ {{item.content}} - + {{userInfo.real_name.slice(0,1)}} {{item.letter_create_time}} @@ -53,12 +53,16 @@ onShow() { this.updateRead(); this.getTwoLetterApp(); - this.interval = setInterval(() => { + let timesRun = 0; + let interval = setInterval(() => { this.getTwoLetterApp(); - } ,5000); + timesRun += 1; + if(timesRun === 5){ + clearInterval(interval); + } + }, 2000); }, onBackPress() { - clearInterval(this.interval); }, onLoad() { uni.setNavigationBarTitle({ @@ -67,13 +71,31 @@ }, watch: { letterList() { - console.log("messageList change"); this.$nextTick(() => { uni.pageScrollTo({scrollTop: 99999, duration: 0}); }) } }, methods: { + /** + * 跳转到其他人的主页 + * @param {Object} item + */ + goToOther(item) { + uni.navigateTo({ + url: `/pages/person-info-page/person-info-page?userId=${item.send_id}` + }) + }, + /** + * 跳转到我的主页 + * @param {Object} item + */ + goToMy() { + uni.switchTab({ + url: '/pages/tabbar/my/my' + }); + }, + /** * 获取两个人的私信 */ diff --git a/HSLink-app/pages/tabbar/my/my-article/my-article.vue b/HSLink-app/pages/tabbar/my/my-article/my-article.vue index facc985..ca5272a 100644 --- a/HSLink-app/pages/tabbar/my/my-article/my-article.vue +++ b/HSLink-app/pages/tabbar/my/my-article/my-article.vue @@ -28,7 +28,7 @@ 文章标签： {{item.label}} - + 发表人： {{item.real_name}} @@ -87,6 +87,21 @@ export default { this.getAllData(); }, methods: { + /** + * 跳转人员信息页面 + * @param {Object} item + */ + goToUserInfo(item) { + if (item.user_id === uni.getStorageSync("userInfo").user_id) { + uni.switchTab({ + url: '/pages/tabbar/my/my' + }); + } else { + uni.navigateTo({ + url: `/pages/person-info-page/person-info-page?userId=${item.user_id}` + }) + } + }, /** * 编辑页面 * @param {Object} item diff --git a/HSLink-app/pages/tabbar/my/my.vue b/HSLink-app/pages/tabbar/my/my.vue index bd9d25f..9edf9c8 100644 --- a/HSLink-app/pages/tabbar/my/my.vue +++ b/HSLink-app/pages/tabbar/my/my.vue @@ -2,17 +2,27 @@ - 裴 + {{userInfo.real_name.slice(0,1)}}