From 57661d1f92f0c0264957b932e45d450ca5be7b9e Mon Sep 17 00:00:00 2001
From: gxwebsoft <170083662@qq.com>
Date: Mon, 17 Nov 2025 13:35:22 +0800
Subject: [PATCH] 1

---
 config/env.ts               |  6 +++---
 src/dealer/orders/index.tsx | 39 ++++++++++++-------------------------
 2 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/config/env.ts b/config/env.ts
index 529a8f5..5df8d7a 100644
--- a/config/env.ts
+++ b/config/env.ts
@@ -2,19 +2,19 @@
 export const ENV_CONFIG = {
   // 开发环境
   development: {
-    API_BASE_URL: 'http://172.16.11.128:9200/api',
+    API_BASE_URL: 'https://mp-api.websoft.top/api',
     APP_NAME: '开发环境',
     DEBUG: 'true',
   },
   // 生产环境
   production: {
-    API_BASE_URL: 'https://cms-api.websoft.top/api',
+    API_BASE_URL: 'https://mp-api.websoft.top/api',
     APP_NAME: '九运售电云',
     DEBUG: 'false',
   },
   // 测试环境
   test: {
-    API_BASE_URL: 'https://cms-api.s209.websoft.top/api',
+    API_BASE_URL: 'https://mp-api.websoft.top/api',
     APP_NAME: '测试环境',
     DEBUG: 'true',
   }
diff --git a/src/dealer/orders/index.tsx b/src/dealer/orders/index.tsx
index 05465e4..686d197 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, Button} from '@nutui/nutui-react-taro'
 import {ArrowDown} from '@nutui/icons-react-taro'
 import Taro from '@tarojs/taro'
 import {pageShopDealerOrder} from '@/api/shop/shopDealerOrder'
@@ -126,12 +126,6 @@ const DealerOrder: React.FC = () => {
     return '待结算'
   }
 
-  // const getStatusColor = (isSettled?: number, isInvalid?: number) => {
-  //   if (isInvalid === 1) return 'danger'
-  //   if (isSettled === 1) return 'success'
-  //   return 'warning'
-  // }
-
   const renderOrderItem = (order: OrderWithDetails) => (
     <View key={order.id} className="bg-white rounded-lg p-4 mb-3 shadow-sm">
       <View className="flex justify-between items-start mb-1">
@@ -153,7 +147,6 @@ const DealerOrder: React.FC = () => {
         </Text>
       </View>
       <View className="mb-1">
-        {/*DealerId：{Taro.getStorageSync('DealerId')}*/}
         {/* 一级佣金30 */}
         {(hasRole('superAdmin') || hasRole('admin') || Taro.getStorageSync('UserId') != order.thirdUserId) && (
           <>
@@ -219,21 +212,6 @@ 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}*/}
-      {/*  </Text>*/}
-      {/*</View>*/}
-
     </View>
   )
 
@@ -254,12 +232,19 @@ const DealerOrder: React.FC = () => {
           lowerThreshold={50}
         >
           {/*筛选工具条*/}
-          <Space
+          <View
             className={'p-4'}
           >
-            <Text className={'text-sm'} onClick={() => setShow1(true)}>{date ? `${date}` : '请选择'}</Text>
-            <ArrowDown size={10} className={'text-gray-400'} onClick={() => setShow1(true)}/>
-          </Space>
+            <View className={'select-month'}>
+              <Text className={'text-sm'} onClick={() => setShow1(true)}>{date ? `${date}` : '请选择'}</Text>
+              <ArrowDown size={10} className={'text-gray-400'} onClick={() => setShow1(true)}/>
+            </View>
+            <View className={'select-user'}>
+              <Button size={'mini'}>业务员</Button>
+              <Button size={'mini'}>聚道1</Button>
+              <Button size={'mini'}>聚道2</Button>
+            </View>
+          </View>
           {/*账单列表*/}
           <View className="px-4">
             {loading && orders.length === 0 ? (