Commit 9d70cb66 authored by wwccw0591's avatar wwccw0591

pc

parent 4663f6b6
File mode changed from 100755 to 100644
...@@ -35,7 +35,7 @@ class ShareServiceModel extends \Business\AbstractModel ...@@ -35,7 +35,7 @@ class ShareServiceModel extends \Business\AbstractModel
$driverType = \Our\Common::getDriverType(); $driverType = \Our\Common::getDriverType();
$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){
$storeDao=\DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName); $storeDao=\DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName);
$data['address']=$storeDao->getAddress($data['id']); $data['address']=$storeDao->getAddress($data['id']);
} }
......
...@@ -64,8 +64,7 @@ ...@@ -64,8 +64,7 @@
document.getElementById(v).innerHTML = pageObj[v]; document.getElementById(v).innerHTML = pageObj[v];
}); });
document.getElementById("headerBg").src = pageObj.headerBg; document.getElementById("headerBg").src = pageObj.headerBg;
if(pageObj.type==1 || pageObj.type==4){
if(pageObj.type<=2){
document.getElementById("qrImg").src = pageObj.qrImg;} document.getElementById("qrImg").src = pageObj.qrImg;}
else{ else{
new QRCode(document.getElementById('qrcodeImg'), pageObj.url); new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
......
...@@ -263,31 +263,31 @@ push.open=1 ...@@ -263,31 +263,31 @@ push.open=1
[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 = "192.168.1.201"
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"
resources.database.params.password = "root" resources.database.params.password = "123456"
resources.database.params.charset = "UTF8" resources.database.params.charset = "UTF8"
resources.database.params.driver_options.1002 = "SET NAMES utf8" 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 = "192.168.1.201"
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"
resources.database.slave.params.password = "root" resources.database.slave.params.password = "123456"
resources.database.slave.params.charset = "UTF8" resources.database.slave.params.charset = "UTF8"
resources.database.slave.params.driver_options.1002 = "SET NAMES utf8" resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
; 从库配置 ; 从库配置
resources.database.drawSource.params.driver = "pdo_mysql" resources.database.drawSource.params.driver = "pdo_mysql"
resources.database.drawSource.params.hostname = "127.0.0.1" resources.database.drawSource.params.hostname = "192.168.1.201"
resources.database.drawSource.params.port = 3306 resources.database.drawSource.params.port = 3306
resources.database.drawSource.params.database = "drawSource" resources.database.drawSource.params.database = "drawSource"
resources.database.drawSource.params.username = "root" resources.database.drawSource.params.username = "root"
resources.database.drawSource.params.password = "root" resources.database.drawSource.params.password = "111111"
resources.database.drawSource.params.charset = "UTF8" resources.database.drawSource.params.charset = "UTF8"
resources.database.drawSource.params.driver_options.1002 = "SET NAMES utf8" resources.database.drawSource.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