From 0b7d6cba8683c8ce8376e69b14891dd2e0200089 Mon Sep 17 00:00:00 2001
From: weiqingting <qingting.wei@yoho.cn>
Date: Mon, 29 Aug 2016 23:09:55 +0800
Subject: [PATCH] Merge branch 'feature_student' into release/4.9.1.0
# Conflicts:
# apps/product/models/detail.js
# config/common.js
# public/scss/common/_good.css
---
apps/activity/controllers/student.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/activity/controllers/student.js b/apps/activity/controllers/student.js
index bb9ae6b..f3ce058 100644
--- a/apps/activity/controllers/student.js
+++ b/apps/activity/controllers/student.js
@@ -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) {
--
libgit2 0.24.0