Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
9d70cb66
Commit
9d70cb66
authored
Nov 15, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
4663f6b6
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
9 deletions
+8
-9
Share.php
application/controllers/Share.php
+0
-0
ShareService.php
application/models/Business/User/ShareService.php
+1
-1
store.phtml
application/views/index/store.phtml
+1
-2
application.ini
conf/application.ini
+6
-6
No files found.
application/controllers/Share.php
100755 → 100644
View file @
9d70cb66
File mode changed from 100755 to 100644
application/models/Business/User/ShareService.php
100755 → 100644
View file @
9d70cb66
...
...
@@ -35,7 +35,7 @@ class ShareServiceModel extends \Business\AbstractModel
$driverType
=
\Our\Common
::
getDriverType
();
$data
[
'driverType'
]
=
$driverType
;
$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
);
$data
[
'address'
]
=
$storeDao
->
getAddress
(
$data
[
'id'
]);
}
...
...
application/views/index/store.phtml
100755 → 100644
View file @
9d70cb66
...
...
@@ -64,8 +64,7 @@
document
.
getElementById
(
v
).
innerHTML
=
pageObj
[
v
];
});
document
.
getElementById
(
"headerBg"
).
src
=
pageObj
.
headerBg
;
if
(
pageObj
.
type
<=
2
){
if
(
pageObj
.
type
==
1
||
pageObj
.
type
==
4
){
document
.
getElementById
(
"qrImg"
).
src
=
pageObj
.
qrImg
;}
else
{
new
QRCode
(
document
.
getElementById
(
'qrcodeImg'
),
pageObj
.
url
);
...
...
conf/application.ini
View file @
9d70cb66
...
...
@@ -263,31 +263,31 @@ push.open=1
[ccwdevelop : common]
; 数据库配置
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.hostname
=
"1
27.0.0.
1"
resources.database.params.hostname
=
"1
92.168.1.20
1"
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
=
"1
27.0.0.
1"
resources.database.slave.params.hostname
=
"1
92.168.1.20
1"
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"
; 从库配置
resources.database.drawSource.params.driver
=
"pdo_mysql"
resources.database.drawSource.params.hostname
=
"1
27.0.0.
1"
resources.database.drawSource.params.hostname
=
"1
92.168.1.20
1"
resources.database.drawSource.params.port
=
3306
resources.database.drawSource.params.database
=
"drawSource"
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.driver_options.1002
=
"SET NAMES utf8"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment