F

babel.config.js

@@ -8,14 +8,14 @@ module.exports = {
     }]
   ],
   plugins: [
-    [
-      "import",
-      {
-        libraryName: "@antmjs/vantui",
-        libraryDirectory: "es",
-        style: (name) => `${name}/style/less`,
-      },
-      "@antmjs/vantui"
-    ]
+    // [
+    //   "import",
+    //   {
+    //     libraryName: "@antmjs/vantui",
+    //     libraryDirectory: "es",
+    //     style: (name) => `${name}/style/less`,
+    //   },
+    //   "@antmjs/vantui"
+    // ]
   ]
 }

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.13:9087"',
+    // HOST: '"http://127.0.0.1:9087"',
+    HOST: '"http://192.168.89.13:9087"',
     // HOST: '"https://wmcj.huoshannews.com"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
     DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02

config/index.js

@@ -10,7 +10,13 @@ export default defineConfig(async (merge, { command, mode }) => {
   const config = {
     projectName: "civilized-miniapp",
     date: "2024-03-21",
-    designWidth: 750,
+    designWidth(input) {
+      console.log('---->', input?.file)
+      // if (input?.file.replace(/\\+/g, '/').indexOf('@antmjs/vantui') > -1) {
+      //   return 750
+      // }
+      return 750
+    },
     deviceRatio: {
       640: 2.34 / 2,
       750: 1,
@@ -61,16 +67,29 @@ export default defineConfig(async (merge, { command, mode }) => {
       router: {
         mode: "hash",
       },
+      esnextModules: ['@antmjs'],
+      // miniCssExtractPluginOption: {
+      //   ignoreOrder: true,
+      //   filename: "css/[name].[hash].css",
+      //   chunkFilename: "css/[id].css",
+      // },
+
       postcss: {
+        autoprefixer: {
+          enable: true,
+          config: {
+          }
+        },
+     
         pxtransform: {
           enable: true,
           config: {
-            // // 设置rpx转换为目标单位为rem
+            // 设置rpx转换为目标单位为rem
             // unitToRem: true,
             // // 设计稿宽度与 rem 基准值，默认设计稿宽度为 750，即 1rem = 75px
             // designWidth: 750,
             // // 可选，选择器黑名单
-            // selectorBlackList: ["body"],
+            // selectorBlackList: [],
             // // // 可选，替换rpx为其他单位后缀，例如 'px' 或 'rem'
             // propList: ["*"],
             // // 可选，媒体查询中是否禁用转换

src/app.js

@@ -3,18 +3,11 @@ import store, { Provider, getState } from "@/store";
 import "./app.less";
 import { useEffect, useMemo } from "react";
 // import wxsdk from "./utils/wx";
+import '@antmjs/vantui/lib/index.less'
+// import '@antmjs/vantui/lib/index.css'
 
 const App = (props) => {
-  // useEffect(async() => {
-  //   const userState = store.getState("user");
 
-  //   // 等待组件挂载完成
-  //   await Promise.resolve();
-
-  //   // 然后执行异步操作
-  //   await userState.login(123);
-  //   userState.current();
-  // }, []);
   const init = async () => {
     console.log(11111111111)
     const userState = store.getState("user");

src/components/Icon.jsx

@@ -1,6 +1,4 @@
 import React from 'react';
-import Taro from '@tarojs/taro';
-import { Image } from '@tarojs/components';
 import { Icon } from '@antmjs/vantui';
 import icon1 from '@/assets/icons/icon1.png';
 import icon2 from '@/assets/icons/icon2.png';

src/layouts/index.jsx

@@ -1,18 +1,20 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View, Image } from '@tarojs/components';
-import { useModel } from '@/store';
-import { Loading, Notify, Dialog } from '@antmjs/vantui';
-import NavLoading from '@/components/NavLoading';
-import Auth from '@/components/Auth';
-import TabBar from './TabBar';
-import laySty from './layout.module.less';
+import React from "react";
+import Taro from "@tarojs/taro";
+import { View, Image } from "@tarojs/components";
+import { useModel } from "@/store";
+import { Loading, Notify, Dialog } from "@antmjs/vantui";
+import NavLoading from "@/components/NavLoading";
+import Auth from "@/components/Auth";
+import TabBar from "./TabBar";
+import laySty from "./layout.module.less";
 
 export default (props) => {
   const { className, style, roles, tabBar = false, loading } = props;
 
-  const { person, user, duty } = useModel('user');
-  const containerClass = `${laySty['page-conatiner']} ${tabBar ? laySty['with-tabbar'] : ''} ${className}`;
+  const { person, user, duty } = useModel("user");
+  const containerClass = `${laySty["page-conatiner"]} ${
+    tabBar ? laySty["with-tabbar"] : ""
+  } ${className}`;
 
   // React.useEffect(() => {
   //   if (person && !user) {
@@ -25,40 +27,43 @@ export default (props) => {
   //   }
   // }, [person, user]);
 
+  React.useMemo(() => {
+    if (person && !user) {
+      const currentPage = Taro.getCurrentPages().slice().pop();
+      if ("pages/login/index" !== currentPage.route) {
+        Taro.navigateTo({
+          url: "/pages/login/index",
+        });
+      }
+    }
+  }, []);
+
   Taro.useShareAppMessage(() => {
     return {
-      title: '文明霍山'
+      title: "文明霍山",
     };
   });
 
   return (
-      <View className={laySty['page-wrapper']}>
-        <Notify id="vanNotify" />
-        <Dialog id="vanDialog" />
-        <NavLoading loading={loading} />
-        <View className={containerClass} style={style}>
-          {
-            !person && (
-              <View className={laySty.loading}>
-                <Loading size="32px" vertical>
-                  加载中...
-                </Loading>
-              </View>
-            )
-          }
-          <Auth roles={roles}>
-            {props.children}
-          </Auth>
+    <View className={laySty["page-wrapper"]}>
+      <Notify id="vanNotify" />
+      <Dialog id="vanDialog" />
+      <NavLoading loading={loading} />
+      <View className={containerClass} style={style}>
+        {!person && (
+          <View className={laySty.loading}>
+            <Loading size="32px" vertical>
+              加载中...
+            </Loading>
+          </View>
+        )}
+        <Auth roles={roles}>{props.children}</Auth>
 
-          {
-            !tabBar && (
-              <View className={laySty['pdm-space']}></View>
-            )
-          }
-        </View>
-        {
-          tabBar && <TabBar className={laySty['page-tabbar']} active={tabBar} duty={duty} />
-        }
+        {!tabBar && <View className={laySty["pdm-space"]}></View>}
       </View>
-  )
-}
+      {tabBar && (
+        <TabBar className={laySty["page-tabbar"]} active={tabBar} duty={duty} />
+      )}
+    </View>
+  );
+};

src/pages/home/index.jsx

@@ -84,7 +84,7 @@ export default (props) => {
 
     return menus[duty];
   }, [duty])
-
+console.log(menuArr)
   return (
     <Page tabBar="home" className="home-page">
       <Head