fix: merge

Next wzy

src/pages/iot-card/CardManagement/index.tsx

@@ -27,9 +27,9 @@ import ExportModal from '@/pages/iot-card/CardManagement/ExportModal';
 import ImportModal from '@/pages/iot-card/CardManagement/ImportModal';
 import BindDeviceModal from '@/pages/iot-card/CardManagement/BindDevice';
 import moment from 'moment';
-import { useDomFullHeight } from '@/hooks';
+import { useDomFullHeight, useLocation } from '@/hooks';
 import { onlyMessage } from '@/utils/util';
-import { useHistory, useLocation } from 'umi';
+import { useHistory } from 'umi';
 import { getMenuPathByParams } from '@/utils/menu';
 
 export const service = new Service('network/card');

src/pages/iot-card/Platform/index.tsx

@@ -24,6 +24,7 @@ const Platform = () => {
   const actionRef = useRef<ActionType>();
   const [param, setParam] = useState({});
   const history = useHistory();
+  const { permission } = PermissionButton.usePermission('iot-card/Platform');
 
   const statusUpdate = async (data: any) => {
     const res = await service.update(data);
@@ -93,7 +94,7 @@ const Platform = () => {
       fixed: 'right',
       render: (text, record) => [
         <PermissionButton
-          isPermission={true}
+          isPermission={permission.update}
           key="edit"
           onClick={() => {
             const url = `${getMenuPathByParams(MENUS_CODE['iot-card/Platform/Detail'], record.id)}`;
@@ -108,7 +109,7 @@ const Platform = () => {
           <EditOutlined />
         </PermissionButton>,
         <PermissionButton
-          isPermission={true}
+          isPermission={permission.action}
           key="action"
           type={'link'}
           style={{ padding: 0 }}
@@ -139,7 +140,7 @@ const Platform = () => {
           {record.state === 'enabled' ? <StopOutlined /> : <PlayCircleOutlined />}
         </PermissionButton>,
         <PermissionButton
-          isPermission={true}
+          isPermission={permission.delete}
           tooltip={{
             title: record.state.value !== 'enabled' ? '删除' : '请先禁用再删除',
           }}
@@ -193,7 +194,7 @@ const Platform = () => {
                 history.push(url);
               }}
               style={{ marginRight: 12 }}
-              isPermission={true}
+              isPermission={permission.update}
               key="button"
               icon={<PlusOutlined />}
               type="primary"

src/pages/iot-card/Recharge/detail.tsx

@@ -1,3 +1,4 @@
+import { Ellipsis } from '@/components';
 import { Modal, Descriptions } from 'antd';
 import moment from 'moment';
 
@@ -15,7 +16,7 @@ const Detail = (props: Props) => {
       visible
       onCancel={props.close}
       onOk={props.close}
-      width="35vw"
+      width="600px"
     >
       <Descriptions bordered column={2}>
         <Descriptions.Item label="充值金额">{data.chargeMoney}</Descriptions.Item>
@@ -23,7 +24,14 @@ const Detail = (props: Props) => {
         <Descriptions.Item label="平台对接">{data.configName}</Descriptions.Item>
         <Descriptions.Item label="订单号">{data.orderNumber}</Descriptions.Item>
         <Descriptions.Item label="支付方式">{data.paymentType}</Descriptions.Item>
-        <Descriptions.Item label="支付URL">{data.url ? data.url : ''}</Descriptions.Item>
+        <Descriptions.Item label="支付URL">
+          {/* {data.url ? data.url : ''} */}
+          <Ellipsis
+            title={data.url ? data.url : ''}
+            tooltip={{ placement: 'topLeft' }}
+            maxWidth={'90%'}
+          />
+        </Descriptions.Item>
         <Descriptions.Item label="订单时间">
           {data.createTime ? moment(data.createTime).format('YYYY-MM-DD HH:mm:ss') : '-'}
         </Descriptions.Item>

src/pages/iot-card/Recharge/index.tsx

@@ -20,6 +20,7 @@ const Recharge = () => {
   const [visible, setVisible] = useState<boolean>(false);
   const [detail, setDetail] = useState<boolean>(false);
   const [current, setCurrent] = useState<any>({});
+  const { permission } = PermissionButton.usePermission('iot-card/Recharge');
 
   const columns: ProColumns<any>[] = [
     {
@@ -31,25 +32,25 @@ const Recharge = () => {
       title: '支付方式',
       dataIndex: 'paymentType',
       ellipsis: true,
-      valueType: 'select',
-      valueEnum: {
-        ALIPAY_WAP: {
-          text: '支付宝手机网站支付',
-          status: 'ALIPAY_WAP',
-        },
-        ALIPAY_WEB: {
-          text: '支付宝网页及时到账支付',
-          status: 'ALIPAY_WEB',
-        },
-        WEIXIN_JSAPI: {
-          text: '微信公众号支付',
-          status: 'WEIXIN_JSAPI',
-        },
-        WEIXIN_NATIVE: {
-          text: '微信扫码支付',
-          status: 'WEIXIN_NATIVE',
-        },
-      },
+      // valueType: 'select',
+      // valueEnum: {
+      //   ALIPAY_WAP: {
+      //     text: '支付宝手机网站支付',
+      //     status: 'ALIPAY_WAP',
+      //   },
+      //   ALIPAY_WEB: {
+      //     text: '支付宝网页及时到账支付',
+      //     status: 'ALIPAY_WEB',
+      //   },
+      //   WEIXIN_JSAPI: {
+      //     text: '微信公众号支付',
+      //     status: 'WEIXIN_JSAPI',
+      //   },
+      //   WEIXIN_NATIVE: {
+      //     text: '微信扫码支付',
+      //     status: 'WEIXIN_NATIVE',
+      //   },
+      // },
     },
     {
       title: '订单号',
@@ -120,7 +121,7 @@ const Recharge = () => {
               onClick={() => {
                 setVisible(true);
               }}
-              isPermission={true}
+              isPermission={permission.pay}
               key="button"
               type="primary"
             >

src/utils/menu/router.ts

@@ -174,6 +174,7 @@ export enum BUTTON_PERMISSION_ENUM {
   'manage' = 'manage', //数据源-管理
   'stop' = 'stop',
   'restart' = 'restart',
+  'pay' = 'pay', //充值
 }
 
 // 调试按钮、通知记录、批量导出、批量导入、选择通道、推送、分配资产、绑定用户对应的ID是啥