Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHO-ACTIVITY-PHP
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
hf
9 years ago
Commit
c6e3ef037fd5d964f433f5e2f0da7daf6c2faa44
1 parent
481fbad1
master
...
beta
develop
fixes bug to partner login
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
yohobuy/m.yohobuy.com/application/controllers/Home.php
yohobuy/m.yohobuy.com/application/models/Product/Detail.php
yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Login.php
yohobuy/m.yohobuy.com/application/controllers/Home.php
View file @
c6e3ef0
...
...
@@ -779,7 +779,7 @@ class HomeController extends AbstractAction
public
function
payAction
()
{
// 审判跳转登录页
//
$this->auditJumpLogin();
$this
->
auditJumpLogin
();
$this
->
setTitle
(
'支付中心'
);
$this
->
setNavHeader
(
'支付中心'
);
...
...
@@ -805,7 +805,7 @@ class HomeController extends AbstractAction
'payLink'
=>
''
,
'appId'
=>
'weixin'
,
'app'
=>
'微信支付'
,
'hint'
=>
'
需安装微信客户端
'
,
'hint'
=>
'
推荐使用
'
,
'subHint'
=>
''
,
),
),
...
...
yohobuy/m.yohobuy.com/application/models/Product/Detail.php
View file @
c6e3ef0
...
...
@@ -79,7 +79,7 @@ class DetailModel
$result
[
'goodsPrice'
]
=
array
();
$result
[
'goodsPrice'
][
'currentPrice'
]
=
$baseInfo
[
'productPriceBo'
][
'formatSalesPrice'
];
if
(
$baseInfo
[
'productPriceBo'
][
'formatMarketPrice'
]
!==
$baseInfo
[
'productPriceBo'
][
'formatSalesPrice'
])
{
$result
[
'goodsPrice'
][
'previousPrice'
]
=
$baseInfo
[
'productPriceBo'
][
'formatMarketPrice'
]
;
$result
[
'goodsPrice'
][
'previousPrice'
]
=
strtr
(
$baseInfo
[
'productPriceBo'
][
'formatMarketPrice'
],
array
(
'¥'
=>
''
))
;
}
}
// VIP商品价格
...
...
@@ -87,7 +87,7 @@ class DetailModel
$build
=
array
();
foreach
(
$baseInfo
[
'productPriceBo'
][
'vipPrices'
]
as
$value
)
{
$build
[
'level'
]
=
$value
[
'vipLevel'
];
$build
[
'text'
]
=
$value
[
'vipPrice'
]
;
$build
[
'text'
]
=
strtr
(
$value
[
'vipPrice'
],
array
(
'¥'
=>
''
))
;
$build
[
'currentLevel'
]
=
(
$value
[
'vipLevel'
]
==
$vipLevel
)
?
true
:
false
;
$result
[
'vipLevel'
][
'list'
][]
=
$build
;
}
...
...
@@ -419,7 +419,7 @@ class DetailModel
if
(
isset
(
$sizeInfo
[
'productIntroBo'
][
'productIntro'
]))
{
$productIntro
=
''
;
if
(
!
empty
(
$sizeInfo
[
'productDescBo'
][
'phrase'
]))
{
$productIntro
.=
$sizeInfo
[
'productDescBo'
][
'phrase'
];
$productIntro
.=
$sizeInfo
[
'productDescBo'
][
'phrase'
]
.
'<br/>'
;
}
$productIntro
.=
$sizeInfo
[
'productIntroBo'
][
'productIntro'
];
if
(
$productIntro
)
{
...
...
yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Login.php
View file @
c6e3ef0
...
...
@@ -187,7 +187,7 @@ class LoginController extends AbstractAction
$refer
=
rawurldecode
(
$refer
);
}
if
(
$result
[
'code'
]
==
200
&&
!
empty
(
$result
[
'data'
][
'uid'
]))
{
if
(
isset
(
$result
[
'code'
])
&&
$result
[
'code'
]
==
200
&&
!
empty
(
$result
[
'data'
][
'uid'
]))
{
$this
->
setSession
(
'_TOKEN'
,
Helpers
::
makeToken
(
$result
[
'data'
][
'uid'
]));
$this
->
go
(
Helpers
::
syncUserSession
(
$result
[
'data'
][
'uid'
],
$refer
));
}
else
{
...
...
@@ -217,7 +217,7 @@ class LoginController extends AbstractAction
$refer
=
rawurldecode
(
$refer
);
}
if
(
$result
[
'code'
]
==
200
&&
!
empty
(
$result
[
'data'
][
'uid'
]))
{
if
(
isset
(
$result
[
'code'
])
&&
$result
[
'code'
]
==
200
&&
!
empty
(
$result
[
'data'
][
'uid'
]))
{
$this
->
setSession
(
'_TOKEN'
,
Helpers
::
makeToken
(
$result
[
'data'
][
'uid'
]));
$this
->
go
(
Helpers
::
syncUserSession
(
$result
[
'data'
][
'uid'
],
$refer
));
}
else
{
...
...
@@ -247,7 +247,7 @@ class LoginController extends AbstractAction
$refer
=
rawurldecode
(
$refer
);
}
if
(
$result
[
'code'
]
==
200
&&
!
empty
(
$result
[
'data'
][
'uid'
]))
{
if
(
isset
(
$result
[
'code'
])
&&
$result
[
'code'
]
==
200
&&
!
empty
(
$result
[
'data'
][
'uid'
]))
{
$this
->
setSession
(
'_TOKEN'
,
Helpers
::
makeToken
(
$result
[
'data'
][
'uid'
]));
$this
->
go
(
Helpers
::
syncUserSession
(
$result
[
'data'
][
'uid'
],
$refer
));
}
else
{
...
...
Please
register
or
login
to post a comment