feats

src/app.config.js

@@ -38,5 +38,13 @@ export default defineAppConfig({
     navigationBarBackgroundColor: '#1A7565',
     navigationBarTitleText: '文明创城',
     navigationBarTextStyle: 'white'
-  }
+  },
+  permission: {
+    "scope.userLocation": {
+      desc: "你的位置信息将用于定位点位" // 高速公路行驶持续后台定位
+    }
+  },
+  requiredPrivateInfos: [
+    'getLocation'
+  ]
 })

src/pages/reporting/detail/components/Map.jsx

@@ -3,8 +3,8 @@ import { View, Map } from '@tarojs/components';
 import style from './map.module.less';
 
 export default (props) => {
-  const { location = '118.805513,31.969974' } = props;
-  const loc = location.split(',')
+  const { location } = props;
+  const loc = location ? location.split(',') : [,];
   
   return (
     <View className={style['map-box']}>

src/pages/reporting/detail/index.jsx

@@ -1,14 +1,40 @@
 import React from 'react';
+import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
 import Page from '@/layouts/index';
+import getAuthorize from '@/utils/authorize';
+import { Notify } from '@antmjs/vantui';
 import Map from './components/Map';
 import Issue from './components/Issue';
 
 export default (props) => {
-  
+
+  const [loc, setLoc] = React.useState();
+
+  React.useMemo(() => {
+    getAuthorize('scope.userLocation').then(() => {
+      Taro.getLocation({
+        success(res) {
+          setLoc(`${res.longitude},${res.latitude}`);
+        },
+        fail() {
+          Notify.show({
+            message: '获取位置失败, 请退出重试',
+            type: 'warning',
+          })
+        }
+      });
+    }).catch((err) => {
+      Notify.show({
+        message: '未能获取位置, 程序部分功能将不能正常使用',
+        type: 'warning',
+      })
+    });
+  }, []);
+
   return (
     <Page>
-      <Map />
+      <Map location={loc} />
       <Issue />
     </Page>
   )

src/utils/authorize.js

@@ -0,0 +1,26 @@
+import Taro from '@tarojs/taro';
+
+export default (scope) => {
+  return new Promise((resolve, reject) => {
+    Taro.getSetting({
+      success(res) {
+        if (!res.authSetting[scope]) {
+          Taro.authorize({
+            scope,
+            success: resolve,
+            fail: (err) => {
+              console.error(err);
+              reject(err);
+            },
+          })
+        } else {
+          resolve();
+        }
+      },
+      fail(err) {
+        console.error(err);
+        reject(err);
+      }
+    });
+  });
+}

src/utils/request.js

@@ -25,9 +25,9 @@ export default function request(api, options = {}) {
       logger.error(err);
 
       if (!silent && 'GET' !== method.toUpperCase()) {
-        Taro.showToast({
+        Taro.showModal({
           title: err.message || err,
-          icon: 'error'
+          showCancel: false,
         })
       }