Browse Source

Merge branch 'dev1.0' of http://git.ycjcjy.com/civilized_city/miniapp into dev1.0

Yansen 2 years ago
parent
commit
6e818c95c2
2 changed files with 5 additions and 2 deletions
  1. 1
    1
      src/pages/apply/verify/index.jsx
  2. 4
    1
      src/pages/user/list/index.jsx

+ 1
- 1
src/pages/apply/verify/index.jsx View File

160
 
160
 
161
   return (
161
   return (
162
     <Page loading={loading}>
162
     <Page loading={loading}>
163
+      <Dialog id={dialogId} />
163
       <Issue issueId={issueId} />
164
       <Issue issueId={issueId} />
164
 
165
 
165
       {
166
       {
241
       </CellGroup>
242
       </CellGroup>
242
       <CellGroup>
243
       <CellGroup>
243
         <View style={{ marginTop: '20px', display: 'flex' }}>
244
         <View style={{ marginTop: '20px', display: 'flex' }}>
244
-          <Dialog id={dialogId} />
245
           <Button block type="primary" loading={submitting} onClick={onSubmit} style={{ flex: 5, marginLeft: 'var(--main-space)' }}>审 批</Button>
245
           <Button block type="primary" loading={submitting} onClick={onSubmit} style={{ flex: 5, marginLeft: 'var(--main-space)' }}>审 批</Button>
246
           <Button block type="info" loading={loading2} onClick={onCopy} style={{ flex: 1, margin: '0 var(--main-space)' }}>复制</Button>
246
           <Button block type="info" loading={loading2} onClick={onCopy} style={{ flex: 1, margin: '0 var(--main-space)' }}>复制</Button>
247
         </View>
247
         </View>

+ 4
- 1
src/pages/user/list/index.jsx View File

14
 export default (props) => {
14
 export default (props) => {
15
   const [loading, setLoading] = React.useState(false);
15
   const [loading, setLoading] = React.useState(false);
16
   const listRef = React.useRef();
16
   const listRef = React.useRef();
17
+  const dialogId = React.useMemo(() => `dialog-${Math.random().toString(36).substring(2, 7)}`, []);
17
 
18
 
18
   const onAdd = () => {
19
   const onAdd = () => {
19
     Taro.navigateTo({
20
     Taro.navigateTo({
25
     Dialog.confirm({
26
     Dialog.confirm({
26
       width: '70vw',
27
       width: '70vw',
27
       title: "确认删除用户?",
28
       title: "确认删除用户?",
29
+      selector: dialogId,
28
     }).then((action) => {
30
     }).then((action) => {
29
       if (action === "confirm") {
31
       if (action === "confirm") {
30
         setLoading(true);
32
         setLoading(true);
49
     listRef.current.refresh();
51
     listRef.current.refresh();
50
   }
52
   }
51
 
53
 
52
-  console.log('loading', loading);
54
+  // console.log('loading', loading);
53
   return (
55
   return (
54
     <Page loading={loading} onShow={onShow}>
56
     <Page loading={loading} onShow={onShow}>
57
+      <Dialog id={dialogId} />
55
       <view className={styles["user-warpper"]}>
58
       <view className={styles["user-warpper"]}>
56
         <view className={styles["user-warpper-list"]}>
59
         <view className={styles["user-warpper-list"]}>
57
           <PowerList
60
           <PowerList