diff --git a/config/env.ts b/config/env.ts index 6870eff..05c55bd 100644 --- a/config/env.ts +++ b/config/env.ts @@ -2,14 +2,14 @@ export const ENV_CONFIG = { // 开发环境 development: { - API_BASE_URL: 'http://127.0.0.1/api', + API_BASE_URL: 'https://cms-api.websoft.top/api', APP_NAME: '开发环境', DEBUG: 'true', }, // 生产环境 production: { API_BASE_URL: 'https://cms-api.websoft.top/api', - APP_NAME: '时里院子市集', + APP_NAME: '邕递+', DEBUG: 'false', }, // 测试环境 diff --git a/src/api/hjm/hjmCar/model/index.ts b/src/api/hjm/hjmCar/model/index.ts index eef768d..4903b06 100644 --- a/src/api/hjm/hjmCar/model/index.ts +++ b/src/api/hjm/hjmCar/model/index.ts @@ -38,6 +38,8 @@ export interface HjmCar { driverName?: string; // 保险状态 insuranceStatus?: number; + // 保单图片 + bdImg?: string; // GPS设备编号 gpsNo?: string; // 速度 diff --git a/src/hjm/query.tsx b/src/hjm/query.tsx index f0c1a2e..d73e320 100644 --- a/src/hjm/query.tsx +++ b/src/hjm/query.tsx @@ -5,7 +5,7 @@ import {HjmCar} from "@/api/hjm/hjmCar/model"; import './location.scss'; import {Swiper} from '@nutui/nutui-react-taro' import {copyText} from "@/utils/common"; -import {View} from '@tarojs/components' +import {View,Text} from '@tarojs/components' import { Form, Button, @@ -43,6 +43,8 @@ const Query = () => { const [dict, setDict] = useState([]) const [claimVehicle, setClaimVehicle] = useState(false) const [showPreview, setShowPreview] = useState(false) + const [showBdImgPreview, setShowBdImgPreview] = useState(false) + const [fileList2, setFileList2] = useState([]) // 图片文件列表 const [disabled, setDisabled] = useState(false) const [fileList, setFileList] = useState([]) // 图片文件列表 const [FormData, setFormData] = useState( @@ -321,8 +323,8 @@ const Query = () => { // 认领车辆 const onClaimVehicle = async () => { const myVerify = await myUserVerify({status: 1}) - if(myVerify){ - if(myVerify.organizationId != FormData.organizationId){ + if (myVerify) { + if (myVerify.organizationId != FormData.organizationId) { Taro.showToast({ title: '只能认领【' + myVerify.organizationName + '】的车辆', icon: 'none' @@ -448,7 +450,7 @@ const Query = () => { // 2.1先查询名下有多少辆车 const carCount = await pageHjmCar({driverId: Taro.getStorageSync('UserId')}) carCount?.list.map(d => { - if(d.code == code){ + if (d.code == code) { // 只能绑定一辆车 } }) @@ -461,6 +463,20 @@ const Query = () => { } return false } + if(carInfo.bdImg){ + const parse = JSON.parse(carInfo.bdImg); + + if(parse.length > 0){ + setFileList2(parse.map( + (img) => ({ + url: img.url, + src: img.url, + name: img.name, + uid: img.uid + }) + )) + } + } // if(carInfo.status == 1 && Taro.getStorageSync('UserId') != carInfo.driverId){ // Taro.showToast({ // title: '暂无权限', @@ -611,7 +627,7 @@ const Query = () => { style={{display: 'flex', alignItems: 'center'}} onClick={saveGpsNo} > - + @@ -761,8 +777,11 @@ const Query = () => { 管理责任人:{FormData?.kuaidiAdmin} - - 保险状态:{FormData?.insuranceStatus} + 保险状态:{FormData?.insuranceStatus} + } className={'car-info-item-content'} extra={FormData?.bdImg ? { + setShowBdImgPreview(true) + }}>查看保单 : ''}> GPS编号:{FormData?.gpsNo} @@ -824,6 +843,13 @@ const Query = () => { ) } + setShowBdImgPreview(false)} + /> )} diff --git a/src/hjm/violation/add.tsx b/src/hjm/violation/add.tsx index 0c7f047..3de518f 100644 --- a/src/hjm/violation/add.tsx +++ b/src/hjm/violation/add.tsx @@ -5,6 +5,7 @@ import { TextArea, Cell, Input, + Picker } from '@nutui/nutui-react-taro' import {addHjmViolation, getHjmViolation, updateHjmViolation} from "@/api/hjm/hjmViolation"; import {HjmViolation} from "@/api/hjm/hjmViolation/model"; @@ -17,12 +18,19 @@ function Add() { const [loading, setLoading] = useState(false) const [lastSubmitTime, setLastSubmitTime] = useState(0) // 最后提交时间 const [isEditMode, setIsEditMode] = useState(false) // 是否为编辑模式 + const [isPickerVisible, setIsPickerVisible] = useState(false) // 处理状态选择器可见性 + // 处理状态选项 + const statusOptions = [ + {text: '未处理', value: 0}, + {text: '已处理', value: 1} + ] const [formData, setFormData] = useState({ code: '', title: '', money: '', score: '', - comments: '' + comments: '', + status: 0 // 默认为未处理 }) // 初始化页面数据 @@ -35,7 +43,10 @@ function Add() { try { const violation = await getHjmViolation(Number(params.id)); if (violation) { - setFormData(violation); + setFormData({ + ...violation, + status: violation.status ?? 0 // 如果没有状态值,默认为0(未处理) + }); } else { Taro.showToast({ title: '未找到该违章记录', @@ -49,6 +60,12 @@ function Add() { icon: 'none' }) } + } else { + // 新增模式下设置默认状态 + setFormData(prev => ({ + ...prev, + status: 0 + })) } setLoading(false) } catch (error) { @@ -113,12 +130,7 @@ function Add() { Taro.eventCenter.trigger('violationListRefresh') } else { // 新增模式 - 添加违章记录 - // 构建提交数据 - const submitData: HjmViolation = { - ...formData, - status: 0 // 0未处理, 1已处理 - } - await addHjmViolation(submitData); + await addHjmViolation(formData); Taro.showToast({ title: '提交成功', icon: 'success' @@ -131,7 +143,8 @@ function Add() { title: '', money: '', score: '', - comments: '' + comments: '', + status: 0 }) } @@ -148,6 +161,15 @@ function Add() { } } + // 处理状态选择确认 + const handleStatusConfirm = (_: any[], values: (string | number)[]) => { + setFormData({ + ...formData, + status: values[0] as number + }) + setIsPickerVisible(false) + } + useEffect(() => { initPageData().then(r => { console.log(r, 'rr') @@ -198,7 +220,7 @@ function Add() { - + + } style={{padding: '12px 16px'}}> - + setFormData({...formData, title: value})} style={{backgroundColor: '#ffffff', borderRadius: '8px'}} /> + } style={{padding: '12px 16px'}}> + - + setFormData({...formData, comments: value})} style={{backgroundColor: '#ffffff', borderRadius: '8px'}} /> + } style={{padding: '12px 16px'}}> + - + setFormData({...formData, money: value})} style={{backgroundColor: '#ffffff', borderRadius: '8px'}} /> + } style={{padding: '12px 16px'}}> + - + setFormData({...formData, score: value})} style={{backgroundColor: '#ffffff', borderRadius: '8px'}} /> + } style={{padding: '12px 16px'}}> + + + + + {statusOptions.find(option => option.value === formData.status)?.text || '请选择'} + + + } style={{padding: '12px 16px'}} onClick={() => setIsPickerVisible(true)}> + {/* 处理状态选择器 */} + setIsPickerVisible(false)} + onClose={() => setIsPickerVisible(false)} + /> + {/* 提交按钮 */}
{ }}> - 提交时间:{item.createTime} + 创建时间:{item.createTime}