Skip to content

M
my-yaf-project
Commit d331624f authored by liuyuzhengrace's avatar liuyuzhengrace
Browse files
Options

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

parents 900e88b2 94aaa1ed
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 32 deletions
application/controllers/Index.php
View file @ d331624f
......@@ -61,7 +61,7 @@ class IndexController extends \Our\Controller_Abstract {
"shareType": "1",
"storeName": "LQ日化用品",
"timestamp": "1543913056",
"type": "4",
"type": "3",
"driverType": 2,
"qrCode": "https://img.shenbd.com/mall/salesman_qr/170.png",
"address": "鑫雄盛快捷酒店仓山紫番林幼儿园",
......@@ -102,7 +102,6 @@ class IndexController extends \Our\Controller_Abstract {
$this->_view->display('index/store.phtml');
}
if($paramsStr['type']==\Our\ApiConst::shareGoods || $paramsStr['type']==\Our\ApiConst::shareGroup){
$this->_view->display('index/goods.phtml');
}
if($paramsStr['type']==\Our\ApiConst::shareSaler){
......@@ -112,11 +111,20 @@ class IndexController extends \Our\Controller_Abstract {
}
public function getInvateHtmlAction(){
$req=$this->getRequest()->getQuery();
if(empty($req['params'] )){
//echo $req['cacheKey'];exit;
if(empty($req['cacheKey'] )){
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['areaManage']='经理';
$this->_view->assign("params", $params);
}
......
application/views/index/getinvatehtml.phtml 100644 → 100755
View file @ d331624f
......@@ -24,42 +24,44 @@
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{ left: 0; top: 300px;}
.mod-card .mod-c2{ right: 0; top: 200px;}
.mod-card .t1{ margin-top: 35px;}
.mod-card .t2{ margin-top: 255px;}
.mod-card .mod-c1{ left: 0; top: 316px;}
.mod-card .mod-c2{ right: 0; top: 188px;}
.mod-card .t1{ margin-top: 25px;}
.mod-card .t2{ margin-top: 260px; line-height: 1; }
.mod-card .message{ line-height: 1.4; margin-top: 160px;}
.mod-card .name{ font-size: 74px; font-family: 'rzyzkxk';}
.mod-card .title{ font-size: 26px;}
.mod-card .phone{ font-size: 36px; margin-top: 20px; letter-spacing: 8px;}
.mod-card .code{ margin-top: 60px;}
.mod-card .code-txt{ font-size: 30px; margin-top: 20px; letter-spacing: 15px; padding-left: 30px;}
</style>
</head>
<body>
<div class="wrap">
<div class="mod-card">
<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 class="t1"><img src="//static.shenbd.com/www/index/2018/img/card/t1.png" alt="我的身边店"></p>
<p class="t2"><img src="//static.shenbd.com/www/index/2018/img/card/t2.png" 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-b.jpg" alt="我的身边店" width="226"></p>
<p class="t2"><img src="//static.shenbd.com/www/index/2018/img/card/slogan-b.jpg" alt="我的身边店" width="500"></p>
</div>
<div class="mod-c2">
<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 class="message">
<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>
</div>
<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>
......
application/views/index/goods.phtml
View file @ d331624f
......@@ -6,17 +6,17 @@
<title></title>
<style type="text/css">
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;}
.avatar{padding:55px 55px 20px 55px;}
.shareC {width:750px;padding:0;text-align:center;font-family: "Microsoft Yahei";color:#212121;}
.avatar{padding: 35px 55px 20px 55px;}
#headerBg{width:600px; height:500px;}
#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;}
.price{color:#ff8519;font-size:46px;}
.price #price{font-size:34px; text-decoration:line-through;}
.qrcode{background:url(/data/img/flower.png); height:488px; margin:6px auto 0 auto;}
#qrImg {margin-top:80px;}
#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: 40px;margin-top: 20px;}
.price #price{font-size: 30px;text-decoration:line-through;}
.qrcode{background:url(/data/img/flower.png);height: 388px;margin: 40px auto 0 auto;padding-top: 100px;}
/*#qrImg {margin-top:80px;}*/
#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;}
</style>
</head>
......@@ -42,6 +42,12 @@
</div>
<script type="text/javascript" src="/data/js/qrcode.min.js"></script>
<script type="text/javascript">
function removeElement(_element){
var _parentElement = _element.parentNode;
if(_parentElement){
_parentElement.removeChild(_element);
}
}
var pageObj = {
type : "<?php echo $params['shareType'];?>",//1或2是小程序码，其它是二维码
id : "<?php echo $params['id'];?>",//1是小程序码，2是二维码,
......@@ -64,8 +70,11 @@
if(pageObj.price != pageObj.discount)
document.getElementById("price").innerHTML = "<span style='font-size:30px;'>¥</span>"+(pageObj.price / 100).toFixed(2);
if(pageObj.type<=2){
document.getElementById("qrImg").src = pageObj.qrImg;}
document.getElementById("qrImg").src = pageObj.qrImg;
}
else{
var ele=document.getElementById('qrImg');
removeElement(ele);
new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
}
......
conf/application.ini
View file @ d331624f
......@@ -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.port = "6379"
redis.database.params.prefix = "qm_"
;redis.database.params.password = "23456ertyu"
;redis.database.params.password = ""
out.config="/data/config"
password.key='~!@#$`1234qwertasdfgzxcvb';
......@@ -285,21 +285,21 @@ elastic.master.scheme="http";
[ccwdevelop : common]
; 数据库配置
resources.database.params.driver = "pdo_mysql"
resources.database.params.hostname = "127.0.0.1"
resources.database.params.hostname = "192.168.1.201"
resources.database.params.port = 3306
resources.database.params.database = "qmcs"
resources.database.params.username = "root"
resources.database.params.password = "root"
resources.database.params.password = "123456"
resources.database.params.charset = "UTF8"
resources.database.params.driver_options.1002 = "SET NAMES utf8"
; 从库配置
resources.database.slave.params.driver = "pdo_mysql"
resources.database.slave.params.hostname = "127.0.0.1"
resources.database.slave.params.hostname = "192.168.1.201"
resources.database.slave.params.port = 3306
resources.database.slave.params.database = "qmcs"
resources.database.slave.params.username = "root"
resources.database.slave.params.password = "root"
resources.database.slave.params.password = "123456"
resources.database.slave.params.charset = "UTF8"
resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
......@@ -319,7 +319,7 @@ password.key='~!@#$`1234qwertasdfgzxcvb';
redis.database.params.host = "127.0.0.1"
redis.database.params.port = "6379"
redis.database.params.prefix = "qm_"
redis.database.params.password = ""
redis.database.params.password = "23456ertyu"
out.config="/data/config";
;锁文件
......
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