Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

config/config.js

@@ -33,11 +33,11 @@ const plugins = [
       },
       pwa: pwa
         ? {
-          workboxPluginMode: 'InjectManifest',
-          workboxOptions: {
-            importWorkboxFrom: 'local',
-          },
-        }
+            workboxPluginMode: 'InjectManifest',
+            workboxOptions: {
+              importWorkboxFrom: 'local',
+            },
+          }
         : false, // default close dll, because issue https://github.com/ant-design/ant-design-pro/issues/4665
       // dll features https://webpack.js.org/plugins/dll-plugin/
       // dll: {
@@ -83,7 +83,8 @@ export default {
   targets: {
     ie: 11,
   },
-  publicPath: './',
+  publicPath:
+    process.env.PROD_ENV === 1 ? 'https://njcjweb.oss-accelerate.aliyuncs.com/admin/' : './',
   // publicPath: 'https://njcjweb.oss-accelerate.aliyuncs.com/admin/',
   history: 'hash',
   devtool: isAntDesignProPreview ? 'source-map' : false,
@@ -97,8 +98,6 @@ export default {
     'btn-danger-bg': '#FF7E48',
     'radio-button-hover-color': '#FF7E48',
     'radio-button-active-color': 'red',
-    
-
   },
   define: {
     ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION:

package.json

@@ -5,7 +5,8 @@
   "description": "An out-of-box UI solution for enterprise applications",
   "scripts": {
     "analyze": "cross-env ANALYZE=1 umi build",
-    "build": "umi build",
+    "build:prod": "cross-env PROD_ENV=1 umi build",
+    "build": "cross-env PROD_ENV=2 umi build",
     "deploy": "cross-env ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION=site npm run site && npm run gh-pages",
     "fetch:blocks": "pro fetch-blocks",
     "format-imports": "import-sort --write '**/*.{js,jsx,ts,tsx}'",

src/components/ActionList/index.jsx

@@ -11,9 +11,10 @@ export default function withActions(actionsRender) {
 
     const menus = (
       <Menu className="actlist-menu">
-        {(leftActs || []).concat(Act2).filter(Boolean).map((Act, index) => (<Menu.Item key={`dm-${index}`}>{Act}</Menu.Item>))}
+        {[Act2].concat(leftActs).filter(Boolean).map((Act, index) => (<Menu.Item key={`dm-${index}`}>{Act}</Menu.Item>))}
       </Menu>
     );
+    console.log('---------->', record, menus)
 
     return (
       <div className="action-list">

src/components/EditIcon/index.jsx

@@ -89,8 +89,8 @@ const EditIcon = ({ text, type, color, position, onClick }) => {
     const color2 = color || icon.color || '#ff925c';
     const position2 = position || icon.pos;
 
-    const wrappedStyle = useMemo(() => ({ color: `${color2}`, display: 'flex', alignItems: 'center', cursor: 'pointer' }), [color]);
-    const iconStyle = useMemo(() => ({ display: 'inline-block', marginLeft: '6px', background: `url(${spriteImg}) 0 ${position2}px / 100% 1300% no-repeat`, width: '18px', height: '18px' }), [position])
+    const wrappedStyle = useMemo(() => ({ color: `${color2}`, display: 'flex', alignItems: 'center', cursor: 'pointer' }), [type, color]);
+    const iconStyle = useMemo(() => ({ display: 'inline-block', marginLeft: '6px', background: `url(${spriteImg}) 0 ${position2}px / 100% 1300% no-repeat`, width: '18px', height: '18px' }), [type, position])
 
     return (
         <span style={wrappedStyle} onClick={onClick || noop} >

src/pages/activity/ActivityList.jsx

@@ -186,7 +186,7 @@ const header = props => {
           <EditIcon type={row.weight === 1 ? 'cancel' : 'add'} text={row.weight === 1 ? '取消标签' : '添加标签'} onClick={topDynamic(row)} />
         </AuthButton>,
 
-        <EditIcon type={row.home === 1 ? 'cancel' : 'top'} text={row.home === 1 ? '取消推首页' : '推首页'} onClick={homeDynamic(row)} />,
+        <EditIcon type={row.home === 1 ? 'cancel' : 'top'} text={row.home === 1 ? '取消推首页' : '推荐首页'} onClick={homeDynamic(row)} />,
 
         <EditIcon type="record" text="数据记录" onClick={toDataReacord(row.dynamicId)} />,
 

src/pages/activity/groupActivity/list.jsx

@@ -163,7 +163,7 @@ const header = props => {
           </AuthButton>,
             
           <AuthButton name="admin.taShareActivity.top" noRight={null}>
-            <EditIcon type={row.sort === 1 ? 'cancel' : 'top'} text={row.sort === 1 ? '取消推荐首页' : '推荐首页'} onClick={recommendGroupActivity(row)} />
+            <EditIcon type={row.sort ? 'cancel' : 'top'} text={row.sort ? '取消推荐首页' : '推荐首页'} onClick={recommendGroupActivity(row)} />
           </AuthButton>,
 
           <EditIcon type="record" text="数据记录" onClick={() => toDataReacord(row.groupActivityId)} />,

src/pages/activity/helpActivity/list.jsx

@@ -149,7 +149,7 @@ const header = props => {
         </AuthButton>,
 
         <AuthButton name="admin.help.top" noRight={null}>
-          <EditIcon type={row.isMain === 1 ? 'cancel' : 'top'} text={row.isMain === 1 ? '取消推首页' : '推首页'} onClick={topDynamic(row, 1)} />
+          <EditIcon type={row.isMain ? 'cancel' : 'top'} text={row.isMain ? '取消推首页' : '推荐首页'} onClick={topDynamic(row, 1)} />
         </AuthButton>,
 
         <EditIcon type="record" text="数据记录" onClick={() => toDataReacord(row.helpActivityId)} />,

src/pages/house/preSelect/list/index.jsx

@@ -1,19 +1,18 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, notification } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
+import { Form, Input, Button, Icon, Select, message, Table, Pagination, Modal, notification } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
-import styles from '../../../style/GoodsList.less';
-import SelectCity from '../../../../components/SelectButton/CitySelect'
+import AuthButton from '@/components/AuthButton';
+import Navigate from '@/components/Navigate';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
 import BuildSelect from '../../../../components/SelectButton/BuildSelect'
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
-import AuthButton from '@/components/AuthButton';
 import PreSelectHelpDoc from '../edit/components/PreSelectHelpDoc';
-import Navigate from '@/components/Navigate';
+import styles from '../../../style/GoodsList.less';
 
 const { Option } = Select;
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -166,11 +165,11 @@ const header = props => {
       dataIndex: '',
       key: '',
       align: 'center',
-      render: (text, record) => (
+      render: withActions((text, record) => [
         <AuthButton name="admin.preselection.detail.get" noRight={null}>
-          <a style={{ color: '#66B3FF' }} onClick={toAddHouse(record)} >查看详情</a>
-        </AuthButton>
-      ),
+          <EditIcon type="look" text="查看详情" onClick={toAddHouse(record)} ></EditIcon>
+        </AuthButton>,
+      ]),
     },
   ];
 

src/pages/system/document/list.jsx

@@ -3,6 +3,8 @@ import { Table, Form, Icon, Input, Button, message  } from 'antd'
 import { router } from 'umi';
 import moment from 'moment';
 import Navigate from '@/components/Navigate';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import AuthButton from '../../../components/AuthButton';
@@ -111,13 +113,11 @@ function body(props) {
       dataIndex: 'documentVerifyId',
       key: 'documentVerifyId',
       align: 'center',
-      render: (x,row) => (
-        <>
-          <AuthButton name="admin.documentVerify.id.get" noRight={null}>
-            <span style={{ color: '#1990FF',cursor: 'pointer' }} onClick={()=>audit(row)}>{ row.unverified === 0 ? '查看' : '审核' }</span>
-           </AuthButton>
-        </>
-      )
+      render: withActions((x,row) => [
+        <AuthButton name="admin.documentVerify.id.get" noRight={null}>
+          <EditIcon type={row.unverified === 0 ? 'look' : ''} text={row.unverified === 0 ? '查看' : '审核'} onClick={()=>audit(row)}></EditIcon>
+        </AuthButton>,
+      ])
     },
   ]