F

config/index.js

@@ -61,11 +61,12 @@ export default defineConfig(async (merge, { command, mode }) => {
     //   },
     // },
     h5: {
-      publicPath: "/",
-      staticDirectory: "static",
-      outputDir: "dist",
+      // publicPath: "/",
+      // staticDirectory: "static",
+      // outputDir: "dist",
       router: {
-        mode: "hash",
+        // mode: "hash",
+        basename:"/h5"
       },
       esnextModules: ["@antmjs"],
       postcss: {
@@ -77,18 +78,6 @@ export default defineConfig(async (merge, { command, mode }) => {
         pxtransform: {
           enable: true,
           config: {
-            // 设置rpx转换为目标单位为rem
-            // unitToRem: true,
-            // // 设计稿宽度与 rem 基准值，默认设计稿宽度为 750，即 1rem = 75px
-            // designWidth: 750,
-            // // 可选，选择器黑名单
-            // selectorBlackList: [],
-            // // // 可选，替换rpx为其他单位后缀，例如 'px' 或 'rem'
-            // propList: ["*"],
-            // // 可选，媒体查询中是否禁用转换
-            // mediaQuery: false,
-            // // 可选，是否转换页面根节点字体大小，如body: font-size: 16px
-            // minPixelValue: 0,
           },
         },
         cssModules: {

config/prod.js

@@ -4,9 +4,10 @@ module.exports = {
   },
   defineConstants: {
     // HOST: '"http://192.168.89.147:9087"',
-    HOST: '"https://wmcj.ycjcjy.com"',
+    // HOST: '"https://wmcj.ycjcjy.com"',
+    HOST: '""',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
-    DEFAULT_POS: '"31.416373,116.373904"', // gcj02
+    DEFAULT_POS: '"116.34761502876347,31.40974743425614"', // 霍山县人民政府 gcj02
     VERSION: '"1.1.29-20240224"',
   },
   mini: {},

src/app.js

@@ -1,21 +1,13 @@
 import Taro from "@tarojs/taro";
-import store, { Provider, getState } from "@/store";
+import store, { Provider } from "@/store";
 import "./app.less";
-import { useEffect, useMemo } from "react";
-// import wxsdk from "./utils/wx";
+import { useEffect } from "react";
 import "@antmjs/vantui/lib/index.less";
-// import '@antmjs/vantui/lib/index.css'
 
 const App = (props) => {
-  const init = () => {
-    const userState = store.getState("user");
-
-    userState.login(123);
-    userState.current();
-  };
-
   useEffect(() => {
-    init();
+    const userState = store.getState("user");
+    // userState.current();
   }, []);
 
   return <Provider>{props.children}</Provider>;

src/components/Auth.jsx

@@ -1,16 +1,38 @@
-import React from 'react';
-import { View } from '@tarojs/components';
-import { useModel } from '@/store';
+import React from "react";
+import { View } from "@tarojs/components";
+import { useModel } from "@/store";
 
 export default (props) => {
-  const { roles = [] } = props;
-  const { duty } = useModel('user');
+  const { roles = []  } = props;
+  console.log(props);
+  const { duty } = useModel("user");
+  console.log("---------------------************-----------------");
 
-  const hasRights = roles.indexOf(duty) > -1;
+  // const hasRights = roles.indexOf(duty) > -1;
+  const hasRights = roles.includes(duty);
+  console.log(duty);
+  console.log("!roles.length", !roles.length);
+  console.log("hasRights", hasRights);
+  console.log("roles", roles);
+  console.log("!roles.length || hasRights", !roles.length || hasRights);
 
-  return !roles.length || hasRights ? props.children : (
-    <View style={{width: '100%', height: '100%', display: 'grid', placeItems: 'center'}}>
+
+  const filteredChildren = React.Children.toArray(props.children).filter(
+    child => React.isValidElement(child)
+  );
+
+  return !roles.length || hasRights ? (
+   <div>{filteredChildren}</div>
+  ) : (
+    <View
+      style={{
+        width: "100%",
+        height: "100%",
+        display: "grid",
+        placeItems: "center",
+      }}
+    >
       <View>暂无权限</View>
     </View>
   );
-}
+};

src/index.html

@@ -8,7 +8,7 @@
   <meta name="format-detection" content="telephone=no,address=no">
   <meta name="apple-mobile-web-app-status-bar-style" content="white">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
-  <script src="http://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
+  <!-- <script src="http://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script> -->
   <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=OB4BZ-D4W3U-B7VVO-4PJWW-6TKDJ-WPB77"></script>
   <title>civilized-miniapp</title>
   <script><%= htmlWebpackPlugin.options.script %></script>

src/layouts/index.jsx

@@ -11,14 +11,13 @@ import laySty from "./layout.module.less";
 export default (props) => {
   const { className, style, roles, tabBar = false, loading } = props;
 
-  // person,
   const { user, duty } = useModel("user");
   const containerClass = `${laySty["page-conatiner"]} ${
     tabBar ? laySty["with-tabbar"] : ""
   } ${className}`;
 
-  const userRef = useRef();
-  const personRef = useRef();
+  // const userRef = useRef();
+  // const personRef = useRef();
 
   // React.useEffect(() => {
   //   if (!userRef.current && !personRef.current) {
@@ -74,14 +73,14 @@ export default (props) => {
       <Dialog id="vanDialog" />
       <NavLoading loading={loading} />
       <View className={containerClass} style={style}>
-        {/* {!person && (
+        {/* {!user && (
           <View className={laySty.loading}>
             <Loading size="32px" vertical>
               加载中...
             </Loading>
           </View>
         )} */}
-        <Auth roles={roles}>{props.children}</Auth>
+        <Auth roles={roles} >{props.children}</Auth>
 
         {!tabBar && <View className={laySty["pdm-space"]}></View>}
       </View>

src/pages/home/components/Head.jsx

@@ -1,40 +1,43 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View, Image, Button } from '@tarojs/components';
-import { ActionSheet, Cell } from '@antmjs/vantui';
-import { ROLES, ROLE_CITIZEN } from '@/utils/user';
-import logo from '@/assets/image/logo.png';
-import Icon from '@/assets/icons/avatar.png';
-import style from './head.module.less';
+import React from "react";
+import Taro from "@tarojs/taro";
+import { View, Image, Button } from "@tarojs/components";
+import { ActionSheet, Cell } from "@antmjs/vantui";
+import { ROLES, ROLE_CITIZEN } from "@/utils/user";
+import logo from "@/assets/image/logo.png";
+import Icon from "@/assets/icons/avatar.png";
+import style from "./head.module.less";
 
 export default (props) => {
   const { userModel } = props;
-  const { user, person, duty, updateDuty, authProfile } = userModel || {};
+  const { user,  duty, updateDuty, authProfile } = userModel || {};
   const { dutyList = [] } = user || {};
   const role = ROLES[duty || ROLE_CITIZEN];
 
   const [show, setShow] = React.useState(false);
 
+  // const [name, avatar] = React.useMemo(() => {
+  //   return [
+  //     user?.name || person?.name || '市民',
+  //     user?.avatar || person?.avatar || logo,
+  //   ];
+  // }, [user, person]);
   const [name, avatar] = React.useMemo(() => {
-    return [
-      user?.name || person?.name || '市民',
-      user?.avatar || person?.avatar || logo,
-    ];
-  }, [user, person]);
+    return [user?.name || "市民", user?.avatar || logo];
+  }, [user]);
 
   const actions = React.useMemo(() => {
-    return dutyList.map(x => ({ name: ROLES[x], value: x }));
+    return dutyList.map((x) => ({ name: ROLES[x], value: x }));
   }, [dutyList]);
 
   const onClick = () => {
     if (dutyList.length < 2) return;
     setShow(true);
-  }
+  };
 
   const onSelect = (e) => {
-    console.log(e)
-    updateDuty(e.detail.value)
-  }
+    console.log(e);
+    updateDuty(e.detail.value);
+  };
 
   const onGetUserProfile = () => {
     // 新版本小程序已开始不支持获取头像, 昵称了
@@ -44,12 +47,12 @@ export default (props) => {
     //     authProfile(res);
     //   }
     // })
-  }
+  };
 
   return (
     <View className={style.head}>
       <View className={style.profile}>
-        <View style={{ letterSpacing: '2px' }}>Hi, {name}!</View>
+        <View style={{ letterSpacing: "2px" }}>Hi, {name}!</View>
         <View className={style.badge} onClick={onClick}>
           <View className={style.icon}>
             <Image src={Icon} />
@@ -71,5 +74,5 @@ export default (props) => {
         </Button>
       </View>
     </View>
-  )
-}
+  );
+};

src/pages/login/components/Form.jsx → src/pages/login/components/Form1.jsx

@@ -1,120 +1,120 @@
-import React from "react";
-import Taro from "@tarojs/taro";
-import { View } from "@tarojs/components";
-import { Form, FormItem, Field, Button } from "@antmjs/vantui";
-import { useModel } from "@/store";
-import user from "@/assets/image/user.png";
-import password from "@/assets/image/password.png";
-import { warn } from "@/utils/message";
-import "./form.less";
-
-export default (props) => {
-  const { onSuccess } = props;
-
-  const { signin } = useModel("user");
-  const form = Form.useForm();
-  const [accErr, setAccErr] = React.useState();
-  const [pwdErr, setPwdErr] = React.useState();
-  const [loading, setLoading] = React.useState(false);
-
-  const onFinish = (errs, res) => {
-    console.log(11111111);
-    if (!res.account) {
-      setAccErr("账户不能为空");
-      return;
-    } else {
-      setAccErr();
-    }
-    if (!res.password) {
-      setPwdErr("密码不能为空");
-      return;
-    } else {
-      setPwdErr();
-    }
-
-    setLoading(true);
-    signin(res)
-      .then(() => {
-        onSuccess();
-        setLoading(false);
-      })
-      .catch((err) => {
-        setLoading(false);
-      });
-  };
-
-  const onForgetPwd = () => {
-    // Taro.navigateTo({
-    //   url: '/pages/reset-password/index'
-    // });
-    warn(true, "请联系管理人员");
-  };
-
-  const handleClick = () => {
-    form.validateFields((err, res) => {
-      if (!res.account) {
-        setAccErr("账户不能为空");
-        return;
-      } else {
-        setAccErr();
-      }
-      if (!res.password) {
-        setPwdErr("密码不能为空");
-        return;
-      } else {
-        setPwdErr();
-      }
-  
-      setLoading(true);
-      signin(res)
-        .then(() => {
-          onSuccess();
-          setLoading(false);
-        })
-        .catch((err) => {
-          setLoading(false);
-        });
-    });
-    console.log(11111);
-  };
-  return (
-    <View className="login-form">
-      {/* onFinish={onFinish} */}
-      <Form form={form} >
-        <FormItem name="account" valueFormat={(e) => e.detail}>
-          <Field
-            border
-            label="账号"
-            leftIcon={user}
-            errorMessage={accErr}
-            placeholder="请输入您的登录账号"
-          ></Field>
-        </FormItem>
-        <FormItem name="password" valueFormat={(e) => e.detail}>
-          <Field
-            password
-            label="密码"
-            leftIcon={password}
-            errorMessage={pwdErr}
-            placeholder="请输入您的登录密码"
-          ></Field>
-        </FormItem>
-        <View className="forget-password" onClick={onForgetPwd}>
-          忘记密码?
-        </View>
-        <View>
-          <Button
-            block
-            type="primary"
-            // formType="submit"
-            loading={loading}
-            disabled={loading}
-            onClick={handleClick}
-          >
-            登录
-          </Button>
-        </View>
-      </Form>
-    </View>
-  );
-};
+import React from "react";
+import Taro from "@tarojs/taro";
+import { View } from "@tarojs/components";
+import { Form, FormItem, Field, Button } from "@antmjs/vantui";
+import { useModel } from "@/store";
+import user from "@/assets/image/user.png";
+import password from "@/assets/image/password.png";
+import { warn } from "@/utils/message";
+import "./form.less";
+
+export default (props) => {
+  const { onSuccess } = props;
+
+  const { signin } = useModel("user");
+  const form = Form.useForm();
+  const [accErr, setAccErr] = React.useState();
+  const [pwdErr, setPwdErr] = React.useState();
+  const [loading, setLoading] = React.useState(false);
+
+  const onFinish = (errs, res) => {
+    console.log(11111111);
+    if (!res.account) {
+      setAccErr("账户不能为空");
+      return;
+    } else {
+      setAccErr();
+    }
+    if (!res.password) {
+      setPwdErr("密码不能为空");
+      return;
+    } else {
+      setPwdErr();
+    }
+
+    setLoading(true);
+    signin(res)
+      .then(() => {
+        onSuccess();
+        setLoading(false);
+      })
+      .catch((err) => {
+        setLoading(false);
+      });
+  };
+
+  const onForgetPwd = () => {
+    // Taro.navigateTo({
+    //   url: '/pages/reset-password/index'
+    // });
+    warn(true, "请联系管理人员");
+  };
+
+  const handleClick = () => {
+    form.validateFields((err, res) => {
+      if (!res.account) {
+        setAccErr("账户不能为空");
+        return;
+      } else {
+        setAccErr();
+      }
+      if (!res.password) {
+        setPwdErr("密码不能为空");
+        return;
+      } else {
+        setPwdErr();
+      }
+  
+      setLoading(true);
+      signin(res)
+        .then(() => {
+          onSuccess();
+          setLoading(false);
+        })
+        .catch((err) => {
+          setLoading(false);
+        });
+    });
+    console.log(11111);
+  };
+  return (
+    <View className="login-form">
+      {/* onFinish={onFinish} */}
+      <Form form={form} >
+        <FormItem name="account" valueFormat={(e) => e.detail}>
+          <Field
+            border
+            label="账号"
+            leftIcon={user}
+            errorMessage={accErr}
+            placeholder="请输入您的登录账号"
+          ></Field>
+        </FormItem>
+        <FormItem name="password" valueFormat={(e) => e.detail}>
+          <Field
+            password
+            label="密码"
+            leftIcon={password}
+            errorMessage={pwdErr}
+            placeholder="请输入您的登录密码"
+          ></Field>
+        </FormItem>
+        <View className="forget-password" onClick={onForgetPwd}>
+          忘记密码?
+        </View>
+        <View>
+          <Button
+            block
+            type="primary"
+            // formType="submit"
+            loading={loading}
+            disabled={loading}
+            onClick={handleClick}
+          >
+            登录
+          </Button>
+        </View>
+      </Form>
+    </View>
+  );
+};

src/pages/login/components/Forms.jsx

@@ -0,0 +1,123 @@
+import React, { useRef, useState } from "react";
+import { Button, Form, Input, View } from "@tarojs/components";
+// import { Form, FormItem, Field, Button } from "@antmjs/vantui";
+import { useModel } from "@/store";
+import user from "@/assets/image/user.png";
+import password from "@/assets/image/password.png";
+import { warn } from "@/utils/message";
+import "./form.less";
+
+export default (props) => {
+  const { onSuccess } = props;
+
+  const { signin } = useModel("user");
+  // const form = Form.useForm();
+  const formRef = useRef();
+  const [accErr, setAccErr] = useState("");
+  const [pwdErr, setPwdErr] = useState("");
+  const [loading, setLoading] = useState(false);
+
+  const onFinish = (errs, res) => {
+    console.log(res);
+    if (!res.account) {
+      setAccErr("账户不能为空");
+      return;
+    } else {
+      setAccErr();
+    }
+    if (!res.password) {
+      setPwdErr("密码不能为空");
+      return;
+    } else {
+      setPwdErr();
+    }
+
+    setLoading(true);
+    signin(res)
+      .then(() => {
+        onSuccess();
+        setLoading(false);
+      })
+      .catch((err) => {
+        setLoading(false);
+      });
+  };
+
+  const onForgetPwd = () => {
+    // Taro.navigateTo({
+    //   url: '/pages/reset-password/index'
+    // });
+    warn(true, "请联系管理人员");
+  };
+
+  // const handleClick = () => {
+  //   form.validateFields((err, res) => {
+  //     if (!res.account) {
+  //       setAccErr("账户不能为空");
+  //       return;
+  //     } else {
+  //       setAccErr();
+  //     }
+  //     if (!res.password) {
+  //       setPwdErr("密码不能为空");
+  //       return;
+  //     } else {
+  //       setPwdErr();
+  //     }
+
+  //     setLoading(true);
+  //     signin(res)
+  //       .then(() => {
+  //         onSuccess();
+  //         setLoading(false);
+  //       })
+  //       .catch((err) => {
+  //         setLoading(false);
+  //       });
+  //   });
+  // };
+  return (
+    <View className="login-form">
+      <Form ref={formRef} onSubmit={onFinish}>
+        {/* <FormItem name="account" valueFormat={(e) => e.detail}> */}
+
+        <View style={{display: 'flex'}}>
+          <View className="page-section-title">账号</View>
+          <Input
+            border
+            name="account"
+            leftIcon={user}
+            errorMessage={accErr}
+            placeholder="请输入您的登录账号"
+          ></Input>
+        </View>
+
+        {/* </FormItem> */}
+        {/* <FormItem name="password" valueFormat={(e) => e.detail}>
+          <Field
+            password
+            label="密码"
+            leftIcon={password}
+            errorMessage={pwdErr}
+            placeholder="请输入您的登录密码"
+          ></Field>
+        </FormItem> */}
+        {/* <View className="forget-password" onClick={onForgetPwd}>
+          忘记密码?
+        </View> */}
+        <View>
+          <Button
+            block
+            type="primary"
+            formType="submit"
+            loading={loading}
+            // disabled={loading}
+            // onClick={handleClick}
+          >
+            登录
+          </Button>
+        </View>
+      </Form>
+    </View>
+  );
+};

src/pages/login/index.jsx

@@ -3,9 +3,11 @@ import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
 import Page from '@/layouts/index';
 import Head from "./components/Head";
-import Form from "./components/Form";
-import Bottom from "./components/Bottom";
+// import Form1 from "./components/Form1";
+// import Bottom from "./components/Bottom";
 import './index.less'
+import Forms from './components/Forms';
+import Form1 from './components/Form1';
 
 export default (props) => {
 
@@ -19,7 +21,7 @@ export default (props) => {
     <Page>
       <View className="login-box">
         <Head />
-        <Form onSuccess={onSuccess} />
+        <Form1 onSuccess={onSuccess} />
         {/* H5此无功能 */}
         {/* <Bottom onSuccess={onSuccess} /> */}
       </View>

src/pages/my/index.jsx

@@ -15,7 +15,7 @@ import styles from './style.module.less';
 
 export default (props) => {
 
-  const { user, person, duty, signOut, changePwd } = useModel('user');
+  const { user,  duty, signOut, changePwd } = useModel('user');
   const [org, setOrg] = React.useState();
 
   const [
@@ -67,8 +67,8 @@ export default (props) => {
       <VABC
         header={(
           <Head
-            avatar={user?.avatar || person?.avatar || logo}
-            name={user?.name || person?.name || '市民'}
+            avatar={user?.avatar || logo}
+            name={user?.name  || '市民'}
             onChangePwd={onChangePwd}
             onExit={onExit}
           />

src/store/user.js

@@ -64,8 +64,8 @@ export default function useUser() {
   const current = () => {
     currentUser()
       .then((res) => {
-        setUser(res.user);
-        initDuty(res.user);
+        setUser(res?.user);
+        initDuty(res?.user);
       })
       .catch((e) => {
         console.log(e);
@@ -76,7 +76,7 @@ export default function useUser() {
     return authPhone(code).then((res) => {
       setUser(res.user);
       initDuty(res.user);
-      setPerson(res.person);
+      // setPerson(res.person);
     });
   };