diff --git a/src/app.config.ts b/src/app.config.ts index f700b727b0bf8cb7a02eb09d32b22c11bc03c70a..c274639cacc087d068c24c6c3069d2d6a859c03b 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -24,8 +24,8 @@ export default defineAppConfig({ }, plugins: { QCloudAIVoice: { - version: '2.3.2', //请于文档顶部【版本更新能力】中获取最新版本号 - provider: 'wx3e17776051baf153', + version: "2.3.2", //请于文档顶部【版本更新能力】中获取最新版本号 + provider: "wx3e17776051baf153", }, }, @@ -55,7 +55,13 @@ export default defineAppConfig({ }, { root: "pages/Event", - pages: ["view/cameraComp/index", "view/miniAiIdentify/index"], + pages: [ + "view/cameraComp/index", + "view/miniAiIdentify/index", + "view/confirmLocation/index", + "view/autoDispatch/index", + "view/orderDirect/index", + ], }, ], }); diff --git a/src/app.less b/src/app.less index eb2a2e9b6385f0f43875c08c171fead10adf5656..afb423cbc484dc8383634fb8d6ab42ec6f5ef55f 100644 --- a/src/app.less +++ b/src/app.less @@ -23,3 +23,8 @@ Image { white-space: nowrap; overflow: hidden; } + + +::-webkit-scrollbar { + display: none; +} \ No newline at end of file diff --git a/src/assets/bg/bg.png b/src/assets/bg/bg.png index a8a9642e138de8dc6cc903324539f256faaebdab..ea5ea0464516ba2f336114200495c422595582c9 100644 Binary files a/src/assets/bg/bg.png and b/src/assets/bg/bg.png differ diff --git a/src/assets/bg/bg1.png b/src/assets/bg/bg1.png index d20f778681949e644428c35d05519a45cd733fa0..3461265f2c0e9ceb2b5f8f81c0580f3d1fbc4f3b 100644 Binary files a/src/assets/bg/bg1.png and b/src/assets/bg/bg1.png differ diff --git a/src/assets/bg/bg10.png b/src/assets/bg/bg10.png index cdd6dbc79a723cd37e4d1c97de99c5f87218e736..b548b5c88822a2477e73e9b5a4d998c2a7047b3f 100644 Binary files a/src/assets/bg/bg10.png and b/src/assets/bg/bg10.png differ diff --git a/src/assets/bg/bg11.png b/src/assets/bg/bg11.png index d9a1590d3e596f510180145a4d23b6f097ab495e..849c73d88f2f13fbc0e77aea4550c55b83fb9b59 100644 Binary files a/src/assets/bg/bg11.png and b/src/assets/bg/bg11.png differ diff --git a/src/assets/bg/bg2.png b/src/assets/bg/bg2.png index 69b87880c559e28bea0be32320b2d2adb0b49208..5c1b99a8b9dfc8987e52e8363ad6a425af8cae46 100644 Binary files a/src/assets/bg/bg2.png and b/src/assets/bg/bg2.png differ diff --git a/src/assets/bg/bg3.png b/src/assets/bg/bg3.png index 2217ebdec0bd1da4b00af70614ba28cd78fb31e0..251e846ccd7ad9f1adf7b5282f083652512ed8d4 100644 Binary files a/src/assets/bg/bg3.png and b/src/assets/bg/bg3.png differ diff --git a/src/assets/bg/bg4.png b/src/assets/bg/bg4.png index 517daae84c5fe398a372d3bda60c046d7c229ec1..5cb4fbbba153c88af334abbab6edae6d3f58ee9d 100644 Binary files a/src/assets/bg/bg4.png and b/src/assets/bg/bg4.png differ diff --git a/src/assets/bg/bg5.png b/src/assets/bg/bg5.png index ccc5c32722e81391dd987eb42d6b56a4cb0e6bca..f9bb67c1c0d794674787c37b8fc029327a0aa0ed 100644 Binary files a/src/assets/bg/bg5.png and b/src/assets/bg/bg5.png differ diff --git a/src/assets/bg/bg6.png b/src/assets/bg/bg6.png index 231a49b12387a417c1da4049f212b62e0f5f666a..57b45bb5356386c1198132c2175c234c53898eca 100644 Binary files a/src/assets/bg/bg6.png and b/src/assets/bg/bg6.png differ diff --git a/src/assets/bg/bg7.png b/src/assets/bg/bg7.png index 54708a53b061139a3e3f5fcb9ea041d9ef764504..faed6e12b2c6d60a3c12156a1fb4c238436b842f 100644 Binary files a/src/assets/bg/bg7.png and b/src/assets/bg/bg7.png differ diff --git a/src/assets/bg/bg8.png b/src/assets/bg/bg8.png index bf958d61102095d49910b57e2009baf83d17c8f9..9c7d46d46bd81841fc6a55614af8004ce4cb1e21 100644 Binary files a/src/assets/bg/bg8.png and b/src/assets/bg/bg8.png differ diff --git a/src/assets/bg/bg9.png b/src/assets/bg/bg9.png index c6ac240874127408d2eadf7609055421f5f65b51..6cd8558d73cfe3cf61ef935c989dbd81ddbe29c2 100644 Binary files a/src/assets/bg/bg9.png and b/src/assets/bg/bg9.png differ diff --git a/src/assets/images/event/dragPoint.png b/src/assets/images/event/dragPoint.png new file mode 100644 index 0000000000000000000000000000000000000000..75c2224a03eed171b112f37f759fe5b6a623a8e9 Binary files /dev/null and b/src/assets/images/event/dragPoint.png differ diff --git a/src/assets/images/event/fly.png b/src/assets/images/event/fly.png new file mode 100644 index 0000000000000000000000000000000000000000..b77803000800d765d046f67bb8a688d773e3b1e6 Binary files /dev/null and b/src/assets/images/event/fly.png differ diff --git a/src/assets/images/event/flyDown.png b/src/assets/images/event/flyDown.png new file mode 100644 index 0000000000000000000000000000000000000000..ec0cd8e000b332c48f7dc56498b6db8a704e03c1 Binary files /dev/null and b/src/assets/images/event/flyDown.png differ diff --git a/src/assets/images/event/lacate.png b/src/assets/images/event/lacate.png new file mode 100644 index 0000000000000000000000000000000000000000..2c3191cf823a3cc5b6fdaf519ed7ed74e658730b Binary files /dev/null and b/src/assets/images/event/lacate.png differ diff --git a/src/assets/images/event/localPoint.png b/src/assets/images/event/localPoint.png new file mode 100644 index 0000000000000000000000000000000000000000..bb986a5c288ddba768a59b360fc46ee10ee49b2b Binary files /dev/null and b/src/assets/images/event/localPoint.png differ diff --git a/src/assets/images/event/location.png b/src/assets/images/event/location.png new file mode 100644 index 0000000000000000000000000000000000000000..911f135afa976bf45311ebd18e5d3523da2c5df3 Binary files /dev/null and b/src/assets/images/event/location.png differ diff --git a/src/assets/images/event/photo/pic1.jpg b/src/assets/images/event/photo/pic1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..0dca3cbb276e954a68a849c53abb1453afa51ad9 Binary files /dev/null and b/src/assets/images/event/photo/pic1.jpg differ diff --git a/src/assets/images/event/photo/pic2.jpg b/src/assets/images/event/photo/pic2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3515db5f664fc0ea5de2572e885c13a2e2ab2610 Binary files /dev/null and b/src/assets/images/event/photo/pic2.jpg differ diff --git a/src/assets/images/event/photo/pic3.jpg b/src/assets/images/event/photo/pic3.jpg new file mode 100644 index 0000000000000000000000000000000000000000..dcde48d065ad518791f81d1d895bcd15f86635cf Binary files /dev/null and b/src/assets/images/event/photo/pic3.jpg differ diff --git a/src/assets/images/event/photo/pic4.jpg b/src/assets/images/event/photo/pic4.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ba6dd46df99d08c32667c22d2acaae9332a3f1dc Binary files /dev/null and b/src/assets/images/event/photo/pic4.jpg differ diff --git a/src/assets/images/event/photo/pic5.jpg b/src/assets/images/event/photo/pic5.jpg new file mode 100644 index 0000000000000000000000000000000000000000..af9a353ce80ef53e6b1514f8e5e345e10408cd6a Binary files /dev/null and b/src/assets/images/event/photo/pic5.jpg differ diff --git a/src/assets/images/event/photo/pic6.jpg b/src/assets/images/event/photo/pic6.jpg new file mode 100644 index 0000000000000000000000000000000000000000..135833c5d426f7000b66ee58a72f05d38b88f27e Binary files /dev/null and b/src/assets/images/event/photo/pic6.jpg differ diff --git a/src/assets/images/event/tagBg.png b/src/assets/images/event/tagBg.png new file mode 100644 index 0000000000000000000000000000000000000000..300b06a142e4fb754dc214f83a9bb21382977c30 Binary files /dev/null and b/src/assets/images/event/tagBg.png differ diff --git a/src/assets/images/event/user.png b/src/assets/images/event/user.png new file mode 100644 index 0000000000000000000000000000000000000000..3d4d02e8bf0c1761526db0cdb077653d74f7120c Binary files /dev/null and b/src/assets/images/event/user.png differ diff --git a/src/pages/Event/view/autoDispatch/autoDispatch.config.ts b/src/pages/Event/view/autoDispatch/index.config.ts similarity index 100% rename from src/pages/Event/view/autoDispatch/autoDispatch.config.ts rename to src/pages/Event/view/autoDispatch/index.config.ts diff --git a/src/pages/Event/view/autoDispatch/autoDispatch.less b/src/pages/Event/view/autoDispatch/index.less similarity index 61% rename from src/pages/Event/view/autoDispatch/autoDispatch.less rename to src/pages/Event/view/autoDispatch/index.less index fe01b952e0f8eb0a0945f28e5d9e9d2bcf15c7b8..6b3597c513a72b5f6497097efe9bc7fb19c8babc 100644 --- a/src/pages/Event/view/autoDispatch/autoDispatch.less +++ b/src/pages/Event/view/autoDispatch/index.less @@ -3,36 +3,36 @@ flex-direction: column; justify-content: center; align-items: center; - padding: 20px 0 10px; + padding: 40px 0 20px; .fly-icon { - width: 80px; - height: 80px; + width: 160px; + height:160px; } .title { color: #1d2541; font-weight: bold; - font-size: 22px; - margin-top: 20px; + font-size: 44px; + margin-top: 40px; } .tip { color: #4a5168; - font-size: 15px; - margin-top: 10px; + font-size: 30px; + margin-top: 20px; } .progress-wrap { width: 70%; - margin-top: 30px; + margin-top: 60px; } .map-wrap { width: 80%; - height: 360px; - border-radius: 20px; - margin-top: 50px; + height: 520px; + border-radius: 40px; + margin-top: 100px; overflow: hidden; } } \ No newline at end of file diff --git a/src/pages/Event/view/autoDispatch/autoDispatch.tsx b/src/pages/Event/view/autoDispatch/index.tsx similarity index 90% rename from src/pages/Event/view/autoDispatch/autoDispatch.tsx rename to src/pages/Event/view/autoDispatch/index.tsx index 85e9a7ea3e3136c9f77750f759cff42ad2b0f74e..503126fed29a9af7b314925c9ed5d7cf2e49b66d 100644 --- a/src/pages/Event/view/autoDispatch/autoDispatch.tsx +++ b/src/pages/Event/view/autoDispatch/index.tsx @@ -3,9 +3,10 @@ import { View, Image, Text, Map } from '@tarojs/components'; import Taro from '@tarojs/taro'; import { useDidHide, useDidShow } from '@tarojs/taro'; import { useRef, useState } from 'react'; -import './autoDispatch.less'; -import { getAuth } from '@/utils/comm'; -const locationImg = require('@/assets/image/discover/user.png'); +import './index.less'; +import { getAuth } from '@/utils/comm'; +import locationImg from "@/assets/images/event/user.png"; +import fly from "@/assets/images/event/fly.png"; function AutoDispatch() { const [progressVal, setProgressVal] = useState(0); const val = useRef(0); @@ -20,7 +21,7 @@ function AutoDispatch() { if (val.current > 100) { clearInterval(timerId.current); Taro.redirectTo({ - url: '/pages/index/view/orderDirect/orderDirect', + url: '/pages/Event/view/orderDirect/index', }); return; } @@ -40,7 +41,7 @@ function AutoDispatch() { return ( 正在自动化派遣 diff --git a/src/pages/Event/view/cameraComp/index.tsx b/src/pages/Event/view/cameraComp/index.tsx index 2dd53c7d2f7887c9fe09994acced55a858775398..2ff2a0680694248423607f2526fef6d094d20efc 100644 --- a/src/pages/Event/view/cameraComp/index.tsx +++ b/src/pages/Event/view/cameraComp/index.tsx @@ -8,6 +8,7 @@ import { getAuth } from "@/utils/comm"; import photoBtn from "@/assets/images/event/photoBtn.png"; import region from "@/assets/images/event/region.png"; import "./index.less"; +import useReportStore from "@/store/report"; interface ImgPathDto { type: 1 | 2 | 3; @@ -41,8 +42,7 @@ const commImgConfig = [ }, ]; function CameraComp() { - const params = Taro.getCurrentInstance().router?.params; - const discoverEntry = params?.type; //发现入口 + const { discoverEntry } = useReportStore(); //事件上报入口 const pathDefault: ImgPathDto[] = [ { type: 1, diff --git a/src/pages/Event/view/confirmLocation/confirmLocation.config.ts b/src/pages/Event/view/confirmLocation/index.config.ts similarity index 100% rename from src/pages/Event/view/confirmLocation/confirmLocation.config.ts rename to src/pages/Event/view/confirmLocation/index.config.ts diff --git a/src/pages/Event/view/confirmLocation/confirmLocation.less b/src/pages/Event/view/confirmLocation/index.less similarity index 57% rename from src/pages/Event/view/confirmLocation/confirmLocation.less rename to src/pages/Event/view/confirmLocation/index.less index ba8d2aa6dfa448ffff49d50a368f82bba436b459..f2a51f249ef533b330bfc9640ee279bd9bb13d27 100644 --- a/src/pages/Event/view/confirmLocation/confirmLocation.less +++ b/src/pages/Event/view/confirmLocation/index.less @@ -10,16 +10,17 @@ position: fixed; top: 50%; left: 50%; - width: 180px; - height: 60px; - margin-left: -90px; - margin-top: -60px; + width: 360px; + height: 120px; + margin-left: -180px; + margin-top: -120px; display: flex; justify-content: center; align-items: center; + .drag-img { - width: 25px; - height: 38px; + width: 50px; + height: 76px; } } @@ -28,20 +29,20 @@ .right-control, .right-lacate { position: absolute; - top: 30px; + top: 60px; left: 50%; - margin-left: -170px; - width: 340px; - padding: 15px; - border-radius: 10px; + margin-left: -340px; + width: 680px; + padding: 30px; + border-radius: 20px; background-color: #ffffff; - box-shadow: 1px 1px 10px 2px #e4e7e9; + box-shadow: 2px 2px 20px 4px #e4e7e9; display: flex; .picture { - width: 60px; - height: 70px; - border-radius: 10px; + width: 120px; + height: 140px; + border-radius: 20px; background: #f6f7f8; overflow: hidden; } @@ -49,18 +50,15 @@ .text { flex: 1; text-align: justify; - line-height: 26px; - margin-left: 20px; + line-height: 52px; + margin-left: 40px; color: #1d2541; - font-size: 15px; + font-size: 30px; .name { color: #ff5167; } - .location { - color: #2c63ff; - } .tip { display: block; @@ -68,47 +66,47 @@ } &.right-control { - width: 40px; + width: 80px; top: auto; - bottom: 260px; + bottom: 520px; left: auto; - right: 20px; + right: 40px; flex-direction: column; align-items: center; justify-content: space-between; - font-size: 26px; + font-size: 52px; font-weight: bold; - padding: 6px; + padding: 12px; } &.right-lacate { - width: 40px; + width: 80px; top: auto; - bottom: 210px; + bottom: 420px; left: auto; - right: 20px; - padding: 6px; + right: 40px; + padding: 12px; justify-content: center; .lacate-icon { - width: 24px; - height: 24px; + width: 48px; + height: 48px; } } &.bottom-confrim { top: auto; - bottom: 60px; - gap: 15px; - font-size: 17px; + bottom: 120px; + gap: 30px; + font-size: 34px; color: #1d2541; font-weight: bold; flex-direction: column; .icon { - width: 14px; - height: 16px; - margin-right: 4px; + width: 28px; + height: 32px; + margin-right: 8px; } } } diff --git a/src/pages/Event/view/confirmLocation/confirmLocation.tsx b/src/pages/Event/view/confirmLocation/index.tsx similarity index 58% rename from src/pages/Event/view/confirmLocation/confirmLocation.tsx rename to src/pages/Event/view/confirmLocation/index.tsx index af53160e6eab110c5dacd4646b89f068e3733d1e..9c08cff45fb5faaece5a3d1a62c66e35827216bb 100644 --- a/src/pages/Event/view/confirmLocation/confirmLocation.tsx +++ b/src/pages/Event/view/confirmLocation/index.tsx @@ -1,62 +1,39 @@ -import { View, Map, Text, Image } from '@tarojs/components'; -import { Button } from '@nutui/nutui-react-taro'; -import './confirmLocation.less'; -import { useRef, useState } from 'react'; -import Taro, { useDidShow } from '@tarojs/taro'; -import { ApiService } from '@/apis'; -import { useStores } from '@/hooks/useStore'; -import { getAuth } from '@/utils/comm'; -const locationImg = require('@/assets/image/discover/localPoint.png'); +import { View, Map, Text, Image } from "@tarojs/components"; +import { Button } from "@nutui/nutui-react-taro"; +import "./index.less"; +import { useRef, useState } from "react"; +import Taro, { useDidShow } from "@tarojs/taro"; +import { getAuth } from "@/utils/comm"; +import services from "@/services"; +import useReportStore from "@/store/report"; +import locationImg from "@/assets/images/event/localPoint.png"; +import dragPoint from "@/assets/images/event/dragPoint.png"; +import lacate from "@/assets/images/event/lacate.png"; +import location from "@/assets/images/event/location.png"; function ConfirmLocation() { - const { reportStore } = useStores(); //上报事件 const { discoverEntry, eventReportInfoExtend, standardEventContent } = - reportStore; + useReportStore(); //上报事件 const [marketPoint, setMarketPoint] = useState({ longitude: 104.067252, latitude: 30.548654, }); //解析的地址信息 const addressInfo = useRef(); - let eventFileImgs = Taro.getStorageSync('beforeFilePath'); //事件图片地址 + let eventFileImgs = Taro.getStorageSync("beforeFilePath"); //事件图片地址 useDidShow(async () => { - // getLocation(); - const auth = await getAuth('scope.userLocation', '请打开位置权限', () => { - Taro.navigateBack() - }) - if(auth){ - getRealLocation() + const auth = await getAuth("scope.userLocation", "请打开位置权限", () => { + Taro.navigateBack(); + }); + if (auth) { + getRealLocation(); } }); - const getLocation = async () => { - try { - // 检查用户是否授权了位置权限 - const setting = await Taro.getSetting(); - if (!setting.authSetting['scope.userLocation']) { - // 用户未授权位置权限，引导用户去授权页面 - Taro.authorize({ - scope: 'scope.userLocation', - success: function () { - getRealLocation(); - }, - fail: function () { - // 用户拒绝授权 - }, - }); - } else { - // 用户已授权位置权限 - getRealLocation(); - } - } catch (error) { - // 处理异常 - console.error(error); - } - }; // 获取位置信息 const getRealLocation = () => { try { Taro.getLocation({ - type: 'wgs84', // 返回的经纬度坐标为WGS84坐标系 + type: "wgs84", // 返回的经纬度坐标为WGS84坐标系 success: async (position) => { let { longitude, latitude } = position; await getAnalysisAddress(longitude, latitude); @@ -73,31 +50,32 @@ function ConfirmLocation() { console.error(error); } }; + //解析地址信息 const getAnalysisAddress = async (longitude: number, latitude: number) => { return new Promise((resolve, reject) => { Taro.request({ url: `https://apis.map.qq.com/ws/geocoder/v1`, - method: 'GET', + method: "GET", data: { location: `${latitude},${longitude}`, - key: 'R5CBZ-5PV3J-J4RFF-XJ5Z2-MDUZ3-VUFBM', + key: "R5CBZ-5PV3J-J4RFF-XJ5Z2-MDUZ3-VUFBM", }, success: function (res) { let { status, result } = res.data; if (status === 0) { addressInfo.current = { - cityCode: '5101', + cityCode: "5101", cityName: result.address_component.city, districtCode: result.ad_info.adcode, districtName: result.ad_info.district, streetCode: result.address_reference?.town?.id, streetName: result.address_component.street, - communityCode: '', - communityName: '', + communityCode: "", + communityName: "", lon: result.location.lng, //事件经度 lat: result.location.lat, //事件纬度 - coordinateType: 'GCJ-02', //坐标类型 + coordinateType: "GCJ-02", //坐标类型 address: result.formatted_addresses.recommend, }; resolve(addressInfo.current); @@ -107,36 +85,37 @@ function ConfirmLocation() { }); }); }; + //确认位置，上报事件 const handleConfirm = () => { let req: API.ReportEventSourceInfoReq = { - standardEventTitle:standardEventContent,//极简上报如果有描述就传入 + standardEventTitle: standardEventContent, //极简上报如果有描述就传入 standardEventContent, //描述 - handlingMethod: '1', //办理方式 1:派遣处置 - collectionMode: '1', + handlingMethod: "1", //办理方式 1:派遣处置 + collectionMode: "1", eventReportInfoExtend: { ...eventReportInfoExtend, ...addressInfo.current, }, beforeFilePath: eventFileImgs, }; - if (discoverEntry === 'liftFinger') { - req.handlingMethod = '2'; //2自查自处(举手之劳传2) - req.afterFilePath = Taro.getStorageSync('afterFilePath');//处置后的图片 + if (discoverEntry === "liftFinger") { + req.handlingMethod = "2"; //2自查自处(举手之劳传2) + req.afterFilePath = Taro.getStorageSync("afterFilePath"); //处置后的图片 } - console.log('上报参数', req); - ApiService.postReportEventSourceInfo(req).then((res) => { + console.log("上报参数", req); + services.event.postReportEventSourceInfo(req).then((res) => { if (res.code === 200) { //上报成功 if (res.data === true) { Taro.redirectTo({ - url: '/pages/index/view/result/result', + url: "/pages/Success/index?sourceType=event", }); } else { - Taro.setStorageSync('dispatchInfo', res.data); //派遣信息 + Taro.setStorageSync("dispatchInfo", res.data); //派遣信息 //直达 Taro.redirectTo({ - url: '/pages/index/autoDispatch/autoDispatch', + url: "/pages/Event/view/autoDispatch/index", }); } } @@ -144,8 +123,8 @@ function ConfirmLocation() { }; //视野发生变化时触发， const regionChange = async (e) => { - if (e.causedBy === 'drag') { - if (e.detail.type === 'end') { + if (e.causedBy === "drag") { + if (e.detail.type === "end") { const { longitude, latitude } = e.detail.centerLocation; await getAnalysisAddress(longitude, latitude); setMarketPoint({ longitude, latitude }); @@ -168,24 +147,20 @@ function ConfirmLocation() { latitude: Number(marketPoint?.latitude), longitude: Number(marketPoint?.longitude), iconPath: locationImg, - width: '76rpx', - height: '100rpx', + width: "76rpx", + height: "100rpx", }, ]} /> ( - + ) 请确认问题是否发生在当前位置 - {/* 当前位置 */} 如果不是,请拖动地图调整 @@ -194,17 +169,11 @@ function ConfirmLocation() { setScale(scale - 1)}>- */} - + - + {addressInfo.current?.address} + + ); +} + +export default OrderDirect; diff --git a/src/pages/Index/components/LiftFinger/index.tsx b/src/pages/Index/components/LiftFinger/index.tsx index acfb544c271a2b78adb5d3ebb9c9a8cbab559239..e96245ea568d0578bcea6f4b16d644089fd1c1a3 100644 --- a/src/pages/Index/components/LiftFinger/index.tsx +++ b/src/pages/Index/components/LiftFinger/index.tsx @@ -1,47 +1,33 @@ //举手之劳弹出框 import { FC } from "react"; -import { View, Text, Image } from "@tarojs/components"; +import { View, Image } from "@tarojs/components"; import "./index.less"; -import { problemList } from "@/utils"; -import take from "@/assets/icon/take.png"; -import photo from "@/assets/bg/bg11.png"; -import video from "@/assets/icon/video.png"; -interface PhotoConfigDto { - name: string; - icon: string; - desc: string[]; -} +import take from "@/assets/icon/take.png"; +import Taro from "@tarojs/taro"; +import pic1 from "@/assets/images/event/photo/pic1.jpg"; +import pic2 from "@/assets/images/event/photo/pic2.jpg"; +import pic3 from "@/assets/images/event/photo/pic3.jpg"; +import pic4 from "@/assets/images/event/photo/pic4.jpg"; +import pic5 from "@/assets/images/event/photo/pic5.jpg"; +import pic6 from "@/assets/images/event/photo/pic6.jpg"; const LiftFinger: FC = ({}) => { - //入口配制 - let photoConfig: PhotoConfigDto[] = [ - { - name: "拍照", - icon: take, - desc: ["1张近照", "1张远照"], - }, - { - name: "相册", - icon: photo, - desc: ["选2-3张"], - }, - { - name: "视频", - icon: video, - desc: ["不超过5秒"], - }, - ]; + //跳转拍照页 + const jumpToCameraPage = () => { + Taro.navigateTo({ + url: "/pages/Event/view/cameraComp/index", + }); + }; return ( - {[1, 2, 3, 4, 5, 6].map((v) => ( - + {[pic1, pic2, pic3, pic4, pic5, pic6].map((v, vIndex) => ( + ))} - - + + 记录我的举手之劳 - ); }; diff --git a/src/pages/Index/components/TakePhoto/index.tsx b/src/pages/Index/components/TakePhoto/index.tsx index 6f026fb85bec39081fd0ab01e150a59f1d2ca4f9..4a2bd05214a7eaf0db7207b810d050f7538575af 100644 --- a/src/pages/Index/components/TakePhoto/index.tsx +++ b/src/pages/Index/components/TakePhoto/index.tsx @@ -5,7 +5,7 @@ import "./index.less"; import { problemList } from "@/utils"; import take from "@/assets/icon/take.png"; import photo from "@/assets/icon/photo.png"; -import video from "@/assets/icon/video.png"; +1 import Taro from "@tarojs/taro"; interface PhotoConfigDto { name: string; @@ -38,10 +38,9 @@ const TakePhoto: FC = ({}) => { const jumpToCameraPage = (jump: boolean | undefined) => { if (jump) { return; - } - console.log(987) + } Taro.navigateTo({ - url: "/pages/Event/view/cameraComp/index?type=take", + url: "/pages/Event/view/cameraComp/index", }); }; return ( diff --git a/src/pages/Success/index.tsx b/src/pages/Success/index.tsx index 8eae8c8b9610be07dc2ec4ec1450022c5e489e0e..e913f03b6538fc6025f1e61fd207ecedced0b8c8 100644 --- a/src/pages/Success/index.tsx +++ b/src/pages/Success/index.tsx @@ -21,6 +21,12 @@ export default function () { subTitle = "感谢您的问题"; } + /** 来源为事件上报 */ + if (sourceType === "event") { + title = "提交成功"; + subTitle = ""; + } + return ( diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 3bc33b92073adab706f5285df57e60f2e3efbae5..9a303a25d2f9627374552440a535fc647e436400 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -14,6 +14,7 @@ import { Flex } from "@taroify/core"; import PopupComp from "./components/PopupComp"; import LiftFinger from "./components/LiftFinger"; import TakePhoto from "./components/TakePhoto"; +import useReportStore, { DiscoverEntryDto } from "@/store/report"; export default function Index() { const { @@ -23,9 +24,10 @@ export default function Index() { queryMainBodyInfo, queryAuthenticationInfo, } = useGlobalStore(); + const { clearStore } = useReportStore(); const [eventEntryModal, setEventEntryModal] = useState<{ open: boolean; - type?: "take" | "liftFinger"; + type?: DiscoverEntryDto; }>({ open: false, }); //事件入口 @@ -101,6 +103,12 @@ export default function Index() { }); }; + //打开事件入口 + const handleOPenEventEntry = (type: DiscoverEntryDto) => { + clearStore(); //清除仓库数据 + setEventEntryModal({ open: true, type }); + }; + return ( @@ -122,10 +130,7 @@ export default function Index() { })} - setEventEntryModal({ open: true, type: "take" })} - > + handleOPenEventEntry("take")}> 随手拍 这里是1句话 @@ -133,9 +138,7 @@ export default function Index() { - setEventEntryModal({ open: true, type: "liftFinger" }) - } + onClick={() => handleOPenEventEntry("liftFinger")} > 举手之劳 @@ -154,16 +157,15 @@ export default function Index() { {/* 举手之劳 */} - {/* setOpen(false)} - onClose={() => setEventEntryModal({open:false})} + open={eventEntryModal.open && eventEntryModal.type === "liftFinger"} + onClose={() => setEventEntryModal({ open: false })} borderColor="#FFAF3D" > - */} + 便民服务查询 diff --git a/src/services/core/apiCore.d.ts b/src/services/core/apiCore.d.ts index 24ce3d2fcff6bee26c32fc10c81e6b16df9c20a8..5afed3e1fd25717b0d6863b00f2ce3ae62226ea6 100644 --- a/src/services/core/apiCore.d.ts +++ b/src/services/core/apiCore.d.ts @@ -226,4 +226,35 @@ declare namespace API { detectedInfo: DetectedInfoItem[]; }[]; } + + interface UserMembersDto { + centerPoint: { + lat: string; + lng: string; + }; + department: string; + eventGroupExName: string; + gridId: string; + gridName: string; + memberId: string; + memberName: string; + phone: string; + photoUrl: string; + position: string; + responsibilityConfigId: string; + responsibilitySystemId: string; + responsibilitySystemName: string; + responsibilityType: string; + shape: string; + workScheduleName: string; + } + + interface EventMembers { + disposeMembers: UserMembersDto[]; + superviseMembers: UserMembersDto[]; + disposeNum: number; + patrolMembers: UserMembersDto[]; + patrolNum: number; + superviseNum: number; + } } diff --git a/src/services/event.ts b/src/services/event.ts index 385ad29e49bc12f3a983d22625086e7a68b4577f..959f710aa285a73a70feba983f8974c1657367f7 100644 --- a/src/services/event.ts +++ b/src/services/event.ts @@ -5,7 +5,7 @@ import request from "./core/request"; * @description: 事件上报、事件列表、事件详情 */ -//文件上传 +//ai识别 export async function postPhotoAcquisitionCategory(data: { img: string; }): Promise> { @@ -14,3 +14,13 @@ export async function postPhotoAcquisitionCategory(data: { { method: "POST", data } ); } + +//上报事件信息 +export async function postReportEventSourceInfo( + data: API.ReportEventSourceInfoReq +): Promise> { + return request(api.eventUrl + "/preprocessing/event-info/reportSourceInfo", { + method: "POST", + data, + }); +} diff --git a/src/store/report.ts b/src/store/report.ts index d628b0d483061a83709583e6ba72789ce9c5397a..5a42b87005c691fcbbf089f798d679b2a355f94a 100644 --- a/src/store/report.ts +++ b/src/store/report.ts @@ -32,16 +32,22 @@ let eventReportForm: API.ReportEventSourceInfoReq = { beforeFilePath: [], //图片 }; +export type DiscoverEntryDto = + | "take" //拍照发现 极简上报 + | "liftFinger"; //举手之劳 + const useReportStore = create<{ standardEventContent: string; + discoverEntry: DiscoverEntryDto; eventReportInfoExtend: API.ReportEventSourceInfoReq["eventReportInfoExtend"]; updateReportEvent: (obj?: any) => void; updateContent: (text?: any) => void; + updateDiscover: (type: DiscoverEntryDto) => void; clearStore: () => void; }>((set) => ({ standardEventContent: "", eventReportInfoExtend: eventReportForm.eventReportInfoExtend, - + discoverEntry:'take', //修改上报事件参数 updateReportEvent(obj?: any) { set({ @@ -56,6 +62,11 @@ const useReportStore = create<{ }); }, + //修改入口，判断识别弹出框显示 + updateDiscover(type: DiscoverEntryDto) { + this.discoverEntry = type; + }, + //重置store clearStore() { set({