F

config/dev.js

@@ -4,10 +4,10 @@ module.exports = {
   },
   defineConstants: {
     // HOST: '"http://127.0.0.1:9087"',
-    HOST: '"http://192.168.89.13:9087"',
+    HOST: '""',
     // HOST: '"https://wmcj.huoshannews.com"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
-    DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02
+    DEFAULT_POS: '"116.34761502876347,31.40974743425614"', // 霍山县人民政府 gcj02
     VERSION: '"1.1.13-20230325"',
   },
   // isWatch:true,

config/index.js

@@ -4,18 +4,19 @@ const path = require("path");
 
 import devConfig from "./dev";
 import prodConfig from "./prod";
-const url = "http://127.0.0.1:9087";
+const url = "http://localhost:9087";
+const url2 = "https://apis.map.qq.com";
 
 export default defineConfig(async (merge, { command, mode }) => {
   const config = {
     projectName: "civilized-miniapp",
     date: "2024-03-21",
     designWidth(input) {
-      console.log('---->', input?.file)
+      console.log("---->", input?.file);
       // if (input?.file.replace(/\\+/g, '/').indexOf('@antmjs/vantui') > -1) {
       //   return 750
       // }
-      return 750
+      return 750;
     },
     deviceRatio: {
       640: 2.34 / 2,
@@ -60,27 +61,19 @@ export default defineConfig(async (merge, { command, mode }) => {
     //   },
     // },
     h5: {
-      esnextModules: ["@antmjs"],
       publicPath: "/",
       staticDirectory: "static",
       outputDir: "dist",
       router: {
         mode: "hash",
       },
-      esnextModules: ['@antmjs'],
-      // miniCssExtractPluginOption: {
-      //   ignoreOrder: true,
-      //   filename: "css/[name].[hash].css",
-      //   chunkFilename: "css/[id].css",
-      // },
-
+      esnextModules: ["@antmjs"],
       postcss: {
         autoprefixer: {
           enable: true,
-          config: {
-          }
+          config: {},
         },
-     
+
         pxtransform: {
           enable: true,
           config: {
@@ -108,13 +101,18 @@ export default defineConfig(async (merge, { command, mode }) => {
       },
       devServer: {
         proxy: {
-          "/api": {
-            target: url, // 服务端地址
+          "/api2": {
+            target: url2, // 服务端地址
+            changeOrigin: true,
             pathRewrite: {
-              "^/api": "",
+              "^/api2": "",
             },
+          },
+          "/api": {
+            target: url, // 服务端地址
             changeOrigin: true,
           },
+         
         },
       },
     },

config/prod.js

@@ -6,7 +6,7 @@ module.exports = {
     // HOST: '"http://192.168.89.147:9087"',
     HOST: '"https://wmcj.ycjcjy.com"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
-    DEFAULT_POS: '"118.91,32.07"', // gcj02
+    DEFAULT_POS: '"31.416373,116.373904"', // gcj02
     VERSION: '"1.1.29-20240224"',
   },
   mini: {},

src/app.js

@@ -3,25 +3,19 @@ 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.less";
 // import '@antmjs/vantui/lib/index.css'
 
 const App = (props) => {
-
-  const init = async () => {
-    console.log(11111111111)
+  const init = () => {
     const userState = store.getState("user");
-    // 等待组件挂载完成
-    await Promise.resolve();
 
-    // 然后执行异步操作
-    await userState.login(123);
-    await userState.current();
+    userState.login(123);
+    userState.current();
   };
- 
 
   useEffect(() => {
-    init()
+    init();
   }, []);
 
   return <Provider>{props.children}</Provider>;

src/app.less

@@ -22,14 +22,17 @@
   }
 
   .van-cell {
-    font-size: var(--cell-font-size, 32rpx) !important;
+    // font-size: var(--cell-font-size, 16px) !important;
   }
 
   .van-field__control {
-    font-size: var(--field-font-size, 30rpx) !important;
+    font-size: var(--field-font-size, 16px) !important;
 
   }
-
+  // .van-icon--image{
+  //   // width: 100%;
+  //   // height: 100%;
+  // }
 
 }
 

src/components/H5Map/index.jsx

@@ -0,0 +1,52 @@
+import Taro from "@tarojs/taro";
+import { getLocation, h5GetLocation } from "@/utils/authorize";
+import React from "react";
+import { useEffect } from "react";
+export default (props) => {
+  const { location, onChange } = props;
+  useEffect(() => {
+    if (location) {
+      console.log(location)
+      const [lat, lng] = (location || DEFAULT_POS).split(",");
+   
+      const center = new TMap.LatLng(parseFloat(lat), parseFloat(lng));
+      new TMap.Map("container", {
+        rotation: 20, //设置地图旋转角度
+        pitch: 30, //设置俯仰角度（0~45）
+        zoom: 20, //设置地图缩放级别
+        center: center, //设置地图中心点坐标
+      });
+    }
+  }, [location]);
+
+  useEffect(() => {
+    fixedLocation().then((res) => {
+      console.log(res);
+      const {lat,lng   } = res.location;
+      onChange([lat,lng].join(","));
+    });
+  }, []);
+
+  const fixedLocation = () => {
+    return new Promise((resolve) => {
+      Taro.showLoading({
+        title: "加载中",
+      });
+      return h5GetLocation()
+        .then((res) => {
+          Taro.hideLoading();
+          resolve(res.data.result);
+        })
+        .catch((err) => {
+          console.error(err);
+          Taro.hideLoading();
+          Taro.showToast({
+            title: "定位失败",
+            icon: "none",
+          });
+        });
+    });
+  };
+
+  return <div id="container"></div>;
+};

src/components/MenuIcon.jsx

@@ -12,16 +12,16 @@ const wrapperStyle = {
 }
 
 const iconStyle = {
-  width: '100rpx',
-  height: '100rpx',
+  width: '50px',
+  height: '50px',
   margin: 'auto',
   display: 'block',
 }
 
 const txtStyle = {
-  marginTop: '20rpx',
+  marginTop: '10px',
   textAlign: 'center',
-  fontSize: '30rpx',
+  fontSize: '15px',
   color: '#202020',
 }
 

src/components/PowerList/index.jsx

@@ -128,7 +128,7 @@ export default React.forwardRef((props, ref) => {
       finished={finished}
       onScrollToLower={onScrollToLower}
       style={{ height: "100%", overflowY: "auto" }}
-      renderLoading={loading ? <view>加载中...</view> : <view></view>}
+      renderLoading={loading ? <View>加载中...</View> : <View></View>}
     >
       {list.map(renderItem)}
     </PowerScrollView>

src/components/Uploader/index.jsx

@@ -1,11 +1,11 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View, Image, Video } from '@tarojs/components';
-import { Loading } from '@antmjs/vantui';
-import { uploadFiles } from '@/utils/request';
-import icon from '@/assets/icons/uploader.png';
-import closeIcon from '@/assets/icons/close.png';
-import style from './style.modules.less';
+import React from "react";
+import Taro from "@tarojs/taro";
+import { View, Image, Video } from "@tarojs/components";
+import { Loading } from "@antmjs/vantui";
+import { uploadFiles } from "@/utils/request";
+import icon from "@/assets/icons/uploader.png";
+import closeIcon from "@/assets/icons/close.png";
+import style from "./style.modules.less";
 
 export default (props) => {
   // value 为数组
@@ -22,72 +22,77 @@ export default (props) => {
     setLoading(true);
     Taro.chooseMedia({
       maxDuration: 60,
-      sizeType: 'compressed',
+      // sizeType: "compressed",
       success: (res) => {
         const { tempFiles } = res;
-        uploadFiles(tempFiles).then(resp => {
-          setLoading(false);          
-          onChange((value || []).concat(resp));
-        }).catch((err) => {
-          console.error(err);
-          setLoading(false);
-        })
+        uploadFiles(tempFiles)
+          .then((resp) => {
+            setLoading(false);
+            onChange((value || []).concat(resp));
+          })
+          .catch((err) => {
+            console.error(err);
+            setLoading(false);
+          });
       },
       fail: (err) => {
         console.error(err);
         setLoading(false);
-      }
-    })
-  }
+      },
+    });
+  };
 
   const onDelete = (item) => {
-    const newVal = value.filter(x => x.url != item.url);
+    const newVal = value.filter((x) => x.url != item.url);
     onChange(newVal);
-  }
+  };
 
   const onPreview = (inx) => {
-    Taro.previewMedia({
-      sources: value.map(x => ({ url: x.url, type: x.fileType })),
-      current: inx,
-    })
-  }
+    const url = value.map((x) => x.url);
+    // Taro.previewMedia({
+    //   sources: value.map(x => ({ url: x.url, type: x.fileType })),
+    //   current: inx,
+    // })
+
+    //H5
+    Taro.previewImage({
+      current: inx, // 当前显示图片的http链接
+      urls: url,
+    });
+  };
 
   return (
-    <View className={style['uploader-wrapper']}>
-      <View className={style['uploader-box']}>
-        {
-          !disabled && (
-            <View className={style['uploader-add']}>
-              <Image src={icon} onClick={onAdd} />
-              {
-                loading && (
-                  <View>
-                    <Loading color="#fff" />
-                  </View>
-                )
-              }
-            </View>
-          )
-        }
-        {
-          (value || []).map((item, inx) => (
-            <View key={item.url} className={style['uploader-item']}>
-              {
-                item.fileType == 'image' ?
-                  <Image src={item.url} onClick={() => onPreview(inx)} /> :
-                  <Video src={item.url} controls={false} onClick={() => onPreview(inx)} />
-              }
-              {
-                !disabled && (
-                  <View onClick={() => onDelete(item)}>
-                    <Image src={closeIcon} />
-                  </View>
-                )
-              }
-            </View>
-          ))
-        }
+    <View className={style["uploader-wrapper"]}>
+      <View className={style["uploader-box"]}>
+        {!disabled && (
+          <View className={style["uploader-add"]}>
+            <Image src={icon} onClick={onAdd} />
+            {loading && (
+              <View>
+                <Loading color="#fff" />
+              </View>
+            )}
+          </View>
+        )}
+        {(value || []).map((item, inx) => (
+          <View key={item.url} className={style["uploader-item"]}>
+            {item.fileType.indexOf("image") == 0 ? (
+              <Image src={item.url} onClick={() => onPreview(inx)} />
+            ) : (
+              <Video
+                src={item.url}
+                controls={false}
+                onClick={() => onPreview(inx)}
+              />
+            )}
+            {!disabled && (
+              <View onClick={() => onDelete(item)}>
+                <Image src={closeIcon} />
+              </View>
+            )}
+          </View>
+        ))}
       </View>
     </View>
-  )
-}
+  );
+};

src/components/map/index copy.jsx

@@ -0,0 +1,148 @@
+import React, { useEffect } from "react";
+import Taro from "@tarojs/taro";
+import { View, Map } from "@tarojs/components";
+import { Icon, Loading } from "@antmjs/vantui";
+import { getLocation } from "@/utils/authorize";
+import iconPath from "@/assets/icons/marker.png";
+import style from "./style.module.less";
+
+/**
+ * 这里使用2个map, 每个 map 负责不同的场景
+ * 如果使用 1 个map, 通过属性去控制, 微信暂时有 bug 比如 showLocation 就有bug
+ */
+export default (props) => {
+  const { readOnly, location, onChange } = props;
+
+  console.log("-----map---readOnly---", readOnly, location);
+
+  const id = React.useMemo(
+    () => `map-${Math.random().toString(36).substring(2, 10)}`,
+    []
+  );
+  const idReadOnly = React.useMemo(
+    () => `map-${Math.random().toString(36).substring(2, 10)}`,
+    []
+  );
+  const mapCtxRef = React.useRef();
+
+  const [markers, center] = React.useMemo(() => {
+    // eslint-disable-next-line no-undef
+    const loc = location || DEFAULT_POS;
+    const [longitude, latitude] = loc.split(",");
+
+    const mks = readOnly
+      ? [
+          {
+            id: 1,
+            longitude,
+            latitude,
+            iconPath,
+            width: 17,
+            height: 20,
+          },
+        ]
+      : [];
+
+    return [mks, { longitude, latitude }];
+  }, [location, readOnly]);
+
+  console.log("------center-------", center, location);
+
+  const moveTo = (ctx, point) => {
+    ctx.moveToLocation({
+      ...point,
+      fail: console.error,
+    });
+  };
+
+  const getContext = React.useCallback(() => {
+    const query = Taro.createSelectorQuery();
+    query
+      .select(`#${id}`)
+      .boundingClientRect((res) => {
+        console.log(res);
+        mapCtxRef.current = res.context;
+
+        // 修改中心图标 - 暂时不起作用, wx bug
+        mapCtxRef.current.setLocMarkerIcon({
+          iconPath,
+          fail: console.error,
+        });
+      })
+      .exec();
+  }, [id]);
+
+  const fixedLocation = () => {
+    return new Promise((resolve) => {
+      Taro.showLoading({
+        title: "加载中",
+      });
+      getLocation({ type: "wgs84" })
+        .then((res) => {
+          Taro.hideLoading();
+          resolve(res);
+        })
+        .catch((err) => {
+          console.error(err);
+          Taro.hideLoading();
+          Taro.showToast({
+            title: "定位失败",
+            icon: "none",
+          });
+        });
+    });
+  };
+
+  const onRefresh = () => {
+    if (mapCtxRef.current) {
+      fixedLocation().then((res) => {
+        const { longitude, latitude } = res;
+        // console.log('longitude', longitude);
+        // console.log('latitude', latitude);
+        onChange([res.longitude, res.latitude].join(","));
+        moveTo(mapCtxRef.current, { longitude, latitude });
+      });
+    }
+  };
+
+  React.useEffect(() => {
+    if (!readOnly) {
+      getContext();
+
+      // 获取定位
+      fixedLocation().then((res) => {
+        const { longitude, latitude } = res;
+        onChange([longitude, latitude].join(","));
+      });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [readOnly, getContext]);
+
+  return (
+    <View className={style["map-wrapper"]}>
+
+      {/* {
+        !readOnly && (
+          <Map
+            id={id}
+            showLocation
+            longitude={center.longitude}
+            latitude={center.latitude}
+          >
+            <Icon name="aim" size="24px" onClick={onRefresh} color="#1A7565" className={style['icon']} />
+          </Map>
+        )
+      }
+      {
+        readOnly && (
+          <Map
+            id={idReadOnly}
+            longitude={center.longitude}
+            latitude={center.latitude}
+            markers={markers}
+          />
+        )
+      } */}
+    </View>
+  );
+};

src/components/map/index.jsx

@@ -1,10 +1,10 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View, Map } from '@tarojs/components';
-import { Icon, Loading } from '@antmjs/vantui';
-import { getLocation } from '@/utils/authorize';
-import iconPath from '@/assets/icons/marker.png';
-import style from './style.module.less';
+import React, { useEffect, useMemo } from "react";
+import Taro from "@tarojs/taro";
+import { View, Map } from "@tarojs/components";
+import { Icon, Loading } from "@antmjs/vantui";
+import { getLocation, h5GetLocation } from "@/utils/authorize";
+import iconPath from "@/assets/icons/marker.png";
+import style from "./style.module.less";
 
 /**
  * 这里使用2个map, 每个 map 负责不同的场景
@@ -13,126 +13,111 @@ import style from './style.module.less';
 export default (props) => {
   const { readOnly, location, onChange } = props;
 
-  console.log('-----map---readOnly---', readOnly, location);
+  console.log("-----map---readOnly---", readOnly, location);
 
-  const id = React.useMemo(() => `map-${Math.random().toString(36).substring(2, 10)}`, []);
-  const idReadOnly = React.useMemo(() => `map-${Math.random().toString(36).substring(2, 10)}`, []);
+  const id = React.useMemo(
+    () => `map-${Math.random().toString(36).substring(2, 10)}`,
+    []
+  );
+  const idReadOnly = React.useMemo(
+    () => `map-${Math.random().toString(36).substring(2, 10)}`,
+    []
+  );
   const mapCtxRef = React.useRef();
 
-  const [
-    markers,
-    center,
-  ] = React.useMemo(() => {
-    // eslint-disable-next-line no-undef
-    const loc = location || DEFAULT_POS;
-    const [longitude, latitude] = loc.split(',');
-
-    const mks = readOnly ? [{
-      id: 1,
-      longitude,
-      latitude,
-      iconPath,
-      width: 17,
-      height: 20
-    }] : [];
-
-    return [
-      mks,
-      { longitude, latitude }
-    ]
-  }, [location, readOnly]);
-
-  console.log('------center-------', center, location)
-
-  const moveTo = (ctx, point) => {
-    ctx.moveToLocation({
-      ...point,
-      fail: console.error,
-    })
-  }
+  useEffect(() => {
+    let map, marker;
+    if (!mapCtxRef.current) {
+      if (location) {
+        console.log(location);
+        console.log(DEFAULT_POS);
+        const [lng, lat] = (location || DEFAULT_POS).split(",");
+        console.log(lng, lat)
+        const center = new TMap.LatLng(parseFloat(lat), parseFloat(lng));
+        map = new TMap.Map("container", {
+          rotation: 20, //设置地图旋转角度
+          pitch: 30, //设置俯仰角度（0~45）
+          zoom: 20, //设置地图缩放级别
+          center: center, //设置地图中心点坐标
+        });
+
+        const isRemove = [
+          {
+            id: "demo",
+            styleId: "marker",
+            position: center,
+            properties: {
+              title: "marker",
+            },
+          },
+        ];
+        marker = new TMap.MultiMarker({
+          id: "marker-layer",
+          map: map,
+          geometries: isRemove,
+        });
+      }
 
-  const getContext = React.useCallback(() => {
-    const query = Taro.createSelectorQuery();
-    query.select(`#${id}`).context(res => {
-      mapCtxRef.current = res.context;
+      mapCtxRef.current = map;
+    } else {
+      map = mapCtxRef.current;
+    }
 
-      // 修改中心图标 - 暂时不起作用, wx bug
-      mapCtxRef.current.setLocMarkerIcon({
-        iconPath,
-        fail: console.error,
-      })
-    }).exec();
-  }, [id]);
+    if (map && marker) {
+      console.log("-------------------------");
+      console.log(marker);
+      console.log(map);
+      getMarker(map, marker);
+    }
+  }, [location]);
+
+  const getMarker = (map, marker) => {
+    if (readOnly) return;
+
+    map.on("click", (evt) => {
+      marker.setGeometries([
+        {
+          position: evt.latLng,
+        },
+      ]);
+      const { lng, lat } = evt.latLng;
+      onChange([lng, lat].join(","));
+    });
+  };
 
   const fixedLocation = () => {
     return new Promise((resolve) => {
       Taro.showLoading({
-        title: '加载中',
-      })
-      getLocation({ type: 'gcj02' }).then((res) => {
-        Taro.hideLoading()
-        resolve(res);
-      }).catch((err) => {
-        console.error(err);
-        Taro.hideLoading();
-        Taro.showToast({
-          title: '定位失败',
-          icon: 'none',
-        })
+        title: "加载中",
       });
+      return h5GetLocation()
+        .then((res) => {
+          Taro.hideLoading();
+          resolve(res.data.result);
+        })
+        .catch((err) => {
+          console.error(err);
+          Taro.hideLoading();
+          Taro.showToast({
+            title: "定位失败",
+            icon: "none",
+          });
+        });
     });
-  }
-
-  const onRefresh = () => {
-    if (mapCtxRef.current) {
-      fixedLocation().then((res) => {
-        const { longitude, latitude } = res;
-        // console.log('longitude', longitude);
-        // console.log('latitude', latitude);
-        onChange([res.longitude, res.latitude].join(','));
-        moveTo(mapCtxRef.current, { longitude, latitude });
-      })
-
-    }
-  }
+  };
 
   React.useEffect(() => {
     if (!readOnly) {
-      getContext();
+      // getContext();
 
       // 获取定位
       fixedLocation().then((res) => {
-        const { longitude, latitude } = res;
-        onChange([longitude, latitude].join(','));
-      })
+        const { lng, lat } = res.location;
+        onChange([lng, lat].join(","));
+      });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [readOnly, getContext]);
+  }, [readOnly]); //getContext
 
-  return (
-    <View className={style['map-wrapper']}>
-      {
-        !readOnly && (
-          <Map
-            id={id}
-            showLocation
-            longitude={center.longitude}
-            latitude={center.latitude}
-          >
-            <Icon name="aim" size="24px" onClick={onRefresh} color="#1A7565" className={style['icon']} />
-          </Map>
-        )
-      }
-      {
-        readOnly && (
-          <Map
-            id={idReadOnly}
-            longitude={center.longitude}
-            latitude={center.latitude}
-            markers={markers}
-          />
-        )
-      }
-    </View >
-  )
-}
+  return <div id="container"></div>;
+};

src/index.html

@@ -9,6 +9,7 @@
   <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 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>
 </head>

src/layouts/TabBar.jsx

@@ -104,29 +104,29 @@ export default (props) => {
       className={className}
       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: 20px; height: 20px;"
+              ></Image>
+            }
+            renderIconActive={
+              <Image
+                src={item.activeIcon}
+                mode="aspectFit"
+                style="width: 20px; height: 20px;"
+              ></Image>
+            }
+          >
+            <View style={{ fontSize: "14px" }}>{item.label}</View>
+          </TabbarItem>
+        ))}
     </Tabbar>
   );
 };

src/layouts/index.jsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useRef } from "react";
 import Taro from "@tarojs/taro";
 import { View, Image } from "@tarojs/components";
 import { useModel } from "@/store";
@@ -16,33 +16,54 @@ export default (props) => {
     tabBar ? laySty["with-tabbar"] : ""
   } ${className}`;
 
-  // React.useEffect(() => {
-  //   if (person && !user) {
-  //     const currentPage = Taro.getCurrentPages().slice().pop();
-  //     if ('pages/login/index' !== currentPage.route) {
-  //       Taro.navigateTo({
-  //         url: '/pages/login/index',
-  //       })
-  //     }
-  //   }
-  // }, [person, user]);
+  const userRef = useRef();
+  const personRef = useRef();
+
+  React.useEffect(() => {
+    if (!userRef.current && !personRef.current) {
+      userRef.current = person;
+      personRef.current = user;
+    }
+    if (!user) {
+      userRef.current = null;
+    }
+    console.log("personRef******************");
+    console.log(personRef.current);
+    console.log("userRef******************");
+    console.log(userRef.current);
+    console.log(personRef.current && !userRef.current);
 
-  console.log(person)
-  console.log(user)
-  React.useMemo(() => {
-    if (person && !user) {
+    if (personRef.current && !userRef.current) {
       const currentPage = Taro.getCurrentPages().slice().pop();
+      console.log(currentPage.route);
       if ("pages/login/index" !== currentPage.route) {
         Taro.navigateTo({
           url: "/pages/login/index",
         });
       }
     }
-  }, []);
+  }, [person, user]);
+
+  // React.useEffect(() => {
+  //   console.log("personRef******************");
+  //   console.log(person);
+  //   console.log("userRef******************");
+  //   console.log(user);
+  //   console.log(person && !user);
+
+  //   if (person && !user) {
+  //     const currentPage = Taro.getCurrentPages().slice().pop();
+  //     if ("pages/login/index" !== currentPage.route) {
+  //       Taro.navigateTo({
+  //         url: "/pages/login/index",
+  //       });
+  //     }
+  //   }
+  // }, [person, user]);
 
   Taro.useShareAppMessage(() => {
     return {
-      title: '文明城市'
+      title: "文明霍山",
     };
   });
 

src/layouts/layout.module.less

@@ -13,7 +13,7 @@
     &.with-tabbar {
       overflow-y: scroll;
       // height: calc(100% - var(--tabbar-height, 100rpx));
-      padding-bottom: var(--tabbar-height, 100rpx);
+      padding-bottom: var(--tabbar-height, 50px);
     }
 
     .pdm-space {

src/pages/issue/components/Issue/index.jsx

@@ -1,22 +1,21 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View } from '@tarojs/components';
-import { Field, Cell, CellGroup } from '@antmjs/vantui';
-import LocType from '@/components/LocType';
-import IssueType from '@/components/IssueType';
-import OrgPicker from '@/components/OrgPicker';
-import DatePicker from '@/components/DatePicker';
-import Map from '@/components/map';
-import Uploader from '@/components/Uploader/index';
-import { getDateStr } from '@/utils/date';
-import mapIcon from '@/assets/icons/marker.png';
-import { getTaOrgIssueByIssueId } from '@/services/taorgissue';
-import { PROCESS_END } from '@/utils/biz';
-import { geocoder } from '@/utils/map';
-import {
-  ROLE_ORG_USER,
-} from "@/utils/user";
-import IssueStatus from './IssueStatus';
+import React, { useEffect } from "react";
+import Taro from "@tarojs/taro";
+import { View } from "@tarojs/components";
+import { Field, Cell, CellGroup } from "@antmjs/vantui";
+import LocType from "@/components/LocType";
+import IssueType from "@/components/IssueType";
+import OrgPicker from "@/components/OrgPicker";
+import DatePicker from "@/components/DatePicker";
+import Map from "@/components/map";
+import Uploader from "@/components/Uploader/index";
+import { getDateStr } from "@/utils/date";
+import mapIcon from "@/assets/icons/marker.png";
+import { getTaOrgIssueByIssueId } from "@/services/taorgissue";
+import { PROCESS_END } from "@/utils/biz";
+import { geocoder } from "@/utils/map";
+import H5Map from "@/components/H5Map";
+import { ROLE_ORG_USER } from "@/utils/user";
+import IssueStatus from "./IssueStatus";
 
 const today = new Date();
 
@@ -28,7 +27,7 @@ export default (props) => {
     showOrg,
     showExpireDate,
     renderFields,
-    renderAction
+    renderAction,
   } = props;
 
   const fmRef = React.useRef({
@@ -54,7 +53,9 @@ export default (props) => {
 
     // 如果单子办结了就是实际办结时间
     // 否则就是预计办结时间
-    return formData.processNode == PROCESS_END ? formData.endDate : formData.expireDate;
+    return formData.processNode == PROCESS_END
+      ? formData.endDate
+      : formData.expireDate;
   }, [formData]);
 
   const onLocTypeChange = (_, it) => {
@@ -62,80 +63,89 @@ export default (props) => {
       ...fmRef.current,
       locId: it.typeId,
       locName: it.name,
-    }
+    };
     fmRef.current = data;
     setFormData(data);
     setShowLocType(false);
-  }
+  };
 
   const onIssueTypeChange = (_, it) => {
     const data = {
       ...fmRef.current,
       typeId: it.typeId,
       typeName: it.name,
-    }
+    };
     fmRef.current = data;
     setFormData(data);
     setShowIssueType(false);
-  }
+  };
 
   const onOrgChange = (_, it) => {
     const data = {
       ...fmRef.current,
       orgId: it.orgId,
       orgName: it.name,
-    }
+    };
     fmRef.current = data;
     setFormData(data);
     setShowOrgPicker(false);
-  }
+  };
 
   const onDateChange = (dt) => {
     const date = getDateStr(dt);
     const data = {
       ...fmRef.current,
       expireDate: date,
-    }
+    };
     fmRef.current = data;
     setFormData(data);
     setShowDatePicker(false);
-  }
+  };
 
   const setFieldChange = (field, value) => {
     const data = {
       ...fmRef.current,
       [field]: value,
-    }
+    };
     fmRef.current = data;
+    console.log(data)
     setFormData(data);
-  }
+  };
 
-  
   const onLocationChange = (loc) => {
-    setFieldChange('location', loc);
-
+    setFieldChange("location", loc);
+    console.log(loc);
     if (loc) {
       // 交换经纬度位置
-      const [x, y] = loc.split(',');
-      const location = [y, x].join(',');
-      geocoder(location).then(e => setFieldChange('addr', e?.address_component?.street_number || e?.address)).catch(console.error)
+      const [x, y] = loc.split(",");
+      const location = [y,x].join(",");
+      geocoder(location)
+        .then((e) => {
+          console.log(e?.address_component?.street_number || e?.address);
+
+          setFieldChange(
+            "addr",
+            e?.address_component?.street_number || e?.address
+          );
+        })
+        .catch(console.error);
     }
-  }
+  };
 
   React.useEffect(() => {
     if (issue) {
       fmRef.current = issue;
       setFormData(issue);
       // console.log('---------issue-------->', issue)
-      getTaOrgIssueByIssueId(issue.issueId, issue.orgId).then(r => {
+      getTaOrgIssueByIssueId(issue.issueId, issue.orgId).then((r) => {
         setOrgIssue(r);
       });
-
     }
   }, [issue]);
 
-  // console.log('showIssueType', showIssueType)
-  // console.log('readOnly', readOnly)
+  useEffect(() => {
+    container;
+  }, []);
   return (
     <View>
       <LocType
@@ -175,15 +185,10 @@ export default (props) => {
         onChange={onLocationChange}
       />
 
+      {/* <H5Map location={formData.location} onChange={onLocationChange} /> */}
+
       <CellGroup>
-        {
-          issue?.issueId && (
-            <Cell
-              title="ID"
-              value={issue.issueId}
-            />
-          )
-        }
+        {issue?.issueId && <Cell title="ID" value={issue.issueId} />}
         <Cell
           title="点位"
           isLink={!readOnly}
@@ -195,24 +200,21 @@ export default (props) => {
           value={formData.addr}
           leftIcon={mapIcon}
           readonly={readOnly}
-          onChange={e => setFieldChange('addr', e.detail)}
+          onChange={(e) => setFieldChange("addr", e.detail)}
         />
       </CellGroup>
 
-      {
-        readOnly && (
-          <CellGroup style={{ marginTop: '20px' }}>
-            <IssueStatus issue={issue} />
-          </CellGroup>
-        )
-      }
+      {readOnly && (
+        <CellGroup style={{ marginTop: "20px" }}>
+          <IssueStatus issue={issue} />
+        </CellGroup>
+      )}
 
-
-      <CellGroup style={{ marginTop: '20px' }}>
+      <CellGroup style={{ marginTop: "20px" }}>
         <Cell
           title="问题分类"
           isLink={!readOnly}
-          style={{ marginTop: '20px' }}
+          style={{ marginTop: "20px" }}
           value={formData.typeName}
           onClick={() => !readOnly && setShowIssueType(true)}
         />
@@ -222,13 +224,13 @@ export default (props) => {
           type="textarea"
           placeholder="请输入问题描述"
           readonly={readOnly}
-          autosize={{ minHeight: '120px' }}
+          autosize={{ minHeight: "120px" }}
           value={formData.content}
-          onChange={e => setFieldChange('content', e.detail)}
+          onChange={(e) => setFieldChange("content", e.detail)}
         />
       </CellGroup>
 
-      <CellGroup style={{ marginTop: '20px' }}>
+      <CellGroup style={{ marginTop: "20px" }}>
         <Cell title="拍照或视频" border={false} />
 
         <Cell
@@ -236,83 +238,62 @@ export default (props) => {
             <Uploader
               value={formData.attachList}
               disabled={readOnly}
-              onChange={e => setFieldChange('attachList', e)}
+              onChange={(e) => setFieldChange("attachList", e)}
             />
           }
         />
       </CellGroup>
 
-      {
-        (showOrg ) && (
-          <CellGroup style={{ marginTop: '20px' }}>
-            {
-              showOrg && (
-                <Cell
-                  title="交办单位"
-                  isLink={!readOnly}
-                  value={formData.orgName}
-                  onClick={() => !readOnly && setShowOrgPicker(true)}
-                />
-              )
-            }
-            {
-              (showExpireDate)  && (
-                <Cell
-                  title="办结时间"
-                  isLink={!readOnly}
-                  value={endDate}
-                  onClick={() => !readOnly && setShowDatePicker(true)}
-                />
-              )
-            }
-          </CellGroup>
-        )
-      }
-
-      {
-        orgIssue && issue?.processNode == PROCESS_END && (
-          <CellGroup style={{ marginTop: '20px' }}>
-            <Cell title="整改结果" />
-            <Field
-              readonly
-              type="textarea"
-              autosize={{ minHeight: '120px' }}
-              value={orgIssue?.result}
+      {showOrg && (
+        <CellGroup style={{ marginTop: "20px" }}>
+          {showOrg && (
+            <Cell
+              title="交办单位"
+              isLink={!readOnly}
+              value={formData.orgName}
+              onClick={() => !readOnly && setShowOrgPicker(true)}
             />
-
-            <Cell title="整改照片" border={false} />
+          )}
+          {showExpireDate && (
             <Cell
-              renderTitle={
-                <Uploader
-                  disabled
-                  value={orgIssue?.attachList}
-                />
-              }
+              title="办结时间"
+              isLink={!readOnly}
+              value={endDate}
+              onClick={() => !readOnly && setShowDatePicker(true)}
             />
-          </CellGroup>
-        )
-      }
+          )}
+        </CellGroup>
+      )}
+
+      {orgIssue && issue?.processNode == PROCESS_END && (
+        <CellGroup style={{ marginTop: "20px" }}>
+          <Cell title="整改结果" />
+          <Field
+            readonly
+            type="textarea"
+            autosize={{ minHeight: "120px" }}
+            value={orgIssue?.result}
+          />
+
+          <Cell title="整改照片" border={false} />
+          <Cell
+            renderTitle={<Uploader disabled value={orgIssue?.attachList} />}
+          />
+        </CellGroup>
+      )}
 
-      {
-        renderFields ?
-          renderFields(
-            formData,
-            {
-              setFieldChange,
-              setFormData,
-              showOrgPicker,
-              setShowOrgPicker,
-            }
-          ) : null
-      }
+      {renderFields
+        ? renderFields(formData, {
+            setFieldChange,
+            setFormData,
+            showOrgPicker,
+            setShowOrgPicker,
+          })
+        : null}
 
-      {
-        renderAction ? (
-          <View style={{ margin: '20px auto' }}>
-            {renderAction(formData)}
-          </View>
-        ) : null
-      }
+      {renderAction ? (
+        <View style={{ margin: "20px auto" }}>{renderAction(formData)}</View>
+      ) : null}
     </View>
-  )
-}
+  );
+};

src/pages/login/components/Form.jsx

@@ -1,59 +1,87 @@
-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';
+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 { 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('账户不能为空');
+      setAccErr("账户不能为空");
       return;
     } else {
       setAccErr();
     }
     if (!res.password) {
-      setPwdErr('密码不能为空');
+      setPwdErr("密码不能为空");
       return;
     } else {
       setPwdErr();
     }
 
     setLoading(true);
-    signin(res).then(() => {
-      onSuccess();
-      setLoading(false);
-    }).catch(err => {
-      setLoading(false);
-    })
-  }
+    signin(res)
+      .then(() => {
+        onSuccess();
+        setLoading(false);
+      })
+      .catch((err) => {
+        setLoading(false);
+      });
+  };
 
   const onForgetPwd = () => {
     // Taro.navigateTo({
     //   url: '/pages/reset-password/index'
     // });
-    warn(true, '请联系管理人员')
-  }
+    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">
-      <Form form={form} onFinish={onFinish}>
-        <FormItem
-          name="account"
-          valueFormat={(e) => e.detail}
-        >
+      {/* onFinish={onFinish} */}
+      <Form form={form} >
+        <FormItem name="account" valueFormat={(e) => e.detail}>
           <Field
             border
             label="账号"
@@ -62,10 +90,7 @@ export default (props) => {
             placeholder="请输入您的登录账号"
           ></Field>
         </FormItem>
-        <FormItem
-          name="password"
-          valueFormat={(e) => e.detail}
-        >
+        <FormItem name="password" valueFormat={(e) => e.detail}>
           <Field
             password
             label="密码"
@@ -81,13 +106,15 @@ export default (props) => {
           <Button
             block
             type="primary"
-            formType="submit"
+            // formType="submit"
             loading={loading}
+            disabled={loading}
+            onClick={handleClick}
           >
             登录
           </Button>
         </View>
       </Form>
     </View>
-  )
-}
+  );
+};

src/pages/login/index.jsx

@@ -20,7 +20,8 @@ export default (props) => {
       <View className="login-box">
         <Head />
         <Form onSuccess={onSuccess} />
-        <Bottom onSuccess={onSuccess} />
+        {/* H5此无功能 */}
+        {/* <Bottom onSuccess={onSuccess} /> */}
       </View>
     </Page>
   )

src/pages/notice/detail/index.jsx

@@ -1,65 +1,72 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View, Image, RichText } from '@tarojs/components';
-import Page from '@/layouts/index';
-import { getTaNoticeById } from '@/services/tanotice';
-import { getDtStr } from '@/utils/date';
-import style from './style.module.less';
+import React from "react";
+import Taro from "@tarojs/taro";
+import { View, Image, RichText } from "@tarojs/components";
+import Page from "@/layouts/index";
+import { getTaNoticeById } from "@/services/tanotice";
+import { getDtStr } from "@/utils/date";
+import style from "./style.module.less";
 
 export default (props) => {
-
   const [loading, setLoading] = React.useState(false);
   const [detail, setDetail] = React.useState();
-  const dateStr = React.useMemo(() => detail?.createDate ? getDtStr(detail.createDate) : '-', [detail]);
+  const dateStr = React.useMemo(
+    () => (detail?.createDate ? getDtStr(detail.createDate) : "-"),
+    [detail]
+  );
 
   const router = Taro.useRouter();
   const { id } = router.params;
 
   const onPreview = () => {
     if (!detail?.thumb) return;
-
-    Taro.previewMedia({
-      sources: [
-        {
-          url: detail.thumb,
-        },        
-      ],
-      current: 0,
-    })
-  }
+      //Weapp
+    // Taro.previewMedia({
+    //   sources: [
+    //     {
+    //       url: detail.thumb,
+    //     },
+    //   ],
+    //   current: 0,
+    // })
+    
+    //H5
+    Taro.previewImage({
+      current: 0, // 当前显示图片的http链接
+      urls: [detail.thumb],
+    });
+  };
 
   React.useEffect(() => {
     if (id) {
       setLoading(true);
-      getTaNoticeById(id).then((res) => {
-        setDetail(res);
-        Taro.setNavigationBarTitle({
-          title: res.title,
+      getTaNoticeById(id)
+        .then((res) => {
+          setDetail(res);
+          Taro.setNavigationBarTitle({
+            title: res.title,
+          });
+          setLoading(false);
         })
-        setLoading(false);
-      }).catch(er => {
-        console.error(er);
-        setLoading(false);
-      });
+        .catch((er) => {
+          console.error(er);
+          setLoading(false);
+        });
     }
   }, [id]);
 
-  
   return (
     <Page loading={loading}>
-      <View className={style['notice-wrapper']} style={style}>
-        <View className={style['notice-hd']}>
+      <View className={style["notice-wrapper"]} style={style}>
+        <View className={style["notice-hd"]}>
           {detail?.title}
-          <View className={style['notice-hd2']}>{dateStr}</View>
+          <View className={style["notice-hd2"]}>{dateStr}</View>
         </View>
-        <View className={style['notice-bd']}>
+        <View className={style["notice-bd"]}>
           <Image src={detail?.thumb} onClick={onPreview}></Image>
           <RichText nodes={detail?.content} />
         </View>
-        <View className={style['notice-ft']}>
-
-        </View>
+        <View className={style["notice-ft"]}></View>
       </View>
     </Page>
-  )
-}
+  );
+};

src/pages/reset-password/components/ResetPwd.jsx

@@ -43,7 +43,6 @@ export default (props) => {
     setLoading(true)
     onSubmit({ password: md5(pwd1) }).then(() => {
       setLoading(false);
-
       Taro.navigateBack({
         delta: 1,
         fail: () => {

src/pages/user/list/index.jsx

@@ -57,8 +57,8 @@ export default (props) => {
   return (
     <Page loading={loading} onShow={onShow}>
       <Dialog id={dialogId} />
-      <view className={styles["user-warpper"]}>
-        <view className={styles["user-warpper-list"]}>
+      <View className={styles["user-warpper"]}>
+        <View className={styles["user-warpper-list"]}>
           <PowerList
             sid={sid1}
             ref={listRef}
@@ -91,7 +91,7 @@ export default (props) => {
               </Cell>
             )}
           />
-        </view>
+        </View>
 
         <Button
           type="primary"
@@ -104,7 +104,7 @@ export default (props) => {
         >
           添加
         </Button>
-      </view>
+      </View>
     </Page>
   );
 };

src/store/user.js

@@ -17,14 +17,15 @@ export default function useUser() {
   const [duty, setDuty] = React.useState();
 
   const maLogin = (code) => {
-    console.log(code)
-    login(code).then((res) => {
-      setPerson(res.person);
-      Taro.setStorage({ key: "personId", data: res.person.personId });
-      Taro.setStorage({ key: "sessionKey", data: res.sessionKey });
-    }).catch(e => {
-      console.log(e)
-    });
+    login(code)
+      .then((res) => {
+        setPerson(res.person);
+        Taro.setStorage({ key: "personId", data: res.person.personId });
+        Taro.setStorage({ key: "sessionKey", data: res.sessionKey });
+      })
+      .catch((e) => {
+        console.error(e);
+      });
   };
 
   const updateDuty = (d = ROLE_CITIZEN) => {
@@ -33,9 +34,9 @@ export default function useUser() {
   };
 
   const initDuty = (u) => {
-    console.log(u)
+    console.log(u);
     const d = Taro.getStorageSync("duty");
-    console.log(d)
+    console.log(d);
     const dutyList = u?.dutyList || [];
     if (d) {
       if (dutyList.indexOf(d) < 0) {
@@ -61,12 +62,14 @@ export default function useUser() {
   };
 
   const current = () => {
-    currentUser().then((res) => {
-      setUser(res.user);
-      initDuty(res.user);
-    }).catch(e => {
-      console.log(e)
-    });
+    currentUser()
+      .then((res) => {
+        setUser(res.user);
+        initDuty(res.user);
+      })
+      .catch((e) => {
+        console.log(e);
+      });
   };
 
   const signinByPhone = (code) => {
@@ -86,7 +89,7 @@ export default function useUser() {
 
   const signOut = () => {
     setUser(null);
-    initDuty([]);
+    initDuty(null);
   };
 
   const changePwd = (params) => {
@@ -95,7 +98,14 @@ export default function useUser() {
       newPassword: md5(params.newPassword),
     };
 
-    changePassword(data);
+    changePassword(data)
+      .then((res) => {
+        signOut()
+
+      })
+      .catch((e) => {
+        console.error(e);
+      });
   };
 
   return {

src/subpkg1/components/chart/index.jsx

@@ -37,9 +37,9 @@ const Chart = (props) => {
   }, [option, inited]);
 
   return (
-    <view className={className} style={style}>
+    <View className={className} style={style}>
       <ec-canvas canvasId={canvasId} ec={ec}></ec-canvas>
-    </view>
+    </View>
   )
 }
 

src/utils/authorize.js

@@ -1,4 +1,4 @@
-import Taro from '@tarojs/taro';
+import Taro from "@tarojs/taro";
 
 export default function getAuthorize(scope) {
   return new Promise((resolve, reject) => {
@@ -12,7 +12,7 @@ export default function getAuthorize(scope) {
               console.error(err);
               reject(err);
             },
-          })
+          });
         } else {
           resolve();
         }
@@ -20,27 +20,50 @@ export default function getAuthorize(scope) {
       fail(err) {
         console.error(err);
         reject(err);
-      }
+      },
     });
   });
 }
 
-export const getLocation = (options) => {
+export const getLocation = async (options) => {
+  // try {
+  return await new Promise((resolve, reject) => {
+    wx.getLocation({
+      ...(options || {}),
+      success(res) {
+        resolve(res);
+      },
+      fail(err) {
+        console.error(err);
+        reject(err);
+      },
+    });
+  });
+  // } catch (err_1) {
+  //   console.error(err_1);
+  //   reject(err_1);
+  // }
+};
+const key = "6WQBZ-5VIC4-BZTUI-DIG64-R4XO3-PWBH3";
+export const h5GetLocation = () => {
   return new Promise((resolve, reject) => {
-    getAuthorize('scope.userLocation').then(() => {
-      Taro.getLocation({
-        ...options || {},
-        success(res) {
-          resolve(res);
-        },
-        fail(err) {
-          console.error(err);
-          reject(err);
-        }
-      });
-    }).catch((err) => {
-      console.error(err);
-      reject(err);
+    const url = `/api2/ws/location/v1/ip?key=${key}`;
+    const res = Taro.request({
+      url: url,
+      method: "GET",
+      dataType: "json",
+      header: {
+        "content-type": "application/json",
+      },
     });
+    resolve(res);
+    reject(res);
+    // .then((res) => {
+    //   resolve(res.result);
+    // })
+    // .catch((error) => {
+    //   reject(error);
+    //   console.error("请求失败", error);
+    // });
   });
-}
+};

src/utils/map.js

@@ -11,7 +11,7 @@ export function geocoder(location, getPoi = 0) {
   }
 
   return new Promise((resolve, reject) => {
-    const url = `https://apis.map.qq.com/ws/geocoder/v1/?location=${location}&key=${QMAP_WEBSERVICE_KEY}&get_poi=${getPoi}`
+    const url = `/api2/ws/geocoder/v1/?location=${location}&key=${QMAP_WEBSERVICE_KEY}&get_poi=${getPoi}`
 
     Taro.request({ url }).then(({ data }) => {
       const { status, message, result } = data || {};

src/utils/message.js

@@ -7,6 +7,7 @@ export function warn(predicate, message) {
       message,
       type: 'warning',
     })
-    throw new Error(message);
+    //Weapp
+    // throw new Error(message);
   }
 }

src/utils/request.js

@@ -32,13 +32,13 @@ export default function request(api, options = {}) {
     const duty = Taro.getStorageSync("duty");
 
     const onError = (err) => {
-      console.error(err);
-      if (!H5) {
-        console.log(1)
-        logger.error(`接口 [${method}]: ${url}`);
-        logger.error("参数: ", data);
-        logger.error(err);
-      }
+      // console.error(err);
+      // if (!H5) {
+      //   console.log(1)
+      //   logger.error(`接口 [${method}]: ${url}`);
+      //   logger.error("参数: ", data);
+      //   logger.error(err);
+      // }
 
       if (!silent && "GET" !== method.toUpperCase()) {
         Taro.showModal({
@@ -54,7 +54,6 @@ export default function request(api, options = {}) {
       url,
       data,
       method,
-      // mode: "no-cors",
       header: {
         "x-client": "miniapp",
         "x-personId": personId,
@@ -104,12 +103,13 @@ export const uploadFiles = async (files, url) => {
       Taro.uploadFile({
         // eslint-disable-next-line no-undef
         url: url || `${HOST}/api/ma/file`,
-        filePath: files[i].tempFilePath,
+        filePath: files[i].tempFilePath,//
         header: {
           authorization: token,
         },
         name: "file",
         formData: {
+          file: files[i].originalFileObj,
           fileType: files[i].fileType,
         },
         success: function (res) {