111

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"',
   },
   defineConstants: {
-    HOST: '"http://127.0.0.1:9087"',
-    // HOST: '"http://192.168.89.147:9087"',
+    // HOST: '"http://127.0.0.1:9087"',
+    HOST: '"http://192.168.89.147:9087"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
     DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02
     VERSION: '"1.1.13-20230325"',

src/components/PowerList/index.jsx

@@ -1,13 +1,13 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View } from '@tarojs/components';
-import { PowerScrollView } from '@antmjs/vantui';
-import useShow from '@/layouts/hooks/useShow';
+import React, { useEffect } from "react";
+import Taro from "@tarojs/taro";
+import { View } from "@tarojs/components";
+import { PowerScrollView } from "@antmjs/vantui";
+import useShow from "@/layouts/hooks/useShow";
 
 export default React.forwardRef((props, ref) => {
   const { request, params, renderItem, onLoadingChange, onDataChange } = props;
 
-  const pageSize = 20;
+  const pageSize = 5;
   const pageNumRef = React.useRef(1);
   const listRef = React.useRef([]);
   const [loading, setLoading] = React.useState(false);
@@ -20,47 +20,70 @@ export default React.forwardRef((props, ref) => {
     if (onLoadingChange) {
       onLoadingChange(val);
     }
-  }
+  };
 
-  const queryData = React.useCallback((options = {}) => {
-    return new Promise((resolve, reject) => {
-      changeLoading(true);
-      request({
-        pageSize,
-        ...(params || {}),
-        ...options
-      }).then((res) => {
-        const { records, current, pages } = res;
+  const queryData = React.useCallback(
+    (options = {}) => {
+      return new Promise((resolve, reject) => {
+        changeLoading(true);
+        request({
+          pageSize,
+          ...(params || {}),
+          ...options,
+        })
+          .then((res) => {
+            const { records, current, pages } = res;
 
-        let dataset = current == 1 ? records || [] : listRef.current.concat(records || [])
-        if (onDataChange) {
-          dataset = onDataChange(dataset)
-        }
-        setList(dataset);
+            let dataset =
+              current == 1
+                ? records || []
+                : listRef.current.concat(records || []);
+            if (onDataChange) {
+              dataset = onDataChange(dataset);
+            }
+            setList(dataset);
 
-        setFinished(current >= pages);
-        changeLoading(false);
-        resolve();
-      }).catch((err) => {
-        changeLoading(false);
-        reject(err);
+            setFinished(current >= pages);
+            console.log("onScrollToLower\n   " + current >= pages);
+
+            changeLoading(false);
+            resolve();
+          })
+          .catch((err) => {
+            changeLoading(false);
+            reject(err);
+          });
       });
-    });
-  }, [request, params]);
+    },
+    [request, params]
+  );
 
   const refresh = React.useCallback(() => {
     pageNumRef.current = 1;
-    queryData({pageNum : pageNumRef.current});
+    // setFinished(true)
+    queryData({ pageNum: pageNumRef.current });
+    console.log("refresh" + pageNumRef.current);
+    console.log("refresh\n  " + finished);
   }, [queryData]);
 
-  const onScrollToLower = React.useCallback((event = 0, isRefresh = false) => {
-    pageNumRef.current += 1;
-    return queryData({pageNum : pageNumRef.current});
-  }, [queryData]);
+  const onScrollToLower = React.useCallback(
+    (event = 0, isRefresh = false) => {
+      console.log("onScrollToLower" + pageNumRef.current);
+      console.log("onScrollToLower\n   " + finished);
+      pageNumRef.current += 1;
+      queryData({ pageNum: pageNumRef.current });
+      // setFinished(isRefresh)
+    },
+    [queryData]
+  );
 
   useShow(() => {
     refresh();
-  })
+  });
+  // 后加的
+  React.useEffect(() => {
+    onScrollToLower();
+  }, [onScrollToLower]);
 
   React.useEffect(() => {
     refresh();
@@ -70,7 +93,7 @@ export default React.forwardRef((props, ref) => {
     refresh,
     updateData: (dt) => setList(dt),
   }));
-  
+
   return (
     <PowerScrollView
       scrollY
@@ -80,11 +103,9 @@ export default React.forwardRef((props, ref) => {
       pageSize={pageSize}
       finished={finished}
       onScrollToLower={onScrollToLower}
-      style={{ height: '100%', overflowY: 'auto' }}
+      style={{ height: "100%", overflowY: "auto" }}
     >
-      {
-        list.map(renderItem)
-      }
+      {list.map(renderItem)}
     </PowerScrollView>
-  )
-})
+  );
+});

src/pages/apply/list/index.jsx

@@ -1,36 +1,35 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View } from '@tarojs/components';
-import { Tab, Tabs } from '@antmjs/vantui';
-import Page from '@/layouts/index';
-import PowerList from '@/components/PowerList';
-import Card from '@/components/IssueCard';
-import { getTaIssueApply } from '@/services/taissueapply';
-import { ROLE_MANAGER, ROLE_ORG_MANAGER } from '@/utils/user';
-import { useModel } from '@/store';
+import React, { useState } from "react";
+import Taro from "@tarojs/taro";
+import { Tab, Tabs, Search } from "@antmjs/vantui";
+import Page from "@/layouts/index";
+import PowerList from "@/components/PowerList";
+import Card from "@/components/IssueCard";
+import { getTaIssueApply } from "@/services/taissueapply";
+import { ROLE_MANAGER, ROLE_ORG_MANAGER } from "@/utils/user";
+import { useModel } from "@/store";
 
 const tabStyle = {
-  overflow: 'hidden',
-  height: 'calc(100vh - 45px)',
-  overflow: 'hidden',
-}
+  overflow: "hidden",
+  height: "calc(100vh - 45px)",
+  overflow: "hidden",
+};
 
 export default (props) => {
-
   const router = Taro.useRouter();
-  const { title, applyType = '' } = router.params;
+  const { title, applyType = "" } = router.params;
+  const [issueId, setIssueId] = useState("");
 
-  const { duty } = useModel('user');
+  const { duty } = useModel("user");
 
   React.useMemo(() => {
     if (title) {
       Taro.setNavigationBarTitle({ title });
     } else {
-      Taro.setNavigationBarTitle({ title: '申请列表' });
+      Taro.setNavigationBarTitle({ title: "申请列表" });
     }
   }, [title]);
 
-  const { user } = useModel('user');
+  const { user } = useModel("user");
 
   const onClick = (item) => {
     if (!user) return;
@@ -38,42 +37,62 @@ export default (props) => {
     if (!item.verifyDate) {
       if (duty != ROLE_MANAGER && duty != ROLE_ORG_MANAGER) {
         Taro.navigateTo({
-          url: `/pages/apply/detail/index?id=${item.applyId}&issueId=${item.issueId}&applyType=${item.applyType}`
-        })
+          url: `/pages/apply/detail/index?id=${item.applyId}&issueId=${item.issueId}&applyType=${item.applyType}`,
+        });
       } else {
         Taro.navigateTo({
-          url: `/pages/apply/verify/index?id=${item.applyId}&issueId=${item.issueId}&applyType=${item.applyType}`
-        })
+          url: `/pages/apply/verify/index?id=${item.applyId}&issueId=${item.issueId}&applyType=${item.applyType}`,
+        });
       }
     } else {
       Taro.navigateTo({
-        url: `/pages/apply/detail/index?id=${item.applyId}&issueId=${item.issueId}&applyType=${item.applyType}`
-      })
+        url: `/pages/apply/detail/index?id=${item.applyId}&issueId=${item.issueId}&applyType=${item.applyType}`,
+      });
     }
-  }
-
+  };
+  const onSearch = (e) => {
+    const { value } = e.target;
+    console.log(value);
+    setIssueId(value);
+  };
   return (
     <Page>
+      <Search
+        // onChange={(e) => setIssueId(e.detail)}
+        placeholder="请输入问题单号"
+        onSearch={onSearch}
+        clearable
+      />
       <Tabs sticky>
         <Tab title="督查员" style={tabStyle}>
           <PowerList
             request={getTaIssueApply}
-            params={{ applyType, sourceType: 'inspector', duty }}
+            params={{ applyType, sourceType: "inspector", duty, issueId }}
             renderItem={(item) => (
-              <Card key={item.applyId} applyInfo={item} stText={title} onClick={() => onClick(item)} />
+              <Card
+                key={item.applyId}
+                applyInfo={item}
+                stText={title}
+                onClick={() => onClick(item)}
+              />
             )}
           />
         </Tab>
         <Tab title="市民" style={tabStyle}>
           <PowerList
             request={getTaIssueApply}
-            params={{ applyType, sourceType: 'feedback', duty }}
+            params={{ applyType, sourceType: "feedback", duty }}
             renderItem={(item) => (
-              <Card key={item.applyId} applyInfo={item} stText={title} onClick={() => onClick(item)} />
+              <Card
+                key={item.applyId}
+                applyInfo={item}
+                stText={title}
+                onClick={() => onClick(item)}
+              />
             )}
           />
         </Tab>
       </Tabs>
     </Page>
-  )
-}
+  );
+};

src/pages/issue/list2/index.jsx

@@ -1,63 +1,81 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View } from '@tarojs/components';
-import { Tab, Tabs } from '@antmjs/vantui';
-import Page from '@/layouts/index';
-import PowerList from '@/components/PowerList';
-import Card from '@/components/IssueCard';
-import { getTaIssue } from '@/services/taissue';
-import { ROLE_MANAGER } from '@/utils/user';
-import { useModel } from '@/store';
-import { getIssueStatus } from '@/utils/biz';
+import React, { useState } from "react";
+import Taro from "@tarojs/taro";
+import { View } from "@tarojs/components";
+import { Tab, Tabs, Search } from "@antmjs/vantui";
+import Page from "@/layouts/index";
+import PowerList from "@/components/PowerList";
+import Card from "@/components/IssueCard";
+import { getTaIssue } from "@/services/taissue";
+import { ROLE_MANAGER } from "@/utils/user";
+import { useModel } from "@/store";
+import { getIssueStatus } from "@/utils/biz";
 
 const tabStyle = {
-  overflow: 'hidden',
-  height: 'calc(100vh - 45px)',
-  overflow: 'hidden',
-}
+  overflow: "hidden",
+  height: "calc(100vh - 45px)",
+  overflow: "hidden",
+};
 
 export default (props) => {
   const router = Taro.useRouter();
-  const { title, bizStatus = '', mine = '' } = router.params;
-
+  const { title, bizStatus = "", mine = "" } = router.params;
+  const [issueId, setIssueId] = useState("");
   React.useMemo(() => {
     if (title) {
       Taro.setNavigationBarTitle({ title });
     } else {
-      Taro.setNavigationBarTitle({ title: '问题列表' });
+      Taro.setNavigationBarTitle({ title: "问题列表" });
     }
   }, [title]);
 
-  const { user } = useModel('user');
+  const { user } = useModel("user");
 
   const onClick = (item) => {
     Taro.navigateTo({
-      url: `/pages/issue/edit/index?id=${item.issueId}`
-    })
-  }
-
+      url: `/pages/issue/edit/index?id=${item.issueId}`,
+    });
+  };
+  const onSearch = (e) => {
+    const { value } = e.target;
+    console.log(value);
+    setIssueId(value);
+  };
   return (
     <Page>
+      <Search
+        // onChange={(e) => setIssueId(e.detail)}
+        placeholder="请输入问题单号"
+        onSearch={onSearch}
+        clearable
+      />
       <Tabs sticky>
         <Tab title="督查员" style={tabStyle}>
           <PowerList
             request={getTaIssue}
-            params={{ bizStatus, mine, sourceType: 'inspector' }}
+            params={{ bizStatus, mine, sourceType: "inspector", issueId }}
             renderItem={(item) => (
-              <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
+              <Card
+                key={item.issueId}
+                issue={item}
+                onClick={() => onClick(item)}
+              />
             )}
           />
         </Tab>
         <Tab title="市民" style={tabStyle}>
           <PowerList
             request={getTaIssue}
-            params={{ bizStatus, mine, sourceType: 'feedback' }}
+            params={{ bizStatus, mine, sourceType: "feedback" }}
             renderItem={(item) => (
-              <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
+              <Card
+                key={item.issueId}
+                issue={item}
+                onClick={() => onClick(item)}
+              />
             )}
           />
         </Tab>
       </Tabs>
     </Page>
-  )
-}
+  );
+};

src/pages/org/issue/list/index.jsx

@@ -1,31 +1,29 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View } from '@tarojs/components';
-import { Tab, Tabs } from '@antmjs/vantui';
-import Page from '@/layouts/index';
-import PowerList from '@/components/PowerList';
-import Card from '@/components/IssueCard';
-import { getTaOrgIssue } from '@/services/taorgissue';
-import { ROLE_MANAGER } from '@/utils/user';
-import { useModel } from '@/store';
-import { getIssueStatus } from '@/utils/biz';
+import React, { useState } from "react";
+import Taro from "@tarojs/taro";
+import { Tab, Tabs, Search } from "@antmjs/vantui";
+import Page from "@/layouts/index";
+import PowerList from "@/components/PowerList";
+import Card from "@/components/IssueCard";
+import { getTaOrgIssue } from "@/services/taorgissue";
+import { ROLE_MANAGER } from "@/utils/user";
+import { useModel } from "@/store";
+import { getIssueStatus } from "@/utils/biz";
 
 const tabStyle = {
-  overflow: 'hidden',
-  height: 'calc(100vh - 45px)',
-  overflow: 'hidden',
-}
+  overflow: "hidden",
+  height: "calc(100vh - 45px)",
+  overflow: "hidden",
+};
 
 export default (props) => {
-
   const router = Taro.useRouter();
   const { title, bizStatus, color } = router.params;
-
+  const [issueId, setIssueId] = useState("");
   React.useMemo(() => {
     if (title) {
       Taro.setNavigationBarTitle({ title });
     } else {
-      Taro.setNavigationBarTitle({ title: '问题列表' });
+      Taro.setNavigationBarTitle({ title: "问题列表" });
     }
   }, [title]);
 
@@ -33,32 +31,59 @@ export default (props) => {
 
   const onClick = (item) => {
     Taro.navigateTo({
-      url: `/pages/org/issue/detail/index?id=${item.issueId}`
-    })
-  }
-
+      url: `/pages/org/issue/detail/index?id=${item.issueId}`,
+    });
+  };
+  const onSearch = (e) => {
+    const {value}=e.target
+    console.log(value)
+    setIssueId(value)
+  };
+  // const searchAction = (e) => {
+  //   console.log("搜索");
+  //   console.log(e)
+  //   // setIssueId(e.target.value)
+  // };
   return (
     <Page>
+      <Search
+        // onChange={(e) => setIssueId(e.detail)}
+        placeholder="请输入问题单号"
+        onSearch={onSearch}
+        clearable
+      />
       <Tabs sticky>
         <Tab title="督查员" style={tabStyle}>
           <PowerList
             request={getTaOrgIssue}
-            params={{ bizStatus, sourceType: 'inspector' }}
+            params={{ bizStatus, sourceType: "inspector" ,issueId}}
             renderItem={(item) => (
-              <Card key={item.issueId} issue={item} stText={title} color={color} onClick={() => onClick(item)} />
+              <Card
+                key={item.issueId}
+                issue={item}
+                stText={title}
+                color={color}
+                onClick={() => onClick(item)}
+              />
             )}
           />
         </Tab>
         <Tab title="市民" style={tabStyle}>
           <PowerList
             request={getTaOrgIssue}
-            params={{ bizStatus, sourceType: 'feedback' }}
+            params={{ bizStatus, sourceType: "feedback" }}
             renderItem={(item) => (
-              <Card key={item.issueId} issue={item} stText={title} color={color} onClick={() => onClick(item)} />
+              <Card
+                key={item.issueId}
+                issue={item}
+                stText={title}
+                color={color}
+                onClick={() => onClick(item)}
+              />
             )}
           />
         </Tab>
       </Tabs>
     </Page>
-  )
-}
+  );
+};