From a2f0aa31fd9d35486480e6c24d000c72b32bc932 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Thu, 21 Sep 2023 23:56:33 +0800
Subject: [PATCH 1/6] =?UTF-8?q?trade:=20=E5=88=86=E9=94=80=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=20-=20=E6=8F=90=E7=8E=B0=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/users/user_cash/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/users/user_cash/index.vue b/pages/users/user_cash/index.vue
index 5883a247..c9b18e65 100644
--- a/pages/users/user_cash/index.vue
+++ b/pages/users/user_cash/index.vue
@@ -33,7 +33,7 @@
 							<view class='input'><input :placeholder='"最低提现金额"+minPrice' placeholder-class='placeholder' name="money" type='digit'></input></view>
 						</view>
 						<view class='tip'>
-              当前可提现金额: <text class="price">￥{{ fen2yuan(commission.brokeragePrice) }},</text>冻结佣金：￥{{ fen2yuan(commission.frozenBrokeragePrice) }}
+              当前可提现金额: <text class="price">￥{{ fen2yuan(commission.brokeragePrice) }}，</text>冻结佣金：￥{{ fen2yuan(commission.frozenPrice) }}
 						</view>
 						<view class='tip'>
               说明: 每笔佣金的冻结期为{{frozenDays}}天，到期后可提现
@@ -65,7 +65,7 @@
 							</view>
 						</view>
 						<view class='tip'>
-              当前可提现金额: <text class="price">￥{{ fen2yuan(commission.brokeragePrice) }},</text>冻结佣金：￥{{ fen2yuan(commission.frozenBrokeragePrice) }}
+              当前可提现金额: <text class="price">￥{{ fen2yuan(commission.brokeragePrice) }}，</text>冻结佣金：￥{{ fen2yuan(commission.frozenPrice) }}
 						</view>
 						<view class='tip'>
               说明: 每笔佣金的冻结期为{{frozenDays}}天，到期后可提现
@@ -97,7 +97,7 @@
 							</view>
 						</view>
 						<view class='tip'>
-							当前可提现金额: <text class="price">￥{{ fen2yuan(commission.brokeragePrice) }},</text>冻结佣金：￥{{ fen2yuan(commission.frozenBrokeragePrice) }}
+							当前可提现金额: <text class="price">￥{{ fen2yuan(commission.brokeragePrice) }}，</text>冻结佣金：￥{{ fen2yuan(commission.frozenPrice) }}
 						</view>
 						<view class='tip'>
 							说明: 每笔佣金的冻结期为{{frozenDays}}天，到期后可提现
@@ -190,7 +190,7 @@
 				})
         TradeConfigApi.getTradeConfig().then(res => {
           this.minPrice = (res.data.brokerageWithdrawMinPrice || 0) / 100.0;
-          this.frozenDays = res.data.brokerageWithdrawMinPrice || 0;
+          this.frozenDays = res.data.brokerageFrozenDays || 0;
         });
 			},
 			getUserExtractBank: function() {

From a91b09a5fc131ca06791767c5b6359b7b6c5d486 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Fri, 22 Sep 2023 15:11:03 +0800
Subject: [PATCH 2/6] =?UTF-8?q?system:=20uniapp=E5=A2=9E=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/system/dict.js |  6 ++++++
 utils/dict.js      | 12 ++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 api/system/dict.js
 create mode 100644 utils/dict.js

diff --git a/api/system/dict.js b/api/system/dict.js
new file mode 100644
index 00000000..b0a923a5
--- /dev/null
+++ b/api/system/dict.js
@@ -0,0 +1,6 @@
+import request from "@/utils/request.js";
+
+// 根据字典类型查询字典数据信息
+export function getDicts(dictType) {
+  return request.get('app-api/system/dict-data/type/' + dictType);
+}
diff --git a/utils/dict.js b/utils/dict.js
new file mode 100644
index 00000000..df9da16b
--- /dev/null
+++ b/utils/dict.js
@@ -0,0 +1,12 @@
+/**
+ * Created by 芋道源码
+ *
+ * 数据字典工具类
+ */
+
+export const DICT_TYPE = {
+
+  // ========== MALL - 交易模块 ==========
+  BROKERAGE_BANK_NAME: 'brokerage_bank_name', // 佣金提现银行
+
+}

From 4f219f2551b78698be397ca79b5f767faf246fed Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Fri, 22 Sep 2023 15:38:40 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=86=E4=BD=A3=EF=BC=9A=E6=8F=90?=
 =?UTF-8?q?=E7=8E=B0=E9=93=B6=E8=A1=8C=E5=8D=A1=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/users/user_cash/index.vue | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/pages/users/user_cash/index.vue b/pages/users/user_cash/index.vue
index c9b18e65..85216fdd 100644
--- a/pages/users/user_cash/index.vue
+++ b/pages/users/user_cash/index.vue
@@ -22,8 +22,8 @@
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'>银行</view>
 							<view class='input'>
-								<picker @change="bindPickerChange" :value="index" :range="array">
-									<text class='Bank'>{{array[index]}}</text>
+								<picker @change="bindPickerChange" :value="bankIndex" range-key="label" :range="bankList">
+									<text class='Bank'>{{bankList[bankIndex] && bankList[bankIndex].label}}</text>
 									<text class='iconfont icon-qiepian38'></text>
 								</picker>
 							</view>
@@ -110,12 +110,13 @@
 	</view>
 </template>
 <script>
-	import { extractBank } from '@/api/user.js';
 	import { toLogin } from '@/libs/login.js';
 	import { mapGetters } from "vuex";
   import * as TradeConfigApi from '@/api/trade/config.js';
   import * as BrokerageAPI from '@/api/trade/brokerage.js'
   import * as Util from '@/utils/util.js';
+  import { getDicts } from "@/api/system/dict";
+  import { DICT_TYPE } from "@/utils/dict";
   export default {
 		data() {
 			return {
@@ -133,8 +134,8 @@
 					}
 				],
 				currentTab: 0,
-				index: 0,
-				array: [], // 提现银行
+				bankIndex: 0,
+				bankList: [], // 提现银行
 				minPrice: 0.00, // 最低提现金额
         frozenDays: 0, // 佣金冻结期
 				isClone: false,
@@ -161,7 +162,7 @@
         toLogin();
         return;
 			}
-      // this.getUserExtractBank();
+      this.getUserExtractBank();
       this.getExtractUser();
 		},
 		methods: {
@@ -194,19 +195,18 @@
         });
 			},
 			getUserExtractBank: function() {
-        // TODO 芋艿：这里要搞个银行的列表；通过数据字典；
 				let that = this;
-				extractBank().then(res => {
-					let array = res.data;
-					array.unshift("请选择银行");
-					that.$set(that, 'array', array);
+        getDicts(DICT_TYPE.BROKERAGE_BANK_NAME).then(res => {
+					let bankList = res.data;
+					bankList.unshift({ label: '请选择银行' });
+					that.$set(that, 'bankList', bankList);
 				});
 			},
 			swichNav: function(current) {
 				this.currentTab = current;
 			},
 			bindPickerChange: function(e) {
-				this.index = e.detail.value;
+				this.bankIndex = e.detail.value;
 			},
 			moneyInput(e) {
 				//正则表达试
@@ -232,14 +232,13 @@
                 title: '请填写卡号'
               });
             }
-						if (that.index === 0) {
+						if (that.bankIndex === 0) {
               return this.$util.Tips({
                 title: "请选择银行"
               });
             }
-            // TODO 芋艿：整列要搞成字典；
             form.name = value.name;
-            form.bankName = that.array[that.index];
+            form.bankName = that.bankList[that.bankIndex].value;
 					} else if (that.currentTab === 1) { // 微信
             form.type = 3;
 						if (value.name.length === 0) {

From 787d115e5a36122e148431ce9ef28437f994c994 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Fri, 22 Sep 2023 15:42:12 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=88=86=E4=BD=A3=EF=BC=9A=E6=8F=90?=
 =?UTF-8?q?=E7=8E=B0=E9=93=B6=E8=A1=8C=E5=8D=A1=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/user.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/api/user.js b/api/user.js
index da81fc15..c0684e25 100644
--- a/api/user.js
+++ b/api/user.js
@@ -209,14 +209,6 @@ export function extractCash(data){
   return request.post('extract/cash',data)
 }
 
-/**
- * 提现银行/提现最低金额
- *
-*/
-export function extractBank(){
-  return request.get('extract/bank');
-}
-
 /**
  * 会员等级列表
  *

From d07f823326b2992b20dab0c1dff19d5c7bc7d9cf Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Fri, 22 Sep 2023 18:06:11 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=88=86=E4=BD=A3:=20=E6=8F=90=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/users/user_cash/index.vue | 52 +++++++++++++--------------------
 utils/dict.js                   | 27 +++++++++++++++++
 2 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/pages/users/user_cash/index.vue b/pages/users/user_cash/index.vue
index 85216fdd..5cdfbb94 100644
--- a/pages/users/user_cash/index.vue
+++ b/pages/users/user_cash/index.vue
@@ -2,14 +2,15 @@
 	<view>
 		<view class='cash-withdrawal'>
 			<view class='nav acea-row'>
-				<view v-for="(item,index) in navList" :key="index" class='item font-color' @click="swichNav(index)">
-					<view class='line bg-color' :class='currentTab==index ? "on":""'></view>
-					<view class='iconfont' :class='item.icon+" "+(currentTab==index ? "on":"")'></view>
+				<view v-for="(item, index) in WithdrawTypeEnum" :key="index" v-if="withdrawTypes.includes(item.type)"
+              class='item font-color' @click="switchWithdrawType(item.type)">
+					<view class='line bg-color' :class='withdrawType === item.type ? "on":""'></view>
+					<view class='iconfont' :class='item.icon+" "+(withdrawType === item.type ? "on":"")'></view>
 					<view>{{item.name}}</view>
 				</view>
 			</view>
 			<view class='wrapper'>
-				<view :hidden='currentTab != 0' class='list'>
+				<view :hidden='withdrawType !== WithdrawTypeEnum.BANK.type' class='list'>
 					<form @submit="subCash" report-submit='true'>
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'>持卡人</view>
@@ -41,7 +42,7 @@
 						<button formType="submit" class='bnt bg-color'>提现</button>
 					</form>
 				</view>
-				<view :hidden='currentTab != 1' class='list'>
+				<view :hidden='withdrawType !== WithdrawTypeEnum.WECHAT.type' class='list'>
 					<form @submit="subCash" report-submit='true'>
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'>账号</view>
@@ -73,7 +74,7 @@
 						<button formType="submit" class='bnt bg-color'>提现</button>
 					</form>
 				</view>
-				<view :hidden='currentTab != 2' class='list'>
+				<view :hidden='withdrawType !== WithdrawTypeEnum.ALIPAY.type' class='list'>
 					<form @submit="subCash" report-submit='true'>
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'>账号</view>
@@ -116,28 +117,17 @@
   import * as BrokerageAPI from '@/api/trade/brokerage.js'
   import * as Util from '@/utils/util.js';
   import { getDicts } from "@/api/system/dict";
-  import { DICT_TYPE } from "@/utils/dict";
+  import { DICT_TYPE, BrokerageWithdrawTypeEnum } from "@/utils/dict";
   export default {
 		data() {
 			return {
-				navList: [{
-						'name': '银行卡',
-						'icon': 'icon-yinhangqia'
-					},
-					{
-						'name': '微信',
-						'icon': 'icon-weixin2'
-					},
-					{
-						'name': '支付宝',
-						'icon': 'icon-icon34'
-					}
-				],
-				currentTab: 0,
+				WithdrawTypeEnum: BrokerageWithdrawTypeEnum,
+				withdrawType: 0,
 				bankIndex: 0,
 				bankList: [], // 提现银行
 				minPrice: 0.00, // 最低提现金额
         frozenDays: 0, // 佣金冻结期
+        withdrawTypes: [], // 提现方式
 				isClone: false,
 				commission: {}, // 分销信息
 				qrcodeUrlW:"",
@@ -190,8 +180,10 @@
 					this.commission = res.data;
 				})
         TradeConfigApi.getTradeConfig().then(res => {
-          this.minPrice = (res.data.brokerageWithdrawMinPrice || 0) / 100.0;
+          this.minPrice = Util.fen2yuan(res.data.brokerageWithdrawMinPrice || 0);
           this.frozenDays = res.data.brokerageFrozenDays || 0;
+          this.withdrawTypes = res.data.brokerageWithdrawType || [];
+          this.withdrawType = this.withdrawTypes[0]; // 默认选中第一个提现方式
         });
 			},
 			getUserExtractBank: function() {
@@ -202,8 +194,8 @@
 					that.$set(that, 'bankList', bankList);
 				});
 			},
-			swichNav: function(current) {
-				this.currentTab = current;
+			switchWithdrawType: function(current) {
+				this.withdrawType = current;
 			},
 			bindPickerChange: function(e) {
 				this.bankIndex = e.detail.value;
@@ -219,9 +211,8 @@
 			subCash: function(e) {
 				let that = this,
 					value = e.detail.value;
-        const form = {};
-					if (this.currentTab === 0) { // 银行卡
-            form.type = 2;
+        const form = { type: this.withdrawType };
+					if (this.withdrawType === this.WithdrawTypeEnum.BANK.type) { // 银行卡
             if (value.name.length === 0) {
               return this.$util.Tips({
                 title: '请填写持卡人姓名'
@@ -238,9 +229,9 @@
               });
             }
             form.name = value.name;
+            form.accountNo = value.cardum;
             form.bankName = that.bankList[that.bankIndex].value;
-					} else if (that.currentTab === 1) { // 微信
-            form.type = 3;
+					} else if (that.withdrawType === this.WithdrawTypeEnum.WECHAT.type) { // 微信
 						if (value.name.length === 0) {
               return this.$util.Tips({
                 title: '请填写微信号'
@@ -248,8 +239,7 @@
             }
 						form.accountNo = value.name;
             form.accountQrCodeUrl = this.qrcodeUrlW;
-					} else if (that.currentTab === 2) { // 支付宝
-            form.type = 4;
+					} else if (that.withdrawType === this.WithdrawTypeEnum.ALIPAY.type) { // 支付宝
 						if (value.name.length === 0) {
               return this.$util.Tips({
                 title: '请填写账号'
diff --git a/utils/dict.js b/utils/dict.js
index df9da16b..ff1b2696 100644
--- a/utils/dict.js
+++ b/utils/dict.js
@@ -8,5 +8,32 @@ export const DICT_TYPE = {
 
   // ========== MALL - 交易模块 ==========
   BROKERAGE_BANK_NAME: 'brokerage_bank_name', // 佣金提现银行
+  BROKERAGE_WITHDRAW_TYPE: 'brokerage_withdraw_type', // 佣金提现类型
 
 }
+
+/**
+ * 佣金提现类型枚举
+ */
+export const BrokerageWithdrawTypeEnum = {
+  WALLET: {
+    type: 1,
+    name: '钱包',
+    icon: 'icon-qiandai'
+  },
+  BANK: {
+    type: 2,
+    name: '银行卡',
+    icon: 'icon-yinhangqia'
+  },
+  WECHAT: {
+    type: 3,
+    name: '微信',
+    icon: 'icon-weixin2'
+  },
+  ALIPAY: {
+    type: 4,
+    name: '支付宝',
+    icon: 'icon-icon34'
+  }
+}
\ No newline at end of file

From fc50e78becb4a12fe704ae1a4f2ed116d902ddd1 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Fri, 22 Sep 2023 18:35:41 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=86=E4=BD=A3:=20=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/users/user_spread_money/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/users/user_spread_money/index.vue b/pages/users/user_spread_money/index.vue
index c340e303..1ce30160 100644
--- a/pages/users/user_spread_money/index.vue
+++ b/pages/users/user_spread_money/index.vue
@@ -5,7 +5,7 @@
 				<view class='headerCon acea-row row-between-wrapper'>
 					<view>
 						<view class='name'>{{name}}</view>
-						<view class='money' v-if="type === 1">￥<text class='num'>{{ fen2yuan(spreadInfo.withdrawBrokeragePrice, 0) }}</text></view>
+						<view class='money' v-if="type === 1">￥<text class='num'>{{ fen2yuan(spreadInfo.withdrawPrice, 0) }}</text></view>
 						<view class='money' v-else>￥<text class='num'>{{ fen2yuan(spreadInfo.brokeragePrice, 0) }}</text></view>
 					</view>
 					<view class='iconfont icon-jinbi1'></view>
@@ -83,7 +83,7 @@
 				type: 0, // 类型；1 - 提现；2 - 佣金
 
         page: 1,
-				limit: 10,
+				limit: 15,
 				recordList: [],
 				statuss: false, // 是否到达底部