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

config/config.js

@@ -83,8 +83,8 @@ export default {
   targets: {
     ie: 11,
   },
-  // publicPath: './',
-  publicPath: 'https://njcjweb.oss-accelerate.aliyuncs.com/admin/',
+  publicPath: './',
+  // publicPath: 'https://njcjweb.oss-accelerate.aliyuncs.com/admin/',
   history: 'hash',
   devtool: isAntDesignProPreview ? 'source-map' : false,
   // umi routes: https://umijs.org/zh/guide/router.html

src/components/ModalButton/ModalButton.jsx

@@ -0,0 +1,36 @@
+import React from 'react';
+import { Modal, Button } from 'antd';
+
+export default function ModalButton(props) {
+  const {
+    method = 'confirm',
+    title = '',
+    content = '',
+    modalConfigs = {},
+    onClick,
+    onCancel,
+    okText = '确认',
+    cancelText = '取消',
+    ...btnProps
+  } = props || {}
+
+  const handleClick = e => {
+    Modal[method]({
+      title,
+      content,
+      okText,
+      cancelText,
+      ...modalConfigs,
+      onOk() {
+        // eslint-disable-next-line no-unused-expressions
+        onClick && onClick(e);
+      },
+      onCancel() {
+        // eslint-disable-next-line no-unused-expressions
+        onCancel && onCancel();
+      },
+    })
+  }
+
+  return <Button {...btnProps} onClick={handleClick}>{props.children}</Button>
+}

src/components/ModalButton/index.jsx

@@ -0,0 +1,9 @@
+import React from 'react';
+import ModalButton from './ModalButton';
+
+const ConfirmButton = props => <ModalButton {...props} method="confirm" />
+
+export {
+  ModalButton,
+  ConfirmButton,
+}

src/pages/activity/ActivityList.jsx

@@ -175,9 +175,7 @@ const header = props => {
           <EditIcon type={row.status === 1 ? 'cancel' : 'publish'} text={row.status === 1 ? '取消发布' : '发布'} onClick={sendOrPublicDynamic.bind(this, row)} />
         </AuthButton>,
 
-    
-          <EditIcon type="look" text="查看详情" onClick={getActivityDetail(row.dynamicId)} />,
-        
+        <EditIcon type="look" text="查看详情" onClick={getActivityDetail(row.dynamicId)} />,
 
         row.activityStatus === 0 ?
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
@@ -194,7 +192,7 @@ const header = props => {
 
         (row.activityStatus === 0 || row.activityStatus === 1) ?
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
-            <EditIcon type="edit" text="编辑" onClick={toEditGoods(row.dynamicId, row.count)} />,
+            <EditIcon type="edit" text="编辑" onClick={toEditGoods(row.dynamicId, row.count)} />
           </AuthButton> : null,
       ]),
     },

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' : 'add'} text={row.sort === 1 ? '取消推荐首页' : '推荐首页'} onClick={recommendGroupActivity(row)} />
+            <EditIcon type={row.sort === 1 ? 'cancel' : 'top'} text={row.sort === 1 ? '取消推荐首页' : '推荐首页'} 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' : 'add'} text={row.isMain === 1 ? '取消推首页' : '推首页'} onClick={topDynamic(row, 1)} />
+          <EditIcon type={row.isMain === 1 ? 'cancel' : 'top'} text={row.isMain === 1 ? '取消推首页' : '推首页'} onClick={topDynamic(row, 1)} />
         </AuthButton>,
 
         <EditIcon type="record" text="数据记录" onClick={() => toDataReacord(row.helpActivityId)} />,

src/pages/news/type/NewsType.jsx

@@ -4,6 +4,7 @@ import router from 'umi/router';
 import AuthButton from '@/components/AuthButton';
 import withActions from '@/components/ActionList';
 import EditIcon from '@/components/EditIcon';
+import { ConfirmButton } from '@/components/ModalButton';
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
 import BuildSelect from '../../../components/SelectButton/BuildSelect';
@@ -58,21 +59,13 @@ function NewsType(props) {
 
 
   const changeNewsStatus = (row, newsId) => () => {
-    Modal.confirm({
-      title: '确认删除？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        request({ ...apis.newsType.put, urlData: { id: newsId }, data: { ...row, status: -1 } }).then((data) => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 });
-        }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-
-      }
-    });
+    request({ ...apis.newsType.put, urlData: { id: newsId }, data: { ...row, status: -1 } }).then((data) => {
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10 });
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
   }
   /**
    *
@@ -102,7 +95,9 @@ function NewsType(props) {
       align: 'center',
       render: withActions((x, row) => [
         <AuthButton name="admin.taNewsType.id.delete" noRight={null}>
-          <EditIcon text={row.status === 1 ? '删除' : '上架'} type={row.status === 1 ? 'delete' : 'up'} onClick={changeNewsStatus(row, row.newsTypeId)} />
+          <ConfirmButton type="link" title="确认删除？" onClick={changeNewsStatus(row, row.newsTypeId)}>
+            <EditIcon text="删除" type="delete" />
+          </ConfirmButton>
         </AuthButton>,
         <AuthButton name="admin.taNewsType.id.put" noRight={null}>
           <EditIcon text="编辑" type="edit" onClick={toEditNews(row.newsTypeId)} />
@@ -110,7 +105,7 @@ function NewsType(props) {
       ]),
     },
   ];
-  
+
   function handleReset() {
     props.form.resetFields();
     getList({ pageNum: 1, pageSize: 10 })

src/pages/system/document/list.jsx

@@ -1,11 +1,11 @@
 import React, { useState, useEffect } from 'react'
 import { Table, Form, Icon, Input, Button, message  } from 'antd'
-import request from '../../../utils/request';
-import apis from '../../../services/apis';
 import { router } from 'umi';
 import moment from 'moment';
-import AuthButton from '../../../components/AuthButton';
 import Navigate from '@/components/Navigate';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import AuthButton from '../../../components/AuthButton';
 
 
 function body(props) {