1

src/pages/wallet/index.jsx

@@ -1,31 +1,31 @@
 import Taro from "@tarojs/taro"
 import { View, ScrollView } from "@tarojs/components"
-import { useEffect,useState } from "react"
+import { useEffect, useState } from "react"
 import withLayout from '@/layouts'
 import CustomNav from "@/components/CustomNav"
 import WalletCard from "@/components/walletCard"
 import ListTitle from "@/components/ListTitle"
-import {getAccount,getLogList} from '@/services/account'
+import { getAccount, getLogList } from '@/services/account'
 import './style.less'
 
 
 export default withLayout((props) => {
-  const [balance,setBlance]=useState(0)
-  const [logList,setLogList]=useState([])
+  const [balance, setBlance] = useState(0)
+  const [logList, setLogList] = useState([])
   const goWithdrawal = () => {
     Taro.navigateTo({ url: `/pages/withdrawal/index?balance=${balance}` });
   }
-  const getList=()=>{
-    getAccount().then(res=>{
-      setBlance(res.amounts)
+  const getList = () => {
+    getAccount().then(res => {
+      setBlance(res.amounts / 100)
     })
-    getLogList().then(res=>{
+    getLogList().then(res => {
       setLogList(res.records)
     })
   }
-  useEffect(()=>{
+  useEffect(() => {
     getList()
-  },[])
+  }, [])
   return (
     <View className='page-index'>
       <View className='index-navbar'>
@@ -35,34 +35,32 @@ export default withLayout((props) => {
         <ScrollView scrollY style={{ height: '100%' }}>
           <WalletCard onClick={goWithdrawal} value={balance} />
           <ListTitle value='零钱明细' />
-          <View className='walletCell'>
-            <View className='flexTop'>
-              <View className='content'>提现</View>
-              <View className='money'>-9000</View>
-            </View>
-            <View className='withDrawalDetail'>2022-4-10 10:55</View>
-          </View>
-          <View className='walletCell'>
-            <View className='flexTop'>
-              <View className='content'>提现</View>
-              <View className='money'>-9</View>
-            </View>
-            <View className='withDrawalDetail'>2022-4-8 10:55</View>
-          </View>
-          <View className='walletCell'>
-            <View className='flexTop'>
-              <View className='content'>收入</View>
-              <View className='money revenue'>+200</View>
-            </View>
-            <View className='withDrawalDetail'>2022-2-10 10:55</View>
-          </View>
-          <View className='walletCell'>
-            <View className='flexTop'>
-              <View className='content'>提现</View>
-              <View className='money'>-90</View>
-            </View>
-            <View className='withDrawalDetail'>2022-4-1 10:55</View>
-          </View>
+          {
+            logList && logList.map(item => {
+              return <View key={item.accountId} className='walletCell'>
+                <View className='flexTop'>
+                  <View className='content'>
+                    {
+                      item.chargeType == 'order_pay' ?
+                        '订单收入' :
+                        item.chargeType == 'order_refund' ?
+                          '用户退款' :
+                          item.chargeType == 'withdraw' ?
+                            '提现' : ''
+                    }
+                  </View>
+                  <View className={['money', item.chargeType == 'order_pay' ? '' : 'revenue']}>
+                    {
+                      item.chargeType == 'order_pay' ?
+                        '+' + item.money / 100 :
+                        '-' + item.money / 100
+                    }
+                  </View>
+                </View>
+                <View className='withDrawalDetail'>{item.createDate.substr(0, 16)}</View>
+              </View>
+            })
+          }
         </ScrollView>
       </View>
     </View>

src/pages/withdrawal/index.jsx

@@ -1,4 +1,4 @@
-import Taro, { useDidShow } from "@tarojs/taro"
+import Taro from "@tarojs/taro"
 import { useState, useEffect } from "react"
 import { View, Image, Input, Picker } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
@@ -7,6 +7,7 @@ import ListTitle from "@/components/ListTitle"
 import MyButton from "@/components/MyButton"
 import withLayout from '@/layouts'
 import { getBankList } from '@/services/bank'
+import { addWithdrawal } from '@/services/withdrawal'
 import goto from '@/assets/user/goto.png'
 import addImg from '@/assets/bank/addBank.png'
 import './style.less'
@@ -18,10 +19,9 @@ export default withLayout((props) => {
   const [money, setMoney] = useState()
   const [bankList, setBankList] = useState([])
   const [bankContentList, setBankContentList] = useState([])
-
+  const [loading, setLoading] = useState(false)
   const [index, setIndex] = useState(0)
   const onChange = e => {
-    console.log(bankList[e.detail.value])
     setIndex(e.detail.value)
   }
 
@@ -33,11 +33,22 @@ export default withLayout((props) => {
           icon: 'none',
         })
       } else {
-        Taro.showToast({
-          title: '提交成功，1到3个工作日将到您的付款账户',
-          icon: 'none',
+        setLoading(true)
+        addWithdrawal({ accountCardNo: bankList[index].cardId, money: (money - 0) * 100 }).then(() => {
+          Taro.showToast({
+            title: '提交成功，平台审核后1到3个工作日到账',
+            icon: 'none',
+          })
+          setTimeout(() => {
+            Taro.navigateBack({ delta: 1 })
+          }, 1000)
+        }).catch(err => {
+          Taro.showToast({
+            title: err.message,
+            icon: 'none',
+          })
+          setLoading(false)
         })
-        // 刷新页面
       }
     }
     else {
@@ -46,7 +57,6 @@ export default withLayout((props) => {
         icon: 'none',
       })
     }
-
   }
   const handleChanage = (e) => {
     setMoney(e.detail.value)
@@ -64,9 +74,6 @@ export default withLayout((props) => {
       }
     })
   }
-  useDidShow(() => {
-    getList()
-  })
   useEffect(() => {
     getList()
   }, [])
@@ -96,10 +103,10 @@ export default withLayout((props) => {
         <ListTitle value='选择银行卡' />
         <View className='bankInput'>
           <View className='header'>￥</View>
-          <Input className='body' type='number' placeholder='请输入提取金额' value={money} onInput={handleChanage} />
+          <Input className='body' type='digit' placeholder='请输入提取金额' value={money} onInput={handleChanage} />
         </View>
         <View className='bottomBtn'>
-          <MyButton value='提现' onClick={onClick} />
+          <MyButton loading={loading} value='提现' onClick={onClick} />
         </View>
       </View>
     </View>

src/services/withdrawal.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+/**
+ * 提现申请
+ * @param {*} data 
+ * @returns 
+ */
+ export const addWithdrawal = (data) => request('/withdrawal', { data, method: 'post' })