From 3a8baa3d81dc983f763a851560ec4da2847b3203 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Wed, 1 Jun 2022 23:58:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js      | 20 +++++++-
 pages/my/my-money-bag.vue | 98 +++++++++++++++++++++++++++------------
 2 files changed, 86 insertions(+), 32 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index 1a4aca2..b6c62cf 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -6,8 +6,8 @@ export default {
 		uni.addInterceptor('request', {
 			invoke(args) {
 				// request 触发前拼接 url 
-				// args.url = 'https://www.opsoul.com' + args.url;
-				args.url = 'http://10.45.137.214:80' + args.url;
+				args.url = 'https://www.opsoul.com' + args.url;
+				// args.url = 'http://10.45.137.214:80' + args.url;
 				// args.url = 'http://127.0.0.1:80' + args.url;
 				if (args.data) {
 					args.data.deptId = globalData.deptId;
@@ -344,5 +344,21 @@ export default {
 			data: params
 		})
 		return res[1].data.data;
+	},
+	async qryFinancialCount(params = {}) {
+		let res = await uni.request({
+			url: '/financial/detail/count',
+			method: 'POST',
+			data: params
+		})
+		return res[1].data;
+	},
+	async qryFinancialDetail(params = {}) {
+		let res = await uni.request({
+			url: '/financial/detail/list',
+			method: 'POST',
+			data: params
+		})
+		return res[1].data;
 	}
 }
diff --git a/pages/my/my-money-bag.vue b/pages/my/my-money-bag.vue
index 0c5c9b9..06694a5 100644
--- a/pages/my/my-money-bag.vue
+++ b/pages/my/my-money-bag.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="margin-bottom-lg">
 		<!-- 顶部操作条 -->
 		<cu-custom :bgColor="'bg-main-color'" :isBack="true">
 			<block slot="backText">返回</block>
@@ -9,7 +9,8 @@
 			<view class="padding-tb-lg padding-lr bg-gradual-color light">
 				<view>账户余额（元）</view>
 				<view class="flex justify-between margin-top-sm">
-					<view class="text-xxl">{{myMoneyBag.balance}}</view>
+					<!-- <view class="text-xxl">{{myMoneyBag.balance}}</view> -->
+					<view class="text-xxl">--</view>
 				</view>
 				<view v-if="bindBankCard && bindBankCard.bankNum" class="flex justify-end margin-top-sm align-center">
 					<view class="margin-lr-sm text-lg">{{bindBankCard.encodeBankNum}}</view>
@@ -20,32 +21,30 @@
 				</view>
 			</view>
 		</view>
-		<view class="margin-bottom-lg">
-			<view v-for="(billItem, index) in myMoneyBag.bill">
-				<uni-collapse v-model="openStatusArr[index]">
-					<uni-collapse-item>
-						<template v-slot:title>
-							<view class="padding bg-white">
-								<view class="margin-bottom-xs">{{billItem.duration}}</view>
-								<view>
-									<text class="margin-right"><text>支出：</text><text class="text-price text-black">{{billItem.outgoings}}</text></text>
-									<text><text>收入：</text><text class="text-price text-black">{{billItem.income}}</text></text>
-								</view>
-							</view>
-						</template>
+		<uni-collapse v-model="openStatusArr[index]" ref="collapse" v-for="(billItem, index) in bill">
+			<uni-collapse-item>
+				<template v-slot:title>
+					<view class="padding bg-white" :data-index="index" @click="showStatement">
+						<view class="margin-bottom-xs">{{billItem.createTime}}</view>
 						<view>
-							<view v-for="(item, index1) in billItem.statement" class="bg-white padding flex justify-between align-center" @click="showDetail">
-								<view>
-									<view class="margin-bottom-xs">{{item.name}}</view>
-									<view>{{item.createTime}}</view>
-								</view>
-								<view class="text-price text-black">{{item.inOutMoney}}</view>
-							</view>
+							<text class="margin-right"><text>支出：</text><text class="text-price text-black">{{billItem.payCount}}</text></text>
+							<text><text>收入：</text><text class="text-price text-black">{{billItem.incomeCount}}</text></text>
 						</view>
-					</uni-collapse-item>
-				</uni-collapse>
-			</view>
-		</view>
+					</view>
+				</template>
+				<view>
+					<view v-for="(item, index1) in billItem.statement" class="bg-white padding flex justify-between align-center" @click="showDetail">
+						<view>
+							<view class="margin-bottom-xs" v-if="item.financialDetailType == 1">师傅转派</view>
+							<view class="margin-bottom-xs" v-else-if="item.financialDetailType == 2">多级分销</view>
+							<view class="margin-bottom-xs" v-else-if="item.financialDetailType == 3">平台抽成</view>
+							<view>{{item.createTime}}</view>
+						</view>
+						<view class="text-price text-black">{{item.payMoney}}</view>
+					</view>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
 	</view>
 </template>
 
@@ -53,10 +52,11 @@
 	export default {
 		data() {
 			return {
-				openStatusArr: [['0']], //0打开，1收起
+				openStatusArr: [], //0打开，1收起
 				myMoneyBag: {},
 				curUserInfo: {},
-				bindBankCard: null
+				bindBankCard: null,
+				bill: []
 			}
 		},
 		onLoad() {
@@ -68,8 +68,11 @@
 		methods: {
 			async loadData() {
 				this.myMoneyBag = await this.$api.data('myMoneyBag');
-				for(let i = 0; i < this.myMoneyBag.bill.length - 1; i++) {
-					this.openStatusArr.concat(['1']);
+				// 查询账单
+				let billRes = await this.$request.qryFinancialCount();
+				this.bill = billRes.data;
+				for (let i = 0; i < this.bill.length; i++) {
+					this.openStatusArr.push('1');
 				}
 				this.curUserInfo = this.$request.getCurUserInfo();
 				this.loadBindBankCard();
@@ -84,6 +87,41 @@
 				this.bindBankCard = res.data;
 				this.bindBankCard.encodeBankNum = '****' + this.bindBankCard.bankNum.substring(this.bindBankCard.bankNum.length - 4);
 			},
+			async showStatement(e) {
+				let curIndex = e.currentTarget.dataset.index;
+				// 1为缩起状态，0为展开状态
+				if (this.openStatusArr[curIndex] == '1' && !this.bill[curIndex].statement) {
+					let createTime = new Date(new Date(this.bill[curIndex].createTime).setHours(0));
+					let createMonth = createTime.getMonth() + 1;
+					let createYear = createTime.getFullYear();
+					let finishYear = createMonth === 12 ? createYear + 1 : createYear;
+					let finishMonth = createMonth === 12 ? 1 : createMonth + 1;
+			
+					let createTimeStr = createYear + '-' + createMonth + '-1 00:00:00';
+					let finishTimeStr = finishYear + '-' + finishMonth + '-1 00:00:00';
+			
+					uni.showLoading({
+						mask: true,
+						title: '加载中'
+					})
+					let res = await this.$request.qryFinancialDetail({
+						beginTime: createTimeStr,
+						endTime: finishTimeStr
+					});
+					// let newStatements = this.statements.concat();
+					// newStatements[curIndex] = res.rows;
+					// this.statements = newStatements;
+					let newBill = this.bill.concat();
+					newBill[curIndex].statement = res.rows;
+					this.bill = newBill;
+					// #ifdef MP
+					this.$nextTick(() => {
+						this.$refs.collapse[curIndex].resize();
+						uni.hideLoading();
+					})
+					// #endif
+				}
+			},
 			showDetail() {
 				uni.navigateTo({
 					url: '/pages/my/statement-desc'