|
|
@@ -2962,6 +2962,11 @@ XL;
|
|
|
$remark = $order->remark ?? '';
|
|
|
$shortRemark = stringUtil::subStringUtf8($remark, 8);
|
|
|
|
|
|
+ $wlName = $custom->wlName ?? '';
|
|
|
+ if(empty($wlName)){
|
|
|
+ $wlName = $shortRemark;
|
|
|
+ }
|
|
|
+
|
|
|
$address = $order->address ?? '';
|
|
|
$floor = $order->floor ?? '';
|
|
|
$fullAddress = $address . $floor;
|
|
|
@@ -2989,8 +2994,8 @@ XL;
|
|
|
$content = '<TEXT x="420" y="130" font="12" w="4" h="4" r="90">' . $shortName . '</TEXT>';
|
|
|
$content .= '<TEXT x="395" y="10" font="12" w="2" h="2" r="90">地址</TEXT>';
|
|
|
$content .= '<TEXT x="290" y="130" font="12" w="3" h="3" r="90">' . $customMobile . '</TEXT>';
|
|
|
- $content .= '<TEXT x="265" y="10" font="12" w="2" h="2" r="90">代码</TEXT>';
|
|
|
- $content .= '<TEXT x="170" y="130" font="12" w="4" h="4" r="90">' . $shortRemark . '</TEXT>';
|
|
|
+ $content .= '<TEXT x="265" y="10" font="12" w="2" h="2" r="90">号码</TEXT>';
|
|
|
+ $content .= '<TEXT x="170" y="130" font="12" w="4" h="4" r="90">' . $wlName . '</TEXT>';
|
|
|
$content .= '<TEXT x="150" y="10" font="12" w="2" h="2" r="90">物流</TEXT>';
|
|
|
$content .= '<TEXT x="45" y="70" font="12" w="2" h="2" r="90">' . $currentName . ' ' . $telephone . '</TEXT>';
|
|
|
} else {
|