Authored by 毕凯

Merge branch 'gray2'

... ... @@ -13,7 +13,8 @@ exports.index = (req, res) => {
page: 'birthday',
title: '生日券',
width750: true,
localCss: true
localCss: true,
isApp: req.yoho.isApp
};
res.render('birthday', responseData);
... ...
... ... @@ -11,7 +11,7 @@
</div>
<div class="rule-item">
<div>领取资格:</div>
<div>您在领取时,必须是有货VIP银卡、金卡、白金卡用户,<a href="//m.yohobuy.com/home/grade">(了解您当前的VIP级别)</a>,且在个人信息中已完善生日信息<a href="//m.yohobuy.com/home/mydetails">(查看/完善个人信息)</a></div>
<div>您在领取时,必须是有货VIP银卡、金卡、白金卡用户,<a href='//m.yohobuy.com/home/grade?openby:yohobuy={"action":"go.vipInfo"}'>(了解您当前的VIP级别)</a>,且在个人信息中已完善生日信息{{#unless @root.isApp}}<a href="//m.yohobuy.com/home/mydetails">(查看/完善个人信息)</a>{{/unless}}</div>
</div>
</div>
<p class="foot-tip">温馨提示:同一用户一年内(365天)仅可以领取一次生日特惠哦!</p>
... ...
... ... @@ -445,6 +445,11 @@ class familyModel extends global.yoho.BaseModel {
let familyIndexData = {};
if (result[0] && result[0].data) {
if (result[0].data.headIco) {
result[0].data.headIco = result[0].data.headIco.replace('img01.yohomars.com', 'imgmars.yohobuy.com').replace('img02.yohomars.com', 'imgmars.yohobuy.com'); // eslint-disable-line
}
familyIndexData = _.assign(familyIndexData, {
head_ico: result[0].data.headIco,
nickname: result[0].data.nickName,
... ... @@ -545,6 +550,9 @@ class familyModel extends global.yoho.BaseModel {
let vip = 0; // 从family进入二维码,暂时显示0
let hideTips = true;
if (result[0].data.headIco) {
result[0].data.headIco = result[0].data.headIco.replace('img01.yohomars.com', 'imgmars.yohobuy.com').replace('img02.yohomars.com', 'imgmars.yohobuy.com'); // eslint-disable-line
}
result[0].data.gender = (thisGender === '1' ? 'BOY' : 'GIRL');
result[0].data.otherGender = (thisGender === '1' ? 'GIRL' : 'BOY');
... ...
... ... @@ -4,7 +4,7 @@ require('3party/question-list.page.css');
let $ = require('yoho-jquery'),
yoho = require('yoho-app');
const DETAIL_URI = 'http://m.yohobuy.com/3party/questionnaire';
const DETAIL_URI = location.protocol + '//m.yohobuy.com/3party/questionnaire';
require('../common');
... ... @@ -115,7 +115,7 @@ $list.on('click', 'li', function() {
if (canShare && yoho && yoho.isApp) {
yoho.invokeMethod('go.showShareAlert', {
title: data.title,
link: 'https://m.yohobuy.com/3party/questionnaire/' + data.id,
link: DETAIL_URI + '/' + data.id,
desc: data.desc,
imgUrl: data.img
});
... ...