yudao
/
mall-uniapp
mirror of https://gitee.com/yudaocode/yudao-mall-uniapp.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

✨ 我的钱包：接入完成

pull/29/head^2
YunaiV 2023-12-17 23:47:16 +08:00
parent 1d9b304026
commit 56666b4836
5 changed files with 374 additions and 408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
pages/user/set.vue
View File

@ -1,88 +0,0 @@
<template>
<s-layout class="set-wrap" title="编辑资料">
<view class="header-box ss-flex-col ss-row-center ss-col-center">
<image
class="logo-img ss-m-b-40"
src="/static/img/shop/tabbar/find2.png"
mode="aspectFit"
></image>
<view class="name ss-m-b-24">SHEEP商城</view>
<view class="version">V1.3.0</view>
</view>
<uni-list :border="true">
<uni-list-item title="清除缓存" rightText="2M" showArrow></uni-list-item>
<uni-list-item title="当前版本" rightText="V1.3.1" showArrow></uni-list-item>
<uni-list-item title="意见反馈" showArrow></uni-list-item>
<uni-list-item title="关于我们" showArrow></uni-list-item>
</uni-list>
<view class="set-footer ss-flex-col ss-row-center ss-col-center">
<view class="agreement-box ss-flex ss-col-center ss-m-b-30">
<view class="ss-flex ss-col-center ss-m-b-10">
<view class="tcp-text">《用户协议》</view>
<view class="agreement-text">与</view>
<view class="tcp-text">《隐私协议》</view>
</view>
</view>
<view class="copyright-text ss-m-b-10">******版权所有</view>
<view class="copyright-text">Copyright© 2018-2022</view>
</view>
</s-layout>
</template>
<script setup></script>
<style lang="scss" scoped>
.set-title {
margin: 0 30rpx;
}
.header-box {
padding: 100rpx 0;
.logo-img {
width: 160rpx;
height: 160rpx;
}
.name {
font-size: 42rpx;
line-height: 42rpx;
font-weight: bold;
color: $dark-3;
}
.version {
font-size: 32rpx;
font-weight: 500;
line-height: 32rpx;
color: $gray-b;
}
}
.set-footer {
margin: 200rpx 0;
.copyright-text {
font-size: 22rpx;
font-weight: 500;
color: $gray-c;
line-height: 30rpx;
}
.agreement-box {
margin: 80rpx auto 0;
.tcp-text {
color: var(--ui-BG-Main);
}
.agreement-text {
font-size: 26rpx;
font-weight: 500;
color: $dark-9;
}
}
}
</style>

631
pages/user/wallet/money.vue
View File

@ -1,345 +1,370 @@
<!-- 我的钱包 -->
<template> <template>
<s-layout class="wallet-wrap" title="钱包"> <s-layout class="wallet-wrap" title="钱包">
<!-- 钱包卡片 --> <!-- 钱包卡片 -->
<view class="header-box ss-flex ss-row-center ss-col-center"> <view class="header-box ss-flex ss-row-center ss-col-center">
<view class="card-box ui-BG-Main ui-Shadow-Main"> <view class="card-box ui-BG-Main ui-Shadow-Main">
<view class="card-head ss-flex ss-col-center"> <view class="card-head ss-flex ss-col-center">
<view class="card-title ss-m-r-10">钱包余额（元）</view> <view class="card-title ss-m-r-10">钱包余额（元）</view>
<view @tap="state.showMoney = !state.showMoney" class="ss-eye-icon" <view
:class="state.showMoney ? 'cicon-eye' : 'cicon-eye-off'"></view> @tap="state.showMoney = !state.showMoney"
</view> class="ss-eye-icon"
<view class="ss-flex ss-row-between ss-col-center ss-m-t-64"> :class="state.showMoney ? 'cicon-eye' : 'cicon-eye-off'"
<view class="money-num">{{ state.showMoney ? userInfo.money : '*****' }}</view> />
<button class="ss-reset-button topup-btn" @tap="sheep.$router.go('/pages/pay/recharge')"> </view>
充值 <view class="ss-flex ss-row-between ss-col-center ss-m-t-64">
</button> <view class="money-num">{{ state.showMoney ? fen2yuan(userInfo.money) : '*****' }}</view>
</view> <button class="ss-reset-button topup-btn" @tap="sheep.$router.go('/pages/pay/recharge')">
</view> 充值
</view> </button>
</view>
</view>
</view>
<su-sticky> <su-sticky>
<!-- 统计 --> <!-- 统计 -->
<view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between"> <view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
<!-- <uni-datetime-picker v-model="state.data" type="daterange" @change="onChangeTime" :end="state.today"> <uni-datetime-picker v-model="state.data" type="daterange" @change="onChangeTime" :end="state.today">
<button class="ss-reset-button date-btn"> <button class="ss-reset-button date-btn">
<text>{{ dateFilterText }}</text> <text>{{ dateFilterText }}</text>
<text class="cicon-drop-down ss-seldate-icon"></text> <text class="cicon-drop-down ss-seldate-icon"></text>
</button> </button>
</uni-datetime-picker> --> </uni-datetime-picker>
<view class="total-box">
<view class="ss-m-b-10">总收入￥{{ fen2yuan(state.summary.totalIncome) }}</view>
<view>总支出￥{{ fen2yuan(state.summary.totalExpense) }}</view>
</view>
</view>
<su-tabs
:list="tabMaps"
@change="onChange"
:scrollable="false"
:current="state.currentTab"
></su-tabs>
</su-sticky>
<s-empty v-if="state.pagination.total === 0" text="暂无数据" icon="/static/data-empty.png" />
<view class="total-box"> <!-- 钱包记录 -->
<!-- state.pagination.income.toFixed(2) --> <view v-if="state.pagination.total > 0">
<!-- <view class="ss-m-b-10">总收入￥{{ }}</view> <view
<view>总支出￥{{ }}</view> --> class="wallet-list ss-flex border-bottom"
<!-- (-state.pagination.expense).toFixed(2) --> v-for="item in state.pagination.list"
</view> :key="item.id"
</view> >
<su-tabs :list="tabMaps" @change="onChange" :scrollable="false" :current="state.currentTab"></su-tabs> <view class="list-content">
</su-sticky> <view class="title-box ss-flex ss-row-between ss-m-b-20">
<s-empty v-if="state.pagination.total === 0" text="暂无数据" icon="/static/data-empty.png" /> <text class="title ss-line-1">
<!-- 钱包记录 --> {{ item.title }}
<view v-if="state.pagination.total > 0"> </text>
<view class="wallet-list ss-flex border-bottom" v-for="item in state.pagination.data" :key="item.id"> <view class="money">
<view class="list-content"> <text v-if="item.price >= 0" class="add">+{{ fen2yuan(item.price) }}</text>
<view class="title-box ss-flex ss-row-between ss-m-b-20"> <text v-else class="minus">{{ fen2yuan(item.price) }}</text>
<!-- <text class="title ss-line-1">{{ item.event_text }}{{ item.memo ? '-' + item.memo : '' }}</text> --> </view>
<text class="title ss-line-1">{{ item.title }}</text> </view>
<view class="money"> <text class="time">
<text v-if="(item.amount >= 0||item.price>=0)" {{ sheep.$helper.timeFormat(state.createTime, 'yyyy-mm-dd hh:MM:ss') }}
class="add">+{{ item.amount||item.price }}</text> </text>
<text v-else class="minus">{{ item.price }}</text> </view>
</view> </view>
</view> </view>
<text class="time">{{ item.createTime }}</text> <uni-load-more
</view> v-if="state.pagination.total > 0"
</view> :status="state.loadStatus"
</view> :content-text="{
<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
contentdown: '上拉加载更多', contentdown: '上拉加载更多',
}" /> }"
</s-layout> />
</s-layout>
</template> </template>
<script setup> <script setup>
import { import { computed, reactive } from 'vue';
computed, import { onLoad, onReachBottom } from '@dcloudio/uni-app';
watch, import sheep from '@/sheep';
reactive import dayjs from 'dayjs';
} from 'vue'; import _ from 'lodash';
import { import PayWalletApi from '@/sheep/api/pay/wallet';
onLoad, import { fen2yuan } from '@/sheep/hooks/useGoods';
onReachBottom import { resetPagination } from '@/sheep/util';
} from '@dcloudio/uni-app';
import sheep from '@/sheep';
import dayjs from 'dayjs';
import _ from 'lodash';
const headerBg = sheep.$url.css('/static/img/shop/user/wallet_card_bg.png'); const headerBg = sheep.$url.css('/static/img/shop/user/wallet_card_bg.png');
const pagination = { // 数据
data: [], const state = reactive({
current_page: 1, showMoney: false,
total: 1, date: [], // 筛选的时间段
last_page: 1, currentTab: 0,
expense: 0, pagination: {
income: 0, list: [],
}; total: 0,
// 数据 pageNo: 1,
const state = reactive({ pageSize: 8
showMoney: false, },
date: [], summary: {
currentTab: 0, totalIncome: 0,
pagination, totalExpense: 0,
loadStatus: '', },
today: '', loadStatus: '',
}); today: '',
});
const tabMaps = [{ const tabMaps = [
name: '全部', {
// value: 'all', name: '全部',
}, value: '',
{ },
name: '收入', {
value: '1', name: '收入',
}, value: '1',
{ },
name: '支出', {
value: '2', name: '支出',
}, value: '2',
]; },
const userInfo = computed(() => sheep.$store('user').userInfo); ];
console.log(userInfo) const userInfo = computed(() => sheep.$store('user').userInfo);
const dateFilterText = computed(() => {
if (state.date[0] === state.date[1]) {
return state.date[0];
} else {
return state.date.join('~');
}
});
async function getLogList(page = 1, list_rows = 8) { // 格式化时间段
// state.loadStatus = 'loading'; const dateFilterText = computed(() => {
let res = await sheep.$api.user.wallet.log({ if (state.date[0] === state.date[1]) {
// type: 'money', return state.date[0];
type: tabMaps[state.currentTab].value, } else {
pageSize: list_rows, return state.date.join('~');
pageNo: page, }
// date: appendTimeHMS(state.date), });
});
if (res.code === 0) {
let list = _.concat(state.pagination.data, res.data.list);
state.pagination = {
...res.data,
data: list,
income: res.data.income,
expense: res.data.expense,
};
console.log('交易数据', state.pagination)
if (state.pagination.current_page < state.pagination.last_page) {
state.loadStatus = 'more';
} else {
state.loadStatus = 'noMore';
}
}
}
onLoad(async (options) => {
state.today = dayjs().format('YYYY-MM-DD');
state.date = [state.today, state.today];
getLogList();
});
function onChange(e) { // 获得钱包记录分页
state.pagination = pagination; async function getLogList() {
state.currentTab = e.index; state.loadStatus = 'loading';
getLogList(); const { data, code } = await PayWalletApi.getWalletTransactionPage({
} pageNo: state.pagination.pageNo,
pageSize: state.pagination.pageSize,
type: tabMaps[state.currentTab].value,
'createTime[0]': state.date[0] + ' 00:00:00',
'createTime[1]': state.date[1] + ' 23:59:59',
});
if (code !== 0) {
return;
}
state.pagination.list = _.concat(state.pagination.list, data.list);
state.pagination.total = data.total;
state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
}
function onChangeTime(e) { // 获得钱包统计
state.date[0] = e[0]; async function getSummary() {
state.date[1] = e[e.length - 1]; const { data, code } = await PayWalletApi.getWalletTransactionSummary({
state.pagination = pagination; 'createTime': [state.date[0] + ' 00:00:00', state.date[1] + ' 23:59:59'],
getLogList(); });
} if (code !== 0) {
return;
}
state.summary = data;
}
function appendTimeHMS(arr) { onLoad(() => {
return [arr[0] + ' 00:00:00', arr[1] + ' 23:59:59']; state.today = dayjs().format('YYYY-MM-DD');
} state.date = [state.today, state.today];
getLogList();
getSummary();
});
onReachBottom(() => { // 处理 tab 切换
if (state.loadStatus !== 'noMore') { function onChange(e) {
getLogList(state.pagination.current_page + 1); state.currentTab = e.index;
} // 重新加载列表
}); resetPagination(state.pagination);
getLogList();
getSummary();
}
// 处理时间筛选
function onChangeTime(e) {
state.date[0] = e[0];
state.date[1] = e[e.length - 1];
// 重新加载列表
resetPagination(state.pagination);
getLogList();
getSummary();
}
onReachBottom(() => {
if (state.loadStatus === 'noMore') {
return;
}
state.pagination.pageNo++;
getLogList();
});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
// 钱包 // 钱包
.header-box { .header-box {
background-color: $white; background-color: $white;
padding: 30rpx; padding: 30rpx;
.card-box { .card-box {
width: 100%; width: 100%;
min-height: 300rpx; min-height: 300rpx;
padding: 40rpx; padding: 40rpx;
background-size: 100% 100%; background-size: 100% 100%;
border-radius: 30rpx; border-radius: 30rpx;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
z-index: 1; z-index: 1;
box-sizing: border-box; box-sizing: border-box;
&::after { &::after {
content: ''; content: '';
display: block; display: block;
width: 100%; width: 100%;
height: 100%; height: 100%;
z-index: 2; z-index: 2;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
background: v-bind(headerBg) no-repeat; background: v-bind(headerBg)
pointer-events: none; no-repeat;
} pointer-events: none;
}
.card-head { .card-head {
color: $white; color: $white;
font-size: 30rpx; font-size: 30rpx;
} }
.ss-eye-icon { .ss-eye-icon {
font-size: 40rpx; font-size: 40rpx;
color: $white; color: $white;
} }
.money-num { .money-num {
font-size: 70rpx; font-size: 70rpx;
line-height: 70rpx; line-height: 70rpx;
font-weight: 500; font-weight: 500;
color: $white; color: $white;
font-family: OPPOSANS; font-family: OPPOSANS;
} }
.reduce-num { .reduce-num {
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
color: $white; color: $white;
} }
.topup-btn { .topup-btn {
width: 120rpx; width: 120rpx;
height: 60rpx; height: 60rpx;
line-height: 60rpx; line-height: 60rpx;
border-radius: 30px; border-radius: 30px;
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
background-color: $white; background-color: $white;
color: var(--ui-BG-Main); color: var(--ui-BG-Main);
} }
} }
} }
// 筛选 // 筛选
.filter-box { .filter-box {
height: 114rpx; height: 114rpx;
background-color: $bg-page; background-color: $bg-page;
.total-box { .total-box {
font-size: 24rpx; font-size: 24rpx;
font-weight: 500; font-weight: 500;
color: $dark-9; color: $dark-9;
} }
.date-btn { .date-btn {
background-color: $white; background-color: $white;
line-height: 54rpx; line-height: 54rpx;
border-radius: 27rpx; border-radius: 27rpx;
padding: 0 20rpx; padding: 0 20rpx;
font-size: 24rpx; font-size: 24rpx;
font-weight: 500; font-weight: 500;
color: $dark-6; color: $dark-6;
.ss-seldate-icon { .ss-seldate-icon {
font-size: 50rpx; font-size: 50rpx;
color: $dark-9; color: $dark-9;
} }
} }
} }
.tabs-box { .tabs-box {
background: $white; background: $white;
border-bottom: 2rpx solid #eeeeee; border-bottom: 2rpx solid #eeeeee;
} }
// tab // tab
.wallet-tab-card { .wallet-tab-card {
.tab-item { .tab-item {
height: 80rpx; height: 80rpx;
position: relative; position: relative;
.tab-title { .tab-title {
font-size: 30rpx; font-size: 30rpx;
} }
.cur-tab-title { .cur-tab-title {
font-weight: $font-weight-bold; font-weight: $font-weight-bold;
} }
.tab-line { .tab-line {
width: 60rpx; width: 60rpx;
height: 6rpx; height: 6rpx;
border-radius: 6rpx; border-radius: 6rpx;
position: absolute; position: absolute;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
bottom: 2rpx; bottom: 2rpx;
background-color: var(--ui-BG-Main); background-color: var(--ui-BG-Main);
} }
} }
} }
// 钱包记录 // 钱包记录
.wallet-list { .wallet-list {
padding: 30rpx; padding: 30rpx;
background-color: #ffff; background-color: #ffff;
.head-img { .head-img {
width: 70rpx; width: 70rpx;
height: 70rpx; height: 70rpx;
border-radius: 50%; border-radius: 50%;
background: $gray-c; background: $gray-c;
} }
.list-content { .list-content {
justify-content: space-between; justify-content: space-between;
align-items: flex-start; align-items: flex-start;
flex: 1; flex: 1;
.title { .title {
font-size: 28rpx; font-size: 28rpx;
color: $dark-3; color: $dark-3;
width: 400rpx; width: 400rpx;
} }
.time { .time {
color: $gray-c; color: $gray-c;
font-size: 22rpx; font-size: 22rpx;
} }
} }
.money { .money {
font-size: 28rpx; font-size: 28rpx;
font-weight: bold; font-weight: bold;
font-family: OPPOSANS; font-family: OPPOSANS;
.add {
color: var(--ui-BG-Main);
}
.add { .minus {
color: var(--ui-BG-Main); color: $dark-3;
} }
}
.minus { }
color: $dark-3; </style>
}
}
}
</style>

26
sheep/api/pay/wallet.js Normal file
View File

@ -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;

7
sheep/api/user.js
View File

@ -293,13 +293,6 @@ export default {
params, params,
custom: {}, custom: {},
}), }),
// log: (params) =>
// request({
// url: '/user/api/walletLog',
// method: 'GET',
// params,
// custom: {},
// }),
}, },
account: { account: {
info: (params) => info: (params) =>

30
sheep/store/user.js
View File

@ -52,6 +52,7 @@ const user = defineStore({
actions: { actions: {
// 获取个人信息 // 获取个人信息
// TODO 芋艿：整理下；
async getInfo() { async getInfo() {
const { const {
code, code,
@ -65,14 +66,15 @@ const user = defineStore({
data: data2 data: data2
} = await userApi.balance(); } = await userApi.balance();
if (code !== 0 || code2 != 0) return; if (code !== 0 || code2 != 0) return;
data.money = data2.balance / 100; data.money = data2.balance;
this.userInfo = data; this.userInfo = data;
console.log(data2, '信息') console.log(data2, '信息')
return Promise.resolve(data); return Promise.resolve(data);
}, },
// 获取分销商信息 // 获取分销商信息
async getAgentInfo() { // TODO 芋艿：整理下；
async getAgentInfo() {
const res = await commissionApi.agent(); const res = await commissionApi.agent();
if (res.error === 0) { if (res.error === 0) {
this.agentInfo = res.data; this.agentInfo = res.data;
@ -81,7 +83,8 @@ const user = defineStore({
}, },
// 获取订单、优惠券等其他资产信息 // 获取订单、优惠券等其他资产信息
async getNumData() { // TODO 芋艿：整理下；
async getNumData() {
const { const {
code, code,
data data
@ -104,7 +107,8 @@ const user = defineStore({
}, },
// 添加分享记录 // 添加分享记录
async addShareLog(params) { // TODO 芋艿：整理下；
async addShareLog(params) {
const { const {
error error
} = await userApi.addShareLog(params); } = await userApi.addShareLog(params);
@ -112,7 +116,8 @@ const user = defineStore({
}, },
// 设置token // 设置token
setToken(token = '') { // TODO 芋艿：整理下；
setToken(token = '') {
if (token === '') { if (token === '') {
this.isLogin = false; this.isLogin = false;
uni.removeStorageSync('token'); uni.removeStorageSync('token');
@ -125,7 +130,8 @@ const user = defineStore({
}, },
// 更新用户相关信息 (手动限流 5秒之内不刷新) // 更新用户相关信息 (手动限流 5秒之内不刷新)
async updateUserData() { // TODO 芋艿：整理下；
async updateUserData() {
if (!this.isLogin) { if (!this.isLogin) {
this.resetUserData(); this.resetUserData();
return; return;
@ -139,7 +145,8 @@ const user = defineStore({
}, },
// 重置用户默认数据 // 重置用户默认数据
resetUserData() { // TODO 芋艿：整理下；
resetUserData() {
this.setToken(); this.setToken();
this.userInfo = clone(defaultUserInfo); this.userInfo = clone(defaultUserInfo);
this.numData = cloneDeep(defaultNumData); this.numData = cloneDeep(defaultNumData);
@ -148,7 +155,8 @@ const user = defineStore({
}, },
// 登录后 // 登录后
async loginAfter() { // TODO 芋艿：整理下；
async loginAfter() {
await this.updateUserData(); await this.updateUserData();
cart().getList(); cart().getList();
// 登录后设置全局分享参数 // 登录后设置全局分享参数
@ -159,7 +167,8 @@ const user = defineStore({
// } // }
// 添加分享记录 // 添加分享记录
const shareLog = uni.getStorageSync('shareLog'); // TODO 芋艿：整理下；
const shareLog = uni.getStorageSync('shareLog');
if (!isEmpty(shareLog)) { if (!isEmpty(shareLog)) {
this.addShareLog({ this.addShareLog({
...shareLog, ...shareLog,
@ -168,7 +177,8 @@ const user = defineStore({
}, },
// 登出 // 登出
async logout(force = false) { // TODO 芋艿：整理下；
async logout(force = false) {
if (!force) { if (!force) {
const { code } = AuthUtil.logout(); const { code } = AuthUtil.logout();
if (code === 0) { if (code === 0) {