恢复 student

@@ -248,28 +248,24 @@ exports.index = (req, res, next) => {
 
 
             options.loginUrl = '//m.yohobuy.com/activity/student/register';
             options.loginUrl = '//m.yohobuy.com/activity/student/register';
             if (options.isApp) {
             if (options.isApp) {
-                options.loginUrl = options.loginUrl + '?openby:yohobuy={"action":"go.h5","params":{"islogin":"N","url":"' + req.__USER__.http + '//m.yohobuy.com/activity/student/register"}}';
+                if (options.isLogin) {
+                    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"}}';
+                    }
+                } else {
+                    // no login
+                    options.loginUrl = options.loginUrl + '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' + req.__USER__.http + '//m.yohobuy.com/activity/student/register","antarget":"1"}}}';
+                }
+            } else {
+                if (options.isLogin) {
+                    if (options.isStudent) {
+                        options.loginUrl = false;
+                    }
+                }
             }
             }
 
 
-            // if (options.isApp) {
-            //     if (options.isLogin) {
-            //         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"}}';
-            //         }
-            //     } else {
-            //         // no login
-            //         options.loginUrl = options.loginUrl + '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' + req.__USER__.http + '//m.yohobuy.com/activity/student/register","antarget":"1"}}}';
-            //     }
-            // } else {
-            //     if (options.isLogin) {
-            //         if (options.isStudent) {
-            //             options.loginUrl = false;
-            //         }
-            //     }
-            // }
-
             // console.log(options);
             // console.log(options);
             res.render('student', options);
             res.render('student', options);
         });
         });
@@ -295,12 +291,9 @@ exports.register = (req, res, next) => {
     }
     }
     Promise.all([verifiedStudentTotal(), getEducationLevelList()]).then((arr) => {
     Promise.all([verifiedStudentTotal(), getEducationLevelList()]).then((arr) => {
         if (req.__USER__.isStudent) {
         if (req.__USER__.isStudent) {
-            refer = '/activity/student';// 所有认证过的，都跳转学生首页
-            if (req.__USER__.isApp) {
-                refer = refer + '?openby:yohobuy={"action":"go.h5","params":{"islogin":"N","url":"' + req.__USER__.http + '//m.yohobuy.com/activity/student/register"}}';
-            } else {
-                refer = refer + '?uid=' + req.__USER__.uid;
-            }
+            refer = '/activity/student?uid=' + req.__USER__.uid;// 所有认证过的，都跳转学生首页
+
+
             res.redirect(helpers.urlFormat(refer));
             res.redirect(helpers.urlFormat(refer));
         } else {
         } else {
             res.render('register', {
             res.render('register', {
@@ -421,20 +414,18 @@ exports.isLogin = (req, res, next) => {
             return;
             return;
         }
         }
 
 
-        // 没有登录
-        if (yoho.isApp) {
-            if (!yoho.isLogin) {
-                url = url + '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' + yoho.http + '//m.yohobuy.com/activity/student/register","antarget":"1"}}}';
-                console.log(url);
-                res.redirect(url);
-            }
-        }
+        // refer = decodeURI(req.cookies.refer)||req.get("refer");
+        //
+        // if (refer) {
+        //     refer = decodeURI(req.cookies.refer)||req.get("refer");
+        // } else {
+        //     refer = '/activity/student/register';
+        // }
 
 
 
 
-        // if (req.path === '/student/register' && !yoho.isStudent) {
-        //     url = '/activity/student/register';
-        // }
-        console.log("aaa");
+        if (req.path === '/student/register' && !yoho.isStudent) {
+            url = '/activity/student/register';
+        }
         res.redirect(helpers.urlFormat('/signin.html', {
         res.redirect(helpers.urlFormat('/signin.html', {
             refer: url
             refer: url
         }));
         }));