From f896222f56331d21d6fad52afcf055b5242294a6 Mon Sep 17 00:00:00 2001 From: "huan.xu" <275942173@qq.com> Date: Tue, 22 Sep 2020 18:22:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AF=86=E7=A0=81=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/app.js | 25 +- src/components/balances/banlanes-tabds.vue | 119 +-- .../bibi-balances/bibi-balances-table.vue | 126 +-- src/components/common/header.vue | 104 +- src/pages/entry.vue | 888 +++++++++--------- src/pages/router.js | 5 + src/router.js | 5 + src/views/personal/profile.vue | 8 +- 8 files changed, 563 insertions(+), 717 deletions(-) diff --git a/src/api/app.js b/src/api/app.js index 5f8f630..70a0965 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -1,17 +1,18 @@ -export const c2cApi = 'https://www.zhixinchains.com/otc'; //法币 -export const btcApi = 'https://www.zhixinchains.com/btc'; //BTC钱包 -export const eosApi = 'https://www.zhixinchains.com/eos'; //EOS钱包 -export const ethApi = 'https://www.zhixinchains.com/eth'; //ETH钱包 -export const cctApi = 'https://www.zhixinchains.com/cct'; //币币 -export const currencyApi = 'https://www.zhixinchains.com/currency'; //行情 -export const jgimApi = 'https://www.zhixinchains.com/imjg'; //聊天 -export const sysconfApi = 'https://www.zhixinchains.com/sysconf'; //行情 -export const userApi = 'https://www.zhixinchains.com/user'; //用户 +export const c2cApi = 'http://121.37.29.24/otc'; //法币 +export const btcApi = 'http://121.37.29.24/btc'; //BTC钱包 +export const eosApi = 'http://121.37.29.24/eos'; //EOS钱包 +export const ethApi = 'http://121.37.29.24/eth'; //ETH钱包 +export const cctApi = 'http://121.37.29.24/cct'; //币币 +export const currencyApi = 'http://121.37.29.24/currency'; //行情 +export const jgimApi = 'http://121.37.29.24/imjg'; //聊天 +export const sysconfApi = 'http://121.37.29.24/sysconf'; //行情 +export const userApi = 'http://121.37.29.24/user'; //用户 -export const FILE_URL = 'https://file.zhixinchains.com/'; //图片地址 +export const FILE_URL = 'http://121.37.29.24/res/'; //图片地址 -export const yyyfApi = 'https://www.zhixinchains.com/yyyfuser'; //用户 -export const yyyfUrl = 'http://www.iyyyf.com/'; //以渔有方地址 +export const yyyfApi = 'http://121.37.29.24/yyyfuser'; //用户 + +export const yyyfUrl = 'http://113.98.59.231:8800/yyyf-server-app'; //以渔有方url // export const c2cApi = 'https://c2c.flamex.io'; //法币 // export const btcApi = 'https://btc.flamex.io'; //BTC钱包 diff --git a/src/components/balances/banlanes-tabds.vue b/src/components/balances/banlanes-tabds.vue index 4669a4f..2f9dc92 100644 --- a/src/components/balances/banlanes-tabds.vue +++ b/src/components/balances/banlanes-tabds.vue @@ -78,19 +78,19 @@ o.oooooo -->
- {{ $t('balances.table.header_last_recharge') }} --> - {{ $t('balances.table.header_last_mention') }} --> + >
- {{ $t('balances.table.header_last_recharge') }}--> - {{ $t('balances.table.header_last_mention') }} --> + >
- {{ $t('balances.table.header_last_recharge') }}--> - {{ $t('balances.table.header_last_mention') }} --> + > - - - -
- BTC -
- - -
- 0 -
- -
- 0 -
-
- - - - -
- - - - -
- ETH -
- - -
- 0 -
- -
- 0 -
+ +
- - - -
- - - - -
- EOS -
- - -
- 0 -
- -
- 0 -
-
- - - - +
+
{{ $t('balances.table.header_nodata') }}
 - - - -
- USDT -
- - -
- 0 -
- -
- 0 -
-
- - - - -
- -
@@ -768,7 +682,6 @@ export default { // 获取btc转usdt资产 if (this.USDTPrie[i].currencyPair == 'BTC-USDT') { // console.log(this.USDTPrie[i].amount); - // this.btcPrice = this.btcMang * this.USDTPrie[i].amount; // console.log('btc'+this.btcPrice); } diff --git a/src/components/balances/bibi-balances/bibi-balances-table.vue b/src/components/balances/bibi-balances/bibi-balances-table.vue index 6c69a0b..f97b32c 100644 --- a/src/components/balances/bibi-balances/bibi-balances-table.vue +++ b/src/components/balances/bibi-balances/bibi-balances-table.vue @@ -76,19 +76,19 @@ }}
- + + >--> +
- + + > --> +
- + + >--> + - - - + +
- BTC -
- - -
- 0 -
- -
- 0 -
-
- - - - -
- - - - -
- ETH -
- - -
- 0 -
- -
- 0 -
-
- - - +
+
{{ $t('balances.table.header_nodata') }}
 - - - -
- EOS -
- - -
- 0 -
- -
- 0 -
-
- - - - -
- - - - -
- USDT -
- - -
- 0 -
- -
- 0 -
-
- - - - -
- -
- + +--> + { - window.location.href = yyyfUrl; - }, - }); - } else { - this.isTeacher = localStorage.getItem('userType') == 1 ? true : false; - //请求类型 - this.reqType = localStorage.getItem('reqType'); - //如果考试 - if (this.reqType == 0) { - //获取考试剩余时间 - this.remainingTime = localStorage.getItem('remainingTime'); - //启动倒计时 - this.setIntervalInt = setInterval(this.showTime, 1000); - } - this.file = FILE_URL; - this.perUrl = window.location.pathname.split('/')[1]; - // console.log(this.perUrl); - - // this.userData = Cookie.get('userData'); - this.userData = localStorage.getItem('userData'); - - if (this.userData != '' && this.userData != undefined) { - this.userData = JSON.parse(localStorage.getItem('userData')); - // console.log(this.userData); - if (this.userData.avatar != null) { - this.headerImg = this.file + this.userData.avatar; - } else { - this.headerImg = this.userData.avatar; + if (window.location.href.indexOf('/#/studyGrade?issueId=') == -1) { + let yyyfToken = localStorage.getItem('yyyfToken'); + this.isSubmit = localStorage.getItem('isSubmit') == 'true' ? true : false; + if (yyyfToken == '' || yyyfToken == undefined) { + this.$alert('未从以渔有方登录，点击确定返回登录', '提示', { + type: 'error', + showClose: false, + confirmButtonText: '确定', + confirmButtonClass: 'btn-self-style', + callback: () => { + window.location.href = yyyfUrl; + }, + }); + } else { + this.isTeacher = localStorage.getItem('userType') == 1 ? true : false; + //请求类型 + this.reqType = localStorage.getItem('reqType'); + //如果考试 + if (this.reqType == 0) { + //获取考试剩余时间 + this.remainingTime = localStorage.getItem('remainingTime'); + //启动倒计时 + this.setIntervalInt = setInterval(this.showTime, 1000); } - } - // console.log(this.headerImg); + this.file = FILE_URL; + this.perUrl = window.location.pathname.split('/')[1]; + // console.log(this.perUrl); + + // this.userData = Cookie.get('userData'); + this.userData = localStorage.getItem('userData'); + + if (this.userData != '' && this.userData != undefined) { + this.userData = JSON.parse(localStorage.getItem('userData')); + // console.log(this.userData); + if (this.userData.avatar != null) { + this.headerImg = this.file + this.userData.avatar; + } else { + this.headerImg = this.userData.avatar; + } + } + // console.log(this.headerImg); - const currentLang = getCurrentLanguage(); - for (let item of this.lang.list) { - if (item.lang === currentLang) { - this.lang.current = item; - break; + const currentLang = getCurrentLanguage(); + for (let item of this.lang.list) { + if (item.lang === currentLang) { + this.lang.current = item; + break; + } } - } - const currentrate = getExchangeRateCookie(); - for (let item of this.exRate.list) { - if (item.id === currentrate) { - this.exRate.current = item; - // setExchangeRateCookie(currentrate); - break; + const currentrate = getExchangeRateCookie(); + for (let item of this.exRate.list) { + if (item.id === currentrate) { + this.exRate.current = item; + // setExchangeRateCookie(currentrate); + break; + } } } } diff --git a/src/pages/entry.vue b/src/pages/entry.vue index 259ddea..99b9e3b 100644 --- a/src/pages/entry.vue +++ b/src/pages/entry.vue @@ -40,7 +40,8 @@

总资产: {{ userTimeMoneyDto.btc }}

-

≈{{btcRMBCount}} CNY

+

≈{{ btcRMBCount }} CNY

+

提币地址：{{ userTimeMoneyDto.assessUserId }}

+ –>
- + -->