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
毕凯
7 years ago
Commit
37a8fc2f60853eec7ccc0897fdd23c6264f527a2
2 parents
f41bd829
47baf8e5
master
...
develop
feature/1215
feature/baidu_ocpcapi
feature/captcha
feature/coupon-captcha
feature/delete-verify-code
feature/extend-params
feature/group-6.9.17
feature/group-tab-and-limit
feature/groupTab
feature/limit-uuid-coupon
feature/magazine
feature/payment
feature/phoneCoupon
feature/privacy
feature/refactor_alert
feature/seckill-coupon
feature/shoppingPay
feature/tagPrice
hotfix/11
hotfix/autoopenapp
hotfix/captcha
hotfix/change-xianyu-login
hotfix/couponWebSession
hotfix/fix-shop-product-floor
hotfix/hide-xianyu-yas
hotfix/im
hotfix/login
hotfix/magazine-style
hotfix/ocpc
hotfix/show-collage-price
hotfix/sub-domain
hotfix/uid-undifined-error
release/6.9.17
release/6.9.22
release/6.9.23
release/7.0.1
release/7.1.1
userAgentTest
ys
2019-12-5
0913
0906
0711
0517
0515
Merge branch 'feature/detail-yohonow' into 'master'
yohonow 商品详情页修改 See merge request
!1363
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
1 deletions
apps/cart/controllers/index.js
public/js/product/new-detail.js
public/scss/layout/_footer.css
public/scss/product/detail/_detail.css
public/scss/product/shop/_shop-index.css
public/scss/product/shop/reds-shop/_header.css
apps/cart/controllers/index.js
View file @
37a8fc2
...
...
@@ -49,7 +49,7 @@ const index = (req, res) => {
},
navBtn
:
false
}),
isWechat
:
req
.
yoho
.
isWechat
||
req
.
yoho
.
isMarsApp
// 默认判断微信,mars下同微信
isWechat
:
req
.
yoho
.
isWechat
||
req
.
yoho
.
isMarsApp
||
req
.
yoho
.
isNowApp
// 默认判断微信,mars下同微信
}));
};
...
...
public/js/product/new-detail.js
View file @
37a8fc2
...
...
@@ -104,6 +104,7 @@ setTimeout(() => {
if
(
data
.
studentPrice
)
{
data
.
studentPrice
=
Math
.
round
(
data
.
studentPrice
.
toString
().
replace
(
'¥'
,
''
));
}
$
(
'#placeholder-pricedata'
).
replaceWith
(
priceDataHbs
(
data
));
$
(
'#placeholder-infodata'
).
replaceWith
(
infoDataHbs
(
data
));
...
...
public/scss/layout/_footer.css
View file @
37a8fc2
...
...
@@ -213,3 +213,15 @@
border-bottom
:
25
PX
solid
#323232
;
border-radius
:
0
0
25
PX
;
}
.is-now-app
{
.op-row
{
.back-to-top
{
display
:
none
;
}
.float-top
{
display
:
none
;
}
}
}
...
...
public/scss/product/detail/_detail.css
View file @
37a8fc2
...
...
@@ -1296,3 +1296,11 @@ iframe {
}
}
}
.is-now-app
{
.cart-bar
{
.fav
{
visibility
:
hidden
;
}
}
}
...
...
public/scss/product/shop/_shop-index.css
View file @
37a8fc2
...
...
@@ -715,3 +715,9 @@
display
:
none
;
}
}
.is-now-app
{
.not-collect
{
display
:
none
;
}
}
...
...
public/scss/product/shop/reds-shop/_header.css
View file @
37a8fc2
...
...
@@ -82,3 +82,9 @@
display
:
none
;
}
}
.is-now-app
{
.not-collect
{
display
:
none
;
}
}
...
...
Please
register
or
login
to post a comment