Skip to content

M
my-yaf-project
Commit c1079899 authored by zhz's avatar zhz
Browse files
Options

Merge branch 'master' of http://git.shenbd.com/api-project-dev/api.shenbd.com into zhz

parents 71023fdc 84183a9b
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 42 deletions
application/controllers/Index.php
View file @ c1079899
...@@ -61,7 +61,7 @@ class IndexController extends \Our\Controller_Abstract { ...@@ -61,7 +61,7 @@ class IndexController extends \Our\Controller_Abstract {
"shareType": "1", "shareType": "1",
"storeName": "LQ日化用品", "storeName": "LQ日化用品",
"timestamp": "1543913056", "timestamp": "1543913056",
"type": "4", "type": "3",
"driverType": 2, "driverType": 2,
"qrCode": "https://img.shenbd.com/mall/salesman_qr/170.png", "qrCode": "https://img.shenbd.com/mall/salesman_qr/170.png",
"address": "鑫雄盛快捷酒店仓山紫番林幼儿园", "address": "鑫雄盛快捷酒店仓山紫番林幼儿园",
...@@ -102,7 +102,6 @@ class IndexController extends \Our\Controller_Abstract { ...@@ -102,7 +102,6 @@ class IndexController extends \Our\Controller_Abstract {
$this->_view->display('index/store.phtml'); $this->_view->display('index/store.phtml');
} }
if($paramsStr['type']==\Our\ApiConst::shareGoods || $paramsStr['type']==\Our\ApiConst::shareGroup){ if($paramsStr['type']==\Our\ApiConst::shareGoods || $paramsStr['type']==\Our\ApiConst::shareGroup){
$this->_view->display('index/goods.phtml'); $this->_view->display('index/goods.phtml');
} }
if($paramsStr['type']==\Our\ApiConst::shareSaler){ if($paramsStr['type']==\Our\ApiConst::shareSaler){
...@@ -112,27 +111,51 @@ class IndexController extends \Our\Controller_Abstract { ...@@ -112,27 +111,51 @@ class IndexController extends \Our\Controller_Abstract {
} }
public function getInvateHtmlAction(){ public function getInvateHtmlAction(){
$req=$this->getRequest()->getQuery(); $req=$this->getRequest()->getQuery();
if(empty($req['params'] )){ //echo $req['cacheKey'];exit;
if(empty($req['cacheKey'] )){
echo 'error';exit; echo 'error';exit;
} }
$params=base64_decode($req['params']); $this->memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
$res= $this->memberDb0Redis->tableCacheGet($req['cacheKey']);
$params=unserialize($res);
$params=base64_decode($params);
// $params['name']='陈传文4';
// $params['telephone']='18305954587';
// $params['qrcodeUrl']='//static.shenbd.com/www/index/2018/img/card/code.jpg';
// $params['areaManage']='区域经理';
$params=\Our\Common::paramToJson($params); $params=\Our\Common::paramToJson($params);
// $params['areaManage']='经理';
$this->_view->assign("params", $params); $this->_view->assign("params", $params);
} }
public function getSendHtmlAction(){ public function getSendHtmlAction(){
$req=$this->getRequest()->getQuery(); $req=$this->getRequest()->getQuery();
if(empty($req['params'] )){ if(empty($req['cacheKey'] )){
echo 'error';exit; echo 'error';exit;
} }
$params=base64_decode($req['params']); $this->memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
$res= $this->memberDb0Redis->tableCacheGet($req['cacheKey']);
$params=unserialize($res);
$params=base64_decode($params);
$params=\Our\Common::paramToJson($params); $params=\Our\Common::paramToJson($params);
$shareService=\Business\User\ShareServiceModel::getInstance(); $shareService=\Business\User\ShareServiceModel::getInstance();
$params['id']=$params['storeId']; $params['id']=$params['storeId'];
$params['qrCode']=$shareService->getQrUrl($params); $params['qrCode']=$shareService->getQrUrl($params);
$this->_view->assign("params", $params); $this->_view->assign("params", $params);
} }
// public function getSendHtmlAction(){
// $req=$this->getRequest()->getQuery();
// if(empty($req['params'] )){
// echo 'error';exit;
// }
// $params=base64_decode($req['params']);
// $params=\Our\Common::paramToJson($params);
// $shareService=\Business\User\ShareServiceModel::getInstance();
// $params['id']=$params['storeId'];
// $params['qrCode']=$shareService->getQrUrl($params);
// $this->_view->assign("params", $params);
//
// }
public function getOpenHtmlAction(){ public function getOpenHtmlAction(){
$req=$this->getRequest()->getQuery(); $req=$this->getRequest()->getQuery();
if(empty($req['params'] )){ if(empty($req['params'] )){
......
application/models/Business/Goods/GoodsClassService.php
View file @ c1079899
...@@ -335,15 +335,19 @@ class GoodsClassServiceModel extends \Business\AbstractModel{ ...@@ -335,15 +335,19 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
if(isset($treeGcIds[$secondGcId][\Our\ApiConst::zero])&&$newPlatThirdGcList){ if(isset($treeGcIds[$secondGcId][\Our\ApiConst::zero])&&$newPlatThirdGcList){
foreach($treeGcIds[$secondGcId][\Our\ApiConst::zero] as $tempPaltThirdGcId){ foreach($treeGcIds[$secondGcId][\Our\ApiConst::zero] as $tempPaltThirdGcId){
$tempPlatClass = $newPlatThirdGcList[$tempPaltThirdGcId]; $tempPlatClass = $newPlatThirdGcList[$tempPaltThirdGcId];
$tempPlatClass['storeFlag'] = \Our\ApiConst::zero; if($tempPlatClass){
$childrenClasses[] = $tempPlatClass; $tempPlatClass['storeFlag'] = \Our\ApiConst::zero;
$childrenClasses[] = $tempPlatClass;
}
} }
} }
if(isset($treeGcIds[$secondGcId][\Our\ApiConst::one])&&$storeThirdGcList){ if(isset($treeGcIds[$secondGcId][\Our\ApiConst::one])&&$storeThirdGcList){
foreach($treeGcIds[$secondGcId][\Our\ApiConst::one] as $tempStoreThirdGcId){ foreach($treeGcIds[$secondGcId][\Our\ApiConst::one] as $tempStoreThirdGcId){
$tempStoreClass = $storeThirdGcList[$tempStoreThirdGcId] ; $tempStoreClass = $storeThirdGcList[$tempStoreThirdGcId] ;
$tempStoreClass['storeFlag'] = \Our\ApiConst::one; if($tempStoreClass){
$childrenClasses[] = $tempStoreClass; $tempStoreClass['storeFlag'] = \Our\ApiConst::one;
$childrenClasses[] = $tempStoreClass;
}
} }
} }
$returnTemp['childClasses'] = $childrenClasses; $returnTemp['childClasses'] = $childrenClasses;
......
application/models/Business/Goods/GoodsCommonService.php
View file @ c1079899
...@@ -1359,7 +1359,6 @@ class GoodsCommonServiceModel extends \Business\AbstractModel ...@@ -1359,7 +1359,6 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
}else{ }else{
$plusFlag=true; $plusFlag=true;
} }
$goodsClassStrMinus = $storeOnlineGoodsClassDao->getChangedGoodsClass(\Our\ApiConst::minus); $goodsClassStrMinus = $storeOnlineGoodsClassDao->getChangedGoodsClass(\Our\ApiConst::minus);
if($goodsClassStrMinus&&$minusFlag==false){ if($goodsClassStrMinus&&$minusFlag==false){
$goodsClassMinus = unserialize($goodsClassStrMinus); $goodsClassMinus = unserialize($goodsClassStrMinus);
...@@ -1384,6 +1383,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel ...@@ -1384,6 +1383,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
$oldTemp = $storeOnlineGoodsClassDao->findByWhere($goodsClass); $oldTemp = $storeOnlineGoodsClassDao->findByWhere($goodsClass);
if(!$oldTemp){ if(!$oldTemp){
$storeOnlineGoodsClassDao->insert($goodsClass); $storeOnlineGoodsClassDao->insert($goodsClass);
\Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreOnlineGoodsClassRedisModel::getInstance(),array(&$storeOnlineGoodsClassDao, 'getStoreOnlineGoodsClassesByGcId'),array(),array($goodsClass['store_id']));
} }
return true; return true;
} }
...@@ -1395,16 +1395,19 @@ class GoodsCommonServiceModel extends \Business\AbstractModel ...@@ -1395,16 +1395,19 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
$gcFrom = $goodsClass['gc_from']; $gcFrom = $goodsClass['gc_from'];
$where['gc_id_1'] = $goodsClass['gc_id_1']; $where['gc_id_1'] = $goodsClass['gc_id_1'];
$where['gc_id_2'] = $goodsClass['gc_id_2']; $where['gc_id_2'] = $goodsClass['gc_id_2'];
$where['gc_id_3'] = $goodsClass['gc_id_3'];
$where['store_id'] = $goodsClass['store_id']; $where['store_id'] = $goodsClass['store_id'];
$where['goods_state'] = \Our\ApiConst::onlineGoodsState; $where['goods_state'] = \Our\ApiConst::onlineGoodsState;
$where['goods_verify'] = \Our\ApiConst::onlineGoodsVerify; $where['goods_verify'] = \Our\ApiConst::onlineGoodsVerify;
$where['is_del'] = \Our\ApiConst::onlineGoodsDel;
if($gcFrom==\Our\ApiConst::one){ if($gcFrom==\Our\ApiConst::one){
$where['goods_class_t_id'] = $goodsClass['gc_id_3']; $where['goods_class_t_id'] = $goodsClass['gc_id_3'];
}else{
$where['gc_id_3'] = $goodsClass['gc_id_3'];
} }
$tempOne = $goodsCommonDao->getOne($where,'goods_commonid'); $tempOne = $goodsCommonDao->getOne($where,'goods_commonid');
if(!$tempOne){ if(!$tempOne){
$storeOnlineGoodsClassDao->del($goodsClass); $storeOnlineGoodsClassDao->del($goodsClass);
\Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreOnlineGoodsClassRedisModel::getInstance(),array(&$storeOnlineGoodsClassDao, 'getStoreOnlineGoodsClassesByGcId'),array(),array($goodsClass['store_id']));
} }
} }
} }
......
application/views/index/getinvatehtml.phtml 100644 → 100755
View file @ c1079899
...@@ -24,42 +24,44 @@ ...@@ -24,42 +24,44 @@
src: url('/data/fonts/fonts/rzyzkxk.ttf'); src: url('/data/fonts/fonts/rzyzkxk.ttf');
} }
.wrap { max-width:1276px; margin: 0 auto; } .wrap { width:1322px; margin: 0 auto; }
body { background: #fff; font-size: 14px; line-height: 1.5; font-family: "Microsoft Yahei";} body { background: #fff; font-size: 14px; line-height: 1.5; font-family:"Microsoft Yahei";}
.mod-card{ height: 1063px; background: url("//static.shenbd.com/www/index/2018/img/card/bg-card.jpg") no-repeat; position: relative; color:#030000} .mod-card{ height: 1100px; background: url("//static.shenbd.com/www/index/2018/img/card/bg-card-b.jpg") no-repeat; position: relative; color:#030000}
.mod-card .mod-c1, .mod-card .mod-c2{ position: absolute; width: 50%; text-align: center;} .mod-card .mod-c1, .mod-card .mod-c2{ position: absolute; width: 50%; text-align: center;}
.mod-card .mod-c1{ left: 0; top: 300px;} .mod-card .mod-c1{ left: 0; top: 316px;}
.mod-card .mod-c2{ right: 0; top: 200px;} .mod-card .mod-c2{ right: 0; top: 188px;}
.mod-card .t1{ margin-top: 35px;} .mod-card .t1{ margin-top: 25px;}
.mod-card .t2{ margin-top: 255px;} .mod-card .t2{ margin-top: 260px; line-height: 1; }
.mod-card .message{ line-height: 1.4; margin-top: 160px;} .mod-card .message{ line-height: 1.4; margin-top: 160px;}
.mod-card .name{ font-size: 74px; font-family: 'rzyzkxk';} .mod-card .name{ font-size: 74px; font-family: 'rzyzkxk';}
.mod-card .title{ font-size: 26px;} .mod-card .title{ font-size: 26px;}
.mod-card .phone{ font-size: 36px; margin-top: 20px; letter-spacing: 8px;} .mod-card .phone{ font-size: 36px; margin-top: 20px; letter-spacing: 8px;}
.mod-card .code{ margin-top: 60px;} .mod-card .code{ margin-top: 60px;}
.mod-card .code-txt{ font-size: 30px; margin-top: 20px; letter-spacing: 15px; padding-left: 30px;}
</style> </style>
</head> </head>
<body> <body>
<div class="wrap"> <div class="wrap">
<div class="mod-card"> <div class="mod-card">
<div class="mod-c1"> <div class="mod-c1">
<p><img src="//static.shenbd.com/www/index/2018/img/code-download-400.jpg" width="325" height="325" alt="我的身边店"></p> <p><img src="//static.shenbd.com/www/index/2018/img/code-download-400.jpg" width="340" height="340" alt="我的身边店"></p>
<p class="t1"><img src="//static.shenbd.com/www/index/2018/img/card/t1.png" alt="我的身边店"></p> <p class="t1"><img src="//static.shenbd.com/www/index/2018/img/card/t1-b.jpg" alt="我的身边店" width="226"></p>
<p class="t2"><img src="//static.shenbd.com/www/index/2018/img/card/t2.png" alt="您身边的品牌 服务品牌的你"></p> <p class="t2"><img src="//static.shenbd.com/www/index/2018/img/card/slogan-b.jpg" alt="我的身边店" width="500"></p>
</div> </div>
<div class="mod-c2"> <div class="mod-c2">
<div class="logo"> <div class="logo">
<img src="//static.shenbd.com/lib/img/logo-black.png" alt="我的身边店"> <img src="//static.shenbd.com/www/index/2018/img/card/logo-b.jpg" alt="我的身边店" width="318">
</div> </div>
<div class="message"> <div class="message">
<p class="name"><?php echo $params['name']; ?></p> <p class="name"><?php echo $params['name']; ?></p>
<p class="title">区域经理</p> <p class="title"><?php echo $params['areaManage']; ?></p>
<p class="phone"><?php echo $params['telephone']; ?></p> <p class="phone"><?php echo $params['telephone']; ?></p>
</div> </div>
<div class="code"> <div class="code">
<img width="213" src="<?php echo $params['qrcodeUrl']; ?>" alt="我的身边店"> <img width="213" src="<?php echo $params['qrcodeUrl']; ?>" width="222" height="222" alt="我的身边店">
<p class="code-txt">扫码开店</p>
</div> </div>
</div> </div>
</div> </div>
......
application/views/index/getopenhtml.phtml
View file @ c1079899
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
body { background: #fff; font-size: 14px; line-height: 1.5; font-family: "Microsoft Yahei";} body { background: #fff; font-size: 14px; line-height: 1.5; font-family: "Microsoft Yahei";}
.mod-card{ height: 1181px; position: relative; background: url("//static.shenbd.com/www/index/2018/img/card/bg-card2.jpg") no-repeat;} .mod-card{ height: 1181px; position: relative; background:#e47d2b url("//static.shenbd.com/www/index/2018/img/card/bg-card2-b.png") bottom center no-repeat;}
.mod-card .info{ position: absolute; left: 126px; top: 118px;} .mod-card .info{ position: absolute; left: 126px; top: 118px;}
.mod-card .name{ color:#fff; font-size: 72px; font-weight: bold} .mod-card .name{ color:#fff; font-size: 72px; font-weight: bold}
.mod-card .img-box{ margin-top: 85px;} .mod-card .img-box{ margin-top: 85px;}
......
application/views/index/getsendhtml.phtml
View file @ c1079899
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
body { background: #fff; font-size: 14px; line-height: 1.5; font-family: "Microsoft Yahei";} body { background: #fff; font-size: 14px; line-height: 1.5; font-family: "Microsoft Yahei";}
.mod-card{ height: 1181px; position: relative; background: url("//static.shenbd.com/www/index/2018/img/card/bg-card2.jpg") no-repeat;} .mod-card{ height: 1181px; position: relative; background:#e47d2b url("//static.shenbd.com/www/index/2018/img/card/bg-card2-b.png") bottom center no-repeat;}
.mod-card .info{ position: absolute; left: 126px; top: 118px; width: 86%;} .mod-card .info{ position: absolute; left: 126px; top: 118px; width: 86%;}
.mod-card .name{ color:#fff; font-size: 72px; font-weight: bold} .mod-card .name{ color:#fff; font-size: 72px; font-weight: bold}
.mod-card .img-box{ margin-top: 85px;} .mod-card .img-box{ margin-top: 85px;}
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<div class="wrap"> <div class="wrap">
<div class="mod-card"> <div class="mod-card">
<div class="info"> <div class="info">
<div class="name">一凡书城德化县分店</div> <div class="name"><?php echo $params['storeName'];?></div>
<div class="img-box" > <div class="img-box" >
<div class="code" > <div class="code" >
<div id="qrcodeImg" class="code-in"></div> <div id="qrcodeImg" class="code-in"></div>
......
application/views/index/goods.phtml
View file @ c1079899
...@@ -6,17 +6,17 @@ ...@@ -6,17 +6,17 @@
<title></title> <title></title>
<style type="text/css"> <style type="text/css">
html,body,p,span,div,img{margin:0;padding:0;}body{width:750px;} html,body,p,span,div,img{margin:0;padding:0;}body{width:750px;}
.shareC { width:750px;padding:0; text-align:center;font-family:"黑体";color:#212121;} .shareC {width:750px;padding:0;text-align:center;font-family: "Microsoft Yahei";color:#212121;}
.avatar{padding:55px 55px 20px 55px;} .avatar{padding: 35px 55px 20px 55px;}
#headerBg{width:600px; height:500px;} #headerBg{width:600px; height:500px;}
#title{font-size:34px; } #title{font-size:34px; }
#title{ font-size:28px; line-height:36px; padding:0 110px 0 110px; height:72px;display:block; display:-webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical;overflow:hidden;text-overflow:ellipsis;} #title{font-size: 40px;line-height: 1.5;padding:0 110px 0 110px;/* height:72px; */display:block;display:-webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;overflow:hidden;text-overflow:ellipsis;}
.price{color:#ff8519;font-size:46px;} .price{color:#ff8519;font-size: 40px;margin-top: 20px;}
.price #price{font-size:34px; text-decoration:line-through;} .price #price{font-size: 30px;text-decoration:line-through;}
.qrcode{background:url(/data/img/flower.png); height:488px; margin:6px auto 0 auto;} .qrcode{background:url(/data/img/flower.png);height: 388px;margin: 40px auto 0 auto;padding-top: 100px;}
#qrImg {margin-top:80px;} /*#qrImg {margin-top:80px;}*/
#qrcodeImg img { margin: 0 auto;} #qrcodeImg img { margin: 0 auto;}
.footer{ font-size:30px; height:66px; line-height:66px; padding:0 0 55px 0;} .footer{font-size:30px;height:66px;line-height:66px;padding: 20px 0 55px 0;}
.footer img{vertical-align:bottom; display:inline-block;} .footer img{vertical-align:bottom; display:inline-block;}
</style> </style>
</head> </head>
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
</div> </div>
<script type="text/javascript" src="/data/js/qrcode.min.js"></script> <script type="text/javascript" src="/data/js/qrcode.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
function removeElement(_element){
var _parentElement = _element.parentNode;
if(_parentElement){
_parentElement.removeChild(_element);
}
}
var pageObj = { var pageObj = {
type : "<?php echo $params['shareType'];?>",//1或2是小程序码，其它是二维码 type : "<?php echo $params['shareType'];?>",//1或2是小程序码，其它是二维码
id : "<?php echo $params['id'];?>",//1是小程序码，2是二维码, id : "<?php echo $params['id'];?>",//1是小程序码，2是二维码,
...@@ -64,8 +70,11 @@ ...@@ -64,8 +70,11 @@
if(pageObj.price != pageObj.discount) if(pageObj.price != pageObj.discount)
document.getElementById("price").innerHTML = "<span style='font-size:30px;'>¥</span>"+(pageObj.price / 100).toFixed(2); document.getElementById("price").innerHTML = "<span style='font-size:30px;'>¥</span>"+(pageObj.price / 100).toFixed(2);
if(pageObj.type<=2){ if(pageObj.type<=2){
document.getElementById("qrImg").src = pageObj.qrImg;} document.getElementById("qrImg").src = pageObj.qrImg;
}
else{ else{
var ele=document.getElementById('qrImg');
removeElement(ele);
new QRCode(document.getElementById('qrcodeImg'), pageObj.url); new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
} }
......
conf/application.ini
View file @ c1079899
...@@ -148,7 +148,7 @@ resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8" ...@@ -148,7 +148,7 @@ resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8"
redis.database.params.host = "127.0.0.1" redis.database.params.host = "127.0.0.1"
redis.database.params.port = "6379" redis.database.params.port = "6379"
redis.database.params.prefix = "qm_" redis.database.params.prefix = "qm_"
;redis.database.params.password = "23456ertyu" ;redis.database.params.password = ""
out.config="/data/config" out.config="/data/config"
password.key='~!@#$`1234qwertasdfgzxcvb'; password.key='~!@#$`1234qwertasdfgzxcvb';
...@@ -285,7 +285,7 @@ elastic.master.scheme="http"; ...@@ -285,7 +285,7 @@ elastic.master.scheme="http";
[ccwdevelop : common] [ccwdevelop : common]
; 数据库配置 ; 数据库配置
resources.database.params.driver = "pdo_mysql" resources.database.params.driver = "pdo_mysql"
resources.database.params.hostname = "127.0.0.1" resources.database.params.hostname = "172.18.0.3"
resources.database.params.port = 3306 resources.database.params.port = 3306
resources.database.params.database = "qmcs" resources.database.params.database = "qmcs"
resources.database.params.username = "root" resources.database.params.username = "root"
...@@ -295,7 +295,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8" ...@@ -295,7 +295,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
; 从库配置 ; 从库配置
resources.database.slave.params.driver = "pdo_mysql" resources.database.slave.params.driver = "pdo_mysql"
resources.database.slave.params.hostname = "127.0.0.1" resources.database.slave.params.hostname = "172.18.0.3"
resources.database.slave.params.port = 3306 resources.database.slave.params.port = 3306
resources.database.slave.params.database = "qmcs" resources.database.slave.params.database = "qmcs"
resources.database.slave.params.username = "root" resources.database.slave.params.username = "root"
...@@ -316,7 +316,7 @@ resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8" ...@@ -316,7 +316,7 @@ resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8"
password.key='~!@#$`1234qwertasdfgzxcvb'; password.key='~!@#$`1234qwertasdfgzxcvb';
redis.database.params.host = "127.0.0.1" redis.database.params.host = "172.18.0.2"
redis.database.params.port = "6379" redis.database.params.port = "6379"
redis.database.params.prefix = "qm_" redis.database.params.prefix = "qm_"
redis.database.params.password = "" redis.database.params.password = ""
......
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