Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuywap-node
·
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
Plain Diff
Browse Files
Authored by
陈轩
2016-12-23 18:00:41 +0800
Commit
1a053c6d3322aa6029125fead46302a708fdd18b
2 parents
98749542
a7fd0535
Merge branch 'feature/captcha' of
http://git.yoho.cn/fe/yohobuywap-node
into feature/captcha
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
apps/product/views/partial/search/list.hbs
public/js/product/shop/coupon.js
public/js/service/chat/index.js
apps/product/views/partial/search/list.hbs
View file @
1a053c6
...
...
@@ -88,8 +88,10 @@
{{/
baseShopHome
}}
<!-- /基础店铺页面 -->
<!-- 优惠卷 -->
<div
class=
"coupon-group"
></div>
{{#
ifor
brandHome
baseShopHome
}}
<!-- 优惠卷 -->
<div
class=
"coupon-group"
></div>
{{/
ifor
}}
<div>
<ul
id=
"list-nav"
class=
"list-nav clearfix"
>
...
...
public/js/product/shop/coupon.js
View file @
1a053c6
...
...
@@ -29,6 +29,10 @@ shopCoupon = {
var
that
=
this
,
_url
=
location
.
protocol
+
'//m.yohobuy.com'
;
if
(
$
(
'.coupon-group'
).
length
<=
0
)
{
return
false
;
}
if
(
that
.
common
.
shopId
)
{
// 店铺领券
_url
+=
'/product/index/getShopCouponsList'
;
...
...
public/js/service/chat/index.js
View file @
1a053c6
...
...
@@ -699,9 +699,14 @@ var chat = {
_drawMSG
:
function
(
viewData
,
cusAction
=
null
)
{
let
chatWin
=
this
.
$chatWin
[
0
];
if
(
viewData
.
type
===
'picture'
)
{
viewData
.
data
.
content
=
viewData
.
data
.
content
.
replace
(
/^http:/
,
''
);
}
// console.log(viewData);
let
$html
=
$
(
this
.
messageT
(
viewData
));
this
.
checkTime
();
if
(
cusAction
)
{
cusAction
.
apply
(
this
,
[
$html
]);
...
...
Please
register
or
login
to post a comment