developer/template-10560
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
gxwebsoft
2025-11-17 13:35:22 +08:00
parent 7a8fca6702
commit 57661d1f92
2 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/env.ts
View File

@@ -2,19 +2,19 @@
export const ENV_CONFIG = { export const ENV_CONFIG = {
// 开发环境 // 开发环境
development: { development: {
API_BASE_URL: 'http://172.16.11.128:9200/api', API_BASE_URL: 'https://mp-api.websoft.top/api',
APP_NAME: '开发环境', APP_NAME: '开发环境',
DEBUG: 'true', DEBUG: 'true',
}, },
// 生产环境 // 生产环境
production: { production: {
API_BASE_URL: 'https://cms-api.websoft.top/api', API_BASE_URL: 'https://mp-api.websoft.top/api',
APP_NAME: '九运售电云', APP_NAME: '九运售电云',
DEBUG: 'false', DEBUG: 'false',
}, },
// 测试环境 // 测试环境
test: { test: {
API_BASE_URL: 'https://cms-api.s209.websoft.top/api', API_BASE_URL: 'https://mp-api.websoft.top/api',
APP_NAME: '测试环境', APP_NAME: '测试环境',
DEBUG: 'true', DEBUG: 'true',
} }

35
src/dealer/orders/index.tsx
View File

@@ -1,6 +1,6 @@
import React, {useState, useEffect, useCallback} from 'react' import React, {useState, useEffect, useCallback} from 'react'
import {View, Text, ScrollView} from '@tarojs/components' 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 {ArrowDown} from '@nutui/icons-react-taro'
import Taro from '@tarojs/taro' import Taro from '@tarojs/taro'
import {pageShopDealerOrder} from '@/api/shop/shopDealerOrder' import {pageShopDealerOrder} from '@/api/shop/shopDealerOrder'
@@ -126,12 +126,6 @@ const DealerOrder: React.FC = () => {
return '待结算' return '待结算'
} }
// const getStatusColor = (isSettled?: number, isInvalid?: number) => {
// if (isInvalid === 1) return 'danger'
// if (isSettled === 1) return 'success'
// return 'warning'
// }
const renderOrderItem = (order: OrderWithDetails) => ( const renderOrderItem = (order: OrderWithDetails) => (
<View key={order.id} className="bg-white rounded-lg p-4 mb-3 shadow-sm"> <View key={order.id} className="bg-white rounded-lg p-4 mb-3 shadow-sm">
<View className="flex justify-between items-start mb-1"> <View className="flex justify-between items-start mb-1">
@@ -153,7 +147,6 @@ const DealerOrder: React.FC = () => {
</Text> </Text>
</View> </View>
<View className="mb-1"> <View className="mb-1">
{/*DealerId：{Taro.getStorageSync('DealerId')}*/}
{/* 一级佣金30 */} {/* 一级佣金30 */}
{(hasRole('superAdmin') || hasRole('admin') || Taro.getStorageSync('UserId') != order.thirdUserId) && ( {(hasRole('superAdmin') || hasRole('admin') || Taro.getStorageSync('UserId') != order.thirdUserId) && (
<> <>
@@ -219,21 +212,6 @@ const DealerOrder: React.FC = () => {
</Text> </Text>
</View> </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> </View>
) )
@@ -254,12 +232,19 @@ const DealerOrder: React.FC = () => {
lowerThreshold={50} lowerThreshold={50}
> >
{/*筛选工具条*/} {/*筛选工具条*/}
<Space <View
className={'p-4'} className={'p-4'}
> >
<View className={'select-month'}>
<Text className={'text-sm'} onClick={() => setShow1(true)}>{date ? `${date}` : '请选择'}</Text> <Text className={'text-sm'} onClick={() => setShow1(true)}>{date ? `${date}` : '请选择'}</Text>
<ArrowDown size={10} className={'text-gray-400'} onClick={() => setShow1(true)}/> <ArrowDown size={10} className={'text-gray-400'} onClick={() => setShow1(true)}/>
</Space> </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"> <View className="px-4">
{loading && orders.length === 0 ? ( {loading && orders.length === 0 ? (