Commit 468b7b7e authored by christ's avatar christ

share

parent 677b22b0
...@@ -38,7 +38,6 @@ class IndexController extends \Our\Controller_Abstract { ...@@ -38,7 +38,6 @@ class IndexController extends \Our\Controller_Abstract {
$this->memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance(); $this->memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
$paramsStr= $this->memberDb0Redis->tablelpop($this->key); $paramsStr= $this->memberDb0Redis->tablelpop($this->key);
$paramsStr=json_decode($paramsStr,true); $paramsStr=json_decode($paramsStr,true);
echo json_encode($paramsStr);exit;
$this->_view->assign("params", $paramsStr); $this->_view->assign("params", $paramsStr);
if($paramsStr['type']==\Our\ApiConst::sharePlat){ if($paramsStr['type']==\Our\ApiConst::sharePlat){
$this->_view->display('index/plat.phtml'); $this->_view->display('index/plat.phtml');
......
...@@ -36,6 +36,7 @@ class ShareServiceModel extends \Business\AbstractModel ...@@ -36,6 +36,7 @@ class ShareServiceModel extends \Business\AbstractModel
$data['driverType'] = $driverType; $data['driverType'] = $driverType;
$data['qrCode']=$this->growQrcode($data); $data['qrCode']=$this->growQrcode($data);
if($data['type']==ApiConst::shareStore || $data['type']== ApiConst::shareSaler){ if($data['type']==ApiConst::shareStore || $data['type']== ApiConst::shareSaler){
if(!empty($data['id'])){
$storeDao=\DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName); $storeDao=\DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName);
$store=$storeDao->getStoreInfoCache($data['id']); $store=$storeDao->getStoreInfoCache($data['id']);
$data['address']=$store['store_address']; $data['address']=$store['store_address'];
...@@ -44,6 +45,8 @@ class ShareServiceModel extends \Business\AbstractModel ...@@ -44,6 +45,8 @@ class ShareServiceModel extends \Business\AbstractModel
$data['desc']=$store['store_notice']; $data['desc']=$store['store_notice'];
} }
}
// $data['qrCode']=\Our\RedisHelper::cachedFunction(\Redis\Db0\MemberRedisModel::getInstance(), array(&$this, 'growQrcode'), array($data)); // $data['qrCode']=\Our\RedisHelper::cachedFunction(\Redis\Db0\MemberRedisModel::getInstance(), array(&$this, 'growQrcode'), array($data));
return $data; return $data;
...@@ -139,7 +142,6 @@ class ShareServiceModel extends \Business\AbstractModel ...@@ -139,7 +142,6 @@ class ShareServiceModel extends \Business\AbstractModel
$saveImageName=ImageUtil::getFileName().\Our\NameConst::jpgSuffix; $saveImageName=ImageUtil::getFileName().\Our\NameConst::jpgSuffix;
$saveFile=$savePath.$saveImageName; $saveFile=$savePath.$saveImageName;
$shell = \Our\Common::format("{0} --crop-w 750 --width 750 {1} {2}",$command,$convertUrl,$saveFile); $shell = \Our\Common::format("{0} --crop-w 750 --width 750 {1} {2}",$command,$convertUrl,$saveFile);
echo $shell;exit;
system($shell, $status); system($shell, $status);
if( $status ){ if( $status ){
\Error\ErrorModel::throwException(\Error\CodeConfigModel::shareGrowImageError); \Error\ErrorModel::throwException(\Error\CodeConfigModel::shareGrowImageError);
......
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