抽成后ecpm

6 months ago · 9fd3267de6
5 changed files with 18 additions and 5 deletions
--- a/dist/index.html
+++ b/dist/index.html
@ -8,6 +8,6 @@
 </head>
 <body>
 <div id="root"></div>
-<script src="/umi.c666be9c.js"></script>
+<script src="/umi.6330b154.js"></script>
 </body></html>
--- a/dist/p__DeviceOwnerApp.0dbd8254.async.js
+++ b/dist/p__DeviceOwnerApp.0dbd8254.async.js
--- a/dist/p__DeviceOwnerApp.67a5dc65.async.js
+++ b/dist/p__DeviceOwnerApp.67a5dc65.async.js
--- a/dist/umi.6330b154.js
+++ b/dist/umi.6330b154.js
--- a/src/pages/DeviceOwnerApp.tsx
+++ b/src/pages/DeviceOwnerApp.tsx
@ -26,7 +26,9 @@ const DeviceOwnerApp: React.FC = () => {
  const fetchDevice = async () => {
    const res = await deviceList({ appCode: code ? code : '' });
-    setUsedDeviceCnt(res.data?.filter((device) => device.status === 0).length);
+    if (res.data) {
      setUsedDeviceCnt(res.data?.filter((device) => device.status === 0).length);
    }
    return {
      data: res.data,
      total: res.data?.length,
@ -112,6 +114,17 @@ const DeviceOwnerApp: React.FC = () => {
        return x / 100;
      },
    },
    {
      title: 'ecpm-抽成后(元)',
      dataIndex: 'deductEcpm',
      hideInSearch: true,
      renderText: (x, record) => {
        if (currentUser?.incomeRate && record.ecpm) {
          return Math.floor((record.ecpm * currentUser.incomeRate) / 100) / 100;
        }
        return '-';
      },
    },
    {
      title: '设备品牌',
      dataIndex: 'deviceBrand',
@ -215,7 +228,7 @@ const DeviceOwnerApp: React.FC = () => {
            {'正常使用设备数：' +
              usedDeviceCnt +
              '，剩余可绑定设备数：' +
-              Math.max(0, currentUser?.deviceCnt - usedDeviceCnt)}
+              Math.max(0, (currentUser?.deviceCnt ? currentUser.deviceCnt : 0) - usedDeviceCnt)}
          </p>
          <ProTable<API.MatrixAdminDevice>
            actionRef={deviceRef}