Merge branch 'dev' of https://gitea.anxinyun.cn/free-sun/Highways4Good into dev

api/app/lib/controllers/report/index.js

@@ -13,6 +13,7 @@ async function reportList (ctx) {
             userInfo.loginSource == 'wx'
             && userInfo.isAdmin
             && userInfo.phone != 'SuperAdmin'
+            && (!performerId || !handleState)
         ) {
             // 是管理员但不是超管 查自己部门及下级部门的所有用户的信息
             const sqlStr = `

weapp/src/packages/patrol/index.jsx

@@ -147,6 +147,8 @@ const Index = () => {
       let key = 'ODQBZ-3FZAU-6VIVL-2XXNM-F7CP7-WVFCY' // 写自己申请的key
       Taro.getLocation({
         type: 'wgs84',
+        isHighAccuracy: true,
+        highAccuracyExpireTime: 1000 * 6,
         success: function (res) {
           setLongitude(res.longitude)
           setLatitude(res.latitude)
@@ -228,7 +230,7 @@ const Index = () => {
     ])
   }, [reportType])
 
-  function report() {
+  function report () {
     if (!canReport) { return }
     if (
       (isPatrol && (!projectType || !road))
@@ -304,7 +306,7 @@ const Index = () => {
     })
   }
 
-  function deleteReport() {
+  function deleteReport () {
     Taro.showModal({
       title: '提示',
       content: '确定删除吗？',
@@ -331,7 +333,7 @@ const Index = () => {
     })
   }
 
-  function handleInput({ detail: { value } }, type) {
+  function handleInput ({ detail: { value } }, type) {
     switch (type) {
       case 'roadSectionStart':
         setRoadSectionStart(value)
@@ -363,15 +365,15 @@ const Index = () => {
     }
   }
 
-  function handleTypeChange(e) {
+  function handleTypeChange (e) {
     setReportType(e.detail.value)
   }
 
-  function handleImgChange(files, operationType, index, type) {
+  function handleImgChange (files, operationType, index, type) {
     if (operationType === 'remove') {
       setImg(false)
     }
-    function setImg(isAdd, url) {
+    function setImg (isAdd, url) {
       switch (type) {
         case 'scenePic':
           let nextImg = sceneImg
@@ -458,7 +460,7 @@ const Index = () => {
     }
   }
 
-  function handleImgClick(index, file) {
+  function handleImgClick (index, file) {
     Taro.previewImage({
       urls: [file.url] // 需要预览的图片http链接列表
     })