diff --git a/src/api/TrackOrder/typings.d.ts b/src/api/TrackOrder/typings.d.ts index d2d92db..8d52fa5 100644 --- a/src/api/TrackOrder/typings.d.ts +++ b/src/api/TrackOrder/typings.d.ts @@ -21,6 +21,10 @@ declare namespace API { type GetDetailTimelineOutput = { /** 轨迹编码 */ trackCode?: string; + /** 轨迹状态 */ + trackStatus?: string; + /** 轨迹状态 code */ + trackStatusCode?: string; /** 轨迹内容 */ content?: string; /** 轨迹英文内容 */ diff --git a/src/api/interface-trackOrder/typings.d.ts b/src/api/interface-trackOrder/typings.d.ts index a821f13..62300a1 100644 --- a/src/api/interface-trackOrder/typings.d.ts +++ b/src/api/interface-trackOrder/typings.d.ts @@ -20,6 +20,10 @@ declare namespace API { type GetDetailTimelineOutput = { /** 轨迹编码 */ trackCode?: string; + /** 轨迹状态 */ + trackStatus?: string; + /** 轨迹状态 code */ + trackStatusCode?: string; /** 轨迹内容 */ content?: string; /** 轨迹英文内容 */ diff --git a/src/assets/style/global.less b/src/assets/style/global.less index 9ce1db6..8ac3ba2 100644 --- a/src/assets/style/global.less +++ b/src/assets/style/global.less @@ -159,6 +159,17 @@ body .arco-drawer { border-radius: 0 !important; } +/* + * index.html 为防 boot/居中抖动给 html 加了 scrollbar-gutter: stable， + * Chromium 下 fixed 容器会被收窄一截 gutter（约 15px），抽屉 right:0 仍贴容器右缘， + * 视觉上就在屏幕右边界留出缝。用 100vw 铺满视觉视口。 + */ +body .arco-drawer-container { + width: 100vw; + left: 0; + right: auto; +} + /* vxe table wrapper */ body .vxe-table--border, body .vxe-grid { diff --git a/src/locale/en-US.ts b/src/locale/en-US.ts index c1a4015..bb8d267 100644 --- a/src/locale/en-US.ts +++ b/src/locale/en-US.ts @@ -1895,6 +1895,7 @@ export default { 'order.myOrders.drawer.track.remark': 'Remark', 'order.myOrders.drawer.track.code': 'Track code', 'order.myOrders.drawer.track.timezone': 'TZ {zone}', + 'order.myOrders.drawer.track.statusUnknown': 'Update', 'order.myOrders.drawer.weightLength': 'Length(cm)', 'order.myOrders.drawer.weightWidth': 'Width(cm)', 'order.myOrders.drawer.weightHeight': 'Height(cm)', @@ -2192,7 +2193,7 @@ export default { 'order.placeOrder.batch.stepTemplate': 'Select template', 'order.placeOrder.batch.stepUpload': 'Upload Excel', 'order.placeOrder.batch.stepSubmit': 'Submit', - 'order.placeOrder.batch.guideHint': 'Click a step to jump · pick template on the right, then upload & submit', + 'order.placeOrder.batch.guideHint': 'Click a step to jump · pick template & sender, then upload & submit', 'order.placeOrder.batch.pickTemplateHint': 'Select a template', 'order.placeOrder.batch.block.noTemplate': 'Please select an order template on the right first', 'order.placeOrder.batch.block.templateDraft': 'Finish mapping this custom template before submitting', @@ -2257,6 +2258,11 @@ export default { 'order.placeOrder.single.hideExtraCols': 'Less', 'order.placeOrder.single.showRecipientOptional': 'More', 'order.placeOrder.single.hideRecipientOptional': 'Less', + 'order.placeOrder.single.saveReceiver': 'Save', + 'order.placeOrder.single.savingReceiver': 'Saving…', + 'order.placeOrder.single.saveReceiverRequired': 'Enter recipient name and address line 1 first', + 'order.placeOrder.single.saveReceiverSuccess': 'Recipient address saved', + 'order.placeOrder.single.saveReceiverFailed': 'Failed to save recipient address', 'order.placeOrder.single.declarationResizeHint': 'Scroll sideways for more columns; drag bottom to resize height', 'order.placeOrder.single.successTitle': 'Order created', 'order.placeOrder.single.successContent': 'You can view details and status in My Orders.', diff --git a/src/locale/zh-CN.ts b/src/locale/zh-CN.ts index aa11be5..f3925aa 100644 --- a/src/locale/zh-CN.ts +++ b/src/locale/zh-CN.ts @@ -1814,6 +1814,7 @@ export default { 'order.myOrders.drawer.track.remark': '备注', 'order.myOrders.drawer.track.code': '轨迹代码', 'order.myOrders.drawer.track.timezone': '时区 {zone}', + 'order.myOrders.drawer.track.statusUnknown': '轨迹更新', 'order.myOrders.drawer.weightLength': '长(cm)', 'order.myOrders.drawer.weightWidth': '宽(cm)', 'order.myOrders.drawer.weightHeight': '高(cm)', @@ -2111,7 +2112,7 @@ export default { 'order.placeOrder.batch.stepTemplate': '选择模板', 'order.placeOrder.batch.stepUpload': '上传 Excel', 'order.placeOrder.batch.stepSubmit': '提交下单', - 'order.placeOrder.batch.guideHint': '点步骤可定位 · 右侧选模板，左侧上传后提交', + 'order.placeOrder.batch.guideHint': '点步骤可定位 · 先选模板与发件人，再上传提交', 'order.placeOrder.batch.pickTemplateHint': '请选择模板', 'order.placeOrder.batch.block.noTemplate': '请先在右侧选择下单模板', 'order.placeOrder.batch.block.templateDraft': '当前自定义模板待编辑完成映射后才能提交', @@ -2182,6 +2183,11 @@ export default { 'order.placeOrder.single.declarationSkuFilled': '已填入申报信息，请补充单价等必填项', 'order.placeOrder.single.showRecipientOptional': '更多', 'order.placeOrder.single.hideRecipientOptional': '收起', + 'order.placeOrder.single.saveReceiver': '保存', + 'order.placeOrder.single.savingReceiver': '保存中…', + 'order.placeOrder.single.saveReceiverRequired': '请先填写收件人名称和地址1', + 'order.placeOrder.single.saveReceiverSuccess': '收件地址已保存', + 'order.placeOrder.single.saveReceiverFailed': '保存收件地址失败', 'order.placeOrder.single.declarationResizeHint': '左右滑动看更多列，底部拖拽调节高度', 'order.placeOrder.single.successTitle': '单票下单成功', 'order.placeOrder.single.successContent': '订单已创建，可前往「我的订单」查看详情与后续状态。', diff --git a/src/views/channel/salesProducts/components/BillingSimulateDrawer.vue b/src/views/channel/salesProducts/components/BillingSimulateDrawer.vue index 390a117..35d7d0f 100644 --- a/src/views/channel/salesProducts/components/BillingSimulateDrawer.vue +++ b/src/views/channel/salesProducts/components/BillingSimulateDrawer.vue @@ -160,9 +160,10 @@ v-for="(w, i) in warningList" :key="i" type="warning" - :content="w" class="warn-item" - /> + > + {{ w }} +
{{ t('channel.salesProducts.billingSimulate.receivable') }}
+ > + {{ t('order.myOrders.claimed.tipInsured', { amount: declaredSumText }) }} + + > + {{ t('order.myOrders.claimed.tipUninsured') }} +
{{ t('order.myOrders.claimed.maxHint', { amount: declaredSumText }) }}
diff --git a/src/views/order/myOrders/components/OrderDetailDrawer.vue b/src/views/order/myOrders/components/OrderDetailDrawer.vue index 9c55103..7fa4227 100644 --- a/src/views/order/myOrders/components/OrderDetailDrawer.vue +++ b/src/views/order/myOrders/components/OrderDetailDrawer.vue @@ -36,12 +36,22 @@ {{ $t('order.myOrders.drawer.actions.edit') }} + + {{ $t('nanaAssistant.askAboutWaybill') }} +