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

src/pages/apply/verify/index.jsx

@@ -160,6 +160,7 @@ export default (props) => {
 
   return (
     <Page loading={loading}>
+      <Dialog id={dialogId} />
       <Issue issueId={issueId} />
 
       {
@@ -241,7 +242,6 @@ export default (props) => {
       </CellGroup>
       <CellGroup>
         <View style={{ marginTop: '20px', display: 'flex' }}>
-          <Dialog id={dialogId} />
           <Button block type="primary" loading={submitting} onClick={onSubmit} style={{ flex: 5, marginLeft: 'var(--main-space)' }}>审 批</Button>
           <Button block type="info" loading={loading2} onClick={onCopy} style={{ flex: 1, margin: '0 var(--main-space)' }}>复制</Button>
         </View>

src/pages/user/list/index.jsx

@@ -14,6 +14,7 @@ const sid1 = Math.random().toString(36).substring(2, 8);
 export default (props) => {
   const [loading, setLoading] = React.useState(false);
   const listRef = React.useRef();
+  const dialogId = React.useMemo(() => `dialog-${Math.random().toString(36).substring(2, 7)}`, []);
 
   const onAdd = () => {
     Taro.navigateTo({
@@ -25,6 +26,7 @@ export default (props) => {
     Dialog.confirm({
       width: '70vw',
       title: "确认删除用户?",
+      selector: dialogId,
     }).then((action) => {
       if (action === "confirm") {
         setLoading(true);
@@ -49,9 +51,10 @@ export default (props) => {
     listRef.current.refresh();
   }
 
-  console.log('loading', loading);
+  // console.log('loading', loading);
   return (
     <Page loading={loading} onShow={onShow}>
+      <Dialog id={dialogId} />
       <view className={styles["user-warpper"]}>
         <view className={styles["user-warpper-list"]}>
           <PowerList