F

babel.config.js

@@ -4,7 +4,9 @@ module.exports = {
   presets: [
     ['taro', {
       framework: 'react',
-      ts: false
+      ts: false,
+      // hot:false,
+      // 'dynamic-import-node': true,
     }]
   ],
   plugins: [

config/dev.js

@@ -10,6 +10,7 @@ module.exports = {
     DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02
     VERSION: '"1.1.13-20230325"',
   },
+  // isWatch:true,
   mini: {},
   h5: {},
 };

config/index.js

@@ -1,59 +1,104 @@
-const path = require('path');
+import { defineConfig } from "@tarojs/cli";
 
-const config = {
-  projectName: 'civilized-miniapp',
-  date: '2022-12-12',
-  designWidth: 750,
-  deviceRatio: {
-    640: 2.34 / 2,
-    750: 1,
-    828: 1.81 / 2
-  },
-  sourceRoot: 'src',
-  outputRoot: 'dist',
-  plugins: [],
-  defineConstants: {
-  },
-  copy: {
-    patterns: [
-      { from: 'src/assets/tabbar/', to: 'dist/assets/tabbar/' },
-    ],
-    options: {
-    }
-  },
-  framework: 'react',
-  compiler: 'webpack4',
-  alias: {
-    '@': path.resolve(__dirname, '..', 'src'),
-  },
-  mini: {
-    postcss: {
-      pxtransform: {
-        enable: true,
-        config: {
+const path = require("path");
 
-        }
+import devConfig from "./dev";
+import prodConfig from "./prod";
+
+export default defineConfig(async (merge, { command, mode }) => {
+  const config = {
+    projectName: "civilized-miniapp",
+    date: "2024-03-21",
+    designWidth: 750,
+    deviceRatio: {
+      640: 2.34 / 2,
+      750: 1,
+      828: 1.81 / 2,
+    },
+
+    sourceRoot: "src",
+    outputRoot: "dist",
+    plugins: [],
+    defineConstants: {},
+    copy: {
+      patterns: [{ from: "src/assets/tabbar/", to: "dist/assets/tabbar/" }],
+      options: {},
+    },
+    framework: "react",
+    compiler: "webpack4",
+    alias: {
+      "@": path.resolve(__dirname, "..", "src"),
+    },
+  
+    mini: {
+      postcss: {
+        pxtransform: {
+          enable: true,
+          config: {},
+        },
+        url: {
+          enable: true,
+          config: {
+            limit: 1024, // 设定转换尺寸上限
+          },
+        },
+        cssModules: {
+          enable: true, // 默认为 false，如需使用 css modules 功能，则设为 true
+          config: {
+            namingPattern: "module", // 转换模式，取值为 global/module
+            generateScopedName: "[name]__[local]___[hash:base64:5]",
+          },
+        },
       },
-      url: {
-        enable: true,
-        config: {
-          limit: 1024 // 设定转换尺寸上限
-        }
+    },
+    h5: {
+      publicPath: "/",
+      staticDirectory: "static",
+      outputDir: 'dist',
+      router : {
+        mode : "hash",
+        // base : "./"
       },
-      cssModules: {
-        enable: true, // 默认为 false，如需使用 css modules 功能，则设为 true
-        config: {
-          namingPattern: 'module', // 转换模式，取值为 global/module
-          generateScopedName: '[name]__[local]___[hash:base64:5]'
-        }
-      }
-    }
-  },
-}
-
-module.exports = function (merge) {
-  if (process.env.NODE_ENV === 'development') {
-    return merge({}, config, require('./dev'))
+      // output: {
+      //   filename: "js/[name].[hash:8].js",
+      //   chunkFilename: "js/[name].[chunkhash:8].js",
+      // },
+      miniCssExtractPluginOption: {
+        ignoreOrder: true,
+        filename: "css/[name].[hash].css",
+        chunkFilename: "css/[name].[chunkhash].css",
+      },
+      postcss: {
+        autoprefixer: {
+          enable: true,
+          config: {},
+        },
+        cssModules: {
+          enable: false, // 默认为 false，如需使用 css modules 功能，则设为 true
+          config: {
+            namingPattern: "module", // 转换模式，取值为 global/module
+            generateScopedName: "[name]__[local]___[hash:base64:5]",
+          },
+        },
+      },
+      // devServer: {
+      //   host: "0.0.0.0",
+      //   // port: ,
+      //   proxy: {
+      //     "/api": {
+      //       target: "http://127.0.0.1:9087", // 服务端地址
+      //       pathRewrite: {
+      //         '/api': ''
+      //       },
+      //       changeOrigin: true,
+      //     },
+      //   },
+      // },
+    },
+ 
+  };
+  if (process.env.NODE_ENV === "development") {
+    return merge({}, config, devConfig);
   }
-  return merge({}, config, require('./prod'))
-}
+  return merge({}, config, prodConfig);
+});

config/prod.js

@@ -1,13 +1,13 @@
 module.exports = {
   env: {
-    NODE_ENV: '"production"'
+    NODE_ENV: '"production"',
   },
   defineConstants: {
-    HOST: '"http://192.168.89.147:9087"',
-    // HOST: '"https://wmcj.huoshannews.com"',
+    // HOST: '"http://192.168.89.147:9087"',
+    HOST: '"https://wmcj.huoshannews.com"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
     DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02
-    VERSION: '"1.1.27-20230612"',
+    VERSION: '"1.1.29-20240224"',
   },
   mini: {},
   h5: {
@@ -15,28 +15,34 @@ module.exports = {
      * WebpackChain 插件配置
      * @docs https://github.com/neutrinojs/webpack-chain
      */
-    webpackChain (chain) {
+    // webpackChain(chain) {
       /**
        * 如果 h5 端编译后体积过大，可以使用 webpack-bundle-analyzer 插件对打包体积进行分析。
        * @docs https://github.com/webpack-contrib/webpack-bundle-analyzer
        */
-      chain.plugin('analyzer')
-        .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin, [])
+      // chain
+      //   .plugin("analyzer")
+      //   .use(require("webpack-bundle-analyzer").BundleAnalyzerPlugin, []);
 
       /**
        * 如果 h5 端首屏加载时间过长，可以使用 prerender-spa-plugin 插件预加载首页。
        * @docs https://github.com/chrisvfritz/prerender-spa-plugin
        */
-      const path = require('path')
-      const Prerender = require('prerender-spa-plugin')
-      const staticDir = path.join(__dirname, '..', 'dist')
-      chain
-        .plugin('prerender')
-        .use(new Prerender({
-          staticDir,
-          routes: [ '/pages/index/index' ],
-          postProcess: (context) => ({ ...context, outputPath: path.join(staticDir, 'index.html') })
-        }))
-    }
-  }
-}
+      // const path = require("path");
+      // const Prerender = require("prerender-spa-plugin");
+      // const staticDir = path.join(__dirname, "..", "dist");
+      // chain.plugin("prerender").use(
+      //   new Prerender({
+      //     staticDir,
+      //     routes: ["/pages/index/index"],
+      //     postProcess: (context) => ({
+      //       ...context,
+      //       outputPath: path.join(staticDir, "index.html"),
+      //     }),
+      //   })
+      // );
+    },
+  // },
+
+
+};

jsconfig.json

@@ -2,9 +2,13 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/*": [
-        "./src/*"
-      ]
-    }
-  }
-}
+      "@/*": ["./src/*"]
+    },
+    // 解决prettier对于装饰器语法的警告
+    "experimentalDecorators": true,
+    // 解决.jsx文件无法快速跳转的问题
+    "jsx": "preserve"
+  },
+  //提高  性能
+  "exclude": ["node_modules", "dist", "build"]
+}

package.json

@@ -35,43 +35,53 @@
   ],
   "author": "",
   "dependencies": {
-    "@antmjs/vantui": "^2.3.5",
+    "@antmjs/vantui": "2.5.0",
     "@babel/runtime": "^7.7.7",
-    "@tarojs/components": "3.5.7",
-    "@tarojs/helper": "3.5.7",
-    "@tarojs/plugin-framework-react": "3.5.7",
-    "@tarojs/plugin-platform-weapp": "3.5.7",
-    "@tarojs/react": "3.5.7",
+    "@tarojs/components": "3.6.25",
+    "@tarojs/helper": "3.6.25",
+    "@tarojs/plugin-framework-react": "3.6.25",
+    "@tarojs/plugin-platform-h5": "3.6.25",
+    "@tarojs/plugin-platform-weapp": "3.6.25",
+    "@tarojs/plugin-platform-harmony-hybrid": "3.6.25",
+    "@tarojs/shared": "3.6.25",
+    "@tarojs/react": "3.6.25",
     "@tarojs/router": "3.5.7",
-    "@tarojs/runtime": "3.5.7",
-    "@tarojs/shared": "3.5.7",
-    "@tarojs/taro": "3.5.7",
-    "@tarojs/taro-h5": "3.5.7",
+    "@tarojs/runtime": "3.6.25",
+    "@tarojs/taro": "3.6.25",
     "@zjxpcyc/js_event": "^1.0.0",
     "@zjxpcyc/react-tiny-store": "^2.0.1",
     "echarts": "5.4.1",
     "echarts-for-weixin": "^1.0.2",
     "md5": "^2.3.0",
+    "postcss-modules": "^6.0.0",
     "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react-dom": "^18.0.0",
+    "taro": "^0.0.7",
+    "taro-ui": "^3.3.0"
   },
   "devDependencies": {
     "@babel/core": "^7.8.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
-    "@tarojs/cli": "3.5.7",
-    "@tarojs/mini-runner": "3.5.7",
-    "@tarojs/webpack-runner": "3.5.7",
+    "react-refresh": "^0.11.0",
+    "@tarojs/cli": "3.6.25",
+    "@tarojs/test-utils-react": "^0.1.1",
+    "@tarojs/mini-runner": "3.6.25",
+    "@tarojs/webpack-runner": "3.6.25",
     "@types/react": "^18.0.0",
     "@types/webpack-env": "^1.13.6",
     "babel-plugin-import": "^1.13.5",
-    "babel-preset-taro": "3.5.7",
+    "babel-preset-taro": "3.6.25",
     "eslint": "^8.12.0",
-    "eslint-config-taro": "3.5.7",
+    "eslint-config-taro": "3.6.25",
     "eslint-plugin-import": "^2.12.0",
     "eslint-plugin-react": "^7.8.2",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "react-refresh": "^0.11.0",
+    "@types/node": "^18.15.11",
+    "@types/jest": "^29.3.1",
+    "jest": "^29.3.1",
+    "jest-environment-jsdom": "^29.5.0",
     "stylelint": "^14.4.0",
+    "postcss": "^8.4.18",
     "webpack": "4.46.0"
   }
 }

src/pages/login/components/Bottom.jsx

@@ -1,7 +1,8 @@
 import React from 'react';
 import { View, Image, Button } from '@tarojs/components';
-import Icon from '@/assets/image/WeChat.png';
+// import Icon from '@/assets/image/WeChat.png';
 import { useModel } from '@/store';
+import { Icon } from '@antmjs/vantui';
 import style from './bottom.module.less';
 
 export default (props) => {
@@ -16,15 +17,16 @@ export default (props) => {
 
   return (
     <View>
-      <View className={style['txt-box2']}>—— 没有账号？微信登录 ——</View>
+      <View className={style['txt-box2']}>—— 没有账号？手机号快捷登录 ——</View>
       <View className={style['img-box2']}>
         <Button openType="getPhoneNumber" onGetPhoneNumber={onGetPhoneNumber}>
-          <Image className={style['img-wechat']}
+          {/* <Image className={style['img-wechat']}
             src={Icon}
-          />
+          /> */}
+          <Icon name="phone" size="32px" color='green' style={{ marginTop: '10px' }} />
         </Button>
       </View>
-      <View className={style['wechat-login']}>微信登录</View>
+      <View className={style['wechat-login']}>手机号快捷登录</View>
     </View>
   )
 }