增加提现记录的分页，完善提现逻辑

src/api/request_api.js

@@ -0,0 +1,73 @@
+import Taro from '@tarojs/taro';
+import ttappid from '../../project.tt.json'; // 抖音
+import wxappid from '../../project.config.json'; // 微信
+import { baseUrl } from './config';
+
+const getAppId = () => {
+  if (process.env.TARO_ENV === 'weapp') {
+    return wxappid.appid;
+  } else if (process.env.TARO_ENV === 'tt') {
+    return ttappid.appid;
+  }
+  return '';
+};
+
+export default async (options = { method: 'GET', data: {} }) => {
+  const request_data = {
+    session_key: Taro.getStorageSync('session_key') || '', // 缓存取值
+    appid: getAppId(),
+    channel_name: 'WeChat'
+  };
+
+  // 如果是登录接口，移除 session_key
+  if (options.url.includes('/user/login_applet')) {
+    delete request_data.session_key;
+  }
+
+  try {
+    const res = await Taro.request({
+      url: baseUrl + options.url,
+      data: {
+        ...request_data,
+        ...options.data,
+      },
+      header: {
+        'Content-Type': 'application/json',
+        accept: 'application/json',
+      },
+      method: options.method.toUpperCase(),
+    });
+    const { code, data, msg } = res.data;
+    console.log('==========', options.url);
+    console.log('options', options.data);
+    console.log('res', res);
+    switch (code) {
+      case 500:
+        Taro.showToast({
+          title: '需要登录',
+          icon: 'none',
+          mask: true,
+        });
+
+        // 获取当前跳转到登录的页面路径
+        const currentPages = Taro.getCurrentPages();
+        const currentPage = currentPages[currentPages.length - 1];
+        if (currentPage) {
+          // 储存当前页面路径
+          Taro.setStorageSync('currentPage', currentPage.route);
+          global.globalData.optionsData = currentPage.options || {};
+        }
+
+        Taro.reLaunch({
+          url: '/pages/login/index',
+        });
+        // throw new Error('需要登录');
+        break
+      default:
+        return res.data;
+    }
+  } catch (error) {
+    console.error('请求错误:', error);
+    return Promise.reject(error);
+  }
+};

src/pages/member/index.jsx

@@ -21,7 +21,20 @@ export default class Index extends Component {
       partner: { partner_direct_cnt: 0 },
       order: { order_all: 0, order_promotion: 0, order_pay: 0, unissued_order_cnt: 0, on_arrival_order_cnt: 0, dead_order_cnt: 0 },
     }, //会员信息
+    isAlipay: true,//是否签约
   };
+
+  // 获取签约信息
+  getWorkerInfo = async () => {
+    const res = await get_my_worker_info();
+    if (res.data.length == 0) {
+      this.setState({
+        isAlipay: false
+      })
+    }
+    console.log(res, 'res');
+  }
+
   // 获取会员首页数据
   getVipInfo = async () => {
     const res = await getVipInfo();
@@ -117,15 +130,18 @@ export default class Index extends Component {
             <View className="withdrawable-amount-content">
               <View className="left">
                 <Text className="amount">
-                  ¥{vipInfo.draw_money.store_earnings_now}
+                  {`¥ ${vipInfo.draw_money.store_earnings_now}`}
                 </Text>
+                {
+                  !this.state.isAlipay &&
+                  <View className="warning-icon-box">
+                    <Image className="warning-icon" src={warning} />
+                    <Text className="warning-text">未完成提现认证</Text>
+                  </View>
+                }
 
-                <View className="warning-icon-box">
-                  <Image className="warning-icon" src={warning} />
-                  <Text className="warning-text">未完成提现认证</Text>
-                </View>
               </View>
-              <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/cashOut/index` })} className="right">点击提现</View> 
+              <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/cashOut/index` })} className="right">点击提现</View>
             </View>
           </View>
           {/* 我的伙伴 */}

src/pages/memberSub/Alipay/index.jsx

@@ -31,8 +31,8 @@ export default class Index extends Component {
   // 获取签约信息
   getWorkerInfo = async () => {
     const res = await get_my_worker_info();
-    if (res.length > 0) {
-      res.forEach(item => {
+    if (res.data.length > 0) {
+      res.data.forEach(item => {
         if (item.rsv_account_type === 1) {
           this.setState({
             name: item.name,
@@ -113,7 +113,7 @@ export default class Index extends Component {
                 img_url: data.url
               }).then(res => {
                 console.log(res, 'res111');
-                let info = JSON.parse(res);
+                let info = JSON.parse(res.data);
                 that.setState({ idCard: info.card_no, name: info.name });
               })
             } else if (type === 'back') {
@@ -190,11 +190,22 @@ export default class Index extends Component {
       national_emblem_page: idCardBack
     }).then(res => {
       console.log(res, 'res');
-      Taro.showToast({
-        title: '签约成功',
-        icon: 'none',
-        duration: 2000
-      });
+      if (res.code === 200) {
+        this.getWorkerInfo()
+        Taro.showToast({
+          title: '签约成功',
+          icon: 'success',
+          mask: true,
+          duration: 2000
+        });
+      } else {
+        Taro.showToast({
+          title: `签约失败:${res.msg}`,
+          icon: 'none',
+          mask: true,
+          duration: 3000
+        });
+      }
     }).finally(() => {
       Taro.hideLoading();
     })
@@ -300,14 +311,17 @@ export default class Index extends Component {
             )
           }
         </View>
-        <View className="alipay-info-tips">
-          <View className="alipay-info-tips-item">
-            <Image src={this.state.signImg} className="alipay-info-tips-item-icon" />
-            <View className="alipay-info-tips-item-text">
-              如需更改，请联系客服
+        {
+          this.isBind() &&
+          <View className="alipay-info-tips">
+            <View className="alipay-info-tips-item">
+              <Image src={this.state.signImg} className="alipay-info-tips-item-icon" />
+              <View className="alipay-info-tips-item-text">
+                如需更改，请联系客服
+              </View>
             </View>
           </View>
-        </View>
+        }
         {/* 注意 */}
         {
           !this.isBind() && (

src/pages/memberSub/cashOut/index.jsx

@@ -11,7 +11,7 @@ export default class Index extends Component {
     isOpened: false,
     isAlipay: false, // 是否已绑定支付宝
     isBank: false, // 是否已绑定银行卡
-    amount: 0, // 提现金额
+    amount: '', // 提现金额
     bank_id: 0, // 银行卡id
     alipay_id: 0, // 支付宝id
     type: 0, // 提现类型
@@ -33,19 +33,19 @@ export default class Index extends Component {
   // 获取签约信息
   getWorkerInfo = async () => {
     const res = await get_my_worker_info();
-    if (res.length > 0) {
-      res.forEach(item => {
+    if (res.data.length > 0) {
+      res.data.forEach(item => {
         if (item.rsv_account_type === 1) {
           this.setState({
             type: 1,
             isAlipay: true,
-            alipay_id: item.rsv_account_id
+            alipay_id: item.id
           });
         } else {
           this.setState({
             type: 0,
             isBank: true,
-            bank_id: item.rsv_account_id
+            bank_id: item.id
           });
         }
       });
@@ -67,28 +67,46 @@ export default class Index extends Component {
     })
   }
   handleChange = (e) => {
-    if (e > this.state.translate_money) {
-      e == this.state.translate_money
+    let amount = e;
+   
+    let translate_money = parseFloat(this.state.translate_money);
+    
+    if (amount > translate_money) {
+      amount = translate_money;
     }
     this.setState({
-      amount: e
-    })
+      amount: amount
+    });
   }
   handleSubmit = async () => {
+    if (this.state.amount <= 0) {
+      Taro.showToast({
+        title: '请输入大于0的金额',
+        icon: 'none'
+      })
+      return;
+    }
+    console.log(this.state.alipay_id, 'this.state.alipay_id', this.state.bank_id, 'this.state.bank_id');
+
     const res = await submit_withdraw_record({
       amount: this.state.amount,
       bank_id: this.state.type === 1 ? this.state.alipay_id : this.state.bank_id
     });
-    if (res.code === 0) {
+    if (res.code === 200) {
       Taro.showToast({
         title: '提现申请成功',
-        icon: 'none'
+        icon: 'success'
       })
-      this.setState({
-        isOpened: false
+    } else {
+      Taro.showToast({
+        title: `提现失败:${res.msg}`,
+        icon: 'error'
       })
-      this.getUserInfo();
     }
+    this.setState({
+      isOpened: false
+    })
+    this.getUserInfo();
   }
 
   render () {
@@ -117,7 +135,7 @@ export default class Index extends Component {
             <View className='line'></View>
             {/* <AtListItem hasBorder={false} title='支付账户' extraText='需维护支付宝账户信息' arrow='right' /> */}
             {/* <View className='line'></View> */}
-            <AtListItem hasBorder={false} onClick={() => Taro.navigateTo({ url: `/pages/memberSub/statementRecords/index` })} title='标题结算单记录' extraText='6月结算单已出' arrow='right' />
+            {/* <AtListItem hasBorder={false} onClick={() => Taro.navigateTo({ url: `/pages/memberSub/statementRecords/index` })} title='标题结算单记录' extraText='6月结算单已出' arrow='right' /> */}
           </AtList>
         </View>
         {/* 结算单说明 */}
@@ -163,14 +181,14 @@ export default class Index extends Component {
               }
               {
                 this.state.isBank &&
-                <View className={['amount-info-item', this.state.type === 0 ? 'active' : '']} onClick={() => this.setState({ type: 2 })}>
+                <View className={['amount-info-item', this.state.type === 0 ? 'active' : '']} onClick={() => this.setState({ type: 0 })}>
                   <Image src='https://video-img.fyshark.com/1735041334363%E6%94%AF%E4%BB%98%E5%B9%B3%E5%8F%B0-%E9%93%B6%E8%81%94.png' style={{ width: '32px', height: '24px' }} />
                   <Text className='amount-info-item-text'>银行卡</Text>
                 </View>
               }
             </View>
-            <View className='submit-btn'>
-              <View className='submit-btn-text' onClick={this.handleSubmit}>提交</View>
+            <View className='submit-btn' onClick={this.handleSubmit}>
+              <View className='submit-btn-text'>提交</View>
             </View>
           </AtModalContent>
           <AtModalAction>  </AtModalAction>

src/pages/memberSub/cashOutRecord/index.jsx

@@ -1,5 +1,5 @@
 import { Component } from 'react'
-import { View, Text, Image } from '@tarojs/components'
+import { View, Text, Image, ScrollView } from '@tarojs/components'
 import './index.less'
 import wallet from '../../../images/wallet.png'
 import { get_withdraw_record } from '../../../service/money_api'
@@ -8,15 +8,17 @@ export default class Index extends Component {
   state = {
     withdraw_record_list: [],
     page: 1,
-    page_size: 20, // 每页加载20条
+    page_size: 7, // 每页加载20条
     total: 0,
-    loading: false // 加载状态
+    loading: false, // 加载状态
+    translate_already_money: 0,
   }
 
   componentDidShow () {
     this.get_withdraw_record()
   }
 
+
   get_withdraw_record = async () => {
     if (this.state.loading) return; // 防止重复加载
     this.setState({ loading: true });
@@ -26,47 +28,71 @@ export default class Index extends Component {
     })
     console.log(res, 'res')
     this.setState(prevState => ({
-      withdraw_record_list: prevState.page === 1 ? res : [...prevState.withdraw_record_list, ...res],
+      withdraw_record_list: prevState.page === 1 ? res.data.record_list : [...prevState.withdraw_record_list, ...res.data.record_list],
+      translate_already_money: res.data.translate_already_money,
+      total: res.data.total_count,
       loading: false
     }))
   }
 
   onReachBottom = () => {
+    console.log(this.state.page + 1, 'this.state.page + 1',this.state.page);
+    
     if (this.state.withdraw_record_list.length < this.state.total) {
       this.setState(prevState => ({ page: prevState.page + 1 }), this.get_withdraw_record)
     }
   }
 
+  stateToMoney = (status) => {
+    console.log(status, 'status');
+
+    switch (status) {
+      case 0:
+        return { text: '提现中', color: 'orange' }
+      case 1:
+        return { text: '审核通过，打款中...', color: 'blue' }
+      case 7:
+        return { text: '已到账', color: '#07d807' }
+      case 4:
+        return { text: '已拒绝，请联系客服', color: 'red' }
+      default:
+        return { text: '未知状态', color: 'gray' }
+    }
+  }
+
   render () {
     return (
-      <View className='index' onScrollToLower={this.onReachBottom}>
-        {/* 提现记录 */}
-        <View className='cash-out-record'>
-          {/* 累计提现金额 */}
-          <View className='total-amount'>
-            <View className='left'>
-              <Image src={wallet} className='icon' />
-              <Text className='title'>累计提现金额</Text>
-            </View>
-            <View className='amount'>
-              <Text className='integer'>￥10000.</Text>
-              <Text className='decimal'>00</Text>
-            </View>
+      <ScrollView
+        className='index'
+        scrollY
+        onScrollToLower={this.onReachBottom}
+      >
+        {/* 累计提现金额 */}
+        <View className='total-amount'>
+          <View className='left'>
+            <Image src={wallet} className='icon' />
+            <Text className='title'>累计提现金额</Text>
+          </View>
+          <View className='amount'>
+            <Text className='integer'>{`￥${this.state.translate_already_money}`}</Text>
           </View>
-          {/* 提现记录 */}
-          {this.state.withdraw_record_list.map((item, index) => {
-            return (
-              <View className='record-item' key={index}>
-                <View className='item-time'>{item.time.replace('T', ' ')}</View>
-                <View className='item-amount'>
-                  <View className='amount'>￥{item.amount}</View>
-                  <View className='status'>{item.msg}</View>
+        </View>
+        {/* 提现记录 */}
+        {this.state.withdraw_record_list.map((item, index) => {
+          const statusInfo = this.stateToMoney(item.state);
+          return (
+            <View className='record-item' key={index}>
+              <View className='item-time'>{item.time.replace('T', ' ')}</View>
+              <View className='item-amount'>
+                <View className='amount'>￥{item.amount}</View>
+                <View className='status' style={{ color: statusInfo.color }}>
+                  {statusInfo.text}
                 </View>
               </View>
-            )
-          })}
-        </View>
-      </View>
+            </View>
+          )
+        })}
+      </ScrollView>
     )
   }
 }

src/pages/memberSub/cashOutRecord/index.less

@@ -4,7 +4,7 @@
     padding: 30px 16px 0 16px;
     box-sizing: border-box;
 
-    .cash-out-record {
+    // .cash-out-record {
         .total-amount {
             height: 170px;
             background-color: #fff;
@@ -80,5 +80,5 @@
                 }
             }
         }
-    }
+    // }
 }

src/service/money_api.js

@@ -1,4 +1,4 @@
-import Request from '../api/request';
+import Request from '../api/request_api';
 
 // 提现认证 
 export const worker_register = data =>