feat(branding): 更新应用名称及时里院子市集相关引用

- 将应用名称从"时里院子市集"更新为"通源堂健康生态平台"
- 修改了config/env.ts中的生产环境应用名称配置
- 更新了src/cms/category/index.tsx中的分享标题引用
- 调整了src/admin/components/UserCell.tsx中的导航路径从/dealer/index到/doctor/index

src/doctor/withdraw/debug.tsx

@@ -0,0 +1,80 @@
+import React, { useState } from 'react'
+import { View, Text } from '@tarojs/components'
+import { Tabs, Button } from '@nutui/nutui-react-taro'
+
+/**
+ * 提现功能调试组件
+ * 用于测试 Tabs 组件的点击和切换功能
+ */
+const WithdrawDebug: React.FC = () => {
+  const [activeTab, setActiveTab] = useState<string | number>('0')
+  const [clickCount, setClickCount] = useState(0)
+
+  // Tab 切换处理函数
+  const handleTabChange = (value: string | number) => {
+    console.log('Tab切换:', { from: activeTab, to: value, type: typeof value })
+    setActiveTab(value)
+    setClickCount(prev => prev + 1)
+  }
+
+  // 手动切换测试
+  const manualSwitch = (tab: string | number) => {
+    console.log('手动切换到:', tab)
+    setActiveTab(tab)
+    setClickCount(prev => prev + 1)
+  }
+
+  return (
+    <View className="bg-gray-50 min-h-screen p-4">
+      <View className="bg-white rounded-lg p-4 mb-4">
+        <Text className="text-lg font-bold mb-2">调试信息</Text>
+        <Text className="block mb-1">当前Tab: {String(activeTab)}</Text>
+        <Text className="block mb-1">切换次数: {clickCount}</Text>
+        <Text className="block mb-1">Tab类型: {typeof activeTab}</Text>
+      </View>
+
+      <View className="bg-white rounded-lg p-4 mb-4">
+        <Text className="text-lg font-bold mb-2">手动切换测试</Text>
+        <View className="flex gap-2">
+          <Button size="small" onClick={() => manualSwitch('0')}>
+            切换到申请提现
+          </Button>
+          <Button size="small" onClick={() => manualSwitch('1')}>
+            切换到提现记录
+          </Button>
+        </View>
+      </View>
+
+      <View className="bg-white rounded-lg">
+        <Tabs value={activeTab} onChange={handleTabChange}>
+          <Tabs.TabPane title="申请提现" value="0">
+            <View className="p-4">
+              <Text className="text-center text-gray-600">申请提现页面内容</Text>
+              <Text className="text-center text-sm text-gray-400 mt-2">
+                当前Tab值: {String(activeTab)}
+              </Text>
+            </View>
+          </Tabs.TabPane>
+
+          <Tabs.TabPane title="提现记录" value="1">
+            <View className="p-4">
+              <Text className="text-center text-gray-600">提现记录页面内容</Text>
+              <Text className="text-center text-sm text-gray-400 mt-2">
+                当前Tab值: {String(activeTab)}
+              </Text>
+            </View>
+          </Tabs.TabPane>
+        </Tabs>
+      </View>
+
+      <View className="bg-white rounded-lg p-4 mt-4">
+        <Text className="text-lg font-bold mb-2">事件日志</Text>
+        <Text className="text-sm text-gray-500">
+          请查看控制台输出以获取详细的切换日志
+        </Text>
+      </View>
+    </View>
+  )
+}
+
+export default WithdrawDebug

src/doctor/withdraw/index.tsx

@@ -1,49 +1,67 @@
-import React, { useState, useRef, useEffect, useCallback } from 'react'
-import { View, Text } from '@tarojs/components'
+import React, {useState, useEffect, useCallback} from 'react'
+import {View, Text} from '@tarojs/components'
 import {
   Cell,
+  Space,
   Button,
-  Form,
   Input,
   CellGroup,
-  Radio,
   Tabs,
   Tag,
   Empty,
+  ActionSheet,
   Loading,
   PullToRefresh
 } from '@nutui/nutui-react-taro'
-import { Wallet } from '@nutui/icons-react-taro'
-import { businessGradients } from '@/styles/gradients'
+import {Wallet, ArrowRight} from '@nutui/icons-react-taro'
+import {businessGradients} from '@/styles/gradients'
 import Taro from '@tarojs/taro'
-import { useDealerUser } from '@/hooks/useDealerUser'
-import { pageShopDealerWithdraw, addShopDealerWithdraw } from '@/api/shop/shopDealerWithdraw'
-import type { ShopDealerWithdraw } from '@/api/shop/shopDealerWithdraw/model'
+import {useDealerUser} from '@/hooks/useDealerUser'
+import {pageShopDealerWithdraw, addShopDealerWithdraw} from '@/api/shop/shopDealerWithdraw'
+import type {ShopDealerWithdraw} from '@/api/shop/shopDealerWithdraw/model'
+import {ShopDealerBank} from "@/api/shop/shopDealerBank/model";
+import {listShopDealerBank} from "@/api/shop/shopDealerBank";
+import {listCmsWebsiteField} from "@/api/cms/cmsWebsiteField";
 
 interface WithdrawRecordWithDetails extends ShopDealerWithdraw {
   accountDisplay?: string
 }
 
 const DealerWithdraw: React.FC = () => {
-  const [activeTab, setActiveTab] = useState('0')
-  const [selectedAccount, setSelectedAccount] = useState('')
+  const [activeTab, setActiveTab] = useState<string | number>('0')
   const [loading, setLoading] = useState<boolean>(false)
   const [refreshing, setRefreshing] = useState<boolean>(false)
   const [submitting, setSubmitting] = useState<boolean>(false)
+  const [banks, setBanks] = useState<any[]>([])
+  const [bank, setBank] = useState<ShopDealerBank>()
+  const [isVisible, setIsVisible] = useState<boolean>(false)
   const [availableAmount, setAvailableAmount] = useState<string>('0.00')
   const [withdrawRecords, setWithdrawRecords] = useState<WithdrawRecordWithDetails[]>([])
-  const formRef = useRef<any>(null)
+  const [withdrawAmount, setWithdrawAmount] = useState<string>('')
+  const [withdrawValue, setWithdrawValue] = useState<string>('')
 
-  const { dealerUser } = useDealerUser()
+  const {dealerUser} = useDealerUser()
+
+  // Tab 切换处理函数
+  const handleTabChange = (value: string | number) => {
+    console.log('Tab切换到:', value)
+    setActiveTab(value)
+
+    // 如果切换到提现记录页面，刷新数据
+    if (String(value) === '1') {
+      fetchWithdrawRecords().then()
+    }
+  }
 
   // 获取可提现余额
   const fetchBalance = useCallback(async () => {
+    console.log(dealerUser, 'dealerUser...')
     try {
-        setAvailableAmount(dealerUser?.money || '0.00')
+      setAvailableAmount(String(dealerUser?.money || '0.00'))
     } catch (error) {
       console.error('获取余额失败:', error)
     }
-  }, [])
+  }, [dealerUser])
 
   // 获取提现记录
   const fetchWithdrawRecords = useCallback(async () => {
@@ -75,6 +93,21 @@ const DealerWithdraw: React.FC = () => {
     }
   }, [dealerUser?.userId])
 
+  function fetchBanks() {
+    listShopDealerBank({}).then(data => {
+      const list = data.map(d => {
+        d.name = d.bankName;
+        d.type = d.bankName;
+        return d;
+      })
+      setBanks(list.concat({
+        name: '管理银行卡',
+        type: 'add'
+      }))
+      setBank(data[0])
+    })
+  }
+
   // 格式化账户显示
   const getAccountDisplay = (record: ShopDealerWithdraw) => {
     if (record.payType === 10) {
@@ -94,35 +127,66 @@ const DealerWithdraw: React.FC = () => {
     setRefreshing(false)
   }
 
+  const handleSelect = (item: ShopDealerBank) => {
+    if(item.type === 'add'){
+      return Taro.navigateTo({
+        url: '/doctor/bank/index'
+      })
+    }
+    setBank(item)
+    setIsVisible(false)
+  }
+
+  function fetchCmsField() {
+    listCmsWebsiteField({ name: 'WithdrawValue'}).then(res => {
+      if(res && res.length > 0){
+        const text = res[0].value;
+        setWithdrawValue(text || '')
+      }
+    })
+  }
+
   // 初始化加载数据
   useEffect(() => {
     if (dealerUser?.userId) {
       fetchBalance().then()
       fetchWithdrawRecords().then()
+      fetchBanks()
+      fetchCmsField()
     }
   }, [fetchBalance, fetchWithdrawRecords])
 
   const getStatusText = (status?: number) => {
     switch (status) {
-      case 40: return '已到账'
-      case 20: return '审核通过'
-      case 10: return '待审核'
-      case 30: return '已驳回'
-      default: return '未知'
+      case 40:
+        return '已到账'
+      case 20:
+        return '审核通过'
+      case 10:
+        return '待审核'
+      case 30:
+        return '已驳回'
+      default:
+        return '未知'
     }
   }
 
   const getStatusColor = (status?: number) => {
     switch (status) {
-      case 40: return 'success'
-      case 20: return 'success'
-      case 10: return 'warning'
-      case 30: return 'danger'
-      default: return 'default'
+      case 40:
+        return 'success'
+      case 20:
+        return 'success'
+      case 10:
+        return 'warning'
+      case 30:
+        return 'danger'
+      default:
+        return 'default'
     }
   }
 
-  const handleSubmit = async (values: any) => {
+  const handleSubmit = async () => {
     if (!dealerUser?.userId) {
       Taro.showToast({
         title: '用户信息获取失败',
@@ -131,9 +195,26 @@ const DealerWithdraw: React.FC = () => {
       return
     }
 
+    if (!bank) {
+      Taro.showToast({
+        title: '请选择提现银行卡',
+        icon: 'error'
+      })
+      return
+    }
+
     // 验证提现金额
-    const amount = parseFloat(values.amount)
-    const available = parseFloat(availableAmount.replace(',', ''))
+    const amount = parseFloat(withdrawAmount)
+    const availableStr = String(availableAmount || '0')
+    const available = parseFloat(availableStr.replace(/,/g, ''))
+
+    if (isNaN(amount) || amount <= 0) {
+      Taro.showToast({
+        title: '请输入有效的提现金额',
+        icon: 'error'
+      })
+      return
+    }
 
     if (amount < 100) {
       Taro.showToast({
@@ -151,26 +232,27 @@ const DealerWithdraw: React.FC = () => {
       return
     }
 
+    // 验证银行卡信息
+    if (!bank.bankCard || !bank.bankAccount || !bank.bankName) {
+      Taro.showToast({
+        title: '银行卡信息不完整',
+        icon: 'error'
+      })
+      return
+    }
+
     try {
       setSubmitting(true)
 
       const withdrawData: ShopDealerWithdraw = {
         userId: dealerUser.userId,
-        money: values.amount,
-        payType: values.accountType === 'wechat' ? 10 :
-                values.accountType === 'alipay' ? 20 : 30,
+        money: withdrawAmount,
+        payType: 30, // 银行卡提现
         applyStatus: 10, // 待审核
-        platform: 'MiniProgram'
-      }
-
-      // 根据提现方式设置账户信息
-      if (values.accountType === 'alipay') {
-        withdrawData.alipayAccount = values.account
-        withdrawData.alipayName = values.accountName
-      } else if (values.accountType === 'bank') {
-        withdrawData.bankCard = values.account
-        withdrawData.bankAccount = values.accountName
-        withdrawData.bankName = values.bankName || '银行卡'
+        platform: 'MiniProgram',
+        bankCard: bank.bankCard,
+        bankAccount: bank.bankAccount,
+        bankName: bank.bankName
       }
 
       await addShopDealerWithdraw(withdrawData)
@@ -181,8 +263,7 @@ const DealerWithdraw: React.FC = () => {
       })
 
       // 重置表单
-      formRef.current?.resetFields()
-      setSelectedAccount('')
+      setWithdrawAmount('')
 
       // 刷新数据
       await handleRefresh()
@@ -201,18 +282,26 @@ const DealerWithdraw: React.FC = () => {
     }
   }
 
-  const quickAmounts = ['100', '300', '500', '1000']
-
-  const setQuickAmount = (amount: string) => {
-    formRef.current?.setFieldsValue({ amount })
+  // 格式化金额
+  const formatMoney = (money?: string) => {
+    if (!money) return '0.00'
+    return parseFloat(money).toFixed(2)
   }
 
-  const setAllAmount = () => {
-    formRef.current?.setFieldsValue({ amount: availableAmount.replace(',', '') })
+  // 计算预计到账金额
+  const calculateExpectedAmount = (amount: string) => {
+    if (!amount || isNaN(parseFloat(amount))) return '0.00'
+    const withdrawAmount = parseFloat(amount)
+    // 提现费率 16% + 3元
+    const feeRate = 0.16
+    const fixedFee = 3
+    const totalFee = withdrawAmount * feeRate + fixedFee
+    const expectedAmount = withdrawAmount - totalFee
+    return Math.max(0, expectedAmount).toFixed(2)
   }
 
   const renderWithdrawForm = () => (
-    <View className="p-4">
+    <View>
       {/* 余额卡片 */}
       <View className="rounded-xl p-6 mb-6 text-white relative overflow-hidden" style={{
         background: businessGradients.dealer.header
@@ -225,190 +314,132 @@ const DealerWithdraw: React.FC = () => {
         }}></View>
 
         <View className="flex items-center justify-between relative z-10">
-          <View>
+          <View className={'flex flex-col'}>
+            <Text className="text-2xl font-bold text-white">{formatMoney(dealerUser?.money)}</Text>
             <Text className="text-white text-opacity-80 text-sm mb-1">可提现余额</Text>
-            <Text className="text-2xl font-bold text-white">¥{availableAmount}</Text>
           </View>
           <View className="p-3 rounded-full" style={{
             background: 'rgba(255, 255, 255, 0.2)'
           }}>
-            <Wallet color="white" size="32" />
+            <Wallet color="white" size="32"/>
           </View>
         </View>
         <View className="mt-4 pt-4 relative z-10" style={{
           borderTop: '1px solid rgba(255, 255, 255, 0.3)'
         }}>
           <Text className="text-white text-opacity-80 text-xs">
-            最低提现金额：¥100 | 手续费：免费
+            最低提现金额：¥100
           </Text>
         </View>
       </View>
 
-      <Form
-        ref={formRef}
-        onFinish={handleSubmit}
-        labelPosition="top"
-      >
-        <CellGroup>
-          <Form.Item name="amount" label="提现金额" required>
+      <CellGroup>
+        <Cell style={{
+          padding: '36px 12px'
+        }} title={
+          <View className="flex items-center justify-between">
+            <Text className={'text-xl'}>￥</Text>
             <Input
-              placeholder="请输入提现金额"
+              placeholder="提现金额"
               type="number"
-              clearable
+              maxLength={7}
+              value={withdrawAmount}
+              onChange={(value) => setWithdrawAmount(value)}
+              style={{
+                padding: '0 10px',
+                fontSize: '20px'
+              }}
             />
-          </Form.Item>
-
-          {/* 快捷金额 */}
-          <View className="px-4 py-2">
-            <Text className="text-sm text-gray-600 mb-2">快捷金额</Text>
-            <View className="flex flex-wrap gap-2">
-              {quickAmounts.map(amount => (
-                <Button
-                  key={amount}
-                  size="small"
-                  fill="outline"
-                  onClick={() => setQuickAmount(amount)}
-                >
-                  {amount}
-                </Button>
-              ))}
-              <Button
-                size="small"
-                fill="outline"
-                onClick={setAllAmount}
-              >
-                全部
-              </Button>
-            </View>
+            <Button fill="none" size={'small'} onClick={() => setWithdrawAmount(dealerUser?.money || '0')}><Text className={'text-blue-500'}>全部提现</Text></Button>
           </View>
+        }
+        />
+        <Cell title={'提现到'} onClick={() => setIsVisible(true)} extra={
+          <View className="flex items-center justify-between gap-1">
+            {bank ? <Text className={'text-gray-800'}>{bank.bankName}</Text> : <Text className={'text-gray-400'}>请选择</Text>}
+            <ArrowRight className={'text-gray-300'} size={15}/>
+          </View>
+        }/>
+        <Cell title={'预计到账金额'} description={'提现费率 16% +3元'}  extra={
+          <View className="flex items-center justify-between gap-1">
+            <Text className={'text-orange-500 px-2 text-lg'}>¥{calculateExpectedAmount(withdrawAmount)}</Text>
+          </View>
+        }/>
+        <Cell title={<Text className={'text-gray-400'}>说明：{withdrawValue}</Text>}/>
+      </CellGroup>
 
-          <Form.Item name="accountType" label="提现方式" required>
-            <Radio.Group value={selectedAccount} onChange={() => setSelectedAccount}>
-              <Cell.Group>
-                <Cell>
-                  <Radio value="wechat">微信钱包</Radio>
-                </Cell>
-                <Cell>
-                  <Radio value="alipay">支付宝</Radio>
-                </Cell>
-                <Cell>
-                  <Radio value="bank">银行卡</Radio>
-                </Cell>
-              </Cell.Group>
-            </Radio.Group>
-          </Form.Item>
-
-          {selectedAccount === 'alipay' && (
-            <>
-              <Form.Item name="account" label="支付宝账号" required>
-                <Input placeholder="请输入支付宝账号" />
-              </Form.Item>
-              <Form.Item name="accountName" label="支付宝姓名" required>
-                <Input placeholder="请输入支付宝实名姓名" />
-              </Form.Item>
-            </>
-          )}
-
-          {selectedAccount === 'bank' && (
-            <>
-              <Form.Item name="bankName" label="开户银行" required>
-                <Input placeholder="请输入开户银行名称" />
-              </Form.Item>
-              <Form.Item name="account" label="银行卡号" required>
-                <Input placeholder="请输入银行卡号" />
-              </Form.Item>
-              <Form.Item name="accountName" label="开户姓名" required>
-                <Input placeholder="请输入银行卡开户姓名" />
-              </Form.Item>
-            </>
-          )}
-
-          {selectedAccount === 'wechat' && (
-            <View className="px-4 py-2">
-              <Text className="text-sm text-gray-500">
-                微信钱包提现将直接转入您的微信零钱
-              </Text>
-            </View>
-          )}
-        </CellGroup>
-
-        <View className="mt-6 px-4">
-          <Button
-            block
-            type="primary"
-            nativeType="submit"
-            loading={submitting}
-            disabled={submitting || !selectedAccount}
-          >
-            {submitting ? '提交中...' : '申请提现'}
-          </Button>
-        </View>
-      </Form>
+      <View className="mt-6 px-4">
+        <Button
+          block
+          type="primary"
+          nativeType="submit"
+          loading={submitting}
+          disabled={submitting || !withdrawAmount || !bank}
+          onClick={handleSubmit}
+        >
+          {submitting ? '提交中...' : '申请提现'}
+        </Button>
+      </View>
     </View>
   )
 
-  const renderWithdrawRecords = () => (
-    <PullToRefresh
-      disabled={refreshing}
-      onRefresh={handleRefresh}
-    >
-      <View className="p-4">
-        {loading ? (
-          <View className="text-center py-8">
-            <Loading />
-            <Text className="text-gray-500 mt-2">加载中...</Text>
-          </View>
-        ) : withdrawRecords.length > 0 ? (
-          withdrawRecords.map(record => (
-            <View key={record.id} className="bg-white rounded-lg p-4 mb-3 shadow-sm">
-              <View className="flex justify-between items-start mb-3">
-                <View>
-                  <Text className="font-semibold text-gray-800 mb-1">
-                    提现金额：¥{record.money}
-                  </Text>
-                  <Text className="text-sm text-gray-500">
-                    提现账户：{record.accountDisplay}
-                  </Text>
-                </View>
-                <Tag type={getStatusColor(record.applyStatus)}>
-                  {getStatusText(record.applyStatus)}
-                </Tag>
-              </View>
+  const renderWithdrawRecords = () => {
+    console.log('渲染提现记录:', {loading, recordsCount: withdrawRecords.length, dealerUserId: dealerUser?.userId})
 
-              <View className="text-xs text-gray-400">
-                <Text>申请时间：{record.createTime}</Text>
-                {record.auditTime && (
-                  <Text className="block mt-1">
-                    审核时间：{new Date(record.auditTime).toLocaleString()}
-                  </Text>
-                )}
-                {record.rejectReason && (
-                  <Text className="block mt-1 text-red-500">
-                    驳回原因：{record.rejectReason}
-                  </Text>
-                )}
-              </View>
-            </View>
-          ))
-        ) : (
-          <Empty description="暂无提现记录" />
-        )}
-      </View>
-    </PullToRefresh>
-  )
-
-  if (!dealerUser) {
     return (
-      <View className="bg-gray-50 min-h-screen flex items-center justify-center">
-        <Loading />
-        <Text className="text-gray-500 mt-2">加载中...</Text>
-      </View>
+      <PullToRefresh
+        disabled={refreshing}
+        onRefresh={handleRefresh}
+      >
+        <View>
+          {loading ? (
+            <View className="text-center py-8">
+              <Loading/>
+              <Text className="text-gray-500 mt-2">加载中...</Text>
+            </View>
+          ) : withdrawRecords.length > 0 ? (
+            withdrawRecords.map(record => (
+              <View key={record.id} className="rounded-lg bg-gray-50 p-4 mb-3 shadow-sm">
+                <View className="flex justify-between items-start mb-3">
+                  <Space direction={'vertical'}>
+                    <Text className="font-semibold text-gray-800 mb-1">
+                      提现金额：¥{record.money}
+                    </Text>
+                    <Text className="text-sm text-gray-500">
+                      提现账户：{record.accountDisplay}
+                    </Text>
+                  </Space>
+                  <Tag type={getStatusColor(record.applyStatus)}>
+                    {getStatusText(record.applyStatus)}
+                  </Tag>
+                </View>
+
+                <View className="text-xs text-gray-400">
+                  <Text>申请时间：{record.createTime}</Text>
+                  {record.auditTime && (
+                    <Text className="block mt-1">
+                      审核时间：{new Date(record.auditTime).toLocaleString()}
+                    </Text>
+                  )}
+                  {record.rejectReason && (
+                    <Text className="block mt-1 text-red-500">
+                      驳回原因：{record.rejectReason}
+                    </Text>
+                  )}
+                </View>
+              </View>
+            ))
+          ) : (
+            <Empty description="暂无提现记录"/>
+          )}
+        </View>
+      </PullToRefresh>
     )
   }
 
   return (
     <View className="bg-gray-50 min-h-screen">
-      <Tabs value={activeTab} onChange={() => setActiveTab}>
+      <Tabs value={activeTab} onChange={handleTabChange}>
         <Tabs.TabPane title="申请提现" value="0">
           {renderWithdrawForm()}
         </Tabs.TabPane>
@@ -417,6 +448,12 @@ const DealerWithdraw: React.FC = () => {
           {renderWithdrawRecords()}
         </Tabs.TabPane>
       </Tabs>
+      <ActionSheet
+        visible={isVisible}
+        options={banks}
+        onSelect={handleSelect}
+        onCancel={() => setIsVisible(false)}
+      />
     </View>
   )
 }