From 3b9b142c215b9511ce1c891932a09ed8965eedce Mon Sep 17 00:00:00 2001 From: cbb <1055026847@qq.com> Date: Sat, 27 Dec 2025 17:52:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B7=BB=E5=8A=A0=E9=93=B6?= =?UTF-8?q?=E8=A1=8C=E5=8D=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/index.js | 9 + components/nav-bar/nav-bar.vue | 99 +++- pages.json | 48 ++ pages/discover/company.vue | 55 ++ pages/discover/discover.vue | 8 + pages/discover/dynamic/dynamic.vue | 115 ++++ pages/discover/punch.vue | 137 ++++- pages/discover/ranking-list.vue | 40 +- pages/discover/styles/dynamic.scss | 126 +++++ pages/discover/styles/index.scss | 21 + pages/my-index/components/card-input.vue | 72 +++ pages/my-index/my-index.vue | 22 +- pages/my-index/personal-center/index.vue | 58 ++ pages/my-index/styles/index.scss | 70 +++ .../wallet/bank-card/card-details.vue | 63 +++ pages/my-index/wallet/bank-card/index.vue | 56 ++ pages/my-index/wallet/edit-password.vue | 101 ++++ pages/my-index/wallet/index.vue | 125 +++++ static/images/discover/bean.png | Bin 0 -> 3240 bytes static/images/discover/calendar.png | Bin 0 -> 76228 bytes static/images/my-index/wallet-bg.png | Bin 0 -> 4443 bytes static/images/my-index/wx.png | Bin 0 -> 1296 bytes static/images/my-index/zfb.png | Bin 0 -> 1265 bytes uni_modules/uni-popup/changelog.md | 102 ++++ .../components/uni-popup-dialog/keypress.js | 45 ++ .../uni-popup-dialog/uni-popup-dialog.vue | 330 +++++++++++ .../uni-popup-message/uni-popup-message.vue | 143 +++++ .../uni-popup-share/uni-popup-share.vue | 188 +++++++ .../components/uni-popup/i18n/en.json | 7 + .../components/uni-popup/i18n/index.js | 8 + .../components/uni-popup/i18n/zh-Hans.json | 7 + .../components/uni-popup/i18n/zh-Hant.json | 7 + .../components/uni-popup/keypress.js | 45 ++ .../uni-popup/components/uni-popup/popup.js | 26 + .../components/uni-popup/uni-popup.uvue | 90 +++ .../components/uni-popup/uni-popup.vue | 518 ++++++++++++++++++ uni_modules/uni-popup/package.json | 107 ++++ uni_modules/uni-popup/readme.md | 17 + uni_modules/uni-transition/changelog.md | 31 ++ .../uni-transition/createAnimation.js | 131 +++++ .../uni-transition/uni-transition.vue | 292 ++++++++++ uni_modules/uni-transition/package.json | 112 ++++ uni_modules/uni-transition/readme.md | 11 + utils/validate.js | 20 + 44 files changed, 3434 insertions(+), 28 deletions(-) create mode 100644 pages/discover/company.vue create mode 100644 pages/discover/dynamic/dynamic.vue create mode 100644 pages/discover/styles/dynamic.scss create mode 100644 pages/my-index/components/card-input.vue create mode 100644 pages/my-index/personal-center/index.vue create mode 100644 pages/my-index/styles/index.scss create mode 100644 pages/my-index/wallet/bank-card/card-details.vue create mode 100644 pages/my-index/wallet/bank-card/index.vue create mode 100644 pages/my-index/wallet/edit-password.vue create mode 100644 pages/my-index/wallet/index.vue create mode 100644 static/images/discover/bean.png create mode 100644 static/images/discover/calendar.png create mode 100644 static/images/my-index/wallet-bg.png create mode 100644 static/images/my-index/wx.png create mode 100644 static/images/my-index/zfb.png create mode 100644 uni_modules/uni-popup/changelog.md create mode 100644 uni_modules/uni-popup/components/uni-popup-dialog/keypress.js create mode 100644 uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue create mode 100644 uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue create mode 100644 uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/en.json create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/index.js create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json create mode 100644 uni_modules/uni-popup/components/uni-popup/keypress.js create mode 100644 uni_modules/uni-popup/components/uni-popup/popup.js create mode 100644 uni_modules/uni-popup/components/uni-popup/uni-popup.uvue create mode 100644 uni_modules/uni-popup/components/uni-popup/uni-popup.vue create mode 100644 uni_modules/uni-popup/package.json create mode 100644 uni_modules/uni-popup/readme.md create mode 100644 uni_modules/uni-transition/changelog.md create mode 100644 uni_modules/uni-transition/components/uni-transition/createAnimation.js create mode 100644 uni_modules/uni-transition/components/uni-transition/uni-transition.vue create mode 100644 uni_modules/uni-transition/package.json create mode 100644 uni_modules/uni-transition/readme.md diff --git a/api/index.js b/api/index.js index 02863d0..e789c9d 100644 --- a/api/index.js +++ b/api/index.js @@ -78,3 +78,12 @@ export const getRegion = data => { data }) } + +/** 用户积分排行榜 */ +export const getUserIntegralRank = data => { + return http({ + url: '/api/system/userPoints/list', + method: 'get', + data + }) +} diff --git a/components/nav-bar/nav-bar.vue b/components/nav-bar/nav-bar.vue index a5e8b4e..b163375 100644 --- a/components/nav-bar/nav-bar.vue +++ b/components/nav-bar/nav-bar.vue @@ -1,23 +1,90 @@ @@ -70,10 +153,6 @@ z-index: 99; } - .nav-bar_bg { - background: #ffffff; - } - .top_left-icon { height: 36rpx; } diff --git a/pages.json b/pages.json index 1308fd7..0a82779 100644 --- a/pages.json +++ b/pages.json @@ -59,6 +59,41 @@ "backgroundColor": "#f7f7f7" } }, + { + "path": "pages/my-index/personal-center/index", + "style": { + "navigationBarTitleText": "个人中心", + "navigationBarBackgroundColor": "#ffffff" + } + }, + { + "path": "pages/my-index/wallet/index", + "style": { + "navigationBarTitleText": "钱包", + "navigationBarBackgroundColor": "#ffffff" + } + }, + { + "path": "pages/my-index/wallet/edit-password", + "style": { + "navigationBarTitleText": "修改钱包密码", + "navigationStyle": "custom" + } + }, + { + "path": "pages/my-index/wallet/bank-card/index", + "style": { + "navigationBarTitleText": "提现卡", + "navigationBarBackgroundColor": "#ffffff" + } + }, + { + "path": "pages/my-index/wallet/bank-card/card-details", + "style": { + "navigationBarTitleText": "卡信息增删改查", + "navigationStyle": "custom" + } + }, { "path": "pages/mall/list", "style": { @@ -128,6 +163,19 @@ "navigationBarTitleText": "签到", "navigationStyle": "custom" } + }, + { + "path": "pages/discover/dynamic/dynamic", + "style": { + "navigationBarTitleText": "朋友圈", + "navigationStyle": "custom" + } + }, + { + "path": "pages/discover/company", + "style": { + "navigationBarTitleText": "公司介绍" + } } ], "globalStyle": { diff --git a/pages/discover/company.vue b/pages/discover/company.vue new file mode 100644 index 0000000..b5c4957 --- /dev/null +++ b/pages/discover/company.vue @@ -0,0 +1,55 @@ + + + + + diff --git a/pages/discover/discover.vue b/pages/discover/discover.vue index 688bec7..8dccea2 100644 --- a/pages/discover/discover.vue +++ b/pages/discover/discover.vue @@ -20,6 +20,14 @@ navigateTo('/pages/discover/punch') return } + if (item === 'company') { + navigateTo('/pages/discover/company') + return + } + if (item === 'circle') { + navigateTo('/pages/discover/dynamic/dynamic') + return + } if (item === 'mall') { navigateTo('/pages/mall/list') return diff --git a/pages/discover/dynamic/dynamic.vue b/pages/discover/dynamic/dynamic.vue new file mode 100644 index 0000000..5f74b8d --- /dev/null +++ b/pages/discover/dynamic/dynamic.vue @@ -0,0 +1,115 @@ + + + + + diff --git a/pages/discover/punch.vue b/pages/discover/punch.vue index 0c0521b..f0a3c99 100644 --- a/pages/discover/punch.vue +++ b/pages/discover/punch.vue @@ -1,4 +1,15 @@ - + - + > + + + + + 每日签到领积分 + + 已连续签到 + 05 + + + + + + + + + +10 + + 今天 + + diff --git a/pages/discover/ranking-list.vue b/pages/discover/ranking-list.vue index f7c30e0..34e3e95 100644 --- a/pages/discover/ranking-list.vue +++ b/pages/discover/ranking-list.vue @@ -1,8 +1,36 @@ - +