Authored by 李奇

拼团h5验收问题修改

... ... @@ -144,7 +144,8 @@ const groupResultRec = (req, res, next) => {
function goodsDetail(req, res, next) {
let headerData = headerModel.setNav({
navTitle: '商品详情'
navTitle: '商品详情',
navBtn: false
});
let param = req.query;
... ... @@ -176,7 +177,7 @@ function goodsDetail(req, res, next) {
finalResult.imgUrl = finalResult.bannerTop.img;
}
return res.render('group/goodsDetail', {
page: 'group-goodsDetail',
page: 'group-detail',
nodownload: true,
wechatShare: true,
pageHeader: headerData,
... ...
... ... @@ -214,6 +214,7 @@
<input type="hidden" class="data-bind" name="loginUrl" id="loginUrl" value="">
<input type="hidden" id="goodsName" value="{{goodsName}}">
<input type="hidden" id="imgUrl" value="{{imgUrl}}">
<input type="hidden" id="collagePrice" value="{{formatCollagePrice}}">
<form id="buyNowForm" class="data-bind" method="post" action="">
<input type="hidden" name="productSku" id="productSku">
<input type="hidden" name="buyNumber" id="buyNumber">
... ...
... ... @@ -29,4 +29,5 @@
{{#if shareInfo}}
<div class='my-share'></div>
{{/if}}
<div class="h5-share-clipboard"></div>
\ No newline at end of file
<a class="back-home" href="/activity/group"></a>
<div class="h5-share-clipboard"></div>
... ...
... ... @@ -93,4 +93,5 @@
<a href="/activity/group">去逛逛</a>
</div>
{{/if}}
<a class="back-home" href="/activity/group"></a>
</div>
... ...
... ... @@ -33,7 +33,7 @@ function hiddenTips($ele) {
}
}
function getUser(name, imgUrl, activityId, productSkn, groupNo) {
function getUser(title, name, imgUrl, activityId, productSkn, groupNo) {
try {
if (user) {
return Promise.resolve();
... ... @@ -41,7 +41,7 @@ function getUser(name, imgUrl, activityId, productSkn, groupNo) {
return yoSdk.getUser().then(u => {
user = u;
shareData = makeShareData({name, imgUrl, activityId, productSkn, groupNo});
shareData = makeShareData({title, name, imgUrl, activityId, productSkn, groupNo});
sharePlugin(shareData.h5);
});
... ... @@ -284,10 +284,14 @@ class Detail extends Page {
let goodsName = document.getElementById('goodsName').value;
let imgUrl = 'http://static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png';
let buynow = document.getElementById('buynow');
let formatCollagePrice = document.getElementById('collagePrice').value;
this.getProductData(productSkn);
buynow.onclick = this.joinGroup.bind(this);
getUser(goodsName, imgUrl, activityId, productSkn, groupNo).then(() => {
let title = `【包邮】${formatCollagePrice}${goodsName}`;
getUser(title, goodsName, imgUrl, activityId, productSkn, groupNo).then(() => {
shareDom.onclick = function() {
if (/QQ/i.test(navigator.userAgent) || /MicroMessenger/i.test(navigator.userAgent)) {
dialog.showDialog({hasClass: 'group-guide-mask'});
... ...
... ... @@ -6,7 +6,7 @@ function h5Path(activityId, productSkn, groupNo) {
function shareData({name, imgUrl, activityId, productSkn, groupNo}) {
function shareData({title, name, imgUrl, activityId, productSkn, groupNo}) {
let link = h5Path(activityId, productSkn, groupNo);
let urls = imgUrl.split('?');
let shareImg = urls[0] || imgUrl;
... ... @@ -17,11 +17,11 @@ function shareData({name, imgUrl, activityId, productSkn, groupNo}) {
return {
h5: {
title: '【包邮】' + name,
title: title,
imgUrl: shareImg,
link: link,
desc: name,
copyDeac: `【包邮】${name}>> ${link} (分享自@Yoho!Buy有货APP)`
copyDeac: `${title}>> ${link} (分享自@Yoho!Buy有货APP)`
}
};
}
... ...
... ... @@ -49,7 +49,7 @@ body {
.my-share {
position: fixed;
bottom: 200px;
bottom: 220px;
right: 4%;
width: 88px;
height: 88px;
... ... @@ -58,6 +58,17 @@ body {
background-repeat: no-repeat;
}
.back-home {
position: fixed;
bottom: 114px;
right: 4%;
width: 88px;
height: 88px;
background-image: url("img/activity/group/back-home.png");
background-size: 100% 100%;
background-repeat: no-repeat;
}
.cell {
width: 100%;
height: 300px;
... ...
... ... @@ -232,3 +232,14 @@
color: #e01;
}
}
.back-home {
position: fixed;
bottom: 114px;
right: 4%;
width: 88px;
height: 88px;
background-image: url("img/activity/group/back-home.png");
background-size: 100% 100%;
background-repeat: no-repeat;
}
... ...
... ... @@ -18,6 +18,7 @@ class DetailProcess {
}
dest.goodsName = origin.product_name;
dest.formatCollagePrice = _.get(origin, 'activityIdDetail.formatCollagePrice', '');
// 是否是虚拟商品
// dest.virtualGoods = (origin.attribute * 1 === 3);
... ...