diff --git a/src/pages.json b/src/pages.json index 4e4e012c..88e8b18f 100644 --- a/src/pages.json +++ b/src/pages.json @@ -232,6 +232,13 @@ "navigationBarTitleText": "问题反馈", "navigationStyle": "custom" } + }, + { + "path": "about", + "style": { + "navigationBarTitleText": "关于", + "navigationStyle": "custom" + } } ] }, diff --git a/src/pages/home/components/scroll-user.vue b/src/pages/home/components/scroll-user.vue new file mode 100644 index 00000000..185ef466 --- /dev/null +++ b/src/pages/home/components/scroll-user.vue @@ -0,0 +1,89 @@ + + + diff --git a/src/pages/home/detail.vue b/src/pages/home/detail.vue index 9cbcb242..15440503 100644 --- a/src/pages/home/detail.vue +++ b/src/pages/home/detail.vue @@ -15,7 +15,7 @@ - - - - - - - - - - - - - + + + + diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index a5bfed04..f0d35abf 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -78,14 +78,36 @@ - 登录即同意《用户协议》和《隐私政策》并同意授权 + 登录即同意《 + + 用户协议 + + 》和《 + + 隐私政策 + + 》并同意授权 + + + + diff --git a/src/pages/moments/components/scroll-moment.vue b/src/pages/moments/components/scroll-moment.vue new file mode 100644 index 00000000..6def6a6c --- /dev/null +++ b/src/pages/moments/components/scroll-moment.vue @@ -0,0 +1,102 @@ + + + diff --git a/src/pages/moments/moments.vue b/src/pages/moments/moments.vue index 714a6a45..13253481 100644 --- a/src/pages/moments/moments.vue +++ b/src/pages/moments/moments.vue @@ -3,7 +3,7 @@ - - - - - - - - - - - - - - - + + + + diff --git a/src/pages/profile/about.vue b/src/pages/profile/about.vue new file mode 100644 index 00000000..deed947a --- /dev/null +++ b/src/pages/profile/about.vue @@ -0,0 +1,39 @@ + + + diff --git a/src/pages/profile/components/swiper-scroll.vue b/src/pages/profile/components/swiper-scroll.vue deleted file mode 100644 index 8d032300..00000000 --- a/src/pages/profile/components/swiper-scroll.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - diff --git a/src/pages/profile/like.vue b/src/pages/profile/like.vue index 6b11f707..b76a4333 100644 --- a/src/pages/profile/like.vue +++ b/src/pages/profile/like.vue @@ -17,12 +17,27 @@ @change="(e) => (current = e.detail.current)" :duration="200" > - - - - + + + + + + + + + @@ -30,21 +45,41 @@ diff --git a/src/sheep/api/member/recent.ts b/src/sheep/api/member/recent.ts index d3942efb..911f7455 100644 --- a/src/sheep/api/member/recent.ts +++ b/src/sheep/api/member/recent.ts @@ -199,6 +199,18 @@ const RecentApi = { }, }); }, + // 获得用户协议或隐私政策文章 + getPromotionArticle: (params: any) => { + return request({ + url: '/promotion/article/get', + method: 'GET', + params, + custom: { + showLoading: true, + loadingMsg: '加载中', + }, + }); + }, }; export default RecentApi; diff --git a/src/sheep/components/moment-card/moment-card.vue b/src/sheep/components/moment-card/moment-card.vue index 8c820c55..86afff85 100644 --- a/src/sheep/components/moment-card/moment-card.vue +++ b/src/sheep/components/moment-card/moment-card.vue @@ -17,40 +17,39 @@ 真人认证 - 近期 + {{ formatDate(data.createTime) }} - {{ `未知性别 · ${member?.memberAge}岁 | ${member?.memberOcc}` }} + {{ getGender(member.memberSex) }}·{{ member.memberAge }}岁 + | + {{ member?.memberOcc }} {{ data.description }} - -