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(1) const [hasMore, setHasMore] = useState(true) const [users, setUsers] = useState([]) + const [users2, setUsers2] = useState([]) const [visible1, setVisible1] = useState(false) const [text1, setText1] = useState('') const [selectedUserId, setSelectedUserId] = useState(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 = () => { - {selectedUserId && } - {/**/} + {/*{selectedUserId && }*/} + {/*账单列表*/} @@ -424,7 +430,7 @@ const DealerOrder: React.FC = () => { confirmPicker2(list, values)} onClose={() => setVisible2(false)} />