diff --git a/App.vue b/App.vue index 841f8ed..d6bb266 100644 --- a/App.vue +++ b/App.vue @@ -17,6 +17,49 @@ } - diff --git a/api/appUser.js b/api/appUser.js index 724bc6f..82ed485 100644 --- a/api/appUser.js +++ b/api/appUser.js @@ -147,3 +147,19 @@ export function getShipments(user_id, page = 1, page_size = 20) { export function getUserInvites(user_id, page = 1, page_size = 20) { return authRequest({ url: `/api/app/users/${user_id}/invites`, method: 'GET', data: { page, page_size } }) } + +// ============================================ +// 兼容性适配接口 (适配 pages/mine/index.vue) +// ============================================ + +export function getUserInfo() { + const user_info = uni.getStorageSync('user_info') + if (user_info) return Promise.resolve(user_info) + return authRequest({ url: '/api/app/users/info', method: 'GET' }) +} + +export const getUserTasks = getTasks +export function getInviteRecords(page = 1, page_size = 20) { + const user_id = uni.getStorageSync('user_id') + return getUserInvites(user_id, page, page_size) +} diff --git a/components/ElCard.vue b/components/ElCard.vue index 3ff944f..4383189 100644 --- a/components/ElCard.vue +++ b/components/ElCard.vue @@ -20,11 +20,36 @@ const shadowClass = computed(() => { }) - diff --git a/components/FlipGrid.vue b/components/FlipGrid.vue index 7e447bf..3dd009e 100644 --- a/components/FlipGrid.vue +++ b/components/FlipGrid.vue @@ -24,7 +24,7 @@ - diff --git a/components/PaymentPopup.vue b/components/PaymentPopup.vue index 820b4d9..7e1aef5 100644 --- a/components/PaymentPopup.vue +++ b/components/PaymentPopup.vue @@ -133,7 +133,7 @@ function handleConfirm() { } - diff --git a/components/YifanSelector.vue b/components/YifanSelector.vue index 8384761..b6caf74 100644 --- a/components/YifanSelector.vue +++ b/components/YifanSelector.vue @@ -290,62 +290,94 @@ async function onPaymentConfirm(paymentData) { } - diff --git a/pages/activity/duiduipeng/index.vue b/pages/activity/duiduipeng/index.vue index 5fcd4ce..08ef370 100644 --- a/pages/activity/duiduipeng/index.vue +++ b/pages/activity/duiduipeng/index.vue @@ -23,51 +23,60 @@ - - - - - - 概率 {{ rw.percent }}% + + + + {{ rw.title }} + BOSS - + + + 概率 {{ rw.percent }}% + + + + + 📭 + 暂无奖励配置 - 暂无奖励配置 - - - - - - 占比 {{ it.percent }}% - + + + + 📝 + 暂无中奖记录 - 暂无中奖记录 暂无期数 - - + + - diff --git a/pages/activity/list/index.vue b/pages/activity/list/index.vue index 4775eb0..ec02a22 100644 --- a/pages/activity/list/index.vue +++ b/pages/activity/list/index.vue @@ -139,36 +139,44 @@ onShareTimeline(() => { }) - diff --git a/pages/activity/pata/index.vue b/pages/activity/pata/index.vue index 8a0f0d7..2084ac2 100644 --- a/pages/activity/pata/index.vue +++ b/pages/activity/pata/index.vue @@ -241,25 +241,71 @@ onLoad((opts) => { }) - diff --git a/pages/activity/wuxianshang/index.vue b/pages/activity/wuxianshang/index.vue index 62e9f62..e2f4718 100644 --- a/pages/activity/wuxianshang/index.vue +++ b/pages/activity/wuxianshang/index.vue @@ -1,4 +1,5 @@ - diff --git a/pages/activity/yifanshang/index.vue b/pages/activity/yifanshang/index.vue index 0063cb1..588eec7 100644 --- a/pages/activity/yifanshang/index.vue +++ b/pages/activity/yifanshang/index.vue @@ -1,5 +1,11 @@ - - diff --git a/pages/address/edit.vue b/pages/address/edit.vue index bc1fb2d..b5a89cf 100644 --- a/pages/address/edit.vue +++ b/pages/address/edit.vue @@ -148,16 +148,16 @@ onLoad((opts) => { }) - \ No newline at end of file diff --git a/pages/address/index.vue b/pages/address/index.vue index 5374f9d..8bb1a51 100644 --- a/pages/address/index.vue +++ b/pages/address/index.vue @@ -113,33 +113,33 @@ onLoad(() => { }) - \ No newline at end of file diff --git a/pages/cabinet/index.vue b/pages/cabinet/index.vue index abc09cb..549fc8d 100644 --- a/pages/cabinet/index.vue +++ b/pages/cabinet/index.vue @@ -680,242 +680,251 @@ async function onShip() { } - diff --git a/pages/index/index.vue b/pages/index/index.vue index 0fb8652..55f99a7 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,5 +1,8 @@