- ID:{{userInfo.uid}} @@ -32,17 +32,17 @@ - {{userInfoBalance.balance || 0 }} + {{userInfoBalance.balance || 0 }} {{coinTypeInfo.system_cropto_code}} {{ i18n.Balance }} - {{userInfoBalance.pledge || 0 }} + {{userInfoBalance.pledge || 0 }} {{coinTypeInfo.system_cropto_code}} {{ i18n.Pledge }} - {{userInfoBalance.contract || 0 }} + {{userInfoBalance.contract || 0 }} {{coinTypeInfo.system_cropto_code}} {{ i18n.Contarct }} @@ -85,10 +85,12 @@ diff --git a/pages/me/notificationDetails.vue b/pages/me/notificationDetails.vue index 8bf5f64..9fa9478 100644 --- a/pages/me/notificationDetails.vue +++ b/pages/me/notificationDetails.vue @@ -1,100 +1,103 @@ diff --git a/pages/me/transfer.vue b/pages/me/transfer.vue index e966ca2..0da3a0d 100644 --- a/pages/me/transfer.vue +++ b/pages/me/transfer.vue @@ -1,355 +1,367 @@ diff --git a/pages/me/walletHistory.vue b/pages/me/walletHistory.vue index 9637df5..93050e2 100644 --- a/pages/me/walletHistory.vue +++ b/pages/me/walletHistory.vue @@ -1,137 +1,192 @@ diff --git a/pages/withdrawal/addOrEditBankCard.vue b/pages/withdrawal/addOrEditBankCard.vue index 654fe8f..2c8b561 100644 --- a/pages/withdrawal/addOrEditBankCard.vue +++ b/pages/withdrawal/addOrEditBankCard.vue @@ -1,138 +1,211 @@ diff --git a/utils/api.js b/utils/api.js index c4b478e..aa6823b 100644 --- a/utils/api.js +++ b/utils/api.js @@ -67,7 +67,7 @@ const api = { receivStepsAward: (params) => Vue.prototype.$axios.post('/api/steps/receivStepsAward',params),//领取奖励 //--------------------------------- home --------------------------------- - indexInfo: () => Vue.prototype.$axios.get('/api/index/info'),//获取系统通用配置 + indexInfo: () => Vue.prototype.$axios.post('/api/index/info'),//获取系统通用配置 indexLang: (params) => Vue.prototype.$axios.post('/api/index/lang',params),//切换语言 customerService: (params) => Vue.prototype.$axios.post('/api/index/customerService',params),//获取客服联系方式 sendEmailCode: (params) => Vue.prototype.$axios.post('/api/index/sendEmailCode',params),//发送邮箱验证码 diff --git a/utils/axios.js b/utils/axios.js index 4e22068..ebaa520 100644 --- a/utils/axios.js +++ b/utils/axios.js @@ -139,17 +139,19 @@ service.interceptors.response.use(res => { // console.log(res.data) // console.log(res.data.data[0].nameAlias) if (res.success || res.errCode === 'USER.0017') { - return res.data; - } else { - + } + if(res.errMsg=='No customer service is online'&&res.errCode=='SYS.0012'){ + return res; + } + else { uni.showToast({ title: res.errMsg, icon: 'none', duration: 1500 }) if (res.errCode === 'USER.0010') { - + uni.setStorageSync('ticket',null); uni.removeStorage({ key: 'logInfo', success: function(res) { @@ -159,8 +161,6 @@ service.interceptors.response.use(res => { }, fail: (err) => {} }); - - // #ifdef H5 var url = location.href; if (url.indexOf('pages') > -1) { @@ -175,8 +175,6 @@ service.interceptors.response.use(res => { uni.removeStorageSync('url') } // #endif - - } uni.$emit('refreshQrCode') return Promise.reject(res.errMsg); diff --git a/utils/index.js b/utils/index.js index 2b377b6..98d1924 100644 --- a/utils/index.js +++ b/utils/index.js @@ -60,7 +60,7 @@ var utils = { var m = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() var s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() // return Y + '-' + M + '-' + D + ' ' + h + ':' + m + ':' + s; - return Y + '-' + M + '-' + D + ' ' + h + ':' + m + ':' + s; + return Y + '/' + M + '/' + D + ' ' + h + ':' + m + ':' + s; }, formathhmm: function(time) { var date = new Date(time) diff --git a/utils/language/en_US.js b/utils/language/en_US.js index 7aafc6d..160e59e 100644 --- a/utils/language/en_US.js +++ b/utils/language/en_US.js @@ -10,6 +10,11 @@ export default { }, // 登陆相关页面 login: { + Donationsucceeded:'Donation succeeded', + Insufficient:'Insufficient available balance', + pullup:'Gently pull up', + toload:'Trying to load', + Nomore:'No more', // 公共字段 Login: 'Login', SignUp: 'Sign Up', @@ -78,6 +83,7 @@ export default { // 合约页面相关 markets: { // markets + Dataisempty:'Data is empty', TrandingPair: 'Tranding Pair', LatestPrice: 'Latest Price', RiseAndfall: '24H Rise and fall', @@ -139,6 +145,7 @@ export default { CharityDetails: 'Charity Details', About: 'About', Participants: 'Participants', + Closeddonation: 'Donation Closing', DonateNow: 'Donate Now', PleaseChooseCoin: 'Please choose coin', AvailableBlance: 'Available blance', @@ -214,7 +221,7 @@ export default { DigitalCurrency: 'Digital currency', OnLine: 'On-line', PleaseChooseCoin: 'Please choose coin', - + WithdrawAddress: 'Withdraw address', Choose: 'Choose', Quantity: 'Quantity', @@ -324,6 +331,7 @@ export default { //me me: { + Dataisempty:'Data is empty', isLogOut:'Are you sure you want to log out?', account: 'account', Recharge: 'Recharge', @@ -363,6 +371,7 @@ export default { ModifyWithdrawalPassword: 'Modify Withdrawal Password', CreateNewPassword: 'Create new password', ModifiedSuccessfully:'Modified successfully', + addSuccessfully:'Added successfully', Fresh: 'Fresh', Release: 'Release', @@ -371,7 +380,7 @@ export default { DonateRecord: 'Donate record', Time: 'Time', - + Status:'Status', SelectCurrency: 'Select currency', PleaseChooseCoin: 'Please choose coin', From: 'From',