fe / yohobuywap-node · Commits

Go to a project

Authored by weiqingting
Commit 0b7d6cba8683c8ce8376e69b14891dd2e0200089 1 parent 2c5bda37

Merge branch 'feature_student' into release/4.9.1.0 

# Conflicts:
#	apps/product/models/detail.js
#	config/common.js
#	public/scss/common/_good.css
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
... ... @@ -179,7 +179,7 @@ exports.index = (req, res, next) => {
couponids.push(item.couponID);
if (!req.__USER__.isLogin) {
item.image.url = 'http://m.yohobuy.com/activity/student/register?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"http://m.yohobuy.com/activity/student"}}}';
item.image.url = 'http://m.yohobuy.com/activity/student/register?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"http://m.yohobuy.com/activity/student?app_version='+req.__USER__.app_version+'"}}}';
}
// if (item.image.url.indexOf('?') === -1) {
... ... @@ -247,11 +247,11 @@ exports.index = (req, res, next) => {
if (options.isStudent) {
options.loginUrl = false;
} else {
options.loginUrl = options.loginUrl + '?openby:yohobuy={"action":"go.h5","params":{"islogin":"N","url":"' + req.__USER__.http + '//m.yohobuy.com/activity/student/register"}}';
options.loginUrl = options.loginUrl + '?openby:yohobuy={"action":"go.h5","params":{"islogin":"N","url":"' + req.__USER__.http + '//m.yohobuy.com/activity/student/register?app_version='+req.__USER__.app_version+'"}}';
}
} else {
// no login
options.loginUrl = options.loginUrl + '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' + req.__USER__.http + '//m.yohobuy.com/activity/student/register"}}}';
options.loginUrl = options.loginUrl + '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' + req.__USER__.http + '//m.yohobuy.com/activity/student/register?app_version='+req.__USER__.app_version+'"}}}';
}
} else {
if (options.isLogin) {
... ...