From 7228d50ca7bff2ffa8df2ef5a4894ff3debd3077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Wed, 15 Oct 2025 01:41:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(dealer):=20=E8=B0=83=E6=95=B4=E5=88=86?=
 =?UTF-8?q?=E9=94=80=E5=95=86=E8=B5=84=E9=87=91=E6=98=8E=E7=BB=86=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=8F=8A=E6=8F=90=E7=8E=B0=E9=80=BB=E8=BE=91-=20?=
 =?UTF-8?q?=E4=BA=A4=E6=8D=A2=E8=AE=A2=E5=8D=95=E7=BC=96=E5=8F=B7=E4=B8=8E?=
 =?UTF-8?q?=E6=94=B6=E7=9B=8A=E6=8F=8F=E8=BF=B0=E7=9A=84=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=20-=20=E6=9B=B4=E6=96=B0=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83API=E5=9F=BA=E7=A1=80URL=20-=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=A0=B9=E6=8D=AE=E8=AE=A2=E5=8D=95=E5=8F=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=88=86=E9=94=80=E5=95=86=E8=B5=84=E9=87=91=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E7=9A=84=E6=96=B9=E6=B3=95=20-=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=97=A5=E6=9C=9F=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=BA=E6=9C=88=E4=BB=BD=E6=A0=BC=E5=BC=8F-=20?=
 =?UTF-8?q?=E5=B0=86=E6=8F=90=E7=8E=B0=E8=B4=B9=E7=8E=87=E4=BB=8E16%?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA0%=EF=BC=8C=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E8=B4=B9=E7=94=A83=E5=85=83=20-=20=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E6=8F=90=E7=8E=B0=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E8=B4=B9=E7=8E=87=E7=9A=84=E6=8F=8F=E8=BF=B0=E6=96=87?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/dealer/bank/index.tsx                 |   6 +-
 src/dealer/orders/index.tsx               |  11 +-
 src/dealer/orders/shopDealerOrderEdit.vue | 335 ++++++++++++++++++++++
 src/dealer/withdraw/index.tsx             |  16 +-
 4 files changed, 355 insertions(+), 13 deletions(-)
 create mode 100644 src/dealer/orders/shopDealerOrderEdit.vue

diff --git a/src/dealer/bank/index.tsx b/src/dealer/bank/index.tsx
index 71046ff..172fa42 100644
--- a/src/dealer/bank/index.tsx
+++ b/src/dealer/bank/index.tsx
@@ -83,12 +83,10 @@ const DealerBank = () => {
             style={{
               backgroundColor: 'transparent'
             }}
-            description="您还没有地址哦"
+            description="您还没有银行卡哦"
           />
           <Space>
-            <Button onClick={() => Taro.navigateTo({url: '/dealer/bank/add'})}>新增地址</Button>
-            <Button type="success" fill="dashed"
-                    onClick={() => Taro.navigateTo({url: '/dealer/bank/wxAddress'})}>获取微信地址</Button>
+            <Button onClick={() => Taro.navigateTo({url: '/dealer/bank/add'})}>新增银行卡</Button>
           </Space>
         </div>
       </ConfigProvider>
diff --git a/src/dealer/orders/index.tsx b/src/dealer/orders/index.tsx
index 50e3bde..2d6557e 100644
--- a/src/dealer/orders/index.tsx
+++ b/src/dealer/orders/index.tsx
@@ -1,6 +1,6 @@
 import React, {useState, useEffect, useCallback} from 'react'
 import {View, Text, ScrollView} from '@tarojs/components'
-import {Empty, PullToRefresh,Space, Loading, DatePicker} from '@nutui/nutui-react-taro'
+import {Empty, PullToRefresh, Space, Loading, DatePicker} from '@nutui/nutui-react-taro'
 import {ArrowDown} from '@nutui/icons-react-taro'
 import Taro from '@tarojs/taro'
 import {pageShopDealerOrder} from '@/api/shop/shopDealerOrder'
@@ -152,6 +152,15 @@ const DealerOrder: React.FC = () => {
         </Text>
       </View>
 
+      {/*<View className="flex justify-between items-center mb-1">*/}
+      {/*  <Text className="text-sm text-gray-400">*/}
+      {/*    {(order.thirdUserId && order.thirdUserId > 0) ? '获取收益' : '推荐收益'}*/}
+      {/*  </Text>*/}
+      {/*  <Text className="text-sm text-gray-400">*/}
+      {/*    合作方收益：{getStatusText(order.isSettled, order.isInvalid)}*/}
+      {/*  </Text>*/}
+      {/*</View>*/}
+
       <View className="flex justify-between items-center mb-1">
         <Text className="text-sm text-gray-400">
           {order.settleTime}
diff --git a/src/dealer/orders/shopDealerOrderEdit.vue b/src/dealer/orders/shopDealerOrderEdit.vue
new file mode 100644
index 0000000..df1f71f
--- /dev/null
+++ b/src/dealer/orders/shopDealerOrderEdit.vue
@@ -0,0 +1,335 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="900"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '分销订单' : '分销订单'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    :footer="null"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="{ span: 6 }"
+      :wrapper-col="{ span: 18 }"
+    >
+      <!-- 订单基本信息 -->
+      <a-divider orientation="left">
+        <span style="color: #1890ff; font-weight: 600;">基本信息</span>
+      </a-divider>
+
+      <a-row :gutter="16">
+        <a-col :span="12">
+          <a-form-item label="客户名称" name="comments">
+            {{ form.comments }}
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="订单编号" name="orderNo">
+            {{ form.orderNo }}
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="结算电量" name="orderPrice">
+            {{ parseFloat(form.orderPrice || 0).toFixed(2) }}
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="税率" name="rate">
+            {{ form.rate }}
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="单价" name="price">
+            {{ form.price }}
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="结算金额" name="payPrice">
+            {{ parseFloat(form.settledPrice || 0).toFixed(2) }}
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="实发金额" name="payPrice">
+            {{ parseFloat(form.payPrice || 0).toFixed(2) }}
+          </a-form-item>
+        </a-col>
+      </a-row>
+
+
+
+      <!-- 分销商信息 -->
+      <a-divider orientation="left">
+        <span style="color: #1890ff; font-weight: 600;">收益计算</span>
+      </a-divider>
+
+      <!-- 二级分销商 -->
+      <div class="dealer-section">
+        <h4 class="dealer-title">
+          <a-tag color="orange">间推收益</a-tag>
+        </h4>
+        <a-row :gutter="16">
+          <a-col :span="12">
+            <a-form-item label="用户ID" name="firstUserId">
+              {{ form.firstUserId }}
+            </a-form-item>
+            <a-form-item label="昵称" name="firstNickname">
+              {{ form.firstNickname }}
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="占比" name="rate">
+              {{ '30%' }}
+            </a-form-item>
+            <a-form-item label="获取收益" name="firstMoney">
+              {{ form.firstMoney }}
+<!--              <a-input-number-->
+<!--                :min="0"-->
+<!--                :precision="2"-->
+<!--                placeholder="请输入一级分销佣金"-->
+<!--                v-model:value=""-->
+<!--                style="width: 100%"-->
+<!--              >-->
+<!--                <template #addonAfter>元</template>-->
+<!--              </a-input-number>-->
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </div>
+
+      <!-- 一级分销商 -->
+      <div class="dealer-section">
+        <h4 class="dealer-title">
+          <a-tag color="orange">{{ form.thirdUserId > 0 ? '推荐收益' : '获取收益' }}</a-tag>
+        </h4>
+        <a-row :gutter="16">
+          <a-col :span="12">
+            <a-form-item label="用户ID" name="userId">
+              {{ form.userId }}
+            </a-form-item>
+            <a-form-item label="昵称" name="nickname">
+              {{ form.nickname }}
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="占比" name="rate">
+              {{ form?.thirdUserId > 0 ? '10%' : '70%' }}
+            </a-form-item>
+            <a-form-item label="获取收益" name="firstMoney">
+              {{ form.secondMoney }}
+<!--              <a-input-number-->
+<!--                :min="0"-->
+<!--                :precision="2"-->
+<!--                placeholder="请输入一级分销佣金"-->
+<!--                v-model:value=""-->
+<!--                style="width: 100%"-->
+<!--              >-->
+<!--                <template #addonAfter>元</template>-->
+<!--              </a-input-number>-->
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </div>
+
+      <!-- 三级分销商 -->
+      <div class="dealer-section" v-if="form.thirdUserId > 0">
+        <h4 class="dealer-title">
+          <a-tag color="orange">{{ form.thirdUserId > 0 ? '获取收益' : '推荐收益' }}</a-tag>
+        </h4>
+        <a-row :gutter="16">
+          <a-col :span="12">
+            <a-form-item label="用户ID" name="secondUserId">
+              {{ form.secondUserId }}
+            </a-form-item>
+            <a-form-item label="昵称" name="secondNickname">
+              {{ form.secondNickname }}
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="占比" name="rate">
+              {{ '60%' }}
+            </a-form-item>
+            <a-form-item label="获取收益" name="thirdMoney">
+              {{ form.thirdMoney }}
+<!--              <a-input-number-->
+<!--                :min="0"-->
+<!--                :precision="2"-->
+<!--                placeholder="请输入二级分销佣金"-->
+<!--                v-model:value=""-->
+<!--                style="width: 100%"-->
+<!--              >-->
+<!--                <template #addonAfter>元</template>-->
+<!--              </a-input-number>-->
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </div>
+
+      <a-form-item label="结算时间" name="settleTime" v-if="form.isSettled === 1">
+        {{ form.settleTime }}
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form } from 'ant-design-vue';
+  import { assignObject } from 'ele-admin-pro';
+  import { ShopDealerOrder } from '@/api/shop/shopDealerOrder/model';
+  import { FormInstance } from 'ant-design-vue/es/form';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: ShopDealerOrder | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+
+  // 表单数据
+  const form = reactive<ShopDealerOrder>({
+    id: undefined,
+    userId: undefined,
+    nickname: undefined,
+    orderNo: undefined,
+    orderPrice: undefined,
+    settledPrice: undefined,
+    price: undefined,
+    month: undefined,
+    payPrice: undefined,
+    firstUserId: undefined,
+    secondUserId: undefined,
+    thirdUserId: undefined,
+    firstMoney: undefined,
+    secondMoney: undefined,
+    thirdMoney: undefined,
+    firstNickname: undefined,
+    secondNickname: undefined,
+    thirdNickname: undefined,
+    rate: undefined,
+    comments: undefined,
+    isInvalid: 0,
+    isSettled: 0,
+    settleTime: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    updateTime: undefined
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    userId: [
+      {
+        required: true,
+        message: '请选择用户ID',
+        trigger: 'blur'
+      }
+    ],
+  });
+
+
+
+  const { resetFields } = useForm(form, rules);
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.orderPrice && props.data.rate){
+            form.firstMoney = (Number(props.data.payPrice) * 0.3).toFixed(2)
+            if(props.data.thirdUserId && props.data.thirdUserId > 0){
+              form.secondMoney = (Number(props.data.payPrice) * 0.1).toFixed(2)
+            }else {
+              form.secondMoney = (Number(props.data.payPrice) * 0.7).toFixed(2)
+            }
+            form.thirdMoney = (Number(props.data.payPrice) * 0.6).toFixed(2)
+          }
+          isUpdate.value = true;
+        } else {
+          // 重置为默认值
+          Object.assign(form, {
+            id: undefined,
+            userId: undefined,
+            orderId: undefined,
+            orderPrice: undefined,
+            firstUserId: undefined,
+            secondUserId: undefined,
+            thirdUserId: undefined,
+            firstMoney: undefined,
+            secondMoney: undefined,
+            thirdMoney: undefined,
+            isInvalid: 0,
+            isSettled: 0,
+            settleTime: undefined
+          });
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>
+
+<style lang="less" scoped>
+.dealer-section {
+  margin-bottom: 24px;
+  padding: 16px;
+  background: #fafafa;
+  border-radius: 6px;
+  border-left: 3px solid #1890ff;
+
+  .dealer-title {
+    margin: 0 0 16px 0;
+    font-size: 14px;
+    font-weight: 600;
+    color: #333;
+
+    .ant-tag {
+      margin-right: 8px;
+    }
+  }
+}
+
+:deep(.ant-divider-horizontal.ant-divider-with-text-left) {
+  margin: 24px 0 16px 0;
+
+  .ant-divider-inner-text {
+    padding: 0 16px 0 0;
+  }
+}
+
+:deep(.ant-form-item) {
+  margin-bottom: 16px;
+}
+
+:deep(.ant-input-number) {
+  width: 100%;
+}
+</style>
diff --git a/src/dealer/withdraw/index.tsx b/src/dealer/withdraw/index.tsx
index 4d97622..17591cc 100644
--- a/src/dealer/withdraw/index.tsx
+++ b/src/dealer/withdraw/index.tsx
@@ -86,7 +86,7 @@ const DealerWithdraw: React.FC = () => {
       console.error('获取提现记录失败:', error)
       Taro.showToast({
         title: '获取提现记录失败',
-        icon: 'error'
+        icon: 'none'
       })
     } finally {
       setLoading(false)
@@ -190,7 +190,7 @@ const DealerWithdraw: React.FC = () => {
     if (!dealerUser?.userId) {
       Taro.showToast({
         title: '用户信息获取失败',
-        icon: 'error'
+        icon: 'none'
       })
       return
     }
@@ -198,7 +198,7 @@ const DealerWithdraw: React.FC = () => {
     if (!bank) {
       Taro.showToast({
         title: '请选择提现银行卡',
-        icon: 'error'
+        icon: 'none'
       })
       return
     }
@@ -211,7 +211,7 @@ const DealerWithdraw: React.FC = () => {
     if (isNaN(amount) || amount <= 0) {
       Taro.showToast({
         title: '请输入有效的提现金额',
-        icon: 'error'
+        icon: 'none'
       })
       return
     }
@@ -219,7 +219,7 @@ const DealerWithdraw: React.FC = () => {
     if (amount < 100) {
       Taro.showToast({
         title: '最低提现金额为100元',
-        icon: 'error'
+        icon: 'none'
       })
       return
     }
@@ -227,7 +227,7 @@ const DealerWithdraw: React.FC = () => {
     if (amount > available) {
       Taro.showToast({
         title: '提现金额超过可用余额',
-        icon: 'error'
+        icon: 'none'
       })
       return
     }
@@ -236,7 +236,7 @@ const DealerWithdraw: React.FC = () => {
     if (!bank.bankCard || !bank.bankAccount || !bank.bankName) {
       Taro.showToast({
         title: '银行卡信息不完整',
-        icon: 'error'
+        icon: 'none'
       })
       return
     }
@@ -275,7 +275,7 @@ const DealerWithdraw: React.FC = () => {
       console.error('提现申请失败:', error)
       Taro.showToast({
         title: error.message || '提现申请失败',
-        icon: 'error'
+        icon: 'none'
       })
     } finally {
       setSubmitting(false)