Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuy-node
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
1
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
周少峰
2017-04-14 14:29:03 +0800
Commit
e3d99e9e90433169fe043f16da59763f3866c7a8
2 parents
1a5a73cb
d25f4c68
Merge branch 'master' into release/5.6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
1 deletions
apps/activity/controllers/special.js
apps/cart/views/action/cart.hbs
apps/activity/controllers/special.js
View file @
e3d99e9
...
...
@@ -16,6 +16,7 @@ exports.special = (req, res) => {
specialModel
.
getSpecialData
(
id
,
channel
).
then
((
result
)
=>
{
let
headerData
=
result
[
0
];
result
[
1
].
content
=
result
[
1
].
content
.
replace
(
/http:/ig
,
''
);
res
.
render
(
'special'
,
_
.
merge
({
module
:
'activity'
,
page
:
'special'
...
...
apps/cart/views/action/cart.hbs
View file @
e3d99e9
...
...
@@ -51,7 +51,6 @@
<div
data-role=
"fine-slide"
class=
"slide-panel"
></div>
<div
data-role=
"latestWalk-slide"
class=
"slide-panel"
style=
"display:none;"
></div>
</div>
{{>
cart-together-tpl
}}
{{/
unless
}}
<div
class=
"loading loading-single"
><span></span>
请稍后...
</div>
...
...
Please
register
or
login
to post a comment