Skip to content

M
my-yaf-project
Commit ba0c36b4 authored by lingqingmei's avatar lingqingmei
Browse files
Options

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

parents dfc5d6e6 e77bea51
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 20 deletions
application/controllers/Index.php
View file @ ba0c36b4
......@@ -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){
......@@ -116,6 +115,10 @@ class IndexController extends \Our\Controller_Abstract {
echo 'error';exit;
}
$params=base64_decode($req['params']);
// $params['name']='陈传文';
// $params['telephone']='18305954587';
// $params['qrcodeUrl']='//static.shenbd.com/www/index/2018/img/card/code.jpg';
$params['areaManage']=$params['areaManage']?$params['areaManage']:'';
$params=\Our\Common::paramToJson($params);
$this->_view->assign("params", $params);
......
application/views/index/getinvatehtml.phtml 100644 → 100755
View file @ ba0c36b4
......@@ -24,17 +24,17 @@
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: "Helvetica Neue", Tahoma, "Microsoft Yahei", "PingFang SC", "ST Heiti", SimHei, sans-serif, "Helvetica Neue", Tahoma, SimSun, "PingFang SC", "ST Heiti", sans-serif;}
.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 .message{ line-height: 1.4; margin-top: 160px;}
.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: 270px; line-height: 1; font-size: 36px; font-family: 'STKaiti';}
.mod-card .message{ line-height: 1.4; margin-top: 170px;}
.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;}
......@@ -45,21 +45,21 @@
<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="我的身边店">
</div>
</div>
</div>
......
conf/application.ini
View file @ ba0c36b4
......@@ -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"
......
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