合并

src/pages/activity/ActivityList.jsx

@@ -166,7 +166,7 @@ const header = props => {
 
   const finishDynamic = row => {
     Modal.confirm({
-      title: '结束以后将无法编辑, 是否继续?',
+      title: '活动会被强制结束，小程序端无法再发起或参与此拼团，如果不想让客户看到活动，请再点击取消发布按钮',
       okText: '确定',
       cancelText: '取消',
       onOk () {
@@ -205,24 +205,38 @@ const header = props => {
 
   // 取消活动
   const cancelDynamic = row => {
-    request({ ...apis.activity.cancel, urlData: { id: row.dynamicId } }).then(data => {
-      message.info('操作成功！')
-      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue()  })
-    }).catch(err => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
+    Modal.confirm({
+      title: '活动会在小程序端隐藏，后台可以继续编辑重新发布',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.activity.cancel, urlData: { id: row.dynamicId } }).then(data => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue()  })
+        }).catch(err => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      }
+    });
   }
 
   // 发布活动
   const sendDynamic = row => {
-    request({ ...apis.activity.send, urlData: { id: row.dynamicId } }).then(data => {
-      message.info('操作成功！')
-      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
-    }).catch(err => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
+    Modal.confirm({
+      title: '确定发布吗？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.activity.send, urlData: { id: row.dynamicId } }).then(data => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
+        }).catch(err => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      }
+    });
   }
 
   const changePageNum = pageNumber => {

src/pages/activity/groupActivity/list.jsx

@@ -155,14 +155,21 @@ const header = props => {
 
   //结束活动
   const endGroupActivity = (row) => () => {
-    request({ ...apis.groupActivity.finish, urlData: { id: row.groupActivityId } }).then((data) => {
-      console.log(data)
-      message.info('操作成功！')
-      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
-    }).catch((err) => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
+    Modal.confirm({
+      title: '活动会被强制结束，小程序端无法再发起或参与此拼团，如果不想让客户看到活动，请再点击取消发布按钮',
+      okText: '确定',
+      cancelText: '取消',
+      onOk () {
+        request({ ...apis.groupActivity.finish, urlData: { id: row.groupActivityId } }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
   }
 
   //置顶
@@ -187,24 +194,38 @@ const header = props => {
 
   // 取消活动
   const cancelDynamic = row => {
-    request({ ...apis.groupActivity.cancel, urlData: { id: row.groupActivityId } }).then(data => {
-      message.info('操作成功！')
-      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue()  })
-    }).catch(err => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
+    Modal.confirm({
+      title: '活动会在小程序端隐藏，后台可以继续编辑重新发布',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.groupActivity.cancel, urlData: { id: row.groupActivityId } }).then(data => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue()  })
+        }).catch(err => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      }
+    });
   }
 
   // 发布活动
   const sendDynamic = row => {
-    request({ ...apis.groupActivity.send, urlData: { id: row.groupActivityId } }).then(data => {
-      message.info('操作成功！')
-      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
-    }).catch(err => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
+    Modal.confirm({
+      title: '确定发布吗？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.groupActivity.send, urlData: { id: row.groupActivityId } }).then(data => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
+        }).catch(err => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      }
+    });
   }
 
   //首页推荐

src/pages/activity/helpActivity/list.jsx

@@ -148,14 +148,23 @@ const toEditGoods = (helpActivityId) => () => {
   
 //   置顶
   const topDynamic = (row, code) => () => {
-      request({ ...apis.helpActivity.top, data: { helpActivityId: row.helpActivityId, status: code } }).then((data) => {
+    const title = row.status === 2 ? '活动会被强制结束，小程序端无法再发起或参与此拼团，如果不想让客户看到活动，请再点击取消发布按钮':'是否进行该操作'
+
+    Modal.confirm({
+      title: title,
+      okText: '确定',
+      cancelText: '取消',
+      onOk () {
+        request({ ...apis.helpActivity.top, data: { helpActivityId: row.helpActivityId, status: code } }).then((data) => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
-      }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-      })
+          }).catch((err) => {
+              console.log(err)
+              message.info(err.msg || err.message)
+          })
+      },
+    });
   }
   
   const sendOrPublicDynamic = (row) => {
@@ -168,24 +177,38 @@ const toEditGoods = (helpActivityId) => () => {
   
   // 取消活动
   const cancelDynamic = (row) => {
-      request({ ...apis.activity.cancel, urlData: {id: row.dynamicId}}).then((data) => {
+    Modal.confirm({
+      title: '活动会在小程序端隐藏，后台可以继续编辑重新发布',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.helpActivity.cancel, urlData: {id: row.helpActivityId}}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
       }).catch((err) => {
           console.log(err)
           message.info(err.msg || err.message)
       })
+      }
+    });
   }
   
   //发布活动
   const sendDynamic = (row) => {
-      request({ ...apis.activity.send, urlData: {id: row.dynamicId}}).then((data) => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
-      }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-      })
+    Modal.confirm({
+      title: '确定发布吗？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.helpActivity.send, urlData: {id: row.helpActivityId}}).then((data) => {
+        message.info('操作成功！')
+        getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
+    }).catch(err => {
+        console.log(err)
+        message.info(err.msg || err.message)
+    })
+      }
+    });
   }
   
   const changePageNum = pageNumber => {

src/pages/building/list/index.jsx

@@ -48,7 +48,7 @@ function CartBody(props) {
   function pulicAndUnPulic(record) {
     const modal = Modal.confirm();
     const buidingStatus = record.status === 1 ? 2 : 1
-    const title = record.status === 1 ? '确认取消发布此数据?' : '确认发布此数据?'
+    const title = record.status === 1 ? '项目会在小程序端隐藏，后台可继续编辑重新发布?' : '确认发布此数据?'
 
     modal.update({
       content: title,
@@ -78,7 +78,7 @@ function CartBody(props) {
   function deleteBuilding(record) {
     const modal = Modal.confirm();
     modal.update({
-      content: '确定删除此楼盘？',
+      content: '项目会被删除，小程序端和后台都无法再看到',
       okText: '确认',
       cancelText: '关闭',
       onOk: () => {

src/pages/building/type/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Button, Table, Pagination, Alert, Icon, Tag, notification } from 'antd'
+import { Button, Table, Pagination, Alert, Icon, Tag, notification, Modal } from 'antd'
 import router from 'umi/router';
 import moment from 'moment';
 import Styles from './style.less'
@@ -83,16 +83,28 @@ function body() {
     getList({ pageNum: pageNumber, pageSize: 10 })
   }
 
-  // 删除
   function deleteType(row) {
     row.status = -1
-    request({ ...apis.buildingType.update, urlData: { id: row.buildingTypeId }, data: { ...row } }).then(() => {
-      getList({ pageNum: data.current, pageSize: 10 })
-    }).then(() => {
-      openNotificationWithIcon('success', '操作成功')
-    }).catch(err => {
-      // openNotificationWithIcon('error', err.message)
-    })
+    const modal = Modal.confirm();
+    modal.update({
+      content: '确认删除？',
+      okText: '确认',
+      cancelText: '关闭',
+      onOk: () => {
+        request({ ...apis.buildingType.update, urlData: { id: row.buildingTypeId }, data: { ...row } }).then(() => {
+          getList({ pageNum: data.current, pageSize: 10 })
+        }).then(() => {
+          openNotificationWithIcon('success', '操作成功')
+        }).catch(err => {
+          // openNotificationWithIcon('error', err.message)
+        })
+
+        modal.destroy();
+      },
+      onCancel: () => {
+        modal.destroy();
+      },
+    });
   }
 
   // 跳转修改页

src/pages/carouselFigure/advertisingList.jsx

@@ -132,7 +132,7 @@ const toEdit = (contentId) => () => {
       }else if(row.status === 1){
         row.status = 0
         Modal.confirm({
-          title: '确认停用此轮播图?',
+          title: '停用后不会再显示在小程序端',
           okText: '确定',
           cancelText: '取消',
           onOk() {

src/pages/carouselFigure/carouselFigureList.jsx

@@ -132,7 +132,7 @@ const toEditCarouse = (contentId) => () => {
       }else if(row.status === 1){
         row.status = 0
         Modal.confirm({
-          title: '确认停用此轮播图?',
+          title: '停用后不会再显示在小程序端',
           okText: '确定',
           cancelText: '取消',
           onOk() {

src/pages/integralMall/GoodsList.jsx

@@ -58,8 +58,10 @@ function header(props) {
 
   
   const changeGoodsStatus = (row) => () => {
+    const title = row.status === 1 ? '商品在小程序端隐藏，后台可继续编辑重新发布?':'商品会重新显示在小程序端?'
+
     Modal.confirm({
-      title: '确认下架该商品？',
+      title: title,
       okText: '确认',
       cancelText: '取消',
       onOk() {

src/pages/integralMall/achieve.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Tabs, Row, Col, Table, Pagination, Alert, message } from 'antd';
+import { Form, Input, Button, Icon, Tabs, Row, Col, Table, Pagination, Alert, message, Modal } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import router from 'umi/router';
@@ -52,10 +52,19 @@ const changePageNum = (pageNumber) => {
   }
 
   const changeStatus = (row) => () => {
-    request({ ...apis.integralMall.change, data: { ...row },}).then((data) => {
-      message.info('操作成功！')
-      getList({ pageNum: 1, pageSize: 10, type: carType})
-    })
+    const title = row.status === 1 ? '停用后用户操作将不再发放积分，请确认相关免责声明等文案已修订说明?':'启用后用户操作将发放积分'
+
+    Modal.confirm({
+      title: title,
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.integralMall.change, data: { ...row },}).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, type: carType})
+        })
+      }
+    });
   }
 
   const updateRules = (row) => () => {

src/pages/news/list/NewsList.jsx

@@ -94,7 +94,7 @@ function body(props) {
     //删除资讯
     const changeNewsListStatus = (row, newsId) => () => {
       Modal.confirm({
-        title: '确认删除该资讯？',
+        title: '资讯会被删除，小程序端和后台都无法再看到',
         okText: '确认',
         cancelText: '取消',
         onOk() {
@@ -136,7 +136,7 @@ function body(props) {
       console.log("newsId" + newsId + "status" + newsStatus);
       if (newsStatus === 1) {
         Modal.confirm({
-          title: '确认取消该资讯？',
+          title: '资讯会在小程序端隐藏，后台可继续编辑重新发布',
           okText: '确认',
           cancelText: '取消',
           onOk() {

src/pages/news/type/NewsType.jsx

@@ -56,7 +56,7 @@ function header(props) {
   
   const changeNewsStatus = (row, newsId) => () => {
     Modal.confirm({
-      title: '确认删除该商品？',
+      title: '确认删除？',
       okText: '确认',
       cancelText: '取消',
       onOk() {

src/pages/staff/list/RoleList.jsx

@@ -66,13 +66,22 @@ const [data, setData] = useState({ data: [] })
 }
 
 
-function stop(ids) {
-  request({ ...apis.role.stop, urlData: { id: ids } }).then((data) => {
-    getRoleList({ pageNum: 1, pageSize: 100 })
-}).catch((err) => {
-    console.log(err)
-    message.info(err.msg || err.message)
-})
+function stop(ids, status) {
+  const title = status === 1 ? '停用后角色对应账号也会被自动停用，请谨慎操作' : '是否启用该角色';
+
+  Modal.confirm({
+    title: title,
+    okText: '确认',
+    cancelText: '取消',
+    onOk () {
+      request({ ...apis.role.stop, urlData: { id: ids } }).then((data) => {
+        getRoleList({ pageNum: 1, pageSize: 100 })
+      }).catch((err) => {
+        console.log(err)
+        message.info(err.msg || err.message)
+      })
+    }
+  });
 }
 
 const dataSource = [
@@ -109,7 +118,7 @@ const columns = [
     align: 'center',
 
     render: (text, record) => <>
-      <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => stop(record.roleId)}>{ record.status === 1 ? '停用' : '启用' }
+      <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => stop(record.roleId, record.status)}>{ record.status === 1 ? '停用' : '启用' }
       <Icon type="stop" className={styles.shoppingCart} style={{ fontSize: 14 }}/>
       </span>
       <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={() => toEditRole(record.roleId)} >编辑

src/pages/staff/list/StaffList.jsx

@@ -37,7 +37,7 @@ const CartBody = (props) => {
     // console.log(data, "11111")
     if (data.status === 1) {
       Modal.confirm({
-        title: '确认停用该角色？',
+        title: '停用后无法登录后台系统',
         okText: '确认',
         cancelText: '取消',
         onOk () {

src/pages/system/housingPolicy.jsx

@@ -103,7 +103,7 @@ const toEditPolicy = (policyId) => () => {
   // 删除
 const deletePolicy = (policyId) => () => {
   Modal.confirm({
-    title: '是否继续删除此政策?',
+    title: '购房政策会被删除，小程序端和后台都无法再看到',
     okText: '确定',
     cancelText: '取消',
     onOk() {
@@ -139,15 +139,24 @@ const deletePolicy = (policyId) => () => {
       } else {
         row.publishStatus = 1
       }
+      const title = row.publishStatus === 0 ? '购房政策会在小程序端隐藏，后台可继续编辑重新发布' : '确认发布此数据'
+      Modal.confirm({
+        title: title,
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          request({ ...apis.system.updateTaPolicy, urlData: {id: row.policyId},data: row, }).then((data) => {
+            console.log(data)
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10,cityId: '' });
+            }).catch((err) => {
+                console.log(err)
+                message.info(err.msg || err.message)
+            })
+        },
+      });
 
-      request({ ...apis.system.updateTaPolicy, urlData: {id: row.policyId},data: row, }).then((data) => {
-          console.log(data)
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10,cityId: '' });
-      }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-      })
+      
   }
   
   const changePageNum = (pageNumber) => {