diff --git a/.workbuddy/memory/2026-04-09.md b/.workbuddy/memory/2026-04-09.md index 56c8343..1661082 100644 --- a/.workbuddy/memory/2026-04-09.md +++ b/.workbuddy/memory/2026-04-09.md @@ -24,7 +24,7 @@ ## Grid.tsx 硬编码改造 (13:48) - 将首页4个功能按钮从后端接口请求改为硬编码 -- 菜单项：我要推荐、客户列表、邀请好友、个人中心 +- 菜单项：推荐客户、客户列表、邀请好友、个人中心 - 图片使用OSS直链，避免接口延迟 - 对应页面路径保持不变 diff --git a/config/env.ts b/config/env.ts index 6df3879..d49548f 100644 --- a/config/env.ts +++ b/config/env.ts @@ -2,21 +2,21 @@ export const ENV_CONFIG = { // 开发环境 development: { - API_BASE_URL: 'https://mp-api.websoft.top/api', + API_BASE_URL: 'https://cms-api.websoft.top/api', // API_BASE_URL: 'http://127.0.0.1:9200/api', APP_NAME: '开发环境', DEBUG: 'true', }, // 生产环境 production: { - API_BASE_URL: 'https://mp-api.websoft.top/api', + API_BASE_URL: 'https://cms-api.websoft.top/api', // API_BASE_URL: 'http://127.0.0.1:9200/api', APP_NAME: '南南佐顿门窗', DEBUG: 'false', }, // 测试环境 test: { - API_BASE_URL: 'https://mp-api.websoft.top/api', + API_BASE_URL: 'https://cms-api.websoft.top/api', // API_BASE_URL: 'http://127.0.0.1:9200/api', APP_NAME: '测试环境', DEBUG: 'true', diff --git a/src/dealer/customer/add-bak.tsx b/src/dealer/customer/add-bak.tsx new file mode 100644 index 0000000..03afaa5 --- /dev/null +++ b/src/dealer/customer/add-bak.tsx @@ -0,0 +1,1549 @@ +import {useEffect, useState, useRef} from "react"; +import {Loading, CellGroup, Cell, Input, Form, Calendar, Popup, SearchBar} from '@nutui/nutui-react-taro' +import {Edit, Calendar as CalendarIcon, ArrowRight, Del} from '@nutui/icons-react-taro' +import Taro from '@tarojs/taro' +import {useRouter} from '@tarojs/taro' +import {View, Text} from '@tarojs/components' +import FixedButton from "@/components/FixedButton"; +import {ShopDealerApply} from "@/api/shop/shopDealerApply/model"; +import { + addShopDealerApply, getShopDealerApply, pageShopDealerApply, + updateShopDealerApply +} from "@/api/shop/shopDealerApply"; +import { + formatDateForDatabase, + extractDateForCalendar, formatDateForDisplay +} from "@/utils/dateUtils"; +import {ShopDealerUser} from "@/api/shop/shopDealerUser/model"; +import {getShopDealerUser, pageShopDealerUser} from "@/api/shop/shopDealerUser"; +import {listDictData} from "@/api/system/dict-data"; +import type {DictData} from "@/api/system/dict-data/model"; + +const AddShopDealerApply = () => { + const {params} = useRouter(); + const [loading, setLoading] = useState(true) + const [FormData, setFormData] = useState() + const formRef = useRef(null) + const [isEditMode, setIsEditMode] = useState(false) + const [existingApply, setExistingApply] = useState(null) + const [referee, setReferee] = useState() + const PROTECTION_DAYS = 15; + const DUP_CHECK_LIMIT = 200; + const DUP_CHECK_MAX_PAGES = 50; + + // 房号信息：用 dealerCode 存储唯一键，dealerName 存储展示文案 + const buildHouseKey = (community: string, buildingNo: string, unitNo: string | undefined, floorNo: string | undefined, roomNo: string) => { + const c = (community || '').trim(); + const b = (buildingNo || '').trim(); + const u = (unitNo || '').trim(); + const f = (floorNo || '').trim(); + const r = (roomNo || '').trim(); + return [c, b, u, f, r].join('|'); + }; + + const buildHouseDisplay = (community: string, buildingNo: string, unitNo: string | undefined, floorNo: string | undefined, roomNo: string) => { + const c = (community || '').trim(); + const b = (buildingNo || '').trim(); + const u = (unitNo || '').trim(); + const f = (floorNo || '').trim(); + const r = (roomNo || '').trim(); + return `${c}${b ? `${b}栋` : ''}${u ? `${u}单元` : ''}${f ? `${f}楼` : ''}${r ? `${r}号` : ''}`; + }; + + const parseHouseKey = (key?: string) => { + const parts = (key || '').split('|'); + return { + community: parts[0] || '', + buildingNo: parts[1] || '', + unitNo: parts[2] || '', + floorNo: parts[3] || '', + roomNo: parts[4] || '', + }; + }; + + // 日期选择器状态 + const [showApplyTimePicker, setShowApplyTimePicker] = useState(false) + const [showContractTimePicker, setShowContractTimePicker] = useState(false) + const [applyTime, setApplyTime] = useState('') + const [contractTime, setContractTime] = useState('') + + // 接待人员选择状态 + const [showReceptionistPicker, setShowReceptionistPicker] = useState(false) + const [receptionistSearch, setReceptionistSearch] = useState('') + const [receptionistList, setReceptionistList] = useState([]) + const [receptionistLoading, setReceptionistLoading] = useState(false) + const [selectedReceptionist, setSelectedReceptionist] = useState(null) + + // 小区选择状态 + const [showCommunityPicker, setShowCommunityPicker] = useState(false) + const [communitySearch, setCommunitySearch] = useState('') + const [communityList, setCommunityList] = useState([]) + const [communityLoading, setCommunityLoading] = useState(false) + const [selectedCommunity, setSelectedCommunity] = useState(null) + + // 楼栋选择状态 + const [showBuildingPicker, setShowBuildingPicker] = useState(false) + const [buildingSearch, setBuildingSearch] = useState('') + const [buildingList, setBuildingList] = useState([]) + const [buildingLoading, setBuildingLoading] = useState(false) + const [selectedBuilding, setSelectedBuilding] = useState(null) + + // 单元选择状态 + const [showUnitPicker, setShowUnitPicker] = useState(false) + const [unitSearch, setUnitSearch] = useState('') + const [unitList, setUnitList] = useState([]) + const [unitLoading, setUnitLoading] = useState(false) + const [selectedUnit, setSelectedUnit] = useState(null) + + // 楼层选择状态 + const [showFloorPicker, setShowFloorPicker] = useState(false) + const [floorSearch, setFloorSearch] = useState('') + const [floorList, setFloorList] = useState([]) + const [floorLoading, setFloorLoading] = useState(false) + const [selectedFloor, setSelectedFloor] = useState(null) + + // 房号选择状态 + const [showRoomPicker, setShowRoomPicker] = useState(false) + const [roomSearch, setRoomSearch] = useState('') + const [roomList, setRoomList] = useState([]) + const [roomLoading, setRoomLoading] = useState(false) + const [selectedRoom, setSelectedRoom] = useState(null) + + // 获取审核状态文字 + const getApplyStatusText = (status?: number) => { + switch (status) { + case 10: + return '待审核' + case 20: + return '已签约' + case 30: + return '已取消' + default: + return '未知状态' + } + } + + // 处理签约时间选择 + const handleApplyTimeConfirm = (param: string) => { + const selectedDate = param[3] // 选中的日期字符串 (YYYY-M-D) + const formattedDate = formatDateForDatabase(selectedDate) // 转换为数据库格式 + setApplyTime(selectedDate) // 保存原始格式用于显示 + setShowApplyTimePicker(false) + + // 更新表单数据（使用数据库格式） + if (formRef.current) { + formRef.current.setFieldsValue({ + applyTime: formattedDate + }) + } + } + + // 处理合同日期选择 + const handleContractTimeConfirm = (param: string) => { + const selectedDate = param[3] // 选中的日期字符串 (YYYY-M-D) + const formattedDate = formatDateForDatabase(selectedDate) // 转换为数据库格式 + setContractTime(selectedDate) // 保存原始格式用于显示 + setShowContractTimePicker(false) + + // 更新表单数据（使用数据库格式） + if (formRef.current) { + formRef.current.setFieldsValue({ + contractTime: formattedDate + }) + } + } + + const reload = async () => { + // 查询推荐人信息 + const dealerUser = await getShopDealerUser(Number(Taro.getStorageSync('UserId'))) + setReferee(dealerUser) + + if (!params.id) { + setLoading(false); + return false; + } + // 查询当前用户ID是否已有申请记录 + try { + const dealerApply = await getShopDealerApply(Number(params.id)); + if (dealerApply) { + setFormData(dealerApply) + setIsEditMode(true); + setExistingApply(dealerApply) + + // 初始化日期数据（从数据库格式转换为Calendar组件格式） + if (dealerApply.applyTime) { + setApplyTime(extractDateForCalendar(dealerApply.applyTime)) + } + if (dealerApply.contractTime) { + setContractTime(extractDateForCalendar(dealerApply.contractTime)) + } + + // 回填接待人员 + if (dealerApply.receptionistId) { + setSelectedReceptionist({ + userId: dealerApply.receptionistId, + dealerName: dealerApply.receptionistName || '', + realName: dealerApply.receptionistName || '', + }) + } + + Taro.setNavigationBarTitle({title: '签约'}) + } + } catch (error) { + setLoading(false) + console.error('查询申请记录失败:', error); + setIsEditMode(false); + setExistingApply(null); + } + } + + // 加载接待人员列表 + const loadReceptionistList = async (keyword?: string) => { + setReceptionistLoading(true) + try { + const res = await pageShopDealerUser({keywords: keyword || '', limit: 50, page: 1}) + setReceptionistList(res?.list || []) + } catch (e) { + console.error('加载接待人员失败:', e) + } finally { + setReceptionistLoading(false) + } + } + + // 打开接待人员选择 + const openReceptionistPicker = () => { + setReceptionistSearch('') + loadReceptionistList() + setShowReceptionistPicker(true) + } + + // 搜索接待人员 + const handleReceptionistSearch = (val: string) => { + setReceptionistSearch(val) + loadReceptionistList(val) + } + + // 选择接待人员 + const handleSelectReceptionist = (user: ShopDealerUser) => { + setSelectedReceptionist(user) + setShowReceptionistPicker(false) + } + + // 清除接待人员 + const handleClearReceptionist = () => { + setSelectedReceptionist(null) + } + + // 加载小区列表 + const loadCommunityList = async (keyword?: string) => { + setCommunityLoading(true) + try { + const list = await listDictData({ dictCode: 'xiaoqu' }) + // 过滤搜索关键词 + if (keyword) { + setCommunityList(list.filter((item: DictData) => + (item.dictDataName || '').includes(keyword) || + (item.label || '').includes(keyword) + )) + } else { + setCommunityList(list) + } + } catch (e) { + console.error('加载小区列表失败:', e) + } finally { + setCommunityLoading(false) + } + } + + // 打开小区选择 + const openCommunityPicker = () => { + setCommunitySearch('') + loadCommunityList() + setShowCommunityPicker(true) + } + + // 搜索小区 + const handleCommunitySearch = (val: string) => { + setCommunitySearch(val) + loadCommunityList(val) + } + + // 选择小区 + const handleSelectCommunity = (item: DictData) => { + setSelectedCommunity(item) + setShowCommunityPicker(false) + // 更新表单数据 + if (formRef.current) { + formRef.current.setFieldsValue({ + address: item.dictDataName || item.label || '' + }) + } + } + + // 清除小区 + const handleClearCommunity = () => { + setSelectedCommunity(null) + if (formRef.current) { + formRef.current.setFieldsValue({ + address: '' + }) + } + } + + // 加载楼栋列表 + const loadBuildingList = async (keyword?: string) => { + setBuildingLoading(true) + try { + const list = await listDictData({ dictCode: 'building' }) + if (keyword) { + setBuildingList(list.filter((item: DictData) => + (item.dictDataName || '').includes(keyword) || + (item.label || '').includes(keyword) + )) + } else { + setBuildingList(list) + } + } catch (e) { + console.error('加载楼栋列表失败:', e) + } finally { + setBuildingLoading(false) + } + } + + // 打开楼栋选择 + const openBuildingPicker = () => { + setBuildingSearch('') + loadBuildingList() + setShowBuildingPicker(true) + } + + // 搜索楼栋 + const handleBuildingSearch = (val: string) => { + setBuildingSearch(val) + loadBuildingList(val) + } + + // 选择楼栋 + const handleSelectBuilding = (item: DictData) => { + setSelectedBuilding(item) + setShowBuildingPicker(false) + if (formRef.current) { + formRef.current.setFieldsValue({ + buildingNo: item.dictDataName || item.label || '' + }) + } + } + + // 清除楼栋 + const handleClearBuilding = () => { + setSelectedBuilding(null) + if (formRef.current) { + formRef.current.setFieldsValue({ + buildingNo: '' + }) + } + } + + // 加载单元列表 + const loadUnitList = async (keyword?: string) => { + setUnitLoading(true) + try { + const list = await listDictData({ dictCode: 'unit' }) + if (keyword) { + setUnitList(list.filter((item: DictData) => + (item.dictDataName || '').includes(keyword) || + (item.label || '').includes(keyword) + )) + } else { + setUnitList(list) + } + } catch (e) { + console.error('加载单元列表失败:', e) + } finally { + setUnitLoading(false) + } + } + + // 打开单元选择 + const openUnitPicker = () => { + setUnitSearch('') + loadUnitList() + setShowUnitPicker(true) + } + + // 搜索单元 + const handleUnitSearch = (val: string) => { + setUnitSearch(val) + loadUnitList(val) + } + + // 选择单元 + const handleSelectUnit = (item: DictData) => { + setSelectedUnit(item) + setShowUnitPicker(false) + if (formRef.current) { + formRef.current.setFieldsValue({ + unitNo: item.dictDataName || item.label || '' + }) + } + } + + // 清除单元 + const handleClearUnit = () => { + setSelectedUnit(null) + if (formRef.current) { + formRef.current.setFieldsValue({ + unitNo: '' + }) + } + } + + // 加载楼层列表 + const loadFloorList = async (keyword?: string) => { + setFloorLoading(true) + try { + const list = await listDictData({ dictCode: 'floor' }) + if (keyword) { + setFloorList(list.filter((item: DictData) => + (item.dictDataName || '').includes(keyword) || + (item.label || '').includes(keyword) + )) + } else { + setFloorList(list) + } + } catch (e) { + console.error('加载楼层列表失败:', e) + } finally { + setFloorLoading(false) + } + } + + // 打开楼层选择 + const openFloorPicker = () => { + setFloorSearch('') + loadFloorList() + setShowFloorPicker(true) + } + + // 搜索楼层 + const handleFloorSearch = (val: string) => { + setFloorSearch(val) + loadFloorList(val) + } + + // 选择楼层 + const handleSelectFloor = (item: DictData) => { + setSelectedFloor(item) + setShowFloorPicker(false) + if (formRef.current) { + formRef.current.setFieldsValue({ + floorNo: item.dictDataName || item.label || '' + }) + } + } + + // 清除楼层 + const handleClearFloor = () => { + setSelectedFloor(null) + if (formRef.current) { + formRef.current.setFieldsValue({ + floorNo: '' + }) + } + } + + // 加载房号列表 + const loadRoomList = async (keyword?: string) => { + setRoomLoading(true) + try { + const list = await listDictData({ dictCode: 'room' }) + if (keyword) { + setRoomList(list.filter((item: DictData) => + (item.dictDataName || '').includes(keyword) || + (item.label || '').includes(keyword) + )) + } else { + setRoomList(list) + } + } catch (e) { + console.error('加载房号列表失败:', e) + } finally { + setRoomLoading(false) + } + } + + // 打开房号选择 + const openRoomPicker = () => { + setRoomSearch('') + loadRoomList() + setShowRoomPicker(true) + } + + // 搜索房号 + const handleRoomSearch = (val: string) => { + setRoomSearch(val) + loadRoomList(val) + } + + // 选择房号 + const handleSelectRoom = (item: DictData) => { + setSelectedRoom(item) + setShowRoomPicker(false) + if (formRef.current) { + formRef.current.setFieldsValue({ + roomNo: item.dictDataName || item.label || '' + }) + } + } + + // 清除房号 + const handleClearRoom = () => { + setSelectedRoom(null) + if (formRef.current) { + formRef.current.setFieldsValue({ + roomNo: '' + }) + } + } + + // 提交表单 + // 计算保护期过期时间（15天后） + const calculateExpirationTime = (): string => { + const now = new Date(); + const expirationDate = new Date(now); + expirationDate.setDate(now.getDate() + PROTECTION_DAYS); // 15天后 + + // 格式化为数据库需要的格式：YYYY-MM-DD HH:mm:ss + const year = expirationDate.getFullYear(); + const month = String(expirationDate.getMonth() + 1).padStart(2, '0'); + const day = String(expirationDate.getDate()).padStart(2, '0'); + const hours = String(expirationDate.getHours()).padStart(2, '0'); + const minutes = String(expirationDate.getMinutes()).padStart(2, '0'); + const seconds = String(expirationDate.getSeconds()).padStart(2, '0'); + + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; + }; + + const normalizeText = (v: any) => (v ?? '').toString().trim(); + + const toHalfWidth = (input: string) => + (input || '').replace(/[\uFF01-\uFF5E]/g, (ch) => String.fromCharCode(ch.charCodeAt(0) - 0xFEE0)).replace(/\u3000/g, ' '); + + const parseChineseNumber = (s: string): number | null => { + const str = (s || '').trim(); + if (!str) return null; + // 仅处理纯中文数字（含大小写）+ 单位 + if (!/^[零〇一二三四五六七八九十百千万两兩俩壹贰叁肆伍陆柒捌玖拾佰仟萬]+$/.test(str)) return null; + + const digitMap: Record = { + 零: 0, 〇: 0, + 一: 1, 壹: 1, + 二: 2, 两: 2, 兩: 2, 俩: 2, 贰: 2, + 三: 3, 叁: 3, + 四: 4, 肆: 4, + 五: 5, 伍: 5, + 六: 6, 陆: 6, + 七: 7, 柒: 7, + 八: 8, 捌: 8, + 九: 9, 玖: 9, + }; + const unitMap: Record = {十: 10, 拾: 10, 百: 100, 佰: 100, 千: 1000, 仟: 1000, 万: 10000, 萬: 10000}; + + let total = 0; + let section = 0; + let number = 0; + for (const ch of str) { + if (digitMap[ch] !== undefined) { + number = digitMap[ch]; + continue; + } + const unit = unitMap[ch]; + if (!unit) continue; + if (unit === 10000) { + section = (section + number) * unit; + total += section; + section = 0; + } else { + // “十/百/千”前省略“一”的情况：十=10、十二=12 + const n = number === 0 ? 1 : number; + section += n * unit; + } + number = 0; + } + const result = total + section + number; + return Number.isFinite(result) ? result : null; + }; + + const normalizeCommunity = (community: string) => { + const s = toHalfWidth(normalizeText(community)); + return s.replace(/\s+/g, '').toUpperCase(); + }; + + const normalizeHouseNoPart = (raw: string, kind: 'building' | 'unit' | 'floor' | 'room') => { + let s = toHalfWidth(normalizeText(raw)).toUpperCase(); + s = s.replace(/\s+/g, ''); + + // 去掉常见后缀/装饰词 + if (kind === 'building') s = s.replace(/(号楼|栋|幢|楼)$/g, ''); + if (kind === 'unit') s = s.replace(/(单元)$/g, ''); + if (kind === 'floor') s = s.replace(/(楼|层)$/g, ''); + if (kind === 'room') s = s.replace(/(室|房|号)$/g, ''); + + // 只保留数字与字母，统一分隔符差异（如 12-01 / 12#01） + s = s.replace(/[^0-9A-Z零〇一二三四五六七八九十百千万两兩俩壹贰叁肆伍陆柒捌玖拾佰仟萬]/g, ''); + + // 纯中文数字 => 阿拉伯数字（支持大小写） + const cn = parseChineseNumber(s); + if (cn !== null) return String(cn); + + // 数字段去前导 0（如 03A => 3A，1201 不变） + s = s.replace(/\d+/g, (m) => String(parseInt(m, 10))); + return s; + }; + + const buildHouseKeyNormalized = (community: string, buildingNo: string, unitNo: string | undefined, floorNo: string | undefined, roomNo: string) => { + const c = normalizeCommunity(community); + const b = normalizeHouseNoPart(buildingNo, 'building'); + const u = normalizeHouseNoPart(unitNo || '', 'unit'); + const f = normalizeHouseNoPart(floorNo || '', 'floor'); + const r = normalizeHouseNoPart(roomNo, 'room'); + return [c, b, u, f, r].join('|'); + }; + + const getNormalizedHouseKeyFromApply = (apply: ShopDealerApply) => { + const parsed = parseHouseKey(apply.dealerCode); + return buildHouseKeyNormalized( + parsed.community || apply.address || '', + parsed.buildingNo || '', + parsed.unitNo || '', + parsed.floorNo || '', + parsed.roomNo || '' + ); + }; + + const findExistingApplyByHouse = async (params: {houseKeyNormalized: string; houseKeyRaw: string; communityKeyword: string}) => { + const tryByDealerCode = async (dealerCode: string) => { + const res = await pageShopDealerApply({dealerCode, type: 4}); + return res?.list?.[0] as ShopDealerApply | undefined; + }; + + const keys = Array.from(new Set([params.houseKeyNormalized, params.houseKeyRaw].filter(Boolean))); + for (const k of keys) { + const hit = await tryByDealerCode(k); + if (hit) return hit; + } + + // 兼容历史数据：用关键词拉取附近数据，再用“规范化后的 houseKey”对比 + const keyword = normalizeText(params.communityKeyword); + if (!keyword) return null; + + for (let page = 1; page <= DUP_CHECK_MAX_PAGES; page++) { + const res = await pageShopDealerApply({type: 4, keywords: keyword, page, limit: DUP_CHECK_LIMIT}); + const list = res?.list || []; + for (const item of list) { + if (getNormalizedHouseKeyFromApply(item) === params.houseKeyNormalized) return item; + } + if (list.length < DUP_CHECK_LIMIT) break; + } + + return null; + }; + + const submitSucceed = async (values: any) => { + + try { + const currentUserId = Number(Taro.getStorageSync('UserId')) || 0; + + // 房号相关必填校验 + if (!values.address || values.address.trim() === '') { + Taro.showToast({title: '请选择/填写小区', icon: 'error'}); + return; + } + if (!values.buildingNo || values.buildingNo.trim() === '') { + Taro.showToast({title: '请选择楼栋', icon: 'error'}); + return; + } + if (!values.floorNo || values.floorNo.trim() === '') { + Taro.showToast({title: '请选择楼层', icon: 'error'}); + return; + } + if (!values.roomNo || values.roomNo.trim() === '') { + Taro.showToast({title: '请选择房号', icon: 'error'}); + return; + } + if (!values.realName || values.realName.trim() === '') { + Taro.showToast({title: '请填写姓名', icon: 'error'}); + return; + } + + // 验证必填字段 + if (!values.mobile || values.mobile.trim() === '') { + Taro.showToast({ + title: '请填写联系方式', + icon: 'error' + }); + return; + } + + // 验证手机号格式 + const phoneRegex = /^1[3-9]\d{9}$/; + if (!phoneRegex.test(values.mobile)) { + Taro.showToast({ + title: '请填写正确的手机号', + icon: 'error' + }); + return; + } + + // 规范化报备人：留空=自己报备（当前登录用户） + const rawUserId = normalizeText(values.userId); + const submitUserId = rawUserId + ? Number(rawUserId) + : (isEditMode ? (existingApply?.userId || currentUserId) : currentUserId); + if (!Number.isFinite(submitUserId) || submitUserId <= 0) { + Taro.showToast({title: '请填写正确的报备人ID', icon: 'error'}); + return; + } + + // 报备人存在性校验 + 获取该报备人的推荐人（用于后端展示链路） + let reporterDealerUser: ShopDealerUser | undefined = undefined; + if (submitUserId === currentUserId) { + reporterDealerUser = referee; + } else { + try { + reporterDealerUser = await getShopDealerUser(submitUserId); + } catch { + Taro.showToast({title: '报备人不存在', icon: 'error'}); + return; + } + } + + // 后端常用 0 表示“无推荐人”，避免传空值触发“推荐人不存在” + const submitRefereeId = (reporterDealerUser?.refereeId && reporterDealerUser.refereeId > 0) + ? reporterDealerUser.refereeId + : undefined; + + const houseKeyRaw = buildHouseKey(values.address, values.buildingNo, values.unitNo, values.floorNo, values.roomNo); + const houseKeyNormalized = buildHouseKeyNormalized(values.address, values.buildingNo, values.unitNo, values.floorNo, values.roomNo); + const houseKey = houseKeyNormalized || houseKeyRaw; + const houseDisplay = buildHouseDisplay(values.address, values.buildingNo, values.unitNo, values.floorNo, values.roomNo); + + // 新增报备：提交前检查房号是否已报备（按 小区+楼栋+单元+房号 判断，且做规范化） + if (!isEditMode) { + const existingCustomer = await findExistingApplyByHouse({ + houseKeyNormalized, + houseKeyRaw, + communityKeyword: values.address + }); + + if (existingCustomer) { + // 报备人不同：直接拦截（避免跨报备人“抢单/续报”） + const existingReporterId = Number(existingCustomer.userId); + if (Number.isFinite(existingReporterId) && existingReporterId > 0 && existingReporterId !== submitUserId) { + Taro.showToast({ + title: '请改房号，该房号信息已报备', + icon: 'none', + duration: 2500 + }); + return false; + } + + // 已签约/已取消：直接提示已报备 + if (existingCustomer.applyStatus && existingCustomer.applyStatus !== 10) { + Taro.showToast({ + title: `该房号信息已报备（${getApplyStatusText(existingCustomer.applyStatus)}），本次报备未生效`, + icon: 'none', + duration: 2500 + }); + return false; + } + + // 跟进中：保护期逻辑 + if (existingCustomer.applyTime) { + const applyTimeStamp = new Date(existingCustomer.applyTime).getTime(); + const currentTimeStamp = new Date().getTime(); + const protectionMs = PROTECTION_DAYS * 24 * 60 * 60 * 1000; + + if (currentTimeStamp - applyTimeStamp < protectionMs) { + const remainingDays = Math.ceil((protectionMs - (currentTimeStamp - applyTimeStamp)) / (24 * 60 * 60 * 1000)); + Taro.showToast({ + title: `该房号信息已报备（${getApplyStatusText(existingCustomer.applyStatus)}），保护期剩余${remainingDays}天，本次报备未生效`, + icon: 'none', + duration: 3000 + }); + return false; + } + + // 超过保护期：询问是否重新报备 + const modalResult = await new Promise((resolve) => { + Taro.showModal({ + title: '提示', + content: `该房号已超过${PROTECTION_DAYS}天保护期，是否重新报备跟进？`, + showCancel: true, + cancelText: '取消', + confirmText: '确定', + success: (modalRes) => resolve(modalRes.confirm), + fail: () => resolve(false) + }); + }); + + if (!modalResult) return false; + } else { + Taro.showToast({ + title: `该房号信息已报备（${getApplyStatusText(existingCustomer.applyStatus)}），本次报备未生效`, + icon: 'none', + duration: 2500 + }); + return false; + } + } + } + + // 计算过期时间 + const expirationTime = isEditMode ? existingApply?.expirationTime : calculateExpirationTime(); + + // 准备提交的数据 + // 避免把表单里的楼栋/单元/楼层/房号等临时字段原样提交给后端 + const {buildingNo, unitNo, floorNo, roomNo, ...restValues} = values; + const submitData = { + ...restValues, + type: 4, + // 展示用：小区+楼栋+单元+房号 + dealerName: houseDisplay, + // 唯一键：用于后续重复报备提示 + dealerCode: houseKey, + // 客户姓名/手机号 + realName: values.realName, + mobile: values.mobile, + // 报备人（留空时用当前登录用户） + // userId: submitUserId, + // 推荐人（报备人的上级；无则传 0） + refereeId: submitRefereeId, + applyStatus: isEditMode ? 20 : 10, + auditTime: undefined, + // 设置保护期过期时间（15天后） + expirationTime: expirationTime, + // 确保日期数据正确提交（使用数据库格式） + applyTime: values.applyTime || (applyTime ? formatDateForDatabase(applyTime) : ''), + contractTime: values.contractTime || (contractTime ? formatDateForDatabase(contractTime) : ''), + // 接待人员 + receptionistId: selectedReceptionist?.userId || undefined, + receptionistName: selectedReceptionist ? (selectedReceptionist.realName || selectedReceptionist.dealerName || '') : undefined, + }; + + // 调试信息 + console.log('=== 提交数据调试 ==='); + console.log('是否编辑模式:', isEditMode); + console.log('计算的过期时间:', expirationTime); + console.log('提交的数据:', submitData); + console.log('=================='); + + // 如果是编辑模式，添加现有申请的id + if (isEditMode && existingApply?.applyId) { + submitData.applyId = existingApply.applyId; + } + + // 执行新增或更新操作 + if (isEditMode) { + await updateShopDealerApply(submitData); + } else { + await addShopDealerApply(submitData); + } + + Taro.showToast({ + title: `${isEditMode ? '更新' : '提交'}成功`, + icon: 'success' + }); + + setTimeout(() => { + Taro.navigateBack(); + }, 1000); + + } catch (error) { + console.error('提交失败:', error); + Taro.showToast({ + title: '提交失败，请重试', + icon: 'error' + }); + } + } + + // 处理固定按钮点击事件 + const handleFixedButtonClick = () => { + // 触发表单提交 + formRef.current?.submit(); + }; + + const submitFailed = (error: any) => { + console.log(error, 'err...') + } + + useEffect(() => { + reload().then(() => { + setLoading(false) + }).catch((error) => { + console.error('页面加载失败:', error); + setLoading(false); + // Taro.showToast({ + // title: '页面加载失败', + // icon: 'error' + // }); + }) + }, []); // 依赖用户ID，当用户变化时重新加载 + + // 编辑模式下，从 dealerCode 反解出楼栋/单元/楼层/房号，回填表单（只读展示） + useEffect(() => { + if (!formRef.current || !FormData) return; + const parsed = parseHouseKey(FormData.dealerCode); + const communityValue = parsed.community || FormData.address || ''; + formRef.current.setFieldsValue({ + address: communityValue, + buildingNo: parsed.buildingNo, + unitNo: parsed.unitNo, + floorNo: parsed.floorNo, + roomNo: parsed.roomNo, + realName: FormData.realName, + mobile: FormData.mobile + }); + // 回填小区选中状态 + if (communityValue) { + setSelectedCommunity({ + dictDataName: communityValue, + label: communityValue + } as DictData) + } + // 回填楼栋选中状态 + if (parsed.buildingNo) { + setSelectedBuilding({ + dictDataName: parsed.buildingNo, + label: parsed.buildingNo + } as DictData) + } + // 回填单元选中状态 + if (parsed.unitNo) { + setSelectedUnit({ + dictDataName: parsed.unitNo, + label: parsed.unitNo + } as DictData) + } + // 回填楼层选中状态 + if (parsed.floorNo) { + setSelectedFloor({ + dictDataName: parsed.floorNo, + label: parsed.floorNo + } as DictData) + } + // 回填房号选中状态 + if (parsed.roomNo) { + setSelectedRoom({ + dictDataName: parsed.roomNo, + label: parsed.roomNo + } as DictData) + } + }, [FormData]); + + if (loading) { + return 加载中 + } + + return ( + <> +
submitSucceed(values)} + onFinishFailed={(errors) => submitFailed(errors)} + > + + + + {selectedCommunity ? ( + + + {selectedCommunity.dictDataName || selectedCommunity.label} + + {!isEditMode && ( + { e.stopPropagation(); handleClearCommunity(); }} + className="flex items-center px-1" + > + + + )} + + ) : ( + 请选择小区 + )} + + + } + onClick={isEditMode ? undefined : openCommunityPicker} + /> + {/* 隐藏字段，通过 ref.setFieldsValue 设置 */} + + + + {/* 楼栋选择 */} + + {selectedBuilding ? ( + + {selectedBuilding.dictDataName || selectedBuilding.label} + {!isEditMode && ( + { e.stopPropagation(); handleClearBuilding(); }} + className="flex items-center px-1" + > + + + )} + + ) : ( + 请选择 + )} + {!isEditMode && } + + } + onClick={isEditMode ? undefined : openBuildingPicker} + /> + {/* 隐藏字段，通过 ref.setFieldsValue 设置 */} + + + + {/* 单元选择 */} + + {selectedUnit ? ( + + {selectedUnit.dictDataName || selectedUnit.label} + {!isEditMode && ( + { e.stopPropagation(); handleClearUnit(); }} + className="flex items-center px-1" + > + + + )} + + ) : ( + 请选择 + )} + {!isEditMode && } + + } + onClick={isEditMode ? undefined : openUnitPicker} + /> + {/* 隐藏字段，通过 ref.setFieldsValue 设置 */} + + + + {/* 楼层选择 */} + + {selectedFloor ? ( + + {selectedFloor.dictDataName || selectedFloor.label} + {!isEditMode && ( + { e.stopPropagation(); handleClearFloor(); }} + className="flex items-center px-1" + > + + + )} + + ) : ( + 请选择 + )} + {!isEditMode && } + + } + onClick={isEditMode ? undefined : openFloorPicker} + /> + {/* 隐藏字段，通过 ref.setFieldsValue 设置 */} + + + + {/* 房号选择 */} + + {selectedRoom ? ( + + {selectedRoom.dictDataName || selectedRoom.label} + {!isEditMode && ( + { e.stopPropagation(); handleClearRoom(); }} + className="flex items-center px-1" + > + + + )} + + ) : ( + 请选择 + )} + {!isEditMode && } + + } + onClick={isEditMode ? undefined : openRoomPicker} + /> + {/* 隐藏字段，通过 ref.setFieldsValue 设置 */} + + + + {/* 接待人员选择 */} + + {selectedReceptionist ? ( + + + {selectedReceptionist.realName || selectedReceptionist.dealerName || '已选择'} + + { e.stopPropagation(); handleClearReceptionist(); }} + className="flex items-center px-1" + > + + + + ) : ( + 请选择 + )} + + + } + onClick={openReceptionistPicker} + /> +
+ + + + + + + + + + {isEditMode && ( + <> + + + + + setShowApplyTimePicker(true)}> + + + + + setShowContractTimePicker(true)}> + + + + {/**/} + {/* */} + {/**/} + + )} + {/**/} + {/* */} + {/**/} + +
+ + {/* 签约时间选择器 */} + setShowApplyTimePicker(false)} + onConfirm={handleApplyTimeConfirm} + /> + + {/* 合同日期选择器 */} + setShowContractTimePicker(false)} + onConfirm={handleContractTimeConfirm} + /> + + {/* 接待人员选择弹出层 */} + setShowReceptionistPicker(false)} + style={{height: '70%'}} + > + + {/* 标题栏 */} + + 选择接待人员 + setShowReceptionistPicker(false)}> + 取消 + + + {/* 搜索框 */} + + + + {/* 列表 */} + + {receptionistLoading ? ( + + 加载中 + + ) : receptionistList.length === 0 ? ( + + 暂无数据 + + ) : ( + receptionistList.map((user) => ( + 已选 + ) : null + } + onClick={() => handleSelectReceptionist(user)} + /> + )) + )} + + + + + {/* 小区选择弹出层 */} + setShowCommunityPicker(false)} + style={{height: '70%'}} + > + + {/* 标题栏 */} + + 选择小区 + setShowCommunityPicker(false)}> + 取消 + + + {/* 搜索框 */} + + + + {/* 列表 */} + + {communityLoading ? ( + + 加载中 + + ) : communityList.length === 0 ? ( + + 暂无小区数据 + + ) : ( + communityList.map((item, index) => ( + 已选 + ) : null + } + onClick={() => handleSelectCommunity(item)} + /> + )) + )} + + + + + {/* 楼栋选择弹出层 */} + setShowBuildingPicker(false)} + style={{height: '70%'}} + > + + {/* 标题栏 */} + + 选择楼栋 + setShowBuildingPicker(false)}> + 取消 + + + {/* 搜索框 */} + + + + {/* 列表 */} + + {buildingLoading ? ( + + 加载中 + + ) : buildingList.length === 0 ? ( + + 暂无楼栋数据 + + ) : ( + buildingList.map((item, index) => ( + 已选 + ) : null + } + onClick={() => handleSelectBuilding(item)} + /> + )) + )} + + + + + {/* 单元选择弹出层 */} + setShowUnitPicker(false)} + style={{height: '70%'}} + > + + {/* 标题栏 */} + + 选择单元 + setShowUnitPicker(false)}> + 取消 + + + {/* 搜索框 */} + + + + {/* 列表 */} + + {unitLoading ? ( + + 加载中 + + ) : unitList.length === 0 ? ( + + 暂无单元数据 + + ) : ( + unitList.map((item, index) => ( + 已选 + ) : null + } + onClick={() => handleSelectUnit(item)} + /> + )) + )} + + + + + {/* 楼层选择弹出层 */} + setShowFloorPicker(false)} + style={{height: '70%'}} + > + + {/* 标题栏 */} + + 选择楼层 + setShowFloorPicker(false)}> + 取消 + + + {/* 搜索框 */} + + + + {/* 列表 */} + + {floorLoading ? ( + + 加载中 + + ) : floorList.length === 0 ? ( + + 暂无楼层数据 + + ) : ( + floorList.map((item, index) => ( + 已选 + ) : null + } + onClick={() => handleSelectFloor(item)} + /> + )) + )} + + + + + {/* 房号选择弹出层 */} + setShowRoomPicker(false)} + style={{height: '70%'}} + > + + {/* 标题栏 */} + + 选择房号 + setShowRoomPicker(false)}> + 取消 + + + {/* 搜索框 */} + + + + {/* 列表 */} + + {roomLoading ? ( + + 加载中 + + ) : roomList.length === 0 ? ( + + 暂无房号数据 + + ) : ( + roomList.map((item, index) => ( + 已选 + ) : null + } + onClick={() => handleSelectRoom(item)} + /> + )) + )} + + + + + {/* 审核状态显示（仅在编辑模式下显示） */} + {isEditMode && ( + + {/**/} + {/* {getApplyStatusText(FormData?.applyStatus)}*/} + {/* */} + {/* }*/} + {/*/>*/} + {FormData?.applyStatus === 20 && ( + + )} + {FormData?.applyStatus === 30 && ( + + )} + + )} + + + {/* 底部浮动按钮 */} + {(!isEditMode || FormData?.applyStatus === 10) && ( + } + text={'立即提交'} + onClick={handleFixedButtonClick} + /> + )} + + + ); +}; + +export default AddShopDealerApply; diff --git a/src/dealer/customer/add.tsx b/src/dealer/customer/add.tsx index 03afaa5..ee496bd 100644 --- a/src/dealer/customer/add.tsx +++ b/src/dealer/customer/add.tsx @@ -16,8 +16,6 @@ import { } from "@/utils/dateUtils"; import {ShopDealerUser} from "@/api/shop/shopDealerUser/model"; import {getShopDealerUser, pageShopDealerUser} from "@/api/shop/shopDealerUser"; -import {listDictData} from "@/api/system/dict-data"; -import type {DictData} from "@/api/system/dict-data/model"; const AddShopDealerApply = () => { const {params} = useRouter(); @@ -32,22 +30,20 @@ const AddShopDealerApply = () => { const DUP_CHECK_MAX_PAGES = 50; // 房号信息：用 dealerCode 存储唯一键，dealerName 存储展示文案 - const buildHouseKey = (community: string, buildingNo: string, unitNo: string | undefined, floorNo: string | undefined, roomNo: string) => { + const buildHouseKey = (community: string, buildingNo: string, unitNo: string | undefined, roomNo: string) => { const c = (community || '').trim(); const b = (buildingNo || '').trim(); const u = (unitNo || '').trim(); - const f = (floorNo || '').trim(); const r = (roomNo || '').trim(); - return [c, b, u, f, r].join('|'); + return [c, b, u, r].join('|'); }; - const buildHouseDisplay = (community: string, buildingNo: string, unitNo: string | undefined, floorNo: string | undefined, roomNo: string) => { + const buildHouseDisplay = (community: string, buildingNo: string, unitNo: string | undefined, roomNo: string) => { const c = (community || '').trim(); const b = (buildingNo || '').trim(); const u = (unitNo || '').trim(); - const f = (floorNo || '').trim(); const r = (roomNo || '').trim(); - return `${c}${b ? `${b}栋` : ''}${u ? `${u}单元` : ''}${f ? `${f}楼` : ''}${r ? `${r}号` : ''}`; + return `${c}${b ? `${b}栋` : ''}${u ? `${u}单元` : ''}${r ? `${r}号` : ''}`; }; const parseHouseKey = (key?: string) => { @@ -56,8 +52,7 @@ const AddShopDealerApply = () => { community: parts[0] || '', buildingNo: parts[1] || '', unitNo: parts[2] || '', - floorNo: parts[3] || '', - roomNo: parts[4] || '', + roomNo: parts[3] || '', }; }; @@ -74,41 +69,6 @@ const AddShopDealerApply = () => { const [receptionistLoading, setReceptionistLoading] = useState(false) const [selectedReceptionist, setSelectedReceptionist] = useState(null) - // 小区选择状态 - const [showCommunityPicker, setShowCommunityPicker] = useState(false) - const [communitySearch, setCommunitySearch] = useState('') - const [communityList, setCommunityList] = useState([]) - const [communityLoading, setCommunityLoading] = useState(false) - const [selectedCommunity, setSelectedCommunity] = useState(null) - - // 楼栋选择状态 - const [showBuildingPicker, setShowBuildingPicker] = useState(false) - const [buildingSearch, setBuildingSearch] = useState('') - const [buildingList, setBuildingList] = useState([]) - const [buildingLoading, setBuildingLoading] = useState(false) - const [selectedBuilding, setSelectedBuilding] = useState(null) - - // 单元选择状态 - const [showUnitPicker, setShowUnitPicker] = useState(false) - const [unitSearch, setUnitSearch] = useState('') - const [unitList, setUnitList] = useState([]) - const [unitLoading, setUnitLoading] = useState(false) - const [selectedUnit, setSelectedUnit] = useState(null) - - // 楼层选择状态 - const [showFloorPicker, setShowFloorPicker] = useState(false) - const [floorSearch, setFloorSearch] = useState('') - const [floorList, setFloorList] = useState([]) - const [floorLoading, setFloorLoading] = useState(false) - const [selectedFloor, setSelectedFloor] = useState(null) - - // 房号选择状态 - const [showRoomPicker, setShowRoomPicker] = useState(false) - const [roomSearch, setRoomSearch] = useState('') - const [roomList, setRoomList] = useState([]) - const [roomLoading, setRoomLoading] = useState(false) - const [selectedRoom, setSelectedRoom] = useState(null) - // 获取审核状态文字 const getApplyStatusText = (status?: number) => { switch (status) { @@ -123,6 +83,8 @@ const AddShopDealerApply = () => { } } + console.log(getApplyStatusText) + // 处理签约时间选择 const handleApplyTimeConfirm = (param: string) => { const selectedDate = param[3] // 选中的日期字符串 (YYYY-M-D) @@ -234,278 +196,6 @@ const AddShopDealerApply = () => { setSelectedReceptionist(null) } - // 加载小区列表 - const loadCommunityList = async (keyword?: string) => { - setCommunityLoading(true) - try { - const list = await listDictData({ dictCode: 'xiaoqu' }) - // 过滤搜索关键词 - if (keyword) { - setCommunityList(list.filter((item: DictData) => - (item.dictDataName || '').includes(keyword) || - (item.label || '').includes(keyword) - )) - } else { - setCommunityList(list) - } - } catch (e) { - console.error('加载小区列表失败:', e) - } finally { - setCommunityLoading(false) - } - } - - // 打开小区选择 - const openCommunityPicker = () => { - setCommunitySearch('') - loadCommunityList() - setShowCommunityPicker(true) - } - - // 搜索小区 - const handleCommunitySearch = (val: string) => { - setCommunitySearch(val) - loadCommunityList(val) - } - - // 选择小区 - const handleSelectCommunity = (item: DictData) => { - setSelectedCommunity(item) - setShowCommunityPicker(false) - // 更新表单数据 - if (formRef.current) { - formRef.current.setFieldsValue({ - address: item.dictDataName || item.label || '' - }) - } - } - - // 清除小区 - const handleClearCommunity = () => { - setSelectedCommunity(null) - if (formRef.current) { - formRef.current.setFieldsValue({ - address: '' - }) - } - } - - // 加载楼栋列表 - const loadBuildingList = async (keyword?: string) => { - setBuildingLoading(true) - try { - const list = await listDictData({ dictCode: 'building' }) - if (keyword) { - setBuildingList(list.filter((item: DictData) => - (item.dictDataName || '').includes(keyword) || - (item.label || '').includes(keyword) - )) - } else { - setBuildingList(list) - } - } catch (e) { - console.error('加载楼栋列表失败:', e) - } finally { - setBuildingLoading(false) - } - } - - // 打开楼栋选择 - const openBuildingPicker = () => { - setBuildingSearch('') - loadBuildingList() - setShowBuildingPicker(true) - } - - // 搜索楼栋 - const handleBuildingSearch = (val: string) => { - setBuildingSearch(val) - loadBuildingList(val) - } - - // 选择楼栋 - const handleSelectBuilding = (item: DictData) => { - setSelectedBuilding(item) - setShowBuildingPicker(false) - if (formRef.current) { - formRef.current.setFieldsValue({ - buildingNo: item.dictDataName || item.label || '' - }) - } - } - - // 清除楼栋 - const handleClearBuilding = () => { - setSelectedBuilding(null) - if (formRef.current) { - formRef.current.setFieldsValue({ - buildingNo: '' - }) - } - } - - // 加载单元列表 - const loadUnitList = async (keyword?: string) => { - setUnitLoading(true) - try { - const list = await listDictData({ dictCode: 'unit' }) - if (keyword) { - setUnitList(list.filter((item: DictData) => - (item.dictDataName || '').includes(keyword) || - (item.label || '').includes(keyword) - )) - } else { - setUnitList(list) - } - } catch (e) { - console.error('加载单元列表失败:', e) - } finally { - setUnitLoading(false) - } - } - - // 打开单元选择 - const openUnitPicker = () => { - setUnitSearch('') - loadUnitList() - setShowUnitPicker(true) - } - - // 搜索单元 - const handleUnitSearch = (val: string) => { - setUnitSearch(val) - loadUnitList(val) - } - - // 选择单元 - const handleSelectUnit = (item: DictData) => { - setSelectedUnit(item) - setShowUnitPicker(false) - if (formRef.current) { - formRef.current.setFieldsValue({ - unitNo: item.dictDataName || item.label || '' - }) - } - } - - // 清除单元 - const handleClearUnit = () => { - setSelectedUnit(null) - if (formRef.current) { - formRef.current.setFieldsValue({ - unitNo: '' - }) - } - } - - // 加载楼层列表 - const loadFloorList = async (keyword?: string) => { - setFloorLoading(true) - try { - const list = await listDictData({ dictCode: 'floor' }) - if (keyword) { - setFloorList(list.filter((item: DictData) => - (item.dictDataName || '').includes(keyword) || - (item.label || '').includes(keyword) - )) - } else { - setFloorList(list) - } - } catch (e) { - console.error('加载楼层列表失败:', e) - } finally { - setFloorLoading(false) - } - } - - // 打开楼层选择 - const openFloorPicker = () => { - setFloorSearch('') - loadFloorList() - setShowFloorPicker(true) - } - - // 搜索楼层 - const handleFloorSearch = (val: string) => { - setFloorSearch(val) - loadFloorList(val) - } - - // 选择楼层 - const handleSelectFloor = (item: DictData) => { - setSelectedFloor(item) - setShowFloorPicker(false) - if (formRef.current) { - formRef.current.setFieldsValue({ - floorNo: item.dictDataName || item.label || '' - }) - } - } - - // 清除楼层 - const handleClearFloor = () => { - setSelectedFloor(null) - if (formRef.current) { - formRef.current.setFieldsValue({ - floorNo: '' - }) - } - } - - // 加载房号列表 - const loadRoomList = async (keyword?: string) => { - setRoomLoading(true) - try { - const list = await listDictData({ dictCode: 'room' }) - if (keyword) { - setRoomList(list.filter((item: DictData) => - (item.dictDataName || '').includes(keyword) || - (item.label || '').includes(keyword) - )) - } else { - setRoomList(list) - } - } catch (e) { - console.error('加载房号列表失败:', e) - } finally { - setRoomLoading(false) - } - } - - // 打开房号选择 - const openRoomPicker = () => { - setRoomSearch('') - loadRoomList() - setShowRoomPicker(true) - } - - // 搜索房号 - const handleRoomSearch = (val: string) => { - setRoomSearch(val) - loadRoomList(val) - } - - // 选择房号 - const handleSelectRoom = (item: DictData) => { - setSelectedRoom(item) - setShowRoomPicker(false) - if (formRef.current) { - formRef.current.setFieldsValue({ - roomNo: item.dictDataName || item.label || '' - }) - } - } - - // 清除房号 - const handleClearRoom = () => { - setSelectedRoom(null) - if (formRef.current) { - formRef.current.setFieldsValue({ - roomNo: '' - }) - } - } - // 提交表单 // 计算保护期过期时间（15天后） const calculateExpirationTime = (): string => { @@ -579,14 +269,13 @@ const AddShopDealerApply = () => { return s.replace(/\s+/g, '').toUpperCase(); }; - const normalizeHouseNoPart = (raw: string, kind: 'building' | 'unit' | 'floor' | 'room') => { + const normalizeHouseNoPart = (raw: string, kind: 'building' | 'unit' | 'room') => { let s = toHalfWidth(normalizeText(raw)).toUpperCase(); s = s.replace(/\s+/g, ''); // 去掉常见后缀/装饰词 if (kind === 'building') s = s.replace(/(号楼|栋|幢|楼)$/g, ''); if (kind === 'unit') s = s.replace(/(单元)$/g, ''); - if (kind === 'floor') s = s.replace(/(楼|层)$/g, ''); if (kind === 'room') s = s.replace(/(室|房|号)$/g, ''); // 只保留数字与字母，统一分隔符差异（如 12-01 / 12#01） @@ -601,13 +290,12 @@ const AddShopDealerApply = () => { return s; }; - const buildHouseKeyNormalized = (community: string, buildingNo: string, unitNo: string | undefined, floorNo: string | undefined, roomNo: string) => { + const buildHouseKeyNormalized = (community: string, buildingNo: string, unitNo: string | undefined, roomNo: string) => { const c = normalizeCommunity(community); const b = normalizeHouseNoPart(buildingNo, 'building'); const u = normalizeHouseNoPart(unitNo || '', 'unit'); - const f = normalizeHouseNoPart(floorNo || '', 'floor'); const r = normalizeHouseNoPart(roomNo, 'room'); - return [c, b, u, f, r].join('|'); + return [c, b, u, r].join('|'); }; const getNormalizedHouseKeyFromApply = (apply: ShopDealerApply) => { @@ -616,7 +304,6 @@ const AddShopDealerApply = () => { parsed.community || apply.address || '', parsed.buildingNo || '', parsed.unitNo || '', - parsed.floorNo || '', parsed.roomNo || '' ); }; @@ -660,15 +347,11 @@ const AddShopDealerApply = () => { return; } if (!values.buildingNo || values.buildingNo.trim() === '') { - Taro.showToast({title: '请选择楼栋', icon: 'error'}); - return; - } - if (!values.floorNo || values.floorNo.trim() === '') { - Taro.showToast({title: '请选择楼层', icon: 'error'}); + Taro.showToast({title: '请填写楼栋号', icon: 'error'}); return; } if (!values.roomNo || values.roomNo.trim() === '') { - Taro.showToast({title: '请选择房号', icon: 'error'}); + Taro.showToast({title: '请填写房号', icon: 'error'}); return; } if (!values.realName || values.realName.trim() === '') { @@ -723,10 +406,10 @@ const AddShopDealerApply = () => { ? reporterDealerUser.refereeId : undefined; - const houseKeyRaw = buildHouseKey(values.address, values.buildingNo, values.unitNo, values.floorNo, values.roomNo); - const houseKeyNormalized = buildHouseKeyNormalized(values.address, values.buildingNo, values.unitNo, values.floorNo, values.roomNo); + const houseKeyRaw = buildHouseKey(values.address, values.buildingNo, values.unitNo, values.roomNo); + const houseKeyNormalized = buildHouseKeyNormalized(values.address, values.buildingNo, values.unitNo, values.roomNo); const houseKey = houseKeyNormalized || houseKeyRaw; - const houseDisplay = buildHouseDisplay(values.address, values.buildingNo, values.unitNo, values.floorNo, values.roomNo); + const houseDisplay = buildHouseDisplay(values.address, values.buildingNo, values.unitNo, values.roomNo); // 新增报备：提交前检查房号是否已报备（按 小区+楼栋+单元+房号 判断，且做规范化） if (!isEditMode) { @@ -803,8 +486,8 @@ const AddShopDealerApply = () => { const expirationTime = isEditMode ? existingApply?.expirationTime : calculateExpirationTime(); // 准备提交的数据 - // 避免把表单里的楼栋/单元/楼层/房号等临时字段原样提交给后端 - const {buildingNo, unitNo, floorNo, roomNo, ...restValues} = values; + // 避免把表单里的楼栋/单元/房号等临时字段原样提交给后端 + const {buildingNo, unitNo, roomNo, ...restValues} = values; const submitData = { ...restValues, type: 4, @@ -891,55 +574,18 @@ const AddShopDealerApply = () => { }) }, []); // 依赖用户ID，当用户变化时重新加载 - // 编辑模式下，从 dealerCode 反解出楼栋/单元/楼层/房号，回填表单（只读展示） + // 编辑模式下，从 dealerCode 反解出楼栋/单元/房号，回填表单（只读展示） useEffect(() => { if (!formRef.current || !FormData) return; const parsed = parseHouseKey(FormData.dealerCode); - const communityValue = parsed.community || FormData.address || ''; formRef.current.setFieldsValue({ - address: communityValue, + address: parsed.community || FormData.address, buildingNo: parsed.buildingNo, unitNo: parsed.unitNo, - floorNo: parsed.floorNo, roomNo: parsed.roomNo, realName: FormData.realName, mobile: FormData.mobile }); - // 回填小区选中状态 - if (communityValue) { - setSelectedCommunity({ - dictDataName: communityValue, - label: communityValue - } as DictData) - } - // 回填楼栋选中状态 - if (parsed.buildingNo) { - setSelectedBuilding({ - dictDataName: parsed.buildingNo, - label: parsed.buildingNo - } as DictData) - } - // 回填单元选中状态 - if (parsed.unitNo) { - setSelectedUnit({ - dictDataName: parsed.unitNo, - label: parsed.unitNo - } as DictData) - } - // 回填楼层选中状态 - if (parsed.floorNo) { - setSelectedFloor({ - dictDataName: parsed.floorNo, - label: parsed.floorNo - } as DictData) - } - // 回填房号选中状态 - if (parsed.roomNo) { - setSelectedRoom({ - dictDataName: parsed.roomNo, - label: parsed.roomNo - } as DictData) - } }, [FormData]); if (loading) { @@ -956,156 +602,7 @@ const AddShopDealerApply = () => { onFinish={(values) => submitSucceed(values)} onFinishFailed={(errors) => submitFailed(errors)} > - - - - {selectedCommunity ? ( - - - {selectedCommunity.dictDataName || selectedCommunity.label} - - {!isEditMode && ( - { e.stopPropagation(); handleClearCommunity(); }} - className="flex items-center px-1" - > - - - )} - - ) : ( - 请选择小区 - )} - - - } - onClick={isEditMode ? undefined : openCommunityPicker} - /> - {/* 隐藏字段，通过 ref.setFieldsValue 设置 */} - - - - {/* 楼栋选择 */} - - {selectedBuilding ? ( - - {selectedBuilding.dictDataName || selectedBuilding.label} - {!isEditMode && ( - { e.stopPropagation(); handleClearBuilding(); }} - className="flex items-center px-1" - > - - - )} - - ) : ( - 请选择 - )} - {!isEditMode && } - - } - onClick={isEditMode ? undefined : openBuildingPicker} - /> - {/* 隐藏字段，通过 ref.setFieldsValue 设置 */} - - - - {/* 单元选择 */} - - {selectedUnit ? ( - - {selectedUnit.dictDataName || selectedUnit.label} - {!isEditMode && ( - { e.stopPropagation(); handleClearUnit(); }} - className="flex items-center px-1" - > - - - )} - - ) : ( - 请选择 - )} - {!isEditMode && } - - } - onClick={isEditMode ? undefined : openUnitPicker} - /> - {/* 隐藏字段，通过 ref.setFieldsValue 设置 */} - - - - {/* 楼层选择 */} - - {selectedFloor ? ( - - {selectedFloor.dictDataName || selectedFloor.label} - {!isEditMode && ( - { e.stopPropagation(); handleClearFloor(); }} - className="flex items-center px-1" - > - - - )} - - ) : ( - 请选择 - )} - {!isEditMode && } - - } - onClick={isEditMode ? undefined : openFloorPicker} - /> - {/* 隐藏字段，通过 ref.setFieldsValue 设置 */} - - - - {/* 房号选择 */} - - {selectedRoom ? ( - - {selectedRoom.dictDataName || selectedRoom.label} - {!isEditMode && ( - { e.stopPropagation(); handleClearRoom(); }} - className="flex items-center px-1" - > - - - )} - - ) : ( - 请选择 - )} - {!isEditMode && } - - } - onClick={isEditMode ? undefined : openRoomPicker} - /> - {/* 隐藏字段，通过 ref.setFieldsValue 设置 */} - - - + {/* 接待人员选择 */} { } onClick={openReceptionistPicker} /> -
+ + + + + + + + + + + + + @@ -1144,24 +653,32 @@ const AddShopDealerApply = () => { {isEditMode && ( <> - + - setShowApplyTimePicker(true)}> - + setShowApplyTimePicker(true)} + > + + + + {applyTime ? formatDateForDisplay(applyTime) : '请选择签约时间'} + + - setShowContractTimePicker(true)}> - + setShowContractTimePicker(true)} + > + + + + {contractTime ? formatDateForDisplay(contractTime) : '请选择合同生效起止时间'} + + {/**/} @@ -1248,267 +765,6 @@ const AddShopDealerApply = () => { - {/* 小区选择弹出层 */} - setShowCommunityPicker(false)} - style={{height: '70%'}} - > - - {/* 标题栏 */} - - 选择小区 - setShowCommunityPicker(false)}> - 取消 - - - {/* 搜索框 */} - - - - {/* 列表 */} - - {communityLoading ? ( - - 加载中 - - ) : communityList.length === 0 ? ( - - 暂无小区数据 - - ) : ( - communityList.map((item, index) => ( - 已选 - ) : null - } - onClick={() => handleSelectCommunity(item)} - /> - )) - )} - - - - - {/* 楼栋选择弹出层 */} - setShowBuildingPicker(false)} - style={{height: '70%'}} - > - - {/* 标题栏 */} - - 选择楼栋 - setShowBuildingPicker(false)}> - 取消 - - - {/* 搜索框 */} - - - - {/* 列表 */} - - {buildingLoading ? ( - - 加载中 - - ) : buildingList.length === 0 ? ( - - 暂无楼栋数据 - - ) : ( - buildingList.map((item, index) => ( - 已选 - ) : null - } - onClick={() => handleSelectBuilding(item)} - /> - )) - )} - - - - - {/* 单元选择弹出层 */} - setShowUnitPicker(false)} - style={{height: '70%'}} - > - - {/* 标题栏 */} - - 选择单元 - setShowUnitPicker(false)}> - 取消 - - - {/* 搜索框 */} - - - - {/* 列表 */} - - {unitLoading ? ( - - 加载中 - - ) : unitList.length === 0 ? ( - - 暂无单元数据 - - ) : ( - unitList.map((item, index) => ( - 已选 - ) : null - } - onClick={() => handleSelectUnit(item)} - /> - )) - )} - - - - - {/* 楼层选择弹出层 */} - setShowFloorPicker(false)} - style={{height: '70%'}} - > - - {/* 标题栏 */} - - 选择楼层 - setShowFloorPicker(false)}> - 取消 - - - {/* 搜索框 */} - - - - {/* 列表 */} - - {floorLoading ? ( - - 加载中 - - ) : floorList.length === 0 ? ( - - 暂无楼层数据 - - ) : ( - floorList.map((item, index) => ( - 已选 - ) : null - } - onClick={() => handleSelectFloor(item)} - /> - )) - )} - - - - - {/* 房号选择弹出层 */} - setShowRoomPicker(false)} - style={{height: '70%'}} - > - - {/* 标题栏 */} - - 选择房号 - setShowRoomPicker(false)}> - 取消 - - - {/* 搜索框 */} - - - - {/* 列表 */} - - {roomLoading ? ( - - 加载中 - - ) : roomList.length === 0 ? ( - - 暂无房号数据 - - ) : ( - roomList.map((item, index) => ( - 已选 - ) : null - } - onClick={() => handleSelectRoom(item)} - /> - )) - )} - - - - {/* 审核状态显示（仅在编辑模式下显示） */} {isEditMode && ( diff --git a/src/pages/brochure/index.tsx b/src/pages/brochure/index.tsx index c54a9df..0490d71 100644 --- a/src/pages/brochure/index.tsx +++ b/src/pages/brochure/index.tsx @@ -52,7 +52,7 @@ const highlightItems = [ { icon: , title: '真实口碑', - description: '5000+家庭选择，98%满意度，支持老房换窗与整屋升级。' + description: '10万+家庭选择，98%满意度，支持老房换窗与整屋升级。' } ] @@ -220,15 +220,15 @@ const BrochurePage: React.FC = () => { - 10年 - 质保承诺 + 20年 + 质保承诺(整窗) 15年 安装经验 - 5000+ + 10万+ 家庭选择 diff --git a/src/pages/index/Grid.tsx b/src/pages/index/Grid.tsx index 305597f..18b7c3c 100644 --- a/src/pages/index/Grid.tsx +++ b/src/pages/index/Grid.tsx @@ -14,7 +14,7 @@ interface MenuItem { const menuList: MenuItem[] = [ { id: 1, - title: '我要推荐', + title: '推荐客户', icon: 'https://oss.wsdns.cn/20260330/5f54527123864193b0a2078f812b117f.png?x-oss-process=image/resize,m_fixed,w_750/quality,Q_90', path: '/dealer/customer/add' }, diff --git a/src/pages/index/TrustSection.tsx b/src/pages/index/TrustSection.tsx index 0610f5b..1cc9dbe 100644 --- a/src/pages/index/TrustSection.tsx +++ b/src/pages/index/TrustSection.tsx @@ -12,8 +12,8 @@ const TrustSection: React.FC = () => { { icon: , title: '品质保障', - highlight: '10年', - description: '质保承诺', + highlight: '20年', + description: '质保承诺(整窗)', subDescription: '德国进口五金配件', bg: 'linear-gradient(135deg, #3b82f6, #2563eb)', }, @@ -30,7 +30,7 @@ const TrustSection: React.FC = () => { title: '客户好评', highlight: '98%', description: '满意度', - subDescription: '5000+家庭信赖之选', + subDescription: '10万+家庭信赖之选', bg: 'linear-gradient(135deg, #f59e0b, #d97706)', } ]