增加 app sdk

config/dev.js

@@ -7,6 +7,7 @@ module.exports = {
     HOST: '""',
     // HOST: '"https://wmcj.huoshannews.com"',
     MAPHOST: '"/api2"',
+    QMAP_WEBSERVICE_KEY: '"HTPBZ-HHJA7-XD2XD-PRS37-H3HVJ-U5BAA"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
     DEFAULT_POS: '"116.34761502876347,31.40974743425614"', // 霍山县人民政府 gcj02
     VERSION: '"1.1.13-20230325"',

config/prod.js

@@ -7,6 +7,7 @@ module.exports = {
     // HOST: '"https://wmcj.ycjcjy.com"',
     HOST: '"http://api.wmcj.ycjcjy.com"',
     MAPHOST: '"http://api.wmcj.ycjcjy.com/api2"',
+    QMAP_WEBSERVICE_KEY: '"HTPBZ-HHJA7-XD2XD-PRS37-H3HVJ-U5BAA"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
     DEFAULT_POS: '"116.34761502876347,31.40974743425614"', // 霍山县人民政府 gcj02
     VERSION: '"1.1.29-20240224"',

src/app.js

@@ -3,21 +3,12 @@ import store, { Provider } from "@/store";
 import "./app.less";
 import { useEffect } from "react";
 import "@antmjs/vantui/lib/index.less";
-import { getLocation } from "./utils/map";
 
 const App = (props) => {
   // useEffect(() => {
   //   const userState = store.getState("user");
   //   userState.current();
   // }, []);
-
-  useEffect(() => {
-    navigator.geolocation.getCurrentPosition((position) => {
-      console.log(position)
-      doSomething(position.coords.latitude, position.coords.longitude);
-    });
-  },[]);
-
   return <Provider>{props.children}</Provider>;
 };
 

src/components/Auth.jsx

@@ -4,17 +4,17 @@ import { useModel } from "@/store";
 
 export default (props) => {
   const { roles = []  } = props;
-  console.log(props);
+  // console.log(props);
   const { duty } = useModel("user");
-  console.log("---------------------************-----------------");
+  // console.log("---------------------************-----------------");
 
   // 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);
+  // 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);
 
 
   const filteredChildren = React.Children.toArray(props.children).filter(

src/components/Uploader/index.jsx

@@ -2,7 +2,7 @@ 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 { uploadFileBase64, uploadFiles } from "@/utils/request";
 import icon from "@/assets/icons/uploader.png";
 import closeIcon from "@/assets/icons/close.png";
 import style from "./style.modules.less";
@@ -20,26 +20,45 @@ export default (props) => {
     if (disabled) return;
 
     setLoading(true);
-    Taro.chooseMedia({
-      maxDuration: 60,
-      // sizeType: "compressed",
-      success: (res) => {
-        const { tempFiles } = res;
-        uploadFiles(tempFiles)
-          .then((resp) => {
-            setLoading(false);
-            onChange((value || []).concat(resp));
-          })
-          .catch((err) => {
-            console.error(err);
-            setLoading(false);
-          });
-      },
-      fail: (err) => {
-        console.error(err);
-        setLoading(false);
-      },
+
+    // eslint-disable-next-line no-undef
+    SmartCity.chooseImage({
+      count : 1 // 图片张数
+    },function(res){
+        console.log("--------上传图片---------", res);
+        const base64 = res[0].imageData;
+        const fileName = res[0].name;
+        const fileType = res[0].type;
+
+        uploadFileBase64(base64, fileName, fileType).then(resp => {
+          setLoading(false);
+          onChange((value || []).concat(resp));
+        }).catch((err) => {
+          console.error(err);
+          setLoading(false);
+        });
     });
+
+    // Taro.chooseMedia({
+    //   maxDuration: 60,
+    //   // sizeType: "compressed",
+    //   success: (res) => {
+    //     const { tempFiles } = res;
+    //     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) => {

src/components/map/index.jsx

@@ -2,8 +2,7 @@ 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 { getLocation } from "@/utils/map";
+import { getLocation } from "@/utils/authorize";
 import iconPath from "@/assets/icons/marker.png";
 import style from "./style.module.less";
 
@@ -91,10 +90,10 @@ export default (props) => {
       Taro.showLoading({
         title: "加载中",
       });
-      return h5GetLocation()
+      return getLocation()
         .then((res) => {
           Taro.hideLoading();
-          resolve(res.result);
+          resolve(res);
         })
         .catch((err) => {
           console.error(err);
@@ -114,6 +113,7 @@ export default (props) => {
       // 获取定位
       fixedLocation().then((res) => {
         const { lng, lat } = res.location;
+        console.log('----获取到定位-----', res);
         onChange([lng, lat].join(","));
       });
     }

src/index.html

@@ -24,7 +24,7 @@
       var vConsole = new window.VConsole();
     </script>
 
-    <title>civilized-miniapp</title>
+    <title>文明城市</title>
     <script>
       <%= htmlWebpackPlugin.options.script %>
     </script>

src/layouts/index.jsx

@@ -12,7 +12,7 @@ import { useEffect } from "react";
 export default (props) => {
   const { className, style, roles, tabBar = false, loading } = props;
 
-  const { person, user, duty } = useModel('user');
+  const { person, user, duty, current } = useModel('user');
 
   const containerClass = `${laySty["page-conatiner"]} ${
     tabBar ? laySty["with-tabbar"] : ""
@@ -21,16 +21,31 @@ export default (props) => {
   React.useEffect(() => {
     const currentPage = Taro.getCurrentPages().slice().pop();
 
-    if (!person || !user) {
-      if (!currentPage.route.includes("pages/login/index")) {
-        Taro.navigateTo({
-          url: "/pages/login/index",
-        });
+    if (!user) {
+      current().then((res) => {
+        console.log('---当前人员----', res);
+      }).catch((err) => {
+        console.log('---当前人员--报错了--');
+        console.error(err);
 
-        return;
-      }
+        if (!currentPage.route.includes("pages/login/index")) {
+          Taro.navigateTo({
+            url: "/pages/login/index",
+          });
+        }
+      });
     }
-  }, [person, user]);
+
+    // if (!person || !user) {
+    //   if (!currentPage.route.includes("pages/login/index")) {
+    //     Taro.navigateTo({
+    //       url: "/pages/login/index",
+    //     });
+
+    //     return;
+    //   }
+    // }
+  }, [current, user]);
 
 
   // React.useEffect(() => {

src/pages/feedback/issue/index.jsx

@@ -73,6 +73,8 @@ export default (props) => {
   const onLocationChange = (loc) => {
     setFieldChange("location", loc);
 
+    console.log('-------onLocationChange------', loc)
+
     if (loc) {
       // 交换经纬度位置
       const [x, y] = loc.split(",");

src/store/user.js

@@ -4,15 +4,14 @@ import md5 from "md5";
 import {
   login,
   signin,
+  signup,
   currentUser,
   authPhone,
   authUser,
 } from "@/services/wxma";
 import { changePassword } from "@/services/sysuser";
-import { signup } from '@/services/wxma';
 import { ROLE_CITIZEN } from "@/utils/user";
 import { setToken } from "@/utils/token";
-import { resolve } from "path";
 
 export default function useUser() {
   const [person, setPerson] = React.useState();
@@ -79,6 +78,10 @@ export default function useUser() {
     return new Promise((resolve, reject) => {
       currentUser()
         .then((res) => {
+          if (res?.person) {
+            setPerson(res.person);
+          }
+
           setUser(res?.user);
           initDuty(res?.user);
           resolve(res?.user);
@@ -107,6 +110,7 @@ export default function useUser() {
 
   const signOut = () => {
     console.log(111111)
+    setPerson(null);
     setUser(null);
     initDuty(null);
     setToken();

src/utils/authorize.js

@@ -1,4 +1,5 @@
 import Taro from "@tarojs/taro";
+import { translate } from "./map";
 
 export default function getAuthorize(scope) {
   return new Promise((resolve, reject) => {
@@ -25,28 +26,31 @@ export default function getAuthorize(scope) {
   });
 }
 
-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);
-      },
+export const getLocation = () => {
+  return new Promise((resolve, reject) => {
+    // eslint-disable-next-line no-undef
+    SmartCity.getLocation(function(res){
+      // 百度坐标
+      // {
+      //   "longitude": "经度 ",
+      //   "latitude": "纬度",
+      //   "provinces": "省",
+      //   "city": "市",
+      //   "area": "区",
+      //   "address": "地址",
+      //   "parameter": "传给客户端的参数",
+      // }
+      console.log('定位地址:' , res);
+
+      translate(res.latitude, res.longitude).then(res2 => {
+        resolve({ ...res, location: res2 });
+      }).catch(reject);
     });
   });
-  // } catch (err_1) {
-  //   console.error(err_1);
-  //   reject(err_1);
-  // }
 };
-const key = "HTPBZ-HHJA7-XD2XD-PRS37-H3HVJ-U5BAA";
-export const h5GetLocation = () => {
-  return new TMap.service.IPLocation().locate();
+
+// export const h5GetLocation = () => {
+  // return new TMap.service.IPLocation().locate();
 
   // return new Promise((resolve, reject) => {
   //   const url = `${MAPHOST}/ws/location/v1/ip?key=${key}`;
@@ -68,4 +72,4 @@ export const h5GetLocation = () => {
   //   //   console.error("请求失败", error);
   //   // });
   // });
-};
+// };

src/utils/map.js

@@ -1,17 +1,15 @@
 import Taro from "@tarojs/taro";
-import gcoord from "gcoord";
-
-// 腾讯地图接口 - 个人开发者
-const QMAP_WEBSERVICE_KEY = "HTPBZ-HHJA7-XD2XD-PRS37-H3HVJ-U5BAA";
 
 // https://lbs.qq.com/service/webService/webServiceGuide/webServiceGcoder
 // location 为 gcj02 编码
 export function geocoder(location, getPoi = 0) {
+  console.log('----待解析地址----', location)
   if (!location || location.length < 3) {
     return Promise.reject(new Error("待解析地址为空"));
   }
 
   return new Promise((resolve, reject) => {
+    // eslint-disable-next-line no-undef
     const url = `${MAPHOST}/ws/geocoder/v1/?location=${location}&key=${QMAP_WEBSERVICE_KEY}&get_poi=${getPoi}`;
 
     Taro.request({ url })
@@ -31,35 +29,33 @@ export function geocoder(location, getPoi = 0) {
   });
 }
 
-// 使用 HTML H5 API 获取当前定位信息
-// 返回 promise 对象
-// resolve 结果是 { lng, lat }
-export function getLocation() {
+/**
+ * 坐标系转换 - 转换为腾讯坐标系
+ * https://lbs.qq.com/service/webService/webServiceGuide/webServiceTranslate
+ * @param {*} lat 纬度
+ * @param {*} lng 经度
+ * @param {*} type , 1 GPS坐标, 2 sogou经纬度, 3 baidu经纬度, 4 mapbar经纬度, 6 sogou墨卡托
+ */
+export function translate(lat, lng, type = 3) {
   return new Promise((resolve, reject) => {
-    return navigator.geolocation.getCurrentPosition(
-      (position) => {
-        console.log("----定位结果-->", JSON.stringify(position));
-        const { longitude, latitude } = position.coords;
-
-        const data = gcoord.transform(
-          [longitude, latitude],
-          gcoord.WGS84,
-          gcoord.GCJ02
-        );
+    const locs = `${lat},${lng}`
 
-        const result = {
-          location: { lng: data[0], lat: data[1] },
-        };
-
-        resolve(result);
-      },
-      (err) => {
-        console.error("----定位失败-->", JSON.stringify(err));
-        reject(err);
-      },
-      {
-        enableHighAccuracy: true,
-      }
-    );
+    // eslint-disable-next-line no-undef
+    const url = `${MAPHOST}/ws/coord/v1/translate?locations=${locs}&type=${type}&key=${QMAP_WEBSERVICE_KEY}&output=json`;
+    Taro.request({ url })
+      .then(({ data }) => {
+        const { status, message, locations } = data || {};
+        if (status != 0) {
+          console.error(data);
+          reject(new Error(message));
+        } else {
+          // { lat, lng }
+          resolve(locations[0]);
+        }
+      })
+      .catch((err) => {
+        console.error(err);
+        reject(new Error(err.errMsg));
+      });
   });
-}
+}

src/utils/request.js

@@ -104,6 +104,7 @@ export const uploadFiles = async (files, url) => {
       formData.append("file", files[i].originalFileObj);
       formData.append("fileType", files[i].fileType);
 
+      // eslint-disable-next-line no-undef
       fetch(url || `${HOST}/api/ma/file`, {
         method: "POST",
         headers: { authorization: token },
@@ -117,33 +118,35 @@ export const uploadFiles = async (files, url) => {
 
           resolve(_data.data);
         });
-      // Taro.uploadFile({
-      //   // eslint-disable-next-line no-undef
-      //   url: url || `${HOST}/api/ma/file`,
-      //   filePath: files[i].tempFilePath, //
-      //   header: {
-      //     authorization: token,
-      //   },
-      //   name: "file",
-      //   formData: {
-      //     file: files[i].originalFileObj,
-      //     fileType: files[i].fileType,
-      //   },
-      //   success: function (res) {
-      //     // debugger
-      //     const _data = JSON.parse(res.data);
-      //     // if (_data.code !== CODE_SUCCESS) {
-      //     //   reject(new Error(_data.message))
-      //     // }
-
-      //     resolve(_data.data);
-      //   },
-      //   fail(err) {
-      //     reject(err);
-      //   },
-      // });
     });
   }
 
   return Promise.all(uploads);
 };
+
+
+export const uploadFileBase64 = async (base64, fileName, fileType) => {
+  const uploads = [];
+  const token = getToken();
+  const formData = new FormData();
+  formData.append("base64", base64);
+  formData.append("fileName", fileName);
+  formData.append("fileType", fileType);
+
+  return new Promise((resolve, reject) => {
+    // eslint-disable-next-line no-undef
+    fetch(`${HOST}/api/ma/file/base64`, {
+      method: "POST",
+      headers: { authorization: token },
+      body: formData,
+    })
+      .then((res) => res.json()) // Add this line to parse the response as JSON
+      .then((_data) => {
+        if (_data.code !== 1000) {
+          reject(new Error(_data.message));
+        }
+
+        resolve(_data.data);
+      });
+  });
+};