fix

src/app.tsx

@@ -168,7 +168,7 @@ export const layout = ({ initialState }: { initialState: { settings?: LayoutSett
             params: {//token变化重新获取
                 mediaPlatform: initialState.mediaPlatform
             },
-            request: async () => {//需要在routes.tsx中配置一份完整的路由
+            request: async () => {
                 return loopMenuItem(initialState?.menu?.data || [])
             },
         },

src/components/RightContent/index.tsx

@@ -44,6 +44,12 @@ const GlobalHeaderRight: React.FC<{}> = () => {
         }
     }
 
+    useEffect(() => {
+        if (location.hash.includes('/iaaSystem')) {
+            setIsJr(() => true)
+        }
+    }, [location.hash])
+
     useEffect(() => {
         if (location.hash.includes('/iaaData') && !isJr) {
             setIsJr(() => true)

src/pages/iaaData/ocenaengineIaa/adList/tableConfig.tsx

@@ -109,6 +109,14 @@ function columns12(dayHandle: (data: any) => void): { label: string, fieldSHow?:
                     title: '项目状态', dataIndex: 'proStatus', label: '广告信息', align: 'center', width: 75, default: 20,
                     render: (a: string) => (<WidthEllipsis value={(PROJECTSTATUs as any)[a]} />)
                 },
+                {
+                    title: '项目预算', dataIndex: 'proBudget', label: '广告信息', align: 'right', width: 75, default: 28, sorter: true,
+                    render: (a: string) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '预算类型', dataIndex: 'budgetMode', label: '广告信息', align: 'center', width: 70, default: 29, 
+                    render: (a: string) => (<WidthEllipsis value={a === 'BUDGET_MODE_DAY' ? '日预算' : a === 'BUDGET_MODE_TOTAL' ? '总预算' : '--'} />)
+                },
                 {
                     title: '推广目标', dataIndex: 'landingType', label: '广告信息', align: 'center', width: 100, default: 10,
                     render: (a: string) => (<WidthEllipsis value={(LANDINGTYPE as any)[a]} />)
@@ -137,6 +145,10 @@ function columns12(dayHandle: (data: any) => void): { label: string, fieldSHow?:
                     title: '广告创建时间', dataIndex: 'promotionCreateTime', label: '广告信息', align: 'center', width: 130, default: 32,
                     render: (a: string, b: any) => <WidthEllipsis value={a} />
                 },
+                {
+                    title: '深度转化ROI系数', dataIndex: 'roiGoal', label: '广告信息', align: 'center', width: 75, default: 30,
+                    render: (a: string) => <Statistic value={a || 0} />
+                },
             ]
         },
         {
@@ -386,18 +398,6 @@ function columns12(dayHandle: (data: any) => void): { label: string, fieldSHow?:
         {
             label: '应用端数据指标',
             data: [
-                {
-                    title: '项目预算', dataIndex: 'proBudget', label: '应用端数据指标', align: 'right', width: 75, default: 28, sorter: true, className: 'payDataBackColorClass',
-                    render: (a: string) => <Statistic value={a || 0} />
-                },
-                {
-                    title: '预算类型', dataIndex: 'budgetMode', label: '应用端数据指标', align: 'center', width: 70, default: 29, className: 'payDataBackColorClass',
-                    render: (a: string) => (<WidthEllipsis value={a === 'BUDGET_MODE_DAY' ? '日预算' : a === 'BUDGET_MODE_TOTAL' ? '总预算' : '--'} />)
-                },
-                {
-                    title: '深度转化ROI系数', dataIndex: 'roiGoal', label: '应用端数据指标', align: 'center', width: 75, default: 30, className: 'payDataBackColorClass',
-                    render: (a: string) => <Statistic value={a || 0} />
-                },
                 {
                     title: '今日注册人数', dataIndex: 'todayRegUser', label: '应用端数据指标', align: 'center', width: 65, default: 47, sorter: true, className: 'payDataBackColorClass',
                     render: (a: string) => <Statistic value={a || 0} />
@@ -479,7 +479,7 @@ function columns12(dayHandle: (data: any) => void): { label: string, fieldSHow?:
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 {
-                    title: '累计首日广告变现人数', dataIndex: 'regTotalUser', label: '应用端数据指标', align: 'center', width: 85, default: 61, sorter: true, className: 'payDataBackColorClass',
+                    title: '累计广告变现人数', dataIndex: 'regTotalUser', label: '应用端数据指标', align: 'center', width: 85, default: 61, sorter: true, className: 'payDataBackColorClass',
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {

src/pages/iaaData/ocenaengineIaa/adList/tableConfigDay.tsx

@@ -109,6 +109,14 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     title: '项目状态', dataIndex: 'proStatus', label: '广告信息', align: 'center', width: 75, default: 20,
                     render: (a: string) => (<WidthEllipsis value={(PROJECTSTATUs as any)[a]} />)
                 },
+                {
+                    title: '项目预算', dataIndex: 'proBudget', label: '广告信息', align: 'right', width: 75, default: 28, sorter: true,
+                    render: (a: string) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '预算类型', dataIndex: 'budgetMode', label: '广告信息', align: 'center', width: 70, default: 29, 
+                    render: (a: string) => (<WidthEllipsis value={a === 'BUDGET_MODE_DAY' ? '日预算' : a === 'BUDGET_MODE_TOTAL' ? '总预算' : '--'} />)
+                },
                 {
                     title: '推广目标', dataIndex: 'landingType', label: '广告信息', align: 'center', width: 100, default: 10,
                     render: (a: string) => (<WidthEllipsis value={(LANDINGTYPE as any)[a]} />)
@@ -137,6 +145,10 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     title: '广告创建时间', dataIndex: 'promotionCreateTime', label: '广告信息', align: 'center', width: 130, default: 32,
                     render: (a: string, b: any) => <WidthEllipsis value={a} />
                 },
+                {
+                    title: '深度转化ROI系数', dataIndex: 'roiGoal', label: '广告信息', align: 'center', width: 75, default: 30,
+                    render: (a: string) => <Statistic value={a || 0} />
+                }
             ]
         },
         {
@@ -390,18 +402,6 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
         {
             label: '应用端数据指标',
             data: [
-                {
-                    title: '项目预算', dataIndex: 'proBudget', label: '应用端数据指标', align: 'right', width: 75, default: 28, sorter: true, className: 'payDataBackColorClass',
-                    render: (a: string) => <Statistic value={a || 0} />
-                },
-                {
-                    title: '预算类型', dataIndex: 'budgetMode', label: '应用端数据指标', align: 'center', width: 70, default: 29, className: 'payDataBackColorClass',
-                    render: (a: string) => (<WidthEllipsis value={a === 'BUDGET_MODE_DAY' ? '日预算' : a === 'BUDGET_MODE_TOTAL' ? '总预算' : '--'} />)
-                },
-                {
-                    title: '深度转化ROI系数', dataIndex: 'roiGoal', label: '应用端数据指标', align: 'center', width: 75, default: 30, className: 'payDataBackColorClass',
-                    render: (a: string) => <Statistic value={a || 0} />
-                },
                 {
                     title: '今日注册人数', dataIndex: 'todayRegUser', label: '应用端数据指标', align: 'center', width: 65, default: 47, sorter: true, className: 'payDataBackColorClass',
                     render: (a: string) => <Statistic value={a || 0} />