Commit c7fd7804 authored by Administrator's avatar Administrator

Merge branch 'release' into 'jd_dev'

release最新代码合并到jd_dev20241108

See merge request !36
parents 5172b0e8 d0ef76f9
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div id="myproa"> <div id="myproa">
<p style="padding-bottom:10px;font-size:16px;"> <p style="padding-bottom:10px;font-size:16px;">
{{ $t('printWarehouseReceipt.orderNo') }}{{ detail.orderNo }} {{ $t('printWarehouseReceipt.orderNo') }}{{ detail.orderNo }}
&nbsp;&nbsp;&nbsp;{{ $t('printWarehouseReceipt.phone') }}{{ detail.name }} {{ detail.phone }} &nbsp;&nbsp;&nbsp;{{ $t('printWarehouseReceipt.phone') }}+{{detail.consignorVO.countryCode}} {{detail.consignorVO.phone|maskPhoneNumber }}
&nbsp;&nbsp;&nbsp;{{ $t('printWarehouseReceipt.address') }}{{ objective.titleZh }} &nbsp;&nbsp;&nbsp;{{ $t('printWarehouseReceipt.address') }}{{ objective.titleZh }}
<img :src="qrcode" style="margin-left: 10px;width:17mm;vertical-align:middle"> <img :src="qrcode" style="margin-left: 10px;width:17mm;vertical-align:middle">
</p> </p>
...@@ -76,7 +76,24 @@ import lodop from '@/utils/lodop' ...@@ -76,7 +76,24 @@ import lodop from '@/utils/lodop'
import { getOrderWarehouseIn, getOrderDetail } from '@/api/order' import { getOrderWarehouseIn, getOrderDetail } from '@/api/order'
import qrcode from 'qrcode' import qrcode from 'qrcode'
export default { export default {
filters: { parseTime }, filters: {
parseTime,
maskPhoneNumber(phoneNumber) {
const length = phoneNumber.length;
if (length <= 5) {
return phoneNumber.slice(0, -3) + '*'.repeat(Math.min(3, length));
}
// 保留的明文字符数
const plainLength = length - 5;
// 尾部保留的明文字符数
const after = Math.floor(plainLength / 2)
// 前面保留的明文字符数
const before = plainLength - after;
return phoneNumber.slice(0, before) + '*'.repeat(5) + phoneNumber.slice(-after);
}
},
components: { }, components: { },
props: { props: {
orderId: [String, Number] orderId: [String, Number]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment