From 1a5e00053e40e4309cd37ad11e6b87fd89736d67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98=E2=80=98?= <kun.cheng@funi.com>
Date: Sun, 29 Jan 2023 17:23:57 +0800
Subject: [PATCH] =?UTF-8?q?feature-hub-1.0:=E6=96=B0=E5=A2=9E=E6=8F=90?=
 =?UTF-8?q?=E7=8E=B0=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    | 121 +++++-------------
 pages-userInfo/withdraw/withdrawLog.vue | 161 ++++++++++++++++++++++++
 pages.json                              |  12 +-
 3 files changed, 199 insertions(+), 95 deletions(-)
 create mode 100644 pages-userInfo/withdraw/withdrawLog.vue

diff --git a/pages-userInfo/withdraw/withdraw.vue b/pages-userInfo/withdraw/withdraw.vue
index d8a5acf..9b41d7d 100644
--- a/pages-userInfo/withdraw/withdraw.vue
+++ b/pages-userInfo/withdraw/withdraw.vue
@@ -1,92 +1,37 @@
 <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)">
-				<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>
+		钱包余额：{{userInfo.amt}}
+		<button class="withdrawBtn" size="default" :loading="loadingFlag" @click="" :disabled="checkUpload">提现</button>
+		<uni-list>
+		 	<uni-list-item title="管理收款账户" :show-extra-icon="true" :extra-icon="wallet" link to="/pages-userInfo/setting/compoSign"></uni-list-item>
+			<uni-list-item title="提现记录" :show-extra-icon="true" :extra-icon="withlog" link to="/pages-userInfo/withdraw/withdrawLog"></uni-list-item>
 		</uni-list>
-		<view class="ivOver" v-if="flag">-----已经到底啦-----</view>
 	</view>
 </template>
 
 <script>
-	import {
-		getWithdrawList
-	} from '@/api/userInfo.js'
 	export default {
 		data() {
 			return {
-				withdrawList: [],
-				pageSize: 10,
-				pageNum: 1,
 				userInfo: {},
-				flag: false
+				wallet: {
+					color:'#0000ff',
+					size: '22',
+					type: 'wallet'
+				},
+				withlog: {
+					color:'#0000ff',
+					size: '22',
+					type: 'compose'
+				},
 			}
+			
 		},
 		created() {
 			const userInfoSync = uni.getStorageSync('userInfo')
 			this.userInfo = userInfoSync
-			this.getWithdrawList();
-		},
-		// 下拉刷新
-		onPullDownRefresh() {
-			this.pageNum = 1
-			this.withdrawList = []
-			this.getWithdrawList()
-			uni.stopPullDownRefresh()
-		},
-		// 上划加载更多
-		onReachBottom() {
-			if (this.withdrawList.length > this.pageSize*this.pageNum-1) {
-				this.flag = false;
-				this.pageNum += 1
-				this.getWithdrawList();
-			}else{
-				this.flag = true;
-			}
 		},
 		methods: {
-			// 查询提现记录列表
-			async getWithdrawList() {
-				const res = await getWithdrawList({
-					pageSize: this.pageSize,
-					pageNum: this.pageNum,
-					creatorId: this.userInfo.id
-				})
-				console.log('res', res)
-				if (res.data.code === 200) {
-					this.withdrawList.push(...res.data.rows)
-				} else {
-					uni.showModal({
-						content: '提现记录列表数据加载失败！',
-						showCancel: false
-					});
-				}
-			},
-
 			targetToDetail(orderId) {
 				console.log('orderId', orderId)
 				if (orderId) {
@@ -95,33 +40,23 @@
 					});
 				}
 			},
-			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">
+	.withdrawBtn{
+		width: 750rpx;
+		height: 60rpx;
+		background-color: royalblue;
+		color: #ffffff;
+		font-size: 30rpx;
+		line-height: 62rpx;
+		border-radius: 17rpx;
+		margin-top:100rpx;
+	}
 	.uni-list-item__icon-img {
 	  border-radius: 16rpx;
 	}
diff --git a/pages-userInfo/withdraw/withdrawLog.vue b/pages-userInfo/withdraw/withdrawLog.vue
new file mode 100644
index 0000000..d8a5acf
--- /dev/null
+++ b/pages-userInfo/withdraw/withdrawLog.vue
@@ -0,0 +1,161 @@
+<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)">
+				<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>
+</template>
+
+<script>
+	import {
+		getWithdrawList
+	} from '@/api/userInfo.js'
+	export default {
+		data() {
+			return {
+				withdrawList: [],
+				pageSize: 10,
+				pageNum: 1,
+				userInfo: {},
+				flag: false
+			}
+		},
+		created() {
+			const userInfoSync = uni.getStorageSync('userInfo')
+			this.userInfo = userInfoSync
+			this.getWithdrawList();
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.pageNum = 1
+			this.withdrawList = []
+			this.getWithdrawList()
+			uni.stopPullDownRefresh()
+		},
+		// 上划加载更多
+		onReachBottom() {
+			if (this.withdrawList.length > this.pageSize*this.pageNum-1) {
+				this.flag = false;
+				this.pageNum += 1
+				this.getWithdrawList();
+			}else{
+				this.flag = true;
+			}
+		},
+		methods: {
+			// 查询提现记录列表
+			async getWithdrawList() {
+				const res = await getWithdrawList({
+					pageSize: this.pageSize,
+					pageNum: this.pageNum,
+					creatorId: this.userInfo.id
+				})
+				console.log('res', res)
+				if (res.data.code === 200) {
+					this.withdrawList.push(...res.data.rows)
+				} else {
+					uni.showModal({
+						content: '提现记录列表数据加载失败！',
+						showCancel: false
+					});
+				}
+			},
+
+			targetToDetail(orderId) {
+				console.log('orderId', orderId)
+				if (orderId) {
+					uni.navigateTo({
+						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: 16rpx;
+	}
+	.ivOver{
+		width: 100%;
+		height:100rpx;
+		line-height: 100rpx;
+		text-align: center;
+		background: #fff;
+		font-size: 20rpx;
+	}
+	.box {
+	  display: flex;
+	  padding-right: 16rpx;
+	  flex: 1;
+	  color: #3b4144;
+	  flex-direction: column;
+	  justify-content: center;
+	  overflow: hidden;
+	}
+	.box-bot {
+	  display: flex;
+	  margin-top: 10rpx;
+	}
+	.box-bot view {
+	  border-radius: 6rpx;
+	  border: 2rpx solid #4d6aff;
+	  padding: 4rpx 10rpx;
+	  margin-right: 10rpx;
+	  font-size: 24rpx;
+	}
+	.uni-list-item__content-title {
+	  font-size: 28rpx;
+	  color: #3b4144;
+	  overflow: hidden;
+	}
+</style>
diff --git a/pages.json b/pages.json
index 696e0cb..87e78bc 100644
--- a/pages.json
+++ b/pages.json
@@ -137,12 +137,20 @@
 				}
 			},
 			{
-				"path": "withdraw/withdraw",
+				"path": "withdraw/withdrawLog",
 				"style": {
 					"navigationBarTitleText": "提现记录",
 					"enablePullDownRefresh": true
 				}
-			}, {
+			}, 
+			{
+				"path": "withdraw/withdraw",
+				"style": {
+					"navigationBarTitleText": "提现",
+					"enablePullDownRefresh": true
+				}
+			},
+			{
 				"path": "notice/noticeDetail",
 				"style": {
 					"navigationBarTitleText": "公告详情",