From e932a677632cb4608b01386b6ca39d5d341d1cbf Mon Sep 17 00:00:00 2001
From: shilei <965026003@qq.com>
Date: Thu, 10 Oct 2024 13:51:45 +0800
Subject: [PATCH] =?UTF-8?q?10.10=20=E9=A3=8E=E6=A0=BC=E6=9B=BF=E6=8D=A2?=
=?UTF-8?q?=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 5 +++-
pages.json | 6 +---
pages/userCenter/userCenter.vue | 2 +-
pagesCenter/accountBalance/accountBalance.vue | 28 ++++++++++++++++++-
pagesCenter/login/changepassword.vue | 26 ++++++++++-------
pagesCenter/login/enter.vue | 11 +++++++-
sheep/api/pay/wallet.js | 5 +---
7 files changed, 60 insertions(+), 23 deletions(-)
diff --git a/package.json b/package.json
index a70d7e1..0fb2495 100644
--- a/package.json
+++ b/package.json
@@ -14,5 +14,8 @@
"通用组件"
]
},
- "name": "zw-tabbar自定义tabbar"
+ "name": "zw-tabbar自定义tabbar",
+ "scripts": {
+ "dev:mp-weixin": "pnpm run dev -- --miniprogram mp-weixin"
+ }
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 9140c8e..c7ce654 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,5 @@
{
- "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+ "pages": [
{
"path": "pages/index/index",
"style": {
@@ -267,14 +267,10 @@
"navigationBarTitleText": "换电云",
"navigationBarBackgroundColor": "#ffffff",
"backgroundColor": "#F8F8F8",
- // "enablePullDownRefresh": true,
"onReachBottomDistance": 100
- // 配置取消系统导航栏
- // "navigationStyle": "custom"
},
"easycom": {
"autoscan": true,
- // 注意一定要放在custom里，否则无效，https://ask.dcloud.net.cn/question/131175
"custom": {
"^u--(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
"^up-(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
diff --git a/pages/userCenter/userCenter.vue b/pages/userCenter/userCenter.vue
index 6a40498..4fa1b89 100644
--- a/pages/userCenter/userCenter.vue
+++ b/pages/userCenter/userCenter.vue
@@ -83,7 +83,7 @@
-
+
diff --git a/pagesCenter/accountBalance/accountBalance.vue b/pagesCenter/accountBalance/accountBalance.vue
index 4201089..8be4aa5 100644
--- a/pagesCenter/accountBalance/accountBalance.vue
+++ b/pagesCenter/accountBalance/accountBalance.vue
@@ -19,7 +19,10 @@
- 充值明细
+
+
+
+
@@ -58,6 +61,7 @@
// import {
// AESDecrypt
// } from '../../../static/utils/encodes.js';
+ import PayWalletApi from '@/sheep/api/pay/wallet';
import {
reactive,
ref,
@@ -74,12 +78,20 @@
const totalPages = ref() //总页数，用于判断是否加载完
const size = ref(10)
const pageNo = ref(1)
+ const tab_list = ref([
+ '充值明细', '消费明细'
+ ])
+ const tab_current = ref(0)
onLoad(() => {
handle_bindType()
+ getPayconsumption()
})
onShow(() => {
getPayList(0)
})
+ const tab_change = (e) => {
+ tab_current.value = e
+ }
const handle_bindType = async (type) => {
let data = {
bindType: 1
@@ -115,6 +127,17 @@
}
})
}
+
+ const getPayconsumption = async () => {
+ let param = {
+ pageNo: pageNo.value,
+ }
+ const {
+ data,
+ code
+ } = await PayWalletApi.getWalletTransactionPage(param)
+ console.log(data, 'data')
+ }
onReachBottom(async () => {
if (payData.value.length == totalPages.value) {
uni.$u.toast('没有更多啦');
@@ -234,6 +257,9 @@
align-items: center;
justify-content: center;
}
+ .tab_cls {
+ padding: 0 30rpx;
+ }