From c6f83537de95f3c5e591cd2eff90f1163f38f118 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 01 十一月 2024 10:55:33 +0800
Subject: [PATCH] 1.钱包

---
 sub_pages/supplier/wallet/wallet-billing-detail.vue |   55 ++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/sub_pages/supplier/wallet/wallet-billing-detail.vue b/sub_pages/supplier/wallet/wallet-billing-detail.vue
index 4edecd7..30eff44 100644
--- a/sub_pages/supplier/wallet/wallet-billing-detail.vue
+++ b/sub_pages/supplier/wallet/wallet-billing-detail.vue
@@ -20,16 +20,6 @@
 						</u-cell>
 					</u-cell-group>
 							
-					<!-- <u-calendar
-						:show="calendarShow"
-						:minDate="minDate"
-						:maxDate="maxDate"
-						allowSameDay="true"
-						mode="range"
-						:defaultDate="[query.startDate,query.endDate]"
-						@confirm="confirm"
-						@close="close"
-					></u-calendar> -->
 					<u-calendar
 						:show="calendarShow"
 						minDate="2024-07-01"
@@ -37,23 +27,42 @@
 						allowSameDay="true"
 						:monthNum="12"
 						mode="range"
+						:startText="startText"
+  						:endText="endText"
 						:defaultDate="[query.startDate,query.endDate]"
 						@confirm="confirm"
 						@close="close"
-					></u-calendar>
+					>
+					</u-calendar>
 				</view>
-						
+
 				<u-cell-group>
 					<u-cell
 						v-for="(item,index) in list " :key="index"
 					>
-						<image slot="icon" src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/dc/dc56da3413664c829b0be3c229672c88qianbi.png" class="image-icon"></image>
-						<view slot="title" class="f10">{{ item.typeName }}</view>
+					<!-- 收入 -->
+					<!-- https://hmy-flower.oss-cn-shanghai.aliyuncs.com/56/56abe8c4217a4f41a87cee6a82a36913billincome.png -->
+						<!-- 提现发起 -->
+						<!-- https://hmy-flower.oss-cn-shanghai.aliyuncs.com/47/4778ee2740904450a9d420305e9c940awithdrawstart.png -->
+						<!-- 提现成功 -->
+						<!-- https://hmy-flower.oss-cn-shanghai.aliyuncs.com/47/477032a3a4a3480ea71f0aad040f9047withdrawsucess.png -->
+						<!-- 提现失败 -->
+						<!-- https://hmy-flower.oss-cn-shanghai.aliyuncs.com/37/3721dfee31684221b3476e4182517699withdrawfail.png -->
+						
+						<view  slot="icon">
+							<image v-if="item.type=='settlement' "  src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/56/56abe8c4217a4f41a87cee6a82a36913billincome.png" class="image-icon"></image>
+							<image v-else-if="item.type=='withdraw' && item.withdrawType=='start' "  src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/47/4778ee2740904450a9d420305e9c940awithdrawstart.png" class="image-icon"></image>
+							<image v-else-if="item.type=='withdraw' && item.withdrawType=='success' "  src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/47/477032a3a4a3480ea71f0aad040f9047withdrawsucess.png" class="image-icon"></image>
+							<image v-else-if="item.type=='withdraw' && item.withdrawType=='fail' "  src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/37/3721dfee31684221b3476e4182517699withdrawfail.png" class="image-icon"></image>
+							<image v-else  src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/56/56abe8c4217a4f41a87cee6a82a36913billincome.png" class="image-icon"></image>
+						</view>
+						<view slot="title" class="f10">{{ item.typeName }}<text v-if="item.withdrawType"> ({{item.withdrawTypeName}}) </text> </view>
 						<view slot="label" class="f10" >{{ getYyyyMmDdHh24Mi(item.createTime) }}</view>
 						<view slot="value" style="text-align: right;" class="f10">
 							<view>
-								<text v-if="item.method==='reduce' ">-</text>
-								{{ item.changeAmount }}
+								<text v-if="item.method==='reduce' && item.withdrawType !='success' " class="f-c-y">-{{ item.changeAmount }}</text>
+								<text v-else-if="item.method==='add' " class="f-c-r">+{{ item.changeAmount }}</text>
+								<text v-else></text>
 							</view>
 							<view>余额:{{ item.balance }}</view>
 						</view>
@@ -71,12 +80,14 @@
 			return {
 				calendarShow:false,
 				calendarLabel:'',
+				startText:"",
+				endText:"",
+				minDate: '',
+				maxDate: '',
 				query:{
 					startDate:"",
 					endDate:""
 				},
-				minDate: '',
-				maxDate: '',
 			};
 		},
 		
@@ -128,7 +139,7 @@
 
 			async getPageList(){
 				this.page.size=20
-				this.listApi = '/v2/wallet-bill-record/page'
+				this.listApi = '/v2/wallet-bill-record/pageByDesc'
 				let ref=await this.getList()
 				console.log(ref)
 			},
@@ -148,6 +159,12 @@
 <style lang="scss">
 	.u-page{
 		font-size: 14px;
+		.f-c-y{
+			color: #FEA850;
+		}
+		.f-c-r{
+			color: red;
+		}
 
 		.f10{
 			font-size: 14px;

--
Gitblit v1.9.3