Authored by 张丽霞

微信分享支持https,文案修改

... ... @@ -6,10 +6,10 @@ const library = '../../../library';
const couponModel = require(`${mRoot}/coupon`); // 领取优惠券 model
const log = require(`${library}/logger`);
exports.index = (req, res) => {
exports.index = (req, res, next) => {
var renderData = {
module: 'coupon',
page: 'index',
module: 'activity',
page: 'coupon',
appDownLoadLink: 'http://a.app.qq.com/o/simple.jsp?pkgname=com.yoho'
},
ordercode = req.query.ordercode,
... ... @@ -33,19 +33,17 @@ exports.index = (req, res) => {
couponData.appDownLoadLink = renderData.appDownLoadLink;
res.render('coupon', {
result: couponData,
module: 'coupon',
page: 'index',
module: 'activity',
page: 'coupon',
title: couponData.title
});
}).catch((err) => {
log.error('频道页面渲染错误:' + JSON.stringify(err));
});
}).catch(next);
};
exports.getCoupon = (req, res) => {
exports.getCoupon = (req, res, next) => {
var renderData = {
module: 'coupon',
page: 'index'
module: 'activity',
page: 'coupon'
};
var ordercode = req.query.ordercode,
... ... @@ -68,15 +66,13 @@ exports.getCoupon = (req, res) => {
res.json({
result: couponData
});
}).catch((err) => {
log.error('频道页面渲染错误:' + JSON.stringify(err));
});
}).catch(next);
};
exports.verify = (req, res) => {
exports.verify = (req, res, next) => {
var renderData = {
module: 'coupon',
page: 'index'
module: 'activity',
page: 'coupon'
};
... ... @@ -103,7 +99,5 @@ exports.verify = (req, res) => {
res.json({
result: couponData
});
}).catch((err) => {
log.error('频道页面渲染错误:' + JSON.stringify(err));
});
}).catch(next);
};
... ...
... ... @@ -21,7 +21,7 @@ const getPageInfo = (pageInfo) => {
dest.couponPic = pageInfo.data.couponPic;
dest.oldUserCouponPic = pageInfo.data.oldUserCouponPic;
dest.mobile = pageInfo.data.mobile;
dest.wechatShare = true;
// 强制活动开始,活动上线产品要求这样设置
pageInfo.data.flag = 1;
if (pageInfo.data.flag === 1) {
... ...
... ... @@ -44,7 +44,7 @@
<div class="input-content vertify-input-content hidden">
<input id="verification" type="text" placeholder="请输入验证码" maxlength="4"/>
<i class="clear-input iconfont hidden clear-verify">&#xe626;</i>
<div>验证领红包</div>
<div>注册领红包</div>
</div>
<div class="coupon-description">
... ...
... ... @@ -13,8 +13,8 @@ module.exports = {
port: 6001,
siteUrl: '//m.yohobuy.com',
domains: {
api: 'http://api.yoho.yohoops.org/',
service: 'http://service.yoho.yohoops.org/'
api: 'http://devapi.yoho.cn:58078/',
service: 'http://testservice.yoho.cn:28078/'
},
useOneapm: false,
useCache: false,
... ...
... ... @@ -36,9 +36,9 @@
{{{body}}}
{{> footer}}
</div>
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
{{#wechatShare}}
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
{{/wechatShare}}
{{#if devEnv}}
<script src="//localhost:5001/libs.js"></script>
... ...
... ... @@ -7,7 +7,7 @@ var $ = require('yoho-jquery'),
newUserCouponPic = $('#newUserCouponPic').html(),
tipMessage = $('#tipMessage').html(),
activityID = $('#activityID').html(),
_weChatInterface = 'http://www.yohoshow.com/api/wechat/getSignPackage',
_weChatInterface = '//m.yohobuy.com/life/getSignPackage',
shareTitle = $('#shareTitle').val(),
shareImg = $('#shareImg').val(),
shareDesc = $('#shareDesc').val(),
... ...
... ... @@ -9,7 +9,7 @@
@import "product/index";
@import "common/index";
@import "outlet/index";
@import "coupon/index";
@import "activity/index";
@import "guang/index";
@import "cart/chose-panel";
... ...