diff --git a/pages/cabinet/index.vue b/pages/cabinet/index.vue index 50104ad..0205b17 100755 --- a/pages/cabinet/index.vue +++ b/pages/cabinet/index.vue @@ -136,6 +136,15 @@ 复制 + + + + {{ item.address.name }} + {{ item.address.phone }} + + {{ item.address.province }} {{ item.address.city }} {{ item.address.district }} {{ item.address.detail }} + + 申请时间:{{ formatDate(item.created_at) }} @@ -581,6 +590,20 @@ async function loadShipments(uid) { // 判断是否可以撤销(48小时内且状态为待发货) const canCancel = checkCanCancel(s.status, s.created_at) + const address = s.address + const normalizedAddress = address + ? { + id: address.id, + name: address.name || address.realname || '', + phone: address.phone || address.mobile || '', + province: address.province || '', + city: address.city || '', + district: address.district || '', + detail: address.detail || address.address || '', + is_default: !!address.is_default + } + : null + return { batch_no: s.batch_no || '', count: s.count ?? (Array.isArray(s.inventory_ids) ? s.inventory_ids.length : 0), @@ -593,7 +616,8 @@ async function loadShipments(uid) { shipped_at: s.shipped_at || '', received_at: s.received_at || '', status: s.status || 1, - can_cancel: canCancel + can_cancel: canCancel, + address: normalizedAddress } }) @@ -1555,6 +1579,37 @@ function onCopyShareLink() { &:active { background: rgba($brand-primary, 0.05); } } +.shipment-address { + background: $bg-page; + border-radius: $radius-md; + padding: 16rpx 20rpx; + margin-bottom: 20rpx; +} +.address-top { + display: flex; + align-items: center; + gap: 16rpx; + margin-bottom: 8rpx; +} +.address-name { + font-size: 26rpx; + font-weight: 600; + color: $text-main; +} +.address-phone { + font-size: 22rpx; + color: $text-sub; +} +.address-detail { + font-size: 24rpx; + line-height: 1.5; + color: $text-sub; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; +} + .shipment-time { display: flex; flex-direction: column; diff --git a/utils/request.js b/utils/request.js index 0cb3d94..1fa68e4 100755 --- a/utils/request.js +++ b/utils/request.js @@ -1,5 +1,5 @@ -//const BASE_URL = 'http://127.0.0.1:9991' -const BASE_URL = 'https://kdy.1024tool.vip' +const BASE_URL = 'http://127.0.0.1:9991' +// const BASE_URL = 'https://kdy.1024tool.vip' let authModalShown = false function handleAuthExpired() {