From c3044c6ea777e7457a42b0c46124cc5dd9809245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 20 Nov 2025 10:27:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(dealer):=20=E6=9B=B4=E6=96=B0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E7=94=A8=E6=88=B7=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改开发环境 API 地址为本地地址
- 在 shopDealerReferee 模型中新增 roleId 和 isAdmin 字段
- 新增 users2 状态用于存储渠道员数据
- 调整 fetchUsers 方法，区分业务员和渠道员的数据获取逻辑
- 优化用户选择器，将渠道员选择绑定到 users2 数据源
- 修复渠道员选择按钮的显示逻辑和点击事件绑定问题
---
 config/env.ts                                 |  2 +-
 src/api/shop/shopDealerReferee/model/index.ts |  2 +
 src/dealer/orders/index.tsx                   | 38 +++++++++++--------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/config/env.ts b/config/env.ts
index 525dff5..f624194 100644
--- a/config/env.ts
+++ b/config/env.ts
@@ -2,7 +2,7 @@
 export const ENV_CONFIG = {
   // 开发环境
   development: {
-    API_BASE_URL: 'https://cms-api.websoft.top/api',
+    API_BASE_URL: 'http://127.0.0.1:9200/api',
     APP_NAME: '开发环境',
     DEBUG: 'true',
   },
diff --git a/src/api/shop/shopDealerReferee/model/index.ts b/src/api/shop/shopDealerReferee/model/index.ts
index 70eee04..e3357aa 100644
--- a/src/api/shop/shopDealerReferee/model/index.ts
+++ b/src/api/shop/shopDealerReferee/model/index.ts
@@ -39,5 +39,7 @@ export interface ShopDealerRefereeParam extends PageParam {
   id?: number;
   dealerId?: number;
   deleted?: number;
+  roleId?: number;
+  isAdmin?: boolean;
   keywords?: string;
 }
diff --git a/src/dealer/orders/index.tsx b/src/dealer/orders/index.tsx
index 13aeb96..89e2ac7 100644
--- a/src/dealer/orders/index.tsx
+++ b/src/dealer/orders/index.tsx
@@ -36,6 +36,7 @@ const DealerOrder: React.FC = () => {
   const [currentPage, setCurrentPage] = useState<number>(1)
   const [hasMore, setHasMore] = useState<boolean>(true)
   const [users, setUsers] = useState<any[]>([])
+  const [users2, setUsers2] = useState<any[]>([])
   const [visible1, setVisible1] = useState(false)
   const [text1, setText1] = useState('')
   const [selectedUserId, setSelectedUserId] = useState<number | undefined>(undefined)
@@ -212,7 +213,9 @@ const DealerOrder: React.FC = () => {
 
   function fetchUsers() {
     pageShopDealerReferee({
-      dealerId: selectedFirstUserId || selectedUserId || Taro.getStorageSync('UserId'),
+      dealerId: selectedFirstUserId || Taro.getStorageSync('UserId'),
+      isAdmin: true,
+      limit: 100
     }).then(res => {
       const data = res?.list.map(d => {
         return {
@@ -225,18 +228,21 @@ const DealerOrder: React.FC = () => {
       })
       setUsers(data || [])
     })
-    // pageUsers({}).then(data => {
-    //   const userList = data?.list.map(d => {
-    //     return {
-    //       text: d.nickname,
-    //       value: d.userId,
-    //       disabled: false,
-    //       children: [],
-    //       className: ''
-    //     }
-    //   })
-    //   setUsers(userList || [])
-    // })
+    pageShopDealerReferee({
+      dealerId: selectedUserId || Taro.getStorageSync('UserId'),
+      limit: 100
+    }).then(res => {
+      const data = res?.list.map(d => {
+        return {
+          text: d.nickname,
+          value: d.userId,
+          disabled: false,
+          children: [],
+          className: ''
+        }
+      })
+      setUsers2(data || [])
+    })
   }
 
   // 初始化加载数据
@@ -365,8 +371,8 @@ const DealerOrder: React.FC = () => {
             </View>
             <Space className={'select-user'}>
               <Button size={'mini'} onClick={() => setVisible1(!visible1)}>{text1 || '业务员'}</Button>
-              {selectedUserId && <Button size={'mini'} onClick={() => setVisible2(!visible2)}>{text2 || '渠道员'}</Button>}
-              {/*<Button size={'mini'} onClick={() => setVisible3(!visible3)}>{text3 || '渠道二'}</Button>*/}
+              {/*{selectedUserId && <Button size={'mini'} onClick={() => setVisible2(!visible2)}>{text2 || '渠道员'}</Button>}*/}
+              <Button size={'mini'} onClick={() => setVisible2(!visible3)}>{text2 || '渠道员'}</Button>
             </Space>
           </View>
           {/*账单列表*/}
@@ -424,7 +430,7 @@ const DealerOrder: React.FC = () => {
       <Picker
         title="请选择"
         visible={visible2}
-        options={users}
+        options={users2}
         onConfirm={(list, values) => confirmPicker2(list, values)}
         onClose={() => setVisible2(false)}
       />