完善登录逻辑和个人资料完善

This commit is contained in:
2026-05-26 11:29:06 +08:00
parent cecb51a8e2
commit 9680276b3f
27 changed files with 3934 additions and 1572 deletions

View File

@@ -1 +1 @@
export const CURRENT_PAGES_MODE = 'delivery'
export const CURRENT_PAGES_MODE = 'consumer'

606
utils/profileRegionData.uts Normal file
View File

@@ -0,0 +1,606 @@
export type RegionCity = {
name: string
districts: Array<string>
}
export type RegionProvince = {
name: string
cities: Array<RegionCity>
}
export const PROFILE_REGION_OPTIONS: Array<RegionProvince> = [
{
name: '北京市',
cities: [
{ name: '北京市', districts: [] }
]
},
{
name: '天津市',
cities: [
{ name: '天津市', districts: [] }
]
},
{
name: '河北省',
cities: [
{ name: '石家庄市', districts: [] },
{ name: '唐山市', districts: [] },
{ name: '秦皇岛市', districts: [] },
{ name: '邯郸市', districts: [] },
{ name: '邢台市', districts: [] },
{ name: '保定市', districts: [] },
{ name: '张家口市', districts: [] },
{ name: '承德市', districts: [] },
{ name: '沧州市', districts: [] },
{ name: '廊坊市', districts: [] },
{ name: '衡水市', districts: [] }
]
},
{
name: '山西省',
cities: [
{ name: '太原市', districts: [] },
{ name: '大同市', districts: [] },
{ name: '阳泉市', districts: [] },
{ name: '长治市', districts: [] },
{ name: '晋城市', districts: [] },
{ name: '朔州市', districts: [] },
{ name: '晋中市', districts: [] },
{ name: '运城市', districts: [] },
{ name: '忻州市', districts: [] },
{ name: '临汾市', districts: [] },
{ name: '吕梁市', districts: [] }
]
},
{
name: '内蒙古自治区',
cities: [
{ name: '呼和浩特市', districts: [] },
{ name: '包头市', districts: [] },
{ name: '乌海市', districts: [] },
{ name: '赤峰市', districts: [] },
{ name: '通辽市', districts: [] },
{ name: '鄂尔多斯市', districts: [] },
{ name: '呼伦贝尔市', districts: [] },
{ name: '巴彦淖尔市', districts: [] },
{ name: '乌兰察布市', districts: [] },
{ name: '兴安盟', districts: [] },
{ name: '锡林郭勒盟', districts: [] },
{ name: '阿拉善盟', districts: [] }
]
},
{
name: '辽宁省',
cities: [
{ name: '沈阳市', districts: [] },
{ name: '大连市', districts: [] },
{ name: '鞍山市', districts: [] },
{ name: '抚顺市', districts: [] },
{ name: '本溪市', districts: [] },
{ name: '丹东市', districts: [] },
{ name: '锦州市', districts: [] },
{ name: '营口市', districts: [] },
{ name: '阜新市', districts: [] },
{ name: '辽阳市', districts: [] },
{ name: '盘锦市', districts: [] },
{ name: '铁岭市', districts: [] },
{ name: '朝阳市', districts: [] },
{ name: '葫芦岛市', districts: [] }
]
},
{
name: '吉林省',
cities: [
{ name: '长春市', districts: [] },
{ name: '吉林市', districts: [] },
{ name: '四平市', districts: [] },
{ name: '辽源市', districts: [] },
{ name: '通化市', districts: [] },
{ name: '白山市', districts: [] },
{ name: '松原市', districts: [] },
{ name: '白城市', districts: [] },
{ name: '延边朝鲜族自治州', districts: [] }
]
},
{
name: '黑龙江省',
cities: [
{ name: '哈尔滨市', districts: [] },
{ name: '齐齐哈尔市', districts: [] },
{ name: '鸡西市', districts: [] },
{ name: '鹤岗市', districts: [] },
{ name: '双鸭山市', districts: [] },
{ name: '大庆市', districts: [] },
{ name: '伊春市', districts: [] },
{ name: '佳木斯市', districts: [] },
{ name: '七台河市', districts: [] },
{ name: '牡丹江市', districts: [] },
{ name: '黑河市', districts: [] },
{ name: '绥化市', districts: [] },
{ name: '大兴安岭地区', districts: [] }
]
},
{
name: '上海市',
cities: [
{ name: '上海市', districts: [] }
]
},
{
name: '江苏省',
cities: [
{ name: '南京市', districts: [] },
{ name: '无锡市', districts: [] },
{ name: '徐州市', districts: [] },
{ name: '常州市', districts: [] },
{ name: '苏州市', districts: [] },
{ name: '南通市', districts: [] },
{ name: '连云港市', districts: [] },
{ name: '淮安市', districts: [] },
{ name: '盐城市', districts: [] },
{ name: '扬州市', districts: [] },
{ name: '镇江市', districts: [] },
{ name: '泰州市', districts: [] },
{ name: '宿迁市', districts: [] }
]
},
{
name: '浙江省',
cities: [
{ name: '杭州市', districts: [] },
{ name: '宁波市', districts: [] },
{ name: '温州市', districts: [] },
{ name: '嘉兴市', districts: [] },
{ name: '湖州市', districts: [] },
{ name: '绍兴市', districts: [] },
{ name: '金华市', districts: [] },
{ name: '衢州市', districts: [] },
{ name: '舟山市', districts: [] },
{ name: '台州市', districts: [] },
{ name: '丽水市', districts: [] }
]
},
{
name: '安徽省',
cities: [
{ name: '合肥市', districts: [] },
{ name: '芜湖市', districts: [] },
{ name: '蚌埠市', districts: [] },
{ name: '淮南市', districts: [] },
{ name: '马鞍山市', districts: [] },
{ name: '淮北市', districts: [] },
{ name: '铜陵市', districts: [] },
{ name: '安庆市', districts: [] },
{ name: '黄山市', districts: [] },
{ name: '滁州市', districts: [] },
{ name: '阜阳市', districts: [] },
{ name: '宿州市', districts: [] },
{ name: '六安市', districts: [] },
{ name: '亳州市', districts: [] },
{ name: '池州市', districts: [] },
{ name: '宣城市', districts: [] }
]
},
{
name: '福建省',
cities: [
{ name: '福州市', districts: [] },
{ name: '厦门市', districts: [] },
{ name: '莆田市', districts: [] },
{ name: '三明市', districts: [] },
{ name: '泉州市', districts: [] },
{ name: '漳州市', districts: [] },
{ name: '南平市', districts: [] },
{ name: '龙岩市', districts: [] },
{ name: '宁德市', districts: [] }
]
},
{
name: '江西省',
cities: [
{ name: '南昌市', districts: [] },
{ name: '景德镇市', districts: [] },
{ name: '萍乡市', districts: [] },
{ name: '九江市', districts: [] },
{ name: '新余市', districts: [] },
{ name: '鹰潭市', districts: [] },
{ name: '赣州市', districts: [] },
{ name: '吉安市', districts: [] },
{ name: '宜春市', districts: [] },
{ name: '抚州市', districts: [] },
{ name: '上饶市', districts: [] }
]
},
{
name: '山东省',
cities: [
{ name: '济南市', districts: [] },
{ name: '青岛市', districts: [] },
{ name: '淄博市', districts: [] },
{ name: '枣庄市', districts: [] },
{ name: '东营市', districts: [] },
{ name: '烟台市', districts: [] },
{ name: '潍坊市', districts: [] },
{ name: '济宁市', districts: [] },
{ name: '泰安市', districts: [] },
{ name: '威海市', districts: [] },
{ name: '日照市', districts: [] },
{ name: '临沂市', districts: [] },
{ name: '德州市', districts: [] },
{ name: '聊城市', districts: [] },
{ name: '滨州市', districts: [] },
{ name: '菏泽市', districts: [] }
]
},
{
name: '河南省',
cities: [
{ name: '郑州市', districts: [] },
{ name: '开封市', districts: [] },
{ name: '洛阳市', districts: [] },
{ name: '平顶山市', districts: [] },
{ name: '安阳市', districts: [] },
{ name: '鹤壁市', districts: [] },
{ name: '新乡市', districts: [] },
{ name: '焦作市', districts: [] },
{ name: '濮阳市', districts: [] },
{ name: '许昌市', districts: [] },
{ name: '漯河市', districts: [] },
{ name: '三门峡市', districts: [] },
{ name: '南阳市', districts: [] },
{ name: '商丘市', districts: [] },
{ name: '信阳市', districts: [] },
{ name: '周口市', districts: [] },
{ name: '驻马店市', districts: [] },
{ name: '济源市', districts: [] }
]
},
{
name: '湖北省',
cities: [
{ name: '武汉市', districts: [] },
{ name: '黄石市', districts: [] },
{ name: '十堰市', districts: [] },
{ name: '宜昌市', districts: [] },
{ name: '襄阳市', districts: [] },
{ name: '鄂州市', districts: [] },
{ name: '荆门市', districts: [] },
{ name: '孝感市', districts: [] },
{ name: '荆州市', districts: [] },
{ name: '黄冈市', districts: [] },
{ name: '咸宁市', districts: [] },
{ name: '随州市', districts: [] },
{ name: '恩施土家族苗族自治州', districts: [] },
{ name: '仙桃市', districts: [] },
{ name: '潜江市', districts: [] },
{ name: '天门市', districts: [] },
{ name: '神农架林区', districts: [] }
]
},
{
name: '湖南省',
cities: [
{ name: '长沙市', districts: [] },
{ name: '株洲市', districts: [] },
{ name: '湘潭市', districts: [] },
{ name: '衡阳市', districts: [] },
{ name: '邵阳市', districts: [] },
{ name: '岳阳市', districts: [] },
{ name: '常德市', districts: [] },
{ name: '张家界市', districts: [] },
{ name: '益阳市', districts: [] },
{ name: '郴州市', districts: [] },
{ name: '永州市', districts: [] },
{ name: '怀化市', districts: [] },
{ name: '娄底市', districts: [] },
{ name: '湘西土家族苗族自治州', districts: [] }
]
},
{
name: '广东省',
cities: [
{ name: '广州市', districts: [] },
{ name: '韶关市', districts: [] },
{ name: '深圳市', districts: [] },
{ name: '珠海市', districts: [] },
{ name: '汕头市', districts: [] },
{ name: '佛山市', districts: [] },
{ name: '江门市', districts: [] },
{ name: '湛江市', districts: [] },
{ name: '茂名市', districts: [] },
{ name: '肇庆市', districts: [] },
{ name: '惠州市', districts: [] },
{ name: '梅州市', districts: [] },
{ name: '汕尾市', districts: [] },
{ name: '河源市', districts: [] },
{ name: '阳江市', districts: [] },
{ name: '清远市', districts: [] },
{ name: '东莞市', districts: [] },
{ name: '中山市', districts: [] },
{ name: '潮州市', districts: [] },
{ name: '揭阳市', districts: [] },
{ name: '云浮市', districts: [] }
]
},
{
name: '广西壮族自治区',
cities: [
{ name: '南宁市', districts: [] },
{ name: '柳州市', districts: [] },
{ name: '桂林市', districts: [] },
{ name: '梧州市', districts: [] },
{ name: '北海市', districts: [] },
{ name: '防城港市', districts: [] },
{ name: '钦州市', districts: [] },
{ name: '贵港市', districts: [] },
{ name: '玉林市', districts: [] },
{ name: '百色市', districts: [] },
{ name: '贺州市', districts: [] },
{ name: '河池市', districts: [] },
{ name: '来宾市', districts: [] },
{ name: '崇左市', districts: [] }
]
},
{
name: '海南省',
cities: [
{ name: '海口市', districts: [] },
{ name: '三亚市', districts: [] },
{ name: '三沙市', districts: [] },
{ name: '儋州市', districts: [] },
{ name: '五指山市', districts: [] },
{ name: '琼海市', districts: [] },
{ name: '文昌市', districts: [] },
{ name: '万宁市', districts: [] },
{ name: '东方市', districts: [] },
{ name: '定安县', districts: [] },
{ name: '屯昌县', districts: [] },
{ name: '澄迈县', districts: [] },
{ name: '临高县', districts: [] },
{ name: '白沙黎族自治县', districts: [] },
{ name: '昌江黎族自治县', districts: [] },
{ name: '乐东黎族自治县', districts: [] },
{ name: '陵水黎族自治县', districts: [] },
{ name: '保亭黎族苗族自治县', districts: [] },
{ name: '琼中黎族苗族自治县', districts: [] }
]
},
{
name: '重庆市',
cities: [
{ name: '重庆市', districts: [] }
]
},
{
name: '四川省',
cities: [
{ name: '成都市', districts: [] },
{ name: '自贡市', districts: [] },
{ name: '攀枝花市', districts: [] },
{ name: '泸州市', districts: [] },
{ name: '德阳市', districts: [] },
{ name: '绵阳市', districts: [] },
{ name: '广元市', districts: [] },
{ name: '遂宁市', districts: [] },
{ name: '内江市', districts: [] },
{ name: '乐山市', districts: [] },
{ name: '南充市', districts: [] },
{ name: '眉山市', districts: [] },
{ name: '宜宾市', districts: [] },
{ name: '广安市', districts: [] },
{ name: '达州市', districts: [] },
{ name: '雅安市', districts: [] },
{ name: '巴中市', districts: [] },
{ name: '资阳市', districts: [] },
{ name: '阿坝藏族羌族自治州', districts: [] },
{ name: '甘孜藏族自治州', districts: [] },
{ name: '凉山彝族自治州', districts: [] }
]
},
{
name: '贵州省',
cities: [
{ name: '贵阳市', districts: [] },
{ name: '六盘水市', districts: [] },
{ name: '遵义市', districts: [] },
{ name: '安顺市', districts: [] },
{ name: '毕节市', districts: [] },
{ name: '铜仁市', districts: [] },
{ name: '黔西南布依族苗族自治州', districts: [] },
{ name: '黔东南苗族侗族自治州', districts: [] },
{ name: '黔南布依族苗族自治州', districts: [] }
]
},
{
name: '云南省',
cities: [
{ name: '昆明市', districts: [] },
{ name: '曲靖市', districts: [] },
{ name: '玉溪市', districts: [] },
{ name: '保山市', districts: [] },
{ name: '昭通市', districts: [] },
{ name: '丽江市', districts: [] },
{ name: '普洱市', districts: [] },
{ name: '临沧市', districts: [] },
{ name: '楚雄彝族自治州', districts: [] },
{ name: '红河哈尼族彝族自治州', districts: [] },
{ name: '文山壮族苗族自治州', districts: [] },
{ name: '西双版纳傣族自治州', districts: [] },
{ name: '大理白族自治州', districts: [] },
{ name: '德宏傣族景颇族自治州', districts: [] },
{ name: '怒江傈僳族自治州', districts: [] },
{ name: '迪庆藏族自治州', districts: [] }
]
},
{
name: '西藏自治区',
cities: [
{ name: '拉萨市', districts: [] },
{ name: '日喀则市', districts: [] },
{ name: '昌都市', districts: [] },
{ name: '林芝市', districts: [] },
{ name: '山南市', districts: [] },
{ name: '那曲市', districts: [] },
{ name: '阿里地区', districts: [] }
]
},
{
name: '陕西省',
cities: [
{ name: '西安市', districts: [] },
{ name: '铜川市', districts: [] },
{ name: '宝鸡市', districts: [] },
{ name: '咸阳市', districts: [] },
{ name: '渭南市', districts: [] },
{ name: '延安市', districts: [] },
{ name: '汉中市', districts: [] },
{ name: '榆林市', districts: [] },
{ name: '安康市', districts: [] },
{ name: '商洛市', districts: [] }
]
},
{
name: '甘肃省',
cities: [
{ name: '兰州市', districts: [] },
{ name: '嘉峪关市', districts: [] },
{ name: '金昌市', districts: [] },
{ name: '白银市', districts: [] },
{ name: '天水市', districts: [] },
{ name: '武威市', districts: [] },
{ name: '张掖市', districts: [] },
{ name: '平凉市', districts: [] },
{ name: '酒泉市', districts: [] },
{ name: '庆阳市', districts: [] },
{ name: '定西市', districts: [] },
{ name: '陇南市', districts: [] },
{ name: '临夏回族自治州', districts: [] },
{ name: '甘南藏族自治州', districts: [] }
]
},
{
name: '青海省',
cities: [
{ name: '西宁市', districts: [] },
{ name: '海东市', districts: [] },
{ name: '海北藏族自治州', districts: [] },
{ name: '黄南藏族自治州', districts: [] },
{ name: '海南藏族自治州', districts: [] },
{ name: '果洛藏族自治州', districts: [] },
{ name: '玉树藏族自治州', districts: [] },
{ name: '海西蒙古族藏族自治州', districts: [] }
]
},
{
name: '宁夏回族自治区',
cities: [
{ name: '银川市', districts: [] },
{ name: '石嘴山市', districts: [] },
{ name: '吴忠市', districts: [] },
{ name: '固原市', districts: [] },
{ name: '中卫市', districts: [] }
]
},
{
name: '新疆维吾尔自治区',
cities: [
{ name: '乌鲁木齐市', districts: [] },
{ name: '克拉玛依市', districts: [] },
{ name: '吐鲁番市', districts: [] },
{ name: '哈密市', districts: [] },
{ name: '昌吉回族自治州', districts: [] },
{ name: '博尔塔拉蒙古自治州', districts: [] },
{ name: '巴音郭楞蒙古自治州', districts: [] },
{ name: '阿克苏地区', districts: [] },
{ name: '克孜勒苏柯尔克孜自治州', districts: [] },
{ name: '喀什地区', districts: [] },
{ name: '和田地区', districts: [] },
{ name: '伊犁哈萨克自治州', districts: [] },
{ name: '塔城地区', districts: [] },
{ name: '阿勒泰地区', districts: [] },
{ name: '石河子市', districts: [] },
{ name: '阿拉尔市', districts: [] },
{ name: '图木舒克市', districts: [] },
{ name: '五家渠市', districts: [] },
{ name: '北屯市', districts: [] },
{ name: '铁门关市', districts: [] },
{ name: '双河市', districts: [] },
{ name: '可克达拉市', districts: [] },
{ name: '昆玉市', districts: [] },
{ name: '胡杨河市', districts: [] },
{ name: '新星市', districts: [] }
]
},
{
name: '台湾省',
cities: [
{ name: '台北市', districts: [] },
{ name: '高雄市', districts: [] },
{ name: '新北市', districts: [] },
{ name: '台中市', districts: [] },
{ name: '台南市', districts: [] },
{ name: '桃园市', districts: [] },
{ name: '基隆市', districts: [] },
{ name: '新竹市', districts: [] },
{ name: '嘉义市', districts: [] },
{ name: '新竹县', districts: [] },
{ name: '苗栗县', districts: [] },
{ name: '彰化县', districts: [] },
{ name: '南投县', districts: [] },
{ name: '云林县', districts: [] },
{ name: '嘉义县', districts: [] },
{ name: '屏东县', districts: [] },
{ name: '宜兰县', districts: [] },
{ name: '花莲县', districts: [] },
{ name: '台东县', districts: [] },
{ name: '澎湖县', districts: [] },
{ name: '金门县', districts: [] },
{ name: '连江县', districts: [] }
]
},
{
name: '香港特别行政区',
cities: [
{ name: '中西区', districts: [] },
{ name: '湾仔区', districts: [] },
{ name: '东区', districts: [] },
{ name: '南区', districts: [] },
{ name: '油尖旺区', districts: [] },
{ name: '深水埗区', districts: [] },
{ name: '九龙城区', districts: [] },
{ name: '黄大仙区', districts: [] },
{ name: '观塘区', districts: [] },
{ name: '荃湾区', districts: [] },
{ name: '屯门区', districts: [] },
{ name: '元朗区', districts: [] },
{ name: '北区', districts: [] },
{ name: '大埔区', districts: [] },
{ name: '西贡区', districts: [] },
{ name: '沙田区', districts: [] },
{ name: '葵青区', districts: [] },
{ name: '离岛区', districts: [] }
]
},
{
name: '澳门特别行政区',
cities: [
{ name: '花地玛堂区', districts: [] },
{ name: '圣安多尼堂区', districts: [] },
{ name: '大堂区', districts: [] },
{ name: '望德堂区', districts: [] },
{ name: '风顺堂区', districts: [] },
{ name: '嘉模堂区', districts: [] },
{ name: '圣方济各堂区', districts: [] },
{ name: '路氹填海区', districts: [] }
]
}
]
export const PROFILE_COMMON_ADDRESS_SUGGESTIONS: Array<string> = [
'广东省梅州市 学海路康养公寓 A 座 907 室',
'广东省广州市 天河路康复护理中心 3 层',
'北京市 望京康养服务站 2 号楼 301 室',
'上海市 花木社区照护点 6 号',
'浙江省杭州市 文二路护理服务中心 3 层'
]

View File

@@ -4656,6 +4656,17 @@ class SupabaseService {
}
private normalizeServiceStatus(status: string): string {
if (status == 'ORDER_CREATED') return 'created'
if (status == 'ORDER_ASSIGNED') return 'assigned'
if (status == 'ORDER_ACCEPTED') return 'accepted'
if (status == 'ORDER_REJECTED') return 'rejected'
if (status == 'ORDER_CHECKED_IN') return 'arrived'
if (status == 'ORDER_IN_SERVICE') return 'in_service'
if (status == 'ORDER_COMPLETED' || status == 'ACCEPTANCE_PENDING') return 'pending_acceptance'
if (status == 'ACCEPTED') return 'accepted_by_user'
if (status == 'SETTLEMENT_READY' || status == 'ARCHIVED') return 'settled'
if (status == 'ORDER_CANCELLED') return 'cancelled'
if (status == 'ORDER_EXCEPTION' || status == 'ACCEPTANCE_REJECTED') return 'exception'
if (status == 'created' || status == 'submitted') return 'created'
if (status == 'paid') return 'paid'
if (status == 'assigned' || status == 'pending_dispatch' || status == 'pending_assignment') return 'assigned'

View File

@@ -149,28 +149,15 @@ export function responsiveState() {
}
}
export function goToLogin(redirectUrl?: string | null) {
try {
const target = redirectUrl != null && redirectUrl.length > 0 ? redirectUrl : ''
uni.showModal({
title: '提示',
content: '当前操作需要登录,是否前往登录页继续?',
confirmText: '去登录',
cancelText: '先逛逛',
success: (res) => {
if (res.confirm) {
if (target.length > 0) {
const redirect = encodeURIComponent(target)
uni.navigateTo({ url: `/pages/user/login?redirect=${redirect}` })
} else {
uni.navigateTo({ url: '/pages/user/login' })
}
}
}
})
} catch (e) {
uni.navigateTo({ url: '/pages/user/login' })
export function goToLogin(redirectUrl: string = ''): void {
let url = '/pages/user/login'
if (redirectUrl != null && redirectUrl !== '') {
url = url + '?redirect=' + encodeURIComponent(redirectUrl)
}
uni.navigateTo({
url
})
}
/**