gxwebsoft/template-10519
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复已知问题

Browse Source
This commit is contained in:
赵忠林
2025-06-07 12:22:27 +08:00
parent 7ff3e3f064
commit de0f6c43b1
9 changed files with 285 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/hjm/hjmBxLog/model/index.ts
View File

@@ -12,6 +12,8 @@ export interface HjmBxLog {
accidentType?: string;
// 车辆ID
carId?: number;
// 车辆编号
carNo?: string;
// 保险图片
image?: string;
// 排序(数字越小越靠前)

1
src/api/hjm/hjmExamLog/index.ts
View File

@@ -105,7 +105,6 @@ export async function checkMonthTaskCompleted() {
const res = await request.get<ApiResult<HjmExamLog>>(
'/hjm/hjm-exam-log/checkMonthTaskCompleted'
);
console.log(res,'1231231123123123')
if (res.code === 0) {
return res.data;
}

4
src/app.config.ts
View File

@@ -47,7 +47,9 @@ export default defineAppConfig({
"video/video",
"exam/exam",
"bx/bx",
"bx/bx-add"
"bx/bx-add",
// "bx/bx-list",
// "question/detail"
]
}
// {

42
src/components/Questions.tsx Normal file
View File

@@ -0,0 +1,42 @@
import {useEffect, useState} from "react";
import {pageHjmQuestions} from "@/api/hjm/hjmQuestions";
import {HjmQuestions} from "@/api/hjm/hjmQuestions/model";
/**
* 文章终极列表
* @constructor
*/
const Questions = () => {
const [list, setList] = useState<HjmQuestions[]>([])
const reload = () => {
pageHjmQuestions({}).then(res => {
if (res?.list) {
setList(res?.list)
}
})
}
useEffect(() => {
reload()
}, [])
return (
<div className={'px-3 mb-10'}>
<div className={'flex flex-col justify-between items-center bg-white rounded-lg p-4'}>
<div className={'bg-white w-full'}>
{
list.map((item, index) => {
return (
<div key={index} className={'flex justify-between items-center py-2'}>
<div className={'text-sm'}>{item.question}</div>
</div>
)
})
}
</div>
</div>
</div>
)
}
export default Questions

87
src/hjm/bx/bx-add.tsx
View File

@@ -1,4 +1,4 @@
import {useEffect, useState} from "react";
import {useEffect, useState, useCallback} from "react";
import Taro from '@tarojs/taro'
import {
Image,
@@ -22,8 +22,10 @@ function BxAdd() {
const [loading, setLoading] = useState<boolean>(false)
const [uploading, setUploading] = useState<boolean>(false)
const [carInfo, setCarInfo] = useState<HjmCar | null>(null)
const [lastClickTime, setLastClickTime] = useState<number>(0)
const [formData, setFormData] = useState<HjmBxLog>({
carId: undefined,
accidentType: undefined,
image: '',
comments: '',
status: 0 // 0: 待审核, 1: 已通过, 2: 已驳回
@@ -74,29 +76,75 @@ function BxAdd() {
}
}
// 拍照上传
const takePhoto = () => {
// 拍照上传 - 使用 useCallback 防止重复触发
const takePhoto = useCallback((event?: any) => {
// 阻止事件冒泡
if (event) {
event.stopPropagation()
event.preventDefault()
}
// 防抖：防止快速连续点击
const now = Date.now()
if (now - lastClickTime < 1000) { // 1秒内不允许重复点击
console.log('点击过于频繁，请稍候...')
return
}
setLastClickTime(now)
// 防止重复点击
if (uploading) {
console.log('正在上传中，请稍候...')
Taro.showToast({
title: '正在上传中...',
icon: 'loading'
})
return
}
console.log('开始拍照上传...')
Taro.chooseImage({
count: 1,
sizeType: ['compressed'],
sourceType: ['camera'],
success: async () => {
success: async (res) => {
try {
setUploading(true)
console.log('选择图片成功:', res.tempFilePaths[0])
// 这里应该调用实际的上传接口
uploadFile().then(data => {
setFormData({
...formData,
image: data.url
})
});
const uploadResult = await uploadFile()
setFormData(prev => ({
...prev,
image: uploadResult.url || res.tempFilePaths[0]
}))
Taro.showToast({
title: '照片上传成功',
icon: 'success'
})
} catch (error) {
console.error('上传失败:', error)
Taro.showToast({
title: '上传失败，请重试',
icon: 'error'
})
} finally {
setUploading(false)
}
},
fail: (error) => {
console.error('选择图片失败:', error)
Taro.showToast({
title: '选择图片失败',
icon: 'error'
})
setUploading(false)
}
})
}
}, [uploading, lastClickTime])
// 提交表单
const handleSubmit = async () => {
@@ -131,7 +179,8 @@ function BxAdd() {
// 构建提交数据
const submitData: HjmBxLog = {
...formData,
comments: `事故类型：${accidentType}\n事故描述：${accidentDescription || '无'}`
accidentType: accidentType,
comments: `${accidentDescription || '无'}`
}
await addHjmBxLog(submitData)
@@ -140,9 +189,10 @@ function BxAdd() {
title: '报险提交成功',
icon: 'success'
})
setTimeout(() => {
Taro.navigateBack()
}, 1500)
}, 2000)
} catch (error) {
console.error('提交失败:', error)
@@ -197,7 +247,7 @@ function BxAdd() {
<span style={{fontSize: '16px', fontWeight: 'bold'}}>车辆信息</span>
</div>
<Space direction="vertical" size={8}>
<Space direction="vertical">
<div style={{display: 'flex', justifyContent: 'space-between'}}>
<span style={{color: '#8c8c8c'}}>车辆编号：</span>
<span style={{fontWeight: 'bold'}}>{carInfo.code}</span>
@@ -322,6 +372,7 @@ function BxAdd() {
<Button
size="small"
loading={uploading}
disabled={uploading}
onClick={takePhoto}
style={{
width: '100px',
@@ -331,11 +382,15 @@ function BxAdd() {
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
border: '2px dashed #d9d9d9'
border: '2px dashed #d9d9d9',
opacity: uploading ? 0.6 : 1,
cursor: uploading ? 'not-allowed' : 'pointer'
}}
>
<Camera size={24}/>
<span style={{fontSize: '12px', marginTop: '4px'}}>拍照</span>
<span style={{fontSize: '12px', marginTop: '4px'}}>
{uploading ? '上传中...' : '拍照'}
</span>
</Button>
)}
</div>

291
src/hjm/bx/bx-list.tsx
View File

@@ -1,291 +0,0 @@
import React, {useEffect, useState} from "react";
import {
InfiniteLoading,
Loading,
Empty,
Button,
Input,
Tag,
Image,
Space,
Cell
} from '@nutui/nutui-react-taro'
import {Search, Calendar, Truck, File} from '@nutui/icons-react-taro'
import Taro from '@tarojs/taro'
import {pageHjmBxLog} from "@/api/hjm/hjmBxLog";
import {HjmBxLog} from "@/api/hjm/hjmBxLog/model";
/**
* 报险记录列表页面
*/
const BxList: React.FC = () => {
const [list, setList] = useState<HjmBxLog[]>([])
const [loading, setLoading] = useState<boolean>(false)
const [keywords, setKeywords] = useState<string>('')
const [refreshing, setRefreshing] = useState<boolean>(false)
// 获取状态显示
const getStatusDisplay = (status?: number) => {
switch (status) {
case 0:
return {text: '待审核', color: '#faad14', bgColor: '#fffbe6'}
case 1:
return {text: '已通过', color: '#52c41a', bgColor: '#f6ffed'}
case 2:
return {text: '已驳回', color: '#ff4d4f', bgColor: '#fff2f0'}
default:
return {text: '未知', color: '#8c8c8c', bgColor: '#f5f5f5'}
}
}
const reload = async (showLoading = true) => {
try {
if (showLoading) setLoading(true)
setRefreshing(true)
const res = await pageHjmBxLog({
keywords: keywords.trim() || undefined
})
setList(res?.list || [])
} catch (error) {
console.error('获取报险记录失败:', error)
Taro.showToast({
title: '获取报险记录失败',
icon: 'error'
})
} finally {
setLoading(false)
setRefreshing(false)
}
}
const onSearch = () => {
reload()
}
const onKeywordsChange = (value: string) => {
setKeywords(value)
}
const onAddInsurance = () => {
Taro.navigateTo({
url: '/hjm/bx/bx-add'
})
}
const viewDetail = (item: HjmBxLog) => {
Taro.navigateTo({
url: `/hjm/bx/bx-detail?id=${item.id}`
})
}
useEffect(() => {
reload()
}, [])
return (
<>
{/* 搜索栏 */}
<div style={{
position: 'fixed',
top: '20px',
left: 0,
right: 0,
zIndex: 20,
padding: '0 16px',
backgroundColor: '#f5f5f5'
}}>
<div style={{
display: 'flex',
alignItems: 'center',
backgroundColor: '#fff',
padding: '8px 12px',
borderRadius: '20px',
boxShadow: '0 2px 8px rgba(0,0,0,0.1)'
}}>
<Search size={16} color="#999"/>
<Input
placeholder="搜索报险记录"
value={keywords}
onChange={onKeywordsChange}
onConfirm={onSearch}
style={{
border: 'none',
backgroundColor: 'transparent',
flex: 1,
marginLeft: '8px'
}}
/>
<Button
type="primary"
size="small"
onClick={onSearch}
loading={loading}
>
搜索
</Button>
</div>
</div>
{/* 报险记录列表 */}
<div style={{
marginTop: '80px',
paddingBottom: '80px'
}}>
{loading && list.length === 0 ? (
<div style={{
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
height: '200px'
}}>
<Loading type="spinner">加载中...</Loading>
</div>
) : list.length === 0 ? (
<Empty description="暂无报险记录">
<Button type="primary" onClick={onAddInsurance}>
立即报险
</Button>
</Empty>
) : (
<div style={{padding: '0 16px'}}>
{list.map((item, index) => {
const statusDisplay = getStatusDisplay(item.status)
return (
<div
key={index}
style={{
backgroundColor: '#fff',
borderRadius: '12px',
padding: '16px',
marginBottom: '12px',
boxShadow: '0 2px 8px rgba(0,0,0,0.06)',
border: '1px solid #f0f0f0'
}}
onClick={() => viewDetail(item)}
>
<div style={{
display: 'flex',
justifyContent: 'space-between',
alignItems: 'flex-start',
marginBottom: '12px'
}}>
<div style={{flex: 1}}>
<div style={{
display: 'flex',
alignItems: 'center',
gap: '8px',
marginBottom: '8px'
}}>
<File size={16} color="#1890ff"/>
<span style={{
fontSize: '16px',
fontWeight: 'bold',
color: '#262626'
}}>
报险记录 #{item.id}
</span>
</div>
<Space direction="vertical" size={4}>
<div style={{
display: 'flex',
alignItems: 'center',
gap: '8px'
}}>
<Truck size={14} color="#8c8c8c"/>
<span style={{fontSize: '13px', color: '#8c8c8c'}}>
车辆ID：{item.carId}
</span>
</div>
<div style={{
display: 'flex',
alignItems: 'center',
gap: '8px'
}}>
<Calendar size={14} color="#8c8c8c"/>
<span style={{fontSize: '13px', color: '#8c8c8c'}}>
提交时间：{item.createTime}
</span>
</div>
</Space>
</div>
<Tag
color={statusDisplay.color}
style={{
backgroundColor: statusDisplay.bgColor,
border: `1px solid ${statusDisplay.color}`,
fontSize: '12px'
}}
>
{statusDisplay.text}
</Tag>
</div>
{/* 事故照片预览 */}
{item.image && (
<div style={{marginBottom: '12px'}}>
<Image
src={item.image}
width="60"
height="60"
radius="6px"
mode="aspectFill"
/>
</div>
)}
{/* 备注信息 */}
{item.comments && (
<div style={{
backgroundColor: '#f8f9fa',
padding: '8px 12px',
borderRadius: '6px',
fontSize: '13px',
color: '#595959',
lineHeight: '1.4'
}}>
{item.comments.length > 50
? `${item.comments.substring(0, 50)}...`
: item.comments
}
</div>
)}
</div>
)
})}
</div>
)}
</div>
{/* 浮动添加按钮 */}
<div style={{
position: 'fixed',
bottom: '20px',
right: '20px',
zIndex: 30
}}>
<Button
type="primary"
shape="round"
size="large"
onClick={onAddInsurance}
style={{
width: '56px',
height: '56px',
borderRadius: '28px',
boxShadow: '0 4px 12px rgba(0,0,0,0.15)'
}}
>
+
</Button>
</div>
</>
)
}
export default BxList

190
src/hjm/bx/bx.tsx
View File

@@ -1,37 +1,55 @@
import {useEffect, useState} from "react";
import {InfiniteLoading, Loading, Empty, Button, Input} from '@nutui/nutui-react-taro'
import {Search, Plus} from '@nutui/icons-react-taro'
import React, {useEffect, useState} from "react";
import {
Loading,
Empty,
Button,
Input,
Tag,
Image,
Space
} from '@nutui/nutui-react-taro'
import {Search, Calendar, Truck, File} from '@nutui/icons-react-taro'
import Taro from '@tarojs/taro'
import {pageHjmCar} from "@/api/hjm/hjmCar";
import {HjmCar} from "@/api/hjm/hjmCar/model";
import BestSellers from "./BestSellers";
import {pageHjmBxLog} from "@/api/hjm/hjmBxLog";
import {HjmBxLog} from "@/api/hjm/hjmBxLog/model";
/**
* 一键报险 - 车辆列表页面
* @constructor
* 报险记录列表页面
*/
const InsuranceList = () => {
const [list, setList] = useState<HjmCar[]>([])
const Bx: React.FC = () => {
const [list, setList] = useState<HjmBxLog[]>([])
const [loading, setLoading] = useState<boolean>(false)
const [keywords, setKeywords] = useState<string>('')
const [refreshing, setRefreshing] = useState<boolean>(false)
console.log(refreshing)
// 获取状态显示
const getStatusDisplay = (status?: number) => {
switch (status) {
case 0:
return {text: '待审核', color: '#faad14', bgColor: '#fffbe6'}
case 1:
return {text: '已通过', color: '#52c41a', bgColor: '#f6ffed'}
case 2:
return {text: '已驳回', color: '#ff4d4f', bgColor: '#fff2f0'}
default:
return {text: '未知', color: '#8c8c8c', bgColor: '#f5f5f5'}
}
}
const reload = async (showLoading = true) => {
try {
if (showLoading) setLoading(true)
setRefreshing(true)
// 获取车辆列表 - 只获取正常状态的车辆
const res = await pageHjmCar({
status: 1,
keywords: keywords.trim() || undefined
const res = await pageHjmBxLog({
keywords: keywords.trim()
})
setList(res?.list || [])
} catch (error) {
console.error('获取车辆列表失败:', error)
console.error('获取报险记录失败:', error)
Taro.showToast({
title: '获取车辆列表失败',
title: '获取报险记录失败',
icon: 'error'
})
} finally {
@@ -54,6 +72,12 @@ const InsuranceList = () => {
})
}
const viewDetail = (item: HjmBxLog) => {
Taro.navigateTo({
url: `/hjm/bx/bx-detail?id=${item.id}`
})
}
useEffect(() => {
reload()
}, [])
@@ -66,6 +90,7 @@ const InsuranceList = () => {
top: '20px',
left: 0,
right: 0,
display: "none",
zIndex: 20,
padding: '0 16px',
backgroundColor: '#f5f5f5'
@@ -80,7 +105,7 @@ const InsuranceList = () => {
}}>
<Search size={16} color="#999"/>
<Input
placeholder="搜索车辆编号或快递公司"
placeholder="搜索报险记录"
value={keywords}
onChange={onKeywordsChange}
onConfirm={onSearch}
@@ -102,9 +127,9 @@ const InsuranceList = () => {
</div>
</div>
{/* 车辆列表 */}
{/* 报险记录列表 */}
<div style={{
marginTop: '80px',
marginTop: '10px',
paddingBottom: '80px'
}}>
{loading && list.length === 0 ? (
@@ -117,19 +142,122 @@ const InsuranceList = () => {
<Loading type="spinner">加载中...</Loading>
</div>
) : list.length === 0 ? (
<Empty description="暂无车辆数据">
<Button type="primary" onClick={() => reload()}>
重新加载
<Empty description="暂无报险记录">
<Button type="primary" onClick={onAddInsurance}>
立即报险
</Button>
</Empty>
) : (
<InfiniteLoading
style={{width: '100%'}}
hasMore={false}
onLoadMore={() => {}}
>
<BestSellers data={list} onRefresh={() => reload(false)}/>
</InfiniteLoading>
<div style={{padding: '0 16px'}}>
{list.map((item, index) => {
const statusDisplay = getStatusDisplay(item.status)
return (
<div
key={index}
style={{
backgroundColor: '#fff',
borderRadius: '12px',
padding: '16px',
marginBottom: '12px',
boxShadow: '0 2px 8px rgba(0,0,0,0.06)',
border: '1px solid #f0f0f0'
}}
onClick={() => viewDetail(item)}
>
<div style={{
display: 'flex',
justifyContent: 'space-between',
alignItems: 'flex-start',
marginBottom: '12px'
}}>
<div style={{flex: 1}}>
<div style={{
display: 'flex',
alignItems: 'center',
gap: '8px',
marginBottom: '8px'
}}>
<File size={16} color="#1890ff"/>
<span style={{
fontSize: '16px',
fontWeight: 'bold',
color: '#262626'
}}>
报险记录 #{item.id}
</span>
</div>
<Space direction="vertical">
<div style={{
display: 'flex',
alignItems: 'center',
gap: '8px'
}}>
<Truck size={14} color="#8c8c8c"/>
<span style={{fontSize: '13px', color: '#8c8c8c'}}>
车辆编号：{item.carNo}
</span>
</div>
<div style={{
display: 'flex',
alignItems: 'center',
gap: '8px'
}}>
<Calendar size={14} color="#8c8c8c"/>
<span style={{fontSize: '13px', color: '#8c8c8c'}}>
提交时间：{item.createTime}
</span>
</div>
</Space>
</div>
<Tag
color={statusDisplay.color}
style={{
backgroundColor: statusDisplay.bgColor,
border: `1px solid ${statusDisplay.color}`,
fontSize: '12px'
}}
>
{statusDisplay.text}
</Tag>
</div>
{/* 事故照片预览 */}
{item.image && (
<div style={{marginBottom: '12px'}}>
<Image
src={item.image}
width="60"
height="60"
radius="6px"
mode="aspectFill"
/>
</div>
)}
{/* 备注信息 */}
{item.comments && (
<div style={{
backgroundColor: '#f8f9fa',
padding: '8px 12px',
borderRadius: '6px',
fontSize: '13px',
color: '#595959',
lineHeight: '1.4'
}}>
{item.comments.length > 50
? `${item.comments.substring(0, 50)}...`
: item.comments
}
</div>
)}
</div>
)
})}
</div>
)}
</div>
@@ -152,11 +280,11 @@ const InsuranceList = () => {
boxShadow: '0 4px 12px rgba(0,0,0,0.15)'
}}
>
<Plus size={24}/>
+
</Button>
</div>
</>
)
}
export default InsuranceList
export default Bx

11
src/pages/study/study.tsx
View File

@@ -1,9 +1,10 @@
import {useEffect, useState} from "react";
import {Image} from '@nutui/nutui-react-taro'
import Taro from '@tarojs/taro'
import {Image} from '@nutui/nutui-react-taro';
import Taro from '@tarojs/taro';
import {pageCmsArticle} from "@/api/cms/cmsArticle";
import {CmsArticle} from "@/api/cms/cmsArticle/model";
import {checkMonthTaskCompleted} from "@/api/hjm/hjmExamLog";
import Questions from '@/components/Questions';
/**
* 文章终极列表
@@ -17,7 +18,7 @@ const Study = () => {
const reload = () => {
setLoading(true)
checkMonthTaskCompleted().then(res => {
if(res){
if (res) {
setMonthTaskCompleted(true)
}
pageCmsArticle({categoryId: 4289, status: 0}).then(data => {
@@ -47,12 +48,14 @@ const Study = () => {
{
!monthTaskCompleted && list?.map((item, index) => {
return (
<div key={index} className={'flex flex-col justify-between items-center bg-white rounded-lg p-2'} onClick={() => Taro.navigateTo({url: `/hjm/video/video?id=${item.articleId}`})}>
<div key={index} className={'flex flex-col justify-between items-center bg-white rounded-lg p-2'}
onClick={() => Taro.navigateTo({url: `/hjm/video/video?id=${item.articleId}`})}>
<Image src={item.image} height={200}/>
</div>
)
})
}
{list?.length == 0 && <Questions/>}
</div>
)
}

2
src/utils/request.ts
View File

@@ -4,7 +4,7 @@ import {BaseUrl, TenantId} from "@/utils/config";
let baseUrl = BaseUrl
if(process.env.NODE_ENV === 'development'){
baseUrl = 'http://localhost:9000/api'
// baseUrl = 'http://localhost:9000/api'
}
export function request<T>(options:any) {
const token = Taro.getStorageSync('access_token');