|
|
@@ -1,29 +1,49 @@
|
|
|
<template>
|
|
|
<view class="content">
|
|
|
- <!-- <view class="navbar">
|
|
|
+ <view class="content-money">
|
|
|
+ <view class="status_bar"><!-- 这里是状态栏 --></view>
|
|
|
+ <view class="body-title">
|
|
|
+ <view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
|
|
|
+ <view class="header">我的余额</view>
|
|
|
+ </view>
|
|
|
+ <view class="content-bg"><image src="../../static/img/tg-bg.png" mode=""></image></view>
|
|
|
+ <view class="money-box">
|
|
|
+ <view class="money">{{ userInfo.money || 0 }}</view>
|
|
|
+ <view>我的余额</view>
|
|
|
+ </view>
|
|
|
+ <view class="moneybtn-box">
|
|
|
+ <view class="money-btn" ></view>
|
|
|
+ <view class="money-btn"></view>
|
|
|
+ <view class="money-btn" @click="navto('/pages/user/yjzz?type=yue')">余额转帐</view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="navbar">
|
|
|
<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
|
|
|
- </view> -->
|
|
|
- <swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
|
|
|
+ </view>
|
|
|
+ <swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300" @change="changeTab">
|
|
|
<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
|
|
|
- <scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
|
|
|
+ <scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
|
|
|
<!-- 空白页 -->
|
|
|
<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
|
|
|
|
|
|
<!-- 订单列表 -->
|
|
|
- <view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
|
|
|
- <view class="title-box">
|
|
|
- <view class="title">
|
|
|
- <text>{{ item.mark }}</text>
|
|
|
+ <view>
|
|
|
+ <view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
|
|
|
+ <view class="title-box">
|
|
|
+ <view class="title">
|
|
|
+ <text>{{ item.mark }}</text>
|
|
|
+ </view>
|
|
|
+ <view class="time">
|
|
|
+ <text>{{ item.add_time }}</text>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
- <view class="time">
|
|
|
- <text>{{ item.add_time }}</text>
|
|
|
+ <view class="money">
|
|
|
+ <view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="money">
|
|
|
- <text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
|
|
|
- </view>
|
|
|
</view>
|
|
|
- <uni-load-more :status="tabItem.loadingType"></uni-load-more>
|
|
|
+ <uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
|
|
|
</scroll-view>
|
|
|
</swiper-item>
|
|
|
</swiper>
|
|
|
@@ -31,38 +51,100 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-
|
|
|
-import { integrallist } from '@/api/functionalUnit.js';
|
|
|
+ import {
|
|
|
+ mapState,
|
|
|
+ mapMutations
|
|
|
+ } from 'vuex';
|
|
|
+import { getCommissionInfo,getUser,moneyList } from '@/api/user.js';
|
|
|
+import { getMoneyStyle } from '@/utils/rocessor.js';
|
|
|
+import { mapGetters } from 'vuex';
|
|
|
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
|
|
|
import empty from '@/components/empty';
|
|
|
+import { spreadCommission, userBalance,extractBank } from '@/api/wallet.js';
|
|
|
export default {
|
|
|
+ filters: {
|
|
|
+ getMoneyStyle
|
|
|
+ },
|
|
|
components: {
|
|
|
empty,
|
|
|
uniLoadMore
|
|
|
},
|
|
|
- onReady() {
|
|
|
-
|
|
|
+ onReady(res) {
|
|
|
+ var _this = this;
|
|
|
+ uni.getSystemInfo({
|
|
|
+ success: resu => {
|
|
|
+ const query = uni.createSelectorQuery();
|
|
|
+ query.select('.swiper-box').boundingClientRect();
|
|
|
+ query.exec(function(res) {
|
|
|
+ _this.height = resu.windowHeight - res[0].top + 'px';
|
|
|
+ console.log('打印页面的剩余高度', _this.height);
|
|
|
+ });
|
|
|
+ },
|
|
|
+ fail: res => {}
|
|
|
+ });
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ userInfo: {},
|
|
|
+ yj: '',
|
|
|
+ height: '',
|
|
|
+ // 头部图高度
|
|
|
+ maxheight: '',
|
|
|
tabCurrentIndex: 0,
|
|
|
+ orderStatusSum: 0,
|
|
|
+ recharge: 0,
|
|
|
navList: [
|
|
|
+ // {
|
|
|
+ // state: 0,
|
|
|
+ // text: '全部',
|
|
|
+ // loadingType: 'more',
|
|
|
+ // orderList: [],
|
|
|
+ // page: 1, //当前页数
|
|
|
+ // limit: 10 //每次信息条数
|
|
|
+ // },
|
|
|
{
|
|
|
state: 0,
|
|
|
- text: '全部',
|
|
|
+ text: '支出',
|
|
|
loadingType: 'more',
|
|
|
orderList: [],
|
|
|
page: 1, //当前页数
|
|
|
limit: 10 //每次信息条数
|
|
|
},
|
|
|
+ {
|
|
|
+ state: 1,
|
|
|
+ text: '收入',
|
|
|
+ loadingType: 'more',
|
|
|
+ orderList: [],
|
|
|
+ page: 1, //当前页数
|
|
|
+ limit: 10 //每次信息条数
|
|
|
+ }
|
|
|
],
|
|
|
+ money: ''
|
|
|
};
|
|
|
},
|
|
|
+ onLoad(options) {},
|
|
|
onShow() {
|
|
|
- // 载入积分数据
|
|
|
+ this.extractBank()
|
|
|
+ this.getUserInfo()
|
|
|
this.loadData();
|
|
|
},
|
|
|
methods: {
|
|
|
+ getUserInfo() {
|
|
|
+ getUser({}).then(({ data }) => {
|
|
|
+ this.userInfo = data
|
|
|
+ });
|
|
|
+ },
|
|
|
+ extractBank() {
|
|
|
+ extractBank().then(res => {
|
|
|
+ console.log(res)
|
|
|
+ this.yj = res.data.money
|
|
|
+ })
|
|
|
+ },
|
|
|
+ toBack() {
|
|
|
+ uni.switchTab({
|
|
|
+ url: '/pages/user/user'
|
|
|
+ });
|
|
|
+ },
|
|
|
// 页面跳转
|
|
|
navto(e) {
|
|
|
uni.navigateTo({
|
|
|
@@ -71,10 +153,10 @@ export default {
|
|
|
},
|
|
|
//获取收入支出信息
|
|
|
async loadData(source) {
|
|
|
+ let obj = this;
|
|
|
//这里是将订单挂载到tab列表下
|
|
|
let index = this.tabCurrentIndex;
|
|
|
let navItem = this.navList[index];
|
|
|
- let state = navItem.state;
|
|
|
if (source === 'tabChange' && navItem.loaded === true) {
|
|
|
//tab切换只有第一次需要加载数据
|
|
|
return;
|
|
|
@@ -86,27 +168,25 @@ export default {
|
|
|
// 修改当前对象状态为加载中
|
|
|
navItem.loadingType = 'loading';
|
|
|
|
|
|
- integrallist(
|
|
|
- {
|
|
|
- page: navItem.page,
|
|
|
- limit: navItem.limit
|
|
|
- },
|
|
|
- state
|
|
|
- )
|
|
|
+ moneyList({
|
|
|
+ page: navItem.page,
|
|
|
+ limit: navItem.limit,
|
|
|
+ pm: navItem.state
|
|
|
+ })
|
|
|
.then(({ data }) => {
|
|
|
- if (data.length > 0) {
|
|
|
+ if(data.length > 0) {
|
|
|
navItem.orderList = navItem.orderList.concat(data);
|
|
|
navItem.page++;
|
|
|
- }
|
|
|
- if (navItem.limit == data.length) {
|
|
|
- //判断是否还有数据， 有改为 more， 没有改为noMore
|
|
|
- navItem.loadingType = 'more';
|
|
|
- return;
|
|
|
- } else {
|
|
|
- //判断是否还有数据， 有改为 more， 没有改为noMore
|
|
|
+ if (navItem.limit == data.length) {
|
|
|
+ navItem.loadingType = 'more';
|
|
|
+ } else {
|
|
|
+ navItem.loadingType = 'noMore';
|
|
|
+ }
|
|
|
+ }else {
|
|
|
navItem.loadingType = 'noMore';
|
|
|
+ this.$set(navItem, 'loaded', true);
|
|
|
}
|
|
|
- uni.hideLoading();
|
|
|
+
|
|
|
this.$set(navItem, 'loaded', true);
|
|
|
})
|
|
|
.catch(e => {
|
|
|
@@ -129,12 +209,147 @@ export default {
|
|
|
|
|
|
<style lang="scss">
|
|
|
page {
|
|
|
- background: #ffffff;
|
|
|
+ background: #f1f1f1;
|
|
|
height: 100%;
|
|
|
}
|
|
|
+.status_bar {
|
|
|
+ height: var(--status-bar-height);
|
|
|
+ width: 100%;
|
|
|
+}
|
|
|
+.content-money {
|
|
|
+ position: relative;
|
|
|
+ height: 480rpx;
|
|
|
+ .content-bg {
|
|
|
+ position: absolute;
|
|
|
+ top: 0;
|
|
|
+ left: 0;
|
|
|
+ right: 0;
|
|
|
+ width: 750rpx;
|
|
|
+ height: 480rpx;
|
|
|
+ image {
|
|
|
+ width: 100%;
|
|
|
+ height: 100%;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .body-title {
|
|
|
+ height: 80rpx;
|
|
|
+ text-align: center;
|
|
|
+ font-size: 35rpx;
|
|
|
+ position: relative;
|
|
|
+ .header {
|
|
|
+ position: absolute;
|
|
|
+ left: 0;
|
|
|
+ top: 0;
|
|
|
+ width: 100%;
|
|
|
+ font-size: 36rpx;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ font-weight: bold;
|
|
|
+ color: #fffeff;
|
|
|
+ height: 80rpx;
|
|
|
+ font-size: 36rpx;
|
|
|
+ font-weight: 700;
|
|
|
+ z-index: 9;
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
+ align-items: center;
|
|
|
+ }
|
|
|
+ .goback-box {
|
|
|
+ position: absolute;
|
|
|
+ left: 18rpx;
|
|
|
+ top: 0;
|
|
|
+ height: 80rpx;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ }
|
|
|
+
|
|
|
+ .goback {
|
|
|
+ z-index: 100;
|
|
|
+ width: 34rpx;
|
|
|
+ height: 34rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
+.info-box {
|
|
|
+ width: 670rpx;
|
|
|
+ height: 186rpx;
|
|
|
+ background: #ffffff;
|
|
|
+ box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
|
|
|
+ border-radius: 20rpx;
|
|
|
+ margin: -100rpx auto 0;
|
|
|
+ position: relative;
|
|
|
+ z-index: 2;
|
|
|
+ .info-item {
|
|
|
+ width: 50%;
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ align-items: center;
|
|
|
+ line-height: 1;
|
|
|
+ .info-font {
|
|
|
+ font-size: 30rpx;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ font-weight: bold;
|
|
|
+ color: #999999;
|
|
|
+ }
|
|
|
+ .info-num {
|
|
|
+ margin-top: 30rpx;
|
|
|
+ font-size: 30rpx;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ font-weight: bold;
|
|
|
+ color: #181818;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .shu {
|
|
|
+ width: 2rpx;
|
|
|
+ height: 74rpx;
|
|
|
+ background: #dcdfe6;
|
|
|
+ }
|
|
|
+}
|
|
|
+.money-box {
|
|
|
+ position: relative;
|
|
|
+ z-index: 2;
|
|
|
+ /* #ifdef H5 */
|
|
|
+ padding-top: 90rpx;
|
|
|
+ /* #endif */
|
|
|
+ color: #ffffff;
|
|
|
+ text-align: center;
|
|
|
+ /* #ifdef APP-PLUS */
|
|
|
+ height: 200rpx;
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ justify-content: center;
|
|
|
+ /* #endif */
|
|
|
+ /* #ifdef MP-WEIXIN */
|
|
|
+ padding-top: 40rpx;
|
|
|
+ /* #endif */
|
|
|
+
|
|
|
+ .money {
|
|
|
+ font-size: 72rpx;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ font-weight: bold;
|
|
|
+ color: #ffffff;
|
|
|
+ }
|
|
|
+ .text {
|
|
|
+ font-size: 30rpx;
|
|
|
+ }
|
|
|
+}
|
|
|
+.moneybtn-box {
|
|
|
+ display: flex;
|
|
|
+
|
|
|
+ justify-content: space-between;
|
|
|
+ position: relative;
|
|
|
+ z-index: 2;
|
|
|
+ color: #ffffff;
|
|
|
+ padding: 20rpx 50rpx 0;
|
|
|
+ font-size: 30rpx;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ font-weight: bold;
|
|
|
+ color: #ffffff;
|
|
|
+}
|
|
|
+
|
|
|
.navbar {
|
|
|
+ margin-top: 20rpx;
|
|
|
display: flex;
|
|
|
- height: 40px;
|
|
|
+ height: 88rpx;
|
|
|
padding: 0 5px;
|
|
|
background: #fff;
|
|
|
box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
|
|
|
@@ -147,10 +362,10 @@ page {
|
|
|
align-items: center;
|
|
|
height: 100%;
|
|
|
font-size: 15px;
|
|
|
- color: $font-color-dark;
|
|
|
+ color: #999999;
|
|
|
position: relative;
|
|
|
&.current {
|
|
|
- color: $base-color;
|
|
|
+ color: #000;
|
|
|
&:after {
|
|
|
content: '';
|
|
|
position: absolute;
|
|
|
@@ -159,16 +374,16 @@ page {
|
|
|
transform: translateX(-50%);
|
|
|
width: 44px;
|
|
|
height: 0;
|
|
|
- border-bottom: 2px solid $base-color;
|
|
|
+ border-bottom: 2px solid #fe5b38;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-// 列表
|
|
|
-
|
|
|
+//列表
|
|
|
.swiper-box {
|
|
|
- height: calc(100% - 44px);
|
|
|
- padding-top: 10rpx;
|
|
|
+ .order-item:last-child {
|
|
|
+ margin-bottom: 60rpx;
|
|
|
+ }
|
|
|
.order-item {
|
|
|
padding: 20rpx 30rpx;
|
|
|
line-height: 1.5;
|
|
|
@@ -185,10 +400,15 @@ page {
|
|
|
.money {
|
|
|
color: #fd5b23;
|
|
|
font-size: $font-lg;
|
|
|
+ text-align: right;
|
|
|
+ .status {
|
|
|
+ color: $font-color-light;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
.list-scroll-content {
|
|
|
+ background: #ffffff;
|
|
|
height: 100%;
|
|
|
}
|
|
|
.content {
|
|
|
@@ -196,5 +416,23 @@ page {
|
|
|
.empty-content {
|
|
|
background-color: #ffffff;
|
|
|
}
|
|
|
+
|
|
|
+}
|
|
|
+.btn-box {
|
|
|
+ width: 674rpx;
|
|
|
+ height: 88rpx;
|
|
|
+ background: linear-gradient(0deg, #2e58ff, #32c6ff);
|
|
|
+ border-radius: 44rpx;
|
|
|
+ font-size: 36rpx;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ font-weight: 500;
|
|
|
+ color: #ffffff;
|
|
|
+ text-align: center;
|
|
|
+ line-height: 88rpx;
|
|
|
+ position: fixed;
|
|
|
+ bottom: 48rpx;
|
|
|
+ left: 0;
|
|
|
+ right: 0;
|
|
|
+ margin: 0 auto;
|
|
|
}
|
|
|
</style>
|
