fix

config/dev.js

@@ -1,12 +1,12 @@
 module.exports = {
   env: {
-    NODE_ENV: '"development"'
+    NODE_ENV: '"development"',
   },
   defineConstants: {
-    HOST: '"http://127.0.0.1:9087"',
-    // HOST: '"http://192.168.1.2: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"',
   },
   mini: {},
-  h5: {}
-}
+  h5: {},
+};

src/app.config.js

@@ -1,56 +1,54 @@
 // eslint-disable-next-line no-undef
 export default defineAppConfig({
   pages: [
-    'pages/home/index',
-    'pages/login/index',
-    'pages/issue/list/index',
-    'pages/issue/list2/index',
-    'pages/issue/edit/index',
-    'pages/org/issue/list/index',
-    'pages/org/issue/detail/index',
-    'pages/apply/list/index',
+    "pages/home/index",
+    "pages/login/index",
+    "pages/issue/list/index",
+    "pages/issue/list2/index",
+    "pages/issue/edit/index",
+    "pages/org/issue/list/index",
+    "pages/org/issue/detail/index",
+    "pages/apply/list/index",
     // 'pages/apply/apply/index',
-    'pages/apply/verify/index',
-    'pages/apply/detail/index',
-    'pages/message/list/index',
-    'pages/checkStand/index',
-    'pages/reporting/index',
-    'pages/reporting/detail/index',
-    'pages/reset-password/index',
-    'pages/check/list/index',
-    'pages/check/loc/list/index',
-    'pages/check/edit/index',
-    'pages/notice/index',
-    'pages/notice/detail/index',
-    'pages/my/index',
-    'pages/my/edit/index',
-    'pages/feedback/issue/index',
-    'pages/feedback/issuelist/index'
+    "pages/apply/verify/index",
+    "pages/apply/detail/index",
+    "pages/message/list/index",
+    // 'pages/checkStand/index',
+    "pages/checkStand/list/index",
+    "pages/checkStand/detail/index",
+    "pages/reporting/index",
+    "pages/reporting/detail/index",
+    "pages/reset-password/index",
+    "pages/check/list/index",
+    "pages/check/loc/list/index",
+    "pages/check/edit/index",
+    "pages/notice/index",
+    "pages/notice/detail/index",
+    "pages/my/index",
+    "pages/my/edit/index",
+    "pages/feedback/issue/index",
+    "pages/feedback/issuelist/index",
   ],
   subpackages: [
     {
-      root: 'subpkg1',
-      pages: [
-        'pages/statistics/index',
-      ]
-    }
+      root: "subpkg1",
+      pages: ["pages/statistics/index"],
+    },
   ],
   window: {
     // backgroundColor: '#1A7565',
-    backgroundTextStyle: 'light',
-    navigationBarBackgroundColor: '#1A7565',
-    navigationBarTitleText: '文明创城',
-    navigationBarTextStyle: 'white'
+    backgroundTextStyle: "light",
+    navigationBarBackgroundColor: "#1A7565",
+    navigationBarTitleText: "文明创城",
+    navigationBarTextStyle: "white",
   },
   permission: {
     "scope.userLocation": {
-      desc: "你的位置信息将用于定位点位" // 高速公路行驶持续后台定位
-    }
+      desc: "你的位置信息将用于定位点位", // 高速公路行驶持续后台定位
+    },
   },
-  requiredPrivateInfos: [
-    'getLocation'
-  ],
+  requiredPrivateInfos: ["getLocation"],
   setting: {
     urlCheck: false,
-  }
-})
+  },
+});

src/layouts/TabBar.jsx

@@ -1,68 +1,68 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View, Image } from '@tarojs/components';
-import { Tabbar, TabbarItem } from '@antmjs/vantui';
+import React from "react";
+import Taro from "@tarojs/taro";
+import { View, Image } from "@tarojs/components";
+import { Tabbar, TabbarItem } from "@antmjs/vantui";
 import {
   ROLE_INSPECTOR,
   ROLE_MANAGER,
   ROLE_ORG_USER,
   ROLE_ORG_MANAGER,
   ROLE_QUERY_PERSON,
-  ROLE_CITIZEN
-} from '@/utils/user';
-import homeIcon from '@/assets/tabbar/page.png';
-import homeActiveIcon from '@/assets/tabbar/page click.png';
-import noticeIcon from '@/assets/tabbar/notice.png';
-import noticeActiveIcon from '@/assets/tabbar/notice click.png';
-import issueIcon from '@/assets/tabbar/release.png';
-import issueActiveIcon from '@/assets/tabbar/release click.png';
-import checkIcon from '@/assets/tabbar/evaluation.png';
-import checkActiveIcon from '@/assets/tabbar/evaluation click.png';
-import mineIcon from '@/assets/tabbar/my.png';
-import mineActiveIcon from '@/assets/tabbar/my click.png';
+  ROLE_CITIZEN,
+} from "@/utils/user";
+import homeIcon from "@/assets/tabbar/page.png";
+import homeActiveIcon from "@/assets/tabbar/page click.png";
+import noticeIcon from "@/assets/tabbar/notice.png";
+import noticeActiveIcon from "@/assets/tabbar/notice click.png";
+import issueIcon from "@/assets/tabbar/release.png";
+import issueActiveIcon from "@/assets/tabbar/release click.png";
+import checkIcon from "@/assets/tabbar/evaluation.png";
+import checkActiveIcon from "@/assets/tabbar/evaluation click.png";
+import mineIcon from "@/assets/tabbar/my.png";
+import mineActiveIcon from "@/assets/tabbar/my click.png";
 
 const home = {
-  name: 'home',
-  label: '首页',
+  name: "home",
+  label: "首页",
   icon: homeIcon,
   activeIcon: homeActiveIcon,
-  page: '/pages/home/index'
-}
+  page: "/pages/home/index",
+};
 const notice = {
-  name: 'notice',
-  label: '公告',
+  name: "notice",
+  label: "公告",
   icon: noticeIcon,
   activeIcon: noticeActiveIcon,
-  page: '/pages/notice/index'
-}
+  page: "/pages/notice/index",
+};
 const issue = {
-  name: 'issue',
-  label: '发布',
+  name: "issue",
+  label: "发布",
   icon: issueIcon,
   activeIcon: issueActiveIcon,
-  page: '/pages/issue/edit/index'
-}
+  page: "/pages/issue/edit/index",
+};
 const feedback = {
-  name: 'feedback',
-  label: '随手拍',
+  name: "feedback",
+  label: "随手拍",
   icon: issueIcon,
   activeIcon: issueActiveIcon,
-  page: '/pages/feedback/issue/index'
-}
+  page: "/pages/feedback/issue/index",
+};
 const check = {
-  name: 'check',
-  label: '测评标准',
+  name: "check",
+  label: "测评标准",
   icon: checkIcon,
   activeIcon: checkActiveIcon,
-  page: '/pages/checkStand/index'
-}
+  page: "/pages/checkStand/list/index",
+};
 const mine = {
-  name: 'mine',
-  label: '我的',
+  name: "mine",
+  label: "我的",
   icon: mineIcon,
   activeIcon: mineActiveIcon,
-  page: '/pages/my/index'
-}
+  page: "/pages/my/index",
+};
 
 export default (props) => {
   const { active = -1, className, duty } = props;
@@ -70,51 +70,34 @@ export default (props) => {
   const tabItems = React.useMemo(() => {
     if (!duty) return [];
 
-    if (duty == ROLE_INSPECTOR // 督察员
-      || duty == ROLE_MANAGER // 管理员
+    if (
+      duty == ROLE_INSPECTOR || // 督察员
+      duty == ROLE_MANAGER // 管理员
     ) {
-      return [
-        home,
-        notice,
-        issue,
-        check,
-        mine
-      ]
+      return [home, notice, issue, check, mine];
     }
-    
-    if (duty == ROLE_QUERY_PERSON) { // 查询员
-      return [
-        home,
-        notice,
-        check,
-        mine
-      ]
+
+    if (duty == ROLE_QUERY_PERSON) {
+      // 查询员
+      return [home, notice, check, mine];
     }
 
     // 责任单位用户
     if (duty == ROLE_ORG_USER || duty == ROLE_ORG_MANAGER) {
-      return [
-        home,
-        notice,
-        mine,
-      ]
+      return [home, notice, mine];
     }
 
     if (duty == ROLE_CITIZEN) {
-      return [
-        home,
-        feedback,
-        mine,
-      ]
+      return [home, feedback, mine];
     }
 
     return [];
   }, [duty]);
 
   const onChange = (e) => {
-    const url = tabItems.filter(x => x.name === e.detail)[0].page;
-    Taro.reLaunch({ url })
-  }
+    const url = tabItems.filter((x) => x.name === e.detail)[0].page;
+    Taro.reLaunch({ url });
+  };
 
   return (
     <Tabbar
@@ -123,32 +106,28 @@ export default (props) => {
       active={active}
       onChange={onChange}
     >
-      {
-        tabItems.map(item => (
-          <TabbarItem
-            key={item.name}
-            name={item.name}
-            renderIcon={
-              <Image
-                src={item.icon}
-                mode="aspectFit"
-                style="width: 30px; height: 20px;"
-              ></Image>
-            }
-            renderIconActive={
-              <Image
-                src={item.activeIcon}
-                mode="aspectFit"
-                style="width: 30px; height: 20px;"
-              ></Image>
-            }
-          >
-            <View style={{fontSize: '14px'}}>
-              {item.label}
-            </View>
-          </TabbarItem>
-        ))
-      }
+      {tabItems.map((item) => (
+        <TabbarItem
+          key={item.name}
+          name={item.name}
+          renderIcon={
+            <Image
+              src={item.icon}
+              mode="aspectFit"
+              style="width: 30px; height: 20px;"
+            ></Image>
+          }
+          renderIconActive={
+            <Image
+              src={item.activeIcon}
+              mode="aspectFit"
+              style="width: 30px; height: 20px;"
+            ></Image>
+          }
+        >
+          <View style={{ fontSize: "14px" }}>{item.label}</View>
+        </TabbarItem>
+      ))}
     </Tabbar>
-  )
-}
+  );
+};

src/pages/checkStand/detail/index.config.js

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '测评标准'
+})

src/pages/checkStand/detail/index.jsx

@@ -0,0 +1,34 @@
+import React from "react";
+import Taro from "@tarojs/taro";
+import Page from "@/layouts/index";
+import { View, RichText } from "@tarojs/components";
+import { getTaCheckStandById } from "@/services/tacheckstand";
+
+export default (props) => {
+  const router = Taro.useRouter();
+  const { id } = router.params;
+  const [loading, setLoading] = React.useState(false);
+  const [detail, setDetail] = React.useState();
+
+  React.useEffect(() => {
+    setLoading(true);
+
+    // ID 固定是 1
+    getTaCheckStandById(id)
+      .then((res) => {
+        setDetail(res);
+        setLoading(false);
+      })
+      .catch(() => {
+        setLoading(false);
+      });
+  }, []);
+
+  return (
+    <Page loading={loading}>
+      <View style={{ padding: "var(--main-space)" }}>
+        <RichText style={{ lineHeight: "2em" }} nodes={detail?.content} />
+      </View>
+    </Page>
+  );
+};

src/pages/checkStand/index.jsx

@@ -1,11 +1,10 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import Page from '@/layouts/index';
-import { View, RichText } from '@tarojs/components';
-import { getTaCheckStandById } from '@/services/tacheckstand';
+import React from "react";
+import Taro from "@tarojs/taro";
+import Page from "@/layouts/index";
+import { View, RichText } from "@tarojs/components";
+import { getTaCheckStandById } from "@/services/tacheckstand";
 
 export default (props) => {
-
   const [loading, setLoading] = React.useState(false);
   const [detail, setDetail] = React.useState();
 
@@ -13,19 +12,21 @@ export default (props) => {
     setLoading(true);
 
     // ID 固定是 1
-    getTaCheckStandById(1).then((res) => {
-      setDetail(res);
-      setLoading(false);
-    }).catch(() => {
-      setLoading(false);
-    });
+    getTaCheckStandById(1)
+      .then((res) => {
+        setDetail(res);
+        setLoading(false);
+      })
+      .catch(() => {
+        setLoading(false);
+      });
   }, []);
-  
+
   return (
     <Page tabBar="check" loading={loading}>
-      <View style={{ padding: 'var(--main-space)' }}>
-        <RichText style={{ lineHeight: '2em' }} nodes={detail?.content} />
+      <View style={{ padding: "var(--main-space)" }}>
+        <RichText style={{ lineHeight: "2em" }} nodes={detail?.content} />
       </View>
     </Page>
-  )
-}
+  );
+};

src/pages/checkStand/list/index.config.js

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '测评标准'
+})

src/pages/checkStand/list/index.jsx

@@ -0,0 +1,59 @@
+import React from "react";
+import Taro from "@tarojs/taro";
+import { View } from "@tarojs/components";
+import { Cell, Tag, Notify } from "@antmjs/vantui";
+import Page from "@/layouts/index";
+import PowerList from "@/components/PowerList";
+import { getTaCheckStand } from "@/services/tacheckstand";
+import { ROLE_INSPECTOR } from "@/utils/user";
+
+export default (props) => {
+  const router = Taro.useRouter();
+  const { checkId } = router.params;
+
+  const [loading, setLoading] = React.useState(false);
+
+  const params = React.useMemo(
+    () => ({
+      checkId,
+      itemType: "loc",
+      pageSize: 500,
+      mustValid: true,
+    }),
+    [checkId]
+  );
+
+  const onClick = (item) => {
+    // if (item.answerNum >= item.num) {
+    //   Notify.show({
+    //     message: "当前测评问卷已收齐",
+    //     type: "warning",
+    //   });
+    //   return;
+    // }
+
+    Taro.navigateTo({
+      url: `/pages/checkStand/detail/index?id=${item.statndId}`,
+    });
+  };
+
+  return (
+    <Page tabBar="check" loading={loading} roles={[ROLE_INSPECTOR]}>
+      <PowerList
+        request={getTaCheckStand}
+        params={params}
+        renderItem={(item) => {
+          return (
+            <Cell
+              isLink
+              key={item.statndId}
+              title={item.locName}
+              onClick={() => onClick(item)}
+            ></Cell>
+          );
+        }}
+        onLoadingChange={setLoading}
+      />
+    </Page>
+  );
+};