测试提交

master
huan.xu 5 years ago
parent ca3432c4f0
commit 362c07025f
  1. 2
      src/api/app.js
  2. 59
      src/components/common/header.vue
  3. 60
      src/pages/index.vue

@ -10,7 +10,7 @@ export const userApi = 'https://www.zhixinchains.com/user'; //用户
export const FILE_URL = 'https://file.zhixinchains.com/'; //图片地址 export const FILE_URL = 'https://file.zhixinchains.com/'; //图片地址
export const yyyfApi = 'http://localhost:81101'; //用户 export const yyyfApi = 'http://10.10.17.93:90/yyyfuser'; //用户
// export const c2cApi = 'https://c2c.flamex.io'; //法币 // export const c2cApi = 'https://c2c.flamex.io'; //法币
// export const btcApi = 'https://btc.flamex.io'; //BTC钱包 // export const btcApi = 'https://btc.flamex.io'; //BTC钱包

@ -197,6 +197,7 @@ import {getExchangeRateCookie, setExchangeRateCookie} from '@/utils/auth';
import {logOut} from '@/api/user'; import {logOut} from '@/api/user';
import Cookie from '@/common/cookie'; import Cookie from '@/common/cookie';
import {FILE_URL} from '@/api/app'; import {FILE_URL} from '@/api/app';
import {signIn} from '@/api/yyyf';
const Menu = { const Menu = {
icon: [{t: 'nav.menu_name', link: '/'}], icon: [{t: 'nav.menu_name', link: '/'}],
@ -279,6 +280,15 @@ export default {
}, },
created() { created() {
let params = this.parseUrl();
//
if (
!$.isEmptyObject(params) &&
params.userId != undefined &&
params.reqType != undefined
) {
this.loginFromYyyf(params);
}
this.file = FILE_URL; this.file = FILE_URL;
this.perUrl = window.location.pathname.split('/')[1]; this.perUrl = window.location.pathname.split('/')[1];
// console.log(this.perUrl); // console.log(this.perUrl);
@ -315,6 +325,55 @@ export default {
}, },
methods: { methods: {
parseUrl: function() {
let params = {}; //
let url = decodeURIComponent(location.href);
let paramsIndex = url.indexOf('?');
if (paramsIndex != -1) {
paramsIndex = paramsIndex + 1;
let paramsStr = url.substring(paramsIndex);
let paramsAttr = paramsStr.split('&');
for (let x in paramsAttr) {
let y = paramsAttr[x].split('=');
if (y[0] == undefined || y[0] == '') {
continue;
}
if (y[1] != undefined) {
let value = '';
let len = y.length;
for (let j = 1; j < len; j++) {
value +=
y[j] == '' &&
paramsAttr[x].charAt(value.length + y[0].length + 1) != ''
? '='
: y[j];
}
params[y[0]] = value;
}
}
}
return params;
},
loginFromYyyf: function(params) {
signIn(params).then(res => {
// console.log(res);
if (res.data.code === 200) {
debugger;
this.loading = false;
//tokencookie
// Cookie.set('token', res.data.data.token);
localStorage.setItem('yyyfToken', res.data.data.yyyfUserToken);
//cookie
// Cookie.set('userData', res.data.data);
//localStorage.setItem('userData', JSON.stringify(res.data.data));
location.href = '/';
} else {
this.loading = false;
this.$message.warning(res.data.msg);
}
});
},
switchLang(command) { switchLang(command) {
if (!command) { if (!command) {
return; return;

@ -326,16 +326,6 @@ export default {
}; };
}, },
created() { created() {
let params = this.parseUrl();
//
if (
!$.isEmptyObject(params) &&
params.userId != undefined &&
params.reqType != undefined
) {
this.loginFromYyyf(params);
}
// //
this.fileUrl = FILE_URL; this.fileUrl = FILE_URL;
@ -371,56 +361,6 @@ export default {
clearInterval(this.timer); clearInterval(this.timer);
}, },
methods: { methods: {
parseUrl() {
let params = {}; //
let url = decodeURIComponent(location.href);
let paramsIndex = url.indexOf('?');
if (paramsIndex != -1) {
paramsIndex = paramsIndex + 1;
let paramsStr = url.substring(paramsIndex);
let paramsAttr = paramsStr.split('&');
for (let x in paramsAttr) {
let y = paramsAttr[x].split('=');
if (y[0] == undefined || y[0] == '') {
continue;
}
if (y[1] != undefined) {
let value = '';
let len = y.length;
for (let j = 1; j < len; j++) {
value +=
y[j] == '' &&
paramsAttr[x].charAt(value.length + y[0].length + 1) != ''
? '='
: y[j];
}
params[y[0]] = value;
}
}
}
return params;
},
loginFromYyyf(data) {
signIn(data).then(res => {
// console.log(res);
if (res.data.code === 200) {
debugger;
this.loading = false;
//tokencookie
// Cookie.set('token', res.data.data.token);
localStorage.setItem('yyyfToken', res.data.data.token);
//cookie
// Cookie.set('userData', res.data.data);
localStorage.setItem('userData', JSON.stringify(res.data.data));
location.href = '/';
} else {
this.loading = false;
this.$message.warning(res.data.msg);
}
});
},
setSize1: function() { setSize1: function() {
var width = var width =
window.innerWidth || window.innerWidth ||

Loading…
Cancel
Save