From 56666b4836265fba19a15849d5b295f7632a1162 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 17 Dec 2023 23:47:16 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E6=88=91=E7=9A=84=E9=92=B1?= =?UTF-8?q?=E5=8C=85=EF=BC=9A=E6=8E=A5=E5=85=A5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/user/set.vue | 88 ----- pages/user/wallet/money.vue | 631 +++++++++++++++++++----------------- sheep/api/pay/wallet.js | 26 ++ sheep/api/user.js | 7 - sheep/store/user.js | 30 +- 5 files changed, 374 insertions(+), 408 deletions(-) delete mode 100644 pages/user/set.vue create mode 100644 sheep/api/pay/wallet.js diff --git a/pages/user/set.vue b/pages/user/set.vue deleted file mode 100644 index 191f074c..00000000 --- a/pages/user/set.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - - - diff --git a/pages/user/wallet/money.vue b/pages/user/wallet/money.vue index 3b6a9143..bd5ef8ed 100644 --- a/pages/user/wallet/money.vue +++ b/pages/user/wallet/money.vue @@ -1,345 +1,370 @@ + \ No newline at end of file + .minus { + color: $dark-3; + } + } + } + diff --git a/sheep/api/pay/wallet.js b/sheep/api/pay/wallet.js new file mode 100644 index 00000000..9ac844fc --- /dev/null +++ b/sheep/api/pay/wallet.js @@ -0,0 +1,26 @@ +import request from '@/sheep/request'; + +const PayWalletApi = { + // 获得钱包流水分页 + getWalletTransactionPage: (params) => { + const queryString = Object.keys(params) + .map((key) => encodeURIComponent(key) + '=' + params[key]) + .join('&'); + return request({ + url: `/app-api/pay/wallet-transaction/page?${queryString}`, + method: 'GET' + }); + }, + // 获得钱包流水统计 + getWalletTransactionSummary: (params) => { + const queryString = `createTime=${params.createTime[0]}&createTime=${params.createTime[1]}` + return request({ + url: `/app-api/pay/wallet-transaction/get-summary?${queryString}`, + // url: `/app-api/pay/wallet-transaction/get-summary`, + method: 'GET', + // params: params + }); + }, +}; + +export default PayWalletApi; diff --git a/sheep/api/user.js b/sheep/api/user.js index 6021a106..9c2e862b 100644 --- a/sheep/api/user.js +++ b/sheep/api/user.js @@ -293,13 +293,6 @@ export default { params, custom: {}, }), - // log: (params) => - // request({ - // url: '/user/api/walletLog', - // method: 'GET', - // params, - // custom: {}, - // }), }, account: { info: (params) => diff --git a/sheep/store/user.js b/sheep/store/user.js index 07e855b7..41eae1f7 100644 --- a/sheep/store/user.js +++ b/sheep/store/user.js @@ -52,6 +52,7 @@ const user = defineStore({ actions: { // 获取个人信息 + // TODO 芋艿：整理下； async getInfo() { const { code, @@ -65,14 +66,15 @@ const user = defineStore({ data: data2 } = await userApi.balance(); if (code !== 0 || code2 != 0) return; - data.money = data2.balance / 100; + data.money = data2.balance; this.userInfo = data; console.log(data2, '信息') return Promise.resolve(data); }, // 获取分销商信息 - async getAgentInfo() { + // TODO 芋艿：整理下； + async getAgentInfo() { const res = await commissionApi.agent(); if (res.error === 0) { this.agentInfo = res.data; @@ -81,7 +83,8 @@ const user = defineStore({ }, // 获取订单、优惠券等其他资产信息 - async getNumData() { + // TODO 芋艿：整理下； + async getNumData() { const { code, data @@ -104,7 +107,8 @@ const user = defineStore({ }, // 添加分享记录 - async addShareLog(params) { + // TODO 芋艿：整理下； + async addShareLog(params) { const { error } = await userApi.addShareLog(params); @@ -112,7 +116,8 @@ const user = defineStore({ }, // 设置token - setToken(token = '') { + // TODO 芋艿：整理下； + setToken(token = '') { if (token === '') { this.isLogin = false; uni.removeStorageSync('token'); @@ -125,7 +130,8 @@ const user = defineStore({ }, // 更新用户相关信息 (手动限流 5秒之内不刷新) - async updateUserData() { + // TODO 芋艿：整理下； + async updateUserData() { if (!this.isLogin) { this.resetUserData(); return; @@ -139,7 +145,8 @@ const user = defineStore({ }, // 重置用户默认数据 - resetUserData() { + // TODO 芋艿：整理下； + resetUserData() { this.setToken(); this.userInfo = clone(defaultUserInfo); this.numData = cloneDeep(defaultNumData); @@ -148,7 +155,8 @@ const user = defineStore({ }, // 登录后 - async loginAfter() { + // TODO 芋艿：整理下； + async loginAfter() { await this.updateUserData(); cart().getList(); // 登录后设置全局分享参数 @@ -159,7 +167,8 @@ const user = defineStore({ // } // 添加分享记录 - const shareLog = uni.getStorageSync('shareLog'); + // TODO 芋艿：整理下； + const shareLog = uni.getStorageSync('shareLog'); if (!isEmpty(shareLog)) { this.addShareLog({ ...shareLog, @@ -168,7 +177,8 @@ const user = defineStore({ }, // 登出 - async logout(force = false) { + // TODO 芋艿：整理下； + async logout(force = false) { if (!force) { const { code } = AuthUtil.logout(); if (code === 0) {