Commit 24361181 authored by zhz's avatar zhz

sale

parent 7f4e0e5c
...@@ -110,6 +110,7 @@ class SalespersonServiceModel extends \Business\AbstractModel ...@@ -110,6 +110,7 @@ class SalespersonServiceModel extends \Business\AbstractModel
'qrCode'=>$qrCode, 'qrCode'=>$qrCode,
'memberName'=>$storeInfo['store_name'], 'memberName'=>$storeInfo['store_name'],
'memberAvatarUrl'=>$storeLabel, 'memberAvatarUrl'=>$storeLabel,
'memberAvatarUrlR20'=>$storeModelDAO->getStoreLabelSrc($storeInfo['store_label'],'','',true).'?x-oss-process=image/rounded-corners,r_20',
'goods'=>$goods ? array($goods) : $goods 'goods'=>$goods ? array($goods) : $goods
]; ];
} }
...@@ -145,6 +146,7 @@ class SalespersonServiceModel extends \Business\AbstractModel ...@@ -145,6 +146,7 @@ class SalespersonServiceModel extends \Business\AbstractModel
'qrCode'=>$qrCode, 'qrCode'=>$qrCode,
'memberName'=>$storeInfo['store_name'], 'memberName'=>$storeInfo['store_name'],
'memberAvatarUrl'=>$storeLabel, 'memberAvatarUrl'=>$storeLabel,
'memberAvatarUrlR20'=>$storeModelDAO->getStoreLabelSrc($storeInfo['store_label'],'','',true).'?x-oss-process=image/rounded-corners,r_20',
'goods'=>$data ? array($data) : $data 'goods'=>$data ? array($data) : $data
]; ];
$hashData[$saleGoods[$id]][$saleGoods[$id].'_'.$memberId] = $qrCode; $hashData[$saleGoods[$id]][$saleGoods[$id].'_'.$memberId] = $qrCode;
......
...@@ -83,7 +83,7 @@ class StoreModel extends \DAO\AbstractModel ...@@ -83,7 +83,7 @@ class StoreModel extends \DAO\AbstractModel
* @param $storeLabel * @param $storeLabel
* @return string * @return string
*/ */
public function getStoreLabelSrc($storeLabel, $width = \Our\ImageConst::circleStoreLabel, $height = 0) public function getStoreLabelSrc($storeLabel, $width = \Our\ImageConst::circleStoreLabel, $height = 0,$original = false)
{ {
$width = ceil($width * \Our\ImageConst::sizeScale); $width = ceil($width * \Our\ImageConst::sizeScale);
$height ? $height = ceil($height * \Our\ImageConst::sizeScale) : $height = $width; $height ? $height = ceil($height * \Our\ImageConst::sizeScale) : $height = $width;
...@@ -92,7 +92,9 @@ class StoreModel extends \DAO\AbstractModel ...@@ -92,7 +92,9 @@ class StoreModel extends \DAO\AbstractModel
} else { } else {
$storeLabel = \Our\Common::getStaticFile(ImageConst::defaultStoreLabelName, ImageConst::defaultPath); $storeLabel = \Our\Common::getStaticFile(ImageConst::defaultStoreLabelName, ImageConst::defaultPath);
} }
$storeLabel .= "?x-oss-process=image/resize,m_fill,h_{$height},w_{$width}"; if($original == false) {
$storeLabel .= "?x-oss-process=image/resize,m_fill,h_{$height},w_{$width}";
}
return $storeLabel; return $storeLabel;
} }
/** /**
......
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