fe / xianyu-ufo-app-web · Commits

Go to a project

Authored by yyq
Commit 3005a13e33915e3387159e164fa0369fb1b33fa2 1 parent 46896be2

fix third refer

Inline Side-by-side
Showing 3 changed files with 16 additions and 6 deletions
@@ -47,13 +47,22 @@ Vue.use(Bind); @@ -47,13 +47,22 @@ Vue.use(Bind);
47 47
48 48
49 yoho.auth = async(loginUrl) => { 49 yoho.auth = async(loginUrl) => {
50 - let user = await sdk.getUser(); 50 + // let user = await sdk.getUser();
  51 +
  52 + let user = '';
51 53
52 if (user && user.uid) { 54 if (user && user.uid) {
53 return user; 55 return user;
54 } else { 56 } else {
55 - cookie.set('third_backurl', location.href);  
56 - location.href = loginUrl || `${location.origin}/xianyu/passport/login/taobao`; 57 + cookie.set('third_backurl', location.href, {
  58 + domain: '.yohobuy.com',
  59 + path: '/'
  60 + });
  61 + console.log(location.href)
  62 +
  63 + setTimeout(() => {
  64 + location.href = loginUrl || `${location.origin}/xianyu/passport/login/taobao`;
  65 + }, 100);
57 return; 66 return;
58 } 67 }
59 } 68 }
@@ -87,6 +87,8 @@ export default { @@ -87,6 +87,8 @@ export default {
87 this.canScan = true; 87 this.canScan = true;
88 } 88 }
89 89
  90 + this.$yoho.auth();
  91 +
90 this.fetchAppraiseAddressChangeNotice({orderCode: this.orderCode}).then(res => { 92 this.fetchAppraiseAddressChangeNotice({orderCode: this.orderCode}).then(res => {
91 let isChanged = get(res, 'data.isChanged'); 93 let isChanged = get(res, 'data.isChanged');
92 let isForceShow = get(res, 'data.isForceShow'); 94 let isForceShow = get(res, 'data.isForceShow');
1 1
2 const _ = require('lodash'); 2 const _ = require('lodash');
3 -const url = require('url');  
4 const uuid = require('uuid'); 3 const uuid = require('uuid');
5 const passport = require('passport'); 4 const passport = require('passport');
6 const TaobaoStrategy = require('./passport-taobao'); 5 const TaobaoStrategy = require('./passport-taobao');
@@ -150,7 +149,7 @@ const login = { @@ -150,7 +149,7 @@ const login = {
150 149
151 if (result.code === 200) { 150 if (result.code === 200) {
152 if (_.get(result, 'data.is_bind') === 'N') { 151 if (_.get(result, 'data.is_bind') === 'N') {
153 - redirectUrl = req.cookies.third_backurl ? url.parse(req.cookies.third_backurl) : homePage; 152 + redirectUrl = req.cookies.third_backurl ? req.cookies.third_backurl : homePage;
154 redirectUrl += redirectUrl.indexOf('?') > 0 ? '&' : '?'; 153 redirectUrl += redirectUrl.indexOf('?') > 0 ? '&' : '?';
155 redirectUrl += 'bind_code=' + encodeURIComponent(aes.dynamicEncryption(`taobao::${user.open_uid}`)); 154 redirectUrl += 'bind_code=' + encodeURIComponent(aes.dynamicEncryption(`taobao::${user.open_uid}`));
156 } else if (+_.get(result, 'data.uid') > 0) { 155 } else if (+_.get(result, 'data.uid') > 0) {
@@ -160,7 +159,7 @@ const login = { @@ -160,7 +159,7 @@ const login = {
160 req, 159 req,
161 res 160 res
162 }).finally(() => { 161 }).finally(() => {
163 - let refer = req.cookies.third_backurl ? url.parse(req.cookies.third_backurl) : homePage; 162 + let refer = req.cookies.third_backurl ? req.cookies.third_backurl : homePage;
164 163
165 return res.redirect(refer); 164 return res.redirect(refer);
166 }); 165 });