From a1d637f3cd549518c369297b64935ef32a78608a Mon Sep 17 00:00:00 2001
From: Penny <2500338766@qq.com>
Date: Sun, 6 Nov 2022 11:43:23 +0800
Subject: [PATCH] =?UTF-8?q?feature:1.0:=E5=AE=8C=E5=96=84=E6=8F=90?=
 =?UTF-8?q?=E7=8E=B0=E8=AE=B0=E5=BD=95=EF=BC=8C=E6=8F=90=E7=8E=B0=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages-userInfo/withdraw/withdraw.vue       | 152 ++++++++++-----------
 pages-userInfo/withdraw/withdrawDetail.vue | 106 ++++++++++++--
 pages/profit/profitEndOrder.vue            |  13 --
 pages/profit/profitInOrder.vue             |  21 ---
 4 files changed, 172 insertions(+), 120 deletions(-)

diff --git a/pages-userInfo/withdraw/withdraw.vue b/pages-userInfo/withdraw/withdraw.vue
index 3970962..1c0f052 100644
--- a/pages-userInfo/withdraw/withdraw.vue
+++ b/pages-userInfo/withdraw/withdraw.vue
@@ -1,9 +1,32 @@
 <template>
 	<view class="container">
-		<uni-list border-full v-for="(item,index) in withdrawList" :key="index">
-			<uni-list-item showArrow clickable :title="'订单号:'+item.orderId"
-				:note="item.createTime+'||'+item.channel+'||'+item.status" :rightText="'￥'+item.amt"
-				@click="targetToDetail(item.orderId)" />
+		<uni-list 
+		border-full 
+		v-for="(item,index) in withdrawList" :key="index"
+		>
+			<uni-list-item 
+			showArrow 
+			clickable 
+			:title="'订单号:'+item.orderId"
+			:note="item.createTime+'&'+item.channel+'&'+item.status" 
+			:rightText="'￥'+item.amt"
+				@click="targetToDetail(item.orderId)">
+				<template v-slot:body>
+				  <view class="box">
+				    <view class="uni-list-item__content-title">{{
+				      item.createTime 
+				    }}</view>
+				    <view class="box-bot">
+				      <view>
+				        {{ setChannel(item.channel) }}
+				      </view>
+				      <view style="color: #4d6aff">
+				        {{ setStatus(item.status)}}
+				      </view>
+				    </view>
+				  </view>
+				</template>
+				</uni-list-item>
 		</uni-list>
 		<view class="ivOver" v-if="flag">-----已经到底啦-----</view>
 	</view>
@@ -71,12 +94,37 @@
 						url: 'withdrawDetail?orderId=' + orderId,
 					});
 				}
+			},
+			setChannel(data){
+				if (data == "0") {
+				  return "微信";
+				} else if (data == "1") {
+				  return "银行卡";
+				} else if (data == "2") {
+				  return "支付宝";
+				}
+			},
+			setStatus(data){
+				if (data == "0") {
+				  return "待审核";
+				} else if (data == "1") {
+				  return "提现中";
+				} else if (data == "2") {
+				  return "提现成功";
+				} else if(data == "3"){
+				  return "提现失败";
+				}else if(data == "4"){
+				  return "审核拒绝";
+				}
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
+	.uni-list-item__icon-img {
+	  border-radius: 8px;
+	}
 	.ivOver{
 		width: 100%;
 		height:50px;
@@ -85,77 +133,29 @@
 		background: #fff;
 		font-size: 20rpx;
 	}
-	.container {
-		.top {
-			width: 100vw;
-
-			image {
-				width: 100vw;
-				height: 400rpx;
-			}
-
-			.uni-searchbar {
-				border: 1px solid #11A8FD;
-				margin: 0 40rpx;
-				border-radius: 16rpx;
-				padding: 0;
-
-				.uni-searchbar__box {
-					padding: 0;
-					border-radius: 16rpx !important;
-				}
-			}
-
-			>text {
-				font-weight: bold;
-				font-size: 14px;
-				display: block;
-				text-align: center;
-				padding-top: 40rpx;
-				padding-bottom: 20rpx;
-			}
-
-			.user-list {
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				overflow-x: auto;
-
-				.user-list-box {
-					width: 140rpx;
-					padding: 20rpx;
-					text-align: center;
-
-					image {
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 100rpx;
-					}
-
-					text {
-						font-size: 24rpx;
-						color: #1E1E1E;
-						text-align: center;
-					}
-				}
-			}
-		}
-
-		.middle {
-			text-align: center;
-			height: calc(100vh - 248rpx);
-			padding-top: 40rpx;
-
-			text {
-				font-weight: bold;
-				font-size: 14px;
-				display: block;
-			}
-
-			image {
-				width: 40rpx;
-				height: 40rpx;
-			}
-		}
+	.box {
+	  display: flex;
+	  padding-right: 8px;
+	  flex: 1;
+	  color: #3b4144;
+	  flex-direction: column;
+	  justify-content: center;
+	  overflow: hidden;
+	}
+	.box-bot {
+	  display: flex;
+	  margin-top: 5px;
+	}
+	.box-bot view {
+	  border-radius: 3px;
+	  border: 1px solid #4d6aff;
+	  padding: 2px 5px;
+	  margin-right: 5px;
+	  font-size: 12px;
+	}
+	.uni-list-item__content-title {
+	  font-size: 14px;
+	  color: #3b4144;
+	  overflow: hidden;
 	}
 </style>
diff --git a/pages-userInfo/withdraw/withdrawDetail.vue b/pages-userInfo/withdraw/withdrawDetail.vue
index 45b80a4..ef4aab0 100644
--- a/pages-userInfo/withdraw/withdrawDetail.vue
+++ b/pages-userInfo/withdraw/withdrawDetail.vue
@@ -1,14 +1,47 @@
 <template>
 	<view>
-		<view>订单号:{{withdrawDetailInfo.orderId}}</view>
-		<view>提现金额:{{withdrawDetailInfo.amt}}</view>
-		<view>手机号:{{withdrawDetailInfo.phone}}</view>
-		<view>银行卡:{{withdrawDetailInfo.bankNo}}</view>
-		<view>渠道:{{withdrawDetailInfo.channel}}</view>
-		<view>状态:{{withdrawDetailInfo.status}}</view>
-		<view>创建时间:{{withdrawDetailInfo.createTime}}</view>
-		<view>审核理由:{{withdrawDetailInfo.reason}}</view>
-		<view>到账时间:{{withdrawDetailInfo.achieveTime}}</view>
+		<view class="back-top"></view>
+		
+		<uni-group mode="card" class="card">
+		  <view class="box">
+		    <text class="title">订单号:</text>
+		    <text>{{ withdrawDetailInfo.orderId }}</text>
+		  </view>
+		  
+		  <view class="box" v-if="withdrawDetailInfo.channel == '2'">
+		    <text class="title">手机号:</text>
+		    <text>{{withdrawDetailInfo.phone }}</text>
+		  </view>
+		  <view class="box" v-if="withdrawDetailInfo.channel == '1'">
+		    <text class="title">银行卡:</text>
+		    <text>{{withdrawDetailInfo.bankNo }}</text>
+		  </view>
+		  <view class="box">
+		    <text class="title">提现金额:</text>
+		    <text style="color: red">{{ withdrawDetailInfo.amt }}</text>
+		  </view>
+		  <view class="box">
+		    <text class="title">渠道:</text>
+		    <text>{{ setChannel(withdrawDetailInfo.channel) }}</text>
+		  </view>
+		  <view class="box">
+		    <text class="title">状态:</text>
+		    <text>{{ setStatus(withdrawDetailInfo.status) }}</text>
+		  </view>
+		  <view class="border"></view>
+		  <view class="box">
+		    <text class="title">提现时间:</text>
+		    <text>{{withdrawDetailInfo.createTime}}</text>
+		  </view>
+		  <view class="box">
+		    <text class="title">审核理由:</text>
+		    <text>{{withdrawDetailInfo.reason}}</text>
+		  </view>
+		  <view class="box">
+		    <text class="title">到账时间:</text>
+		    <text>{{withdrawDetailInfo.achieveTime || "待确认"}}</text>
+		  </view>
+		  </uni-group>
 	</view>
 </template>
 
@@ -53,10 +86,63 @@
 					});
 				}
 			},
+			setChannel(data){
+				if (data == "0") {
+				  return "微信";
+				} else if (data == "1") {
+				  return "银行卡";
+				} else if (data == "2") {
+				  return "支付宝";
+				}
+			},
+			setStatus(data){
+				if (data == "0") {
+				  return "待审核";
+				} else if (data == "1") {
+				  return "提现中";
+				} else if (data == "2") {
+				  return "提现成功";
+				} else if(data == "3"){
+				  return "提现失败";
+				}else if(data == "4"){
+				  return "审核拒绝";
+				}
+			},
 		}
 	}
 </script>
 
 <style>
-
+.back-top {
+  width: 100%;
+  position: absolute;
+  height: 120px;
+  background: #416bdc;
+}
+.card {
+  width: 100%;
+  position: absolute;
+}
+.uni-group--card {
+  margin-top: 20px !important;
+}
+.title {
+  display: block;
+  width: 70px;
+  margin-right: 10px;
+  font-weight: bold;
+}
+.box {
+  display: flex;
+  margin-bottom: 20px;
+}
+.card view:first-child {
+  margin-top: 10px;
+}
+.border {
+  width: 100%;
+  height: 1px;
+  background: rgb(229, 229, 229);
+  margin-bottom: 20px;
+}
 </style>
diff --git a/pages/profit/profitEndOrder.vue b/pages/profit/profitEndOrder.vue
index 7fc87a8..2a552b1 100644
--- a/pages/profit/profitEndOrder.vue
+++ b/pages/profit/profitEndOrder.vue
@@ -27,19 +27,6 @@
         <text class="title">转入时间:</text>
         <text>{{ orderDetail.walletTime }}</text>
       </view>
-
-      <!-- <uni-title type="h1" title="结算单号" align="left" />
-			<text>{{orderDetail.orderNo}}</text>
-			<uni-title type="h1" title="结算平台" align="left" />
-			<text>{{orderDetail.platform}}</text>
-			<uni-title type="h1" title="应用" align="left" />
-			<text>{{orderDetail.appType}}</text>
-			<uni-title type="h1" title="收益类型" align="left" />
-			<text>{{orderDetail.type}}</text>
-			<uni-title type="h1" title="结算收入" align="left" />
-			<text>{{orderDetail.profit}}</text>
-			<uni-title type="h1" title="转入时间" align="left" />
-			<text>{{orderDetail.walletTime}}</text> -->
     </uni-group>
   </view>
 </template>
diff --git a/pages/profit/profitInOrder.vue b/pages/profit/profitInOrder.vue
index 99fe79d..82128c6 100644
--- a/pages/profit/profitInOrder.vue
+++ b/pages/profit/profitInOrder.vue
@@ -43,27 +43,6 @@
         <text class="title">确认状态:</text>
         <text>{{ orderDetail.confirmStatus == 0 ? "待确认" : "已确认" }}</text>
       </view>
-
-      <!-- <uni-title type="h1" title="结算单号" align="left" />
-			<text>{{orderDetail.orderNo}}</text>
-			<uni-title type="h1" title="结算平台" align="left" />
-			<text>{{orderDetail.platform}}</text>
-			<uni-title type="h1" title="应用" align="left" />
-			<text>{{orderDetail.appType}}</text>
-			<uni-title type="h1" title="收益类型" align="left" />
-			<text>{{orderDetail.type}}</text>
-			<uni-title type="h1" title="结算时间" align="left" />
-			<text>{{orderDetail.createTime}}</text>
-			<uni-title type="h1" title="结算收入" align="left" />
-			<text>{{orderDetail.profit}}</text>
-			<uni-title type="h1" title="下载次数" align="left" />
-			<text>{{orderDetail.downloadNum}}</text>
-			<uni-title type="h1" title="确认类型" align="left" />
-			<text>{{orderDetail.confirmType}}</text>
-			<uni-title type="h1" title="确认时间" align="left" />
-			<text>{{orderDetail.confirmTime}}</text>
-			<uni-title type="h1" title="确认状态" align="left" />
-			<text>{{orderDetail.confirmStatus}}</text> -->
     </uni-group>
   </view>
 </template>