Browse Source

合并提交

master
j1ack 3 years ago
parent
commit
00543f7e23
  1. 4
      pages/charity/index.vue
  2. 9
      pages/me/myTeam.vue
  3. 1
      pages/me/transfer.vue
  4. 6
      pages/subscription/index.vue
  5. 19
      utils/index.js
  6. 4
      utils/language/en_US.js
  7. 4
      utils/language/vi_VN.js
  8. 2
      utils/language/zh_TW.js

4
pages/charity/index.vue

@ -17,7 +17,7 @@
<view class="title">{{item.title}} </view>
<view class="target">Target: {{item.targetAmount}}{{" "}}{{coinTypeInfo.system_cropto_code}}</view>
<u-line-progress class="progressbar" :percentage="item.percentage"
activeColor="#00E8A2" height="22rpx">
activeColor="#00E8A2" height="30rpx">
<text class="u-percentage-slot">{{item.percentage}}%</text>
</u-line-progress>
</view>
@ -112,7 +112,7 @@
<style lang="scss" scoped>
.u-percentage-slot {
position: absolute;
top: -6rpx;
top: -2rpx;
left: 24rpx;
font-size: 24rpx;
color: #333;

9
pages/me/myTeam.vue

@ -17,7 +17,7 @@
{{Number(inviteData.yestodayRevenue)}}
</view>
<view class="t2">
{{i18n.Earnlingsyesterday}}
{{i18n.Earnlingsyesterday}}(U)
</view>
</view>
<view class="item">
@ -25,7 +25,7 @@
{{Number(inviteData.totalRevenue)}}
</view>
<view class="t2">
{{i18n.Totalincome}}
{{i18n.Totalincome}}(U)
</view>
</view>
</view>
@ -44,8 +44,9 @@
<tbody class="tbody">
<tr v-for="item,index in userInfoObj" :key="index">
<td style="width: 100px;"><div style="width: 100%;"><div style="width: 130px;word-break: break-all;">{{item.email}}</div></div></td>
<td v-if="curNow==1">{{item.amount}}{{coinTypeInfo.system_coin_code}}</td>
<td>{{i18n.Financialfunds}}{{item.userLevel}}</td>
<td v-if="curNow==1">{{item.amount}}USDT</td>
<td v-if="curNow==1">{{i18n.Financialfunds}}{{item.divideLev}}</td>
<td v-if="curNow==0">{{i18n.Financialfunds}}{{item.userLevel}}</td>
<!-- <td v-if="curNow==0">{{item.tranAmt}}{{coinTypeInfo.system_coin_code}}</td>-->
<td>{{item.timestr}}</td>
</tr>

1
pages/me/transfer.vue

@ -260,6 +260,7 @@
}).then(res => {
this.coinWayInfo=res
this.accountPopupShow = false
this.accountPopupShowTo = false
})
},
//

6
pages/subscription/index.vue

@ -73,7 +73,7 @@
<key-value-row :keyName="i18n.ConfirmAmount" :value="item.tradeAmount+item.coinSymbol" :leftColor="'#F2FE8D'"
:rightColor="'#F2FE8D'"></key-value-row>
<key-value-row :keyName="i18n.USDT" :value="item.baseAmount+item.baseSymbol"></key-value-row>
<key-value-row :keyName="i18n.CheckTheNumberoOfUSDT" :value="item.realAmount+item.baseAmount" :leftColor="'#F2FE8D'"
<key-value-row :keyName="i18n.CheckTheNumberoOfUSDT" :value="item.realAmount+item.baseSymbol" :leftColor="'#F2FE8D'"
:rightColor="'#F2FE8D'">
</key-value-row>
<key-value-row :keyName="i18n.Time" :value="item.timestr"></key-value-row>
@ -203,11 +203,11 @@
this.loadStatus = 'nomore'
for (var i = 0; i < this.info.length; i++) {
if (this.info[i].startDate) {
this.info[i].timestr = this.$index.formatyymmddhhmmss(this.info[
this.info[i].timestr = this.$index.formatyymmddhhmm(this.info[
i].startDate)
}
if (this.info[i].initalDate) {
this.info[i].timestrIntital = this.$index.formatyymmddhhmmss(this.info[
this.info[i].timestrIntital = this.$index.formatyymmddhhmm(this.info[
i].initalDate)
}
}

19
utils/index.js

@ -63,6 +63,25 @@ var utils = {
return D + '/' + M + '/' + Y + ' ' + h + ':' + m + ':' + s;
},
formatyymmddhhmm: function(time) {
var date = new Date(time)
var localTime = date.getTime()
var localOffset = date.getTimezoneOffset() * 60000 //获得当地时间偏移的毫秒数
var utc = localTime + localOffset; //utc即GMT时间
var offset = uni.getStorageSync('coinTypeInfo').system_timezone //时区拿接口的
var beijing = utc + (3600000 * offset);
date = new Date(beijing)
var Y = date.getFullYear()
var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1)
var D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
var h = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
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 D + '/' + M + '/' + Y + ' ' + h + ':' + m;
},
getformatyymmddhhmmss: function(time) {
var date = new Date(time)
var localTime = date.getTime()

4
utils/language/en_US.js

@ -351,7 +351,7 @@ export default {
FullNameOfToken: 'Full name of token:',
TotalCirculation: 'Total circulation:',
ICOPrice: 'ICO Price:',
ICOTime: 'Full name of token:',
// ICOTime: 'Full name of token:',
},
//me
@ -423,7 +423,7 @@ export default {
OptionAccount: 'Option account',
To: 'To',
TradingAccount: 'Trading account',
TransferNumber: 'Truyền tải',
TransferNumber: 'Transfer number',
PleaseEnterNumber: 'Please enter number',
Usable: 'Usable :',
ALL: 'ALL',

4
utils/language/vi_VN.js

@ -347,7 +347,7 @@ export default {
FullNameOfToken: 'Tên đầy đủ của mã thông báo:',
TotalCirculation: 'Giá đăng ký:',
ICOPrice: 'Giá đăng ký:',
ICOTime: 'Thời gian đăng ký:',
// ICOTime: 'Thời gian đăng ký:',
},
//me
@ -412,7 +412,7 @@ export default {
OptionAccount: 'Tài khoản quyền chọn',
To: 'Đến',
TradingAccount: 'Tài khoản giao dịch',
TransferNumber: 'Chuyển số',
TransferNumber: 'Truyền tải',
PleaseEnterNumber: 'Vui lòng nhập số',
Usable: 'Có thể sử dụng :',
ALL: 'TẤT CẢ CÁC',

2
utils/language/zh_TW.js

@ -348,7 +348,7 @@ export default {
FullNameOfToken: '幣名全稱:',
TotalCirculation: '申購價格:',
ICOPrice: '申購價格:',
ICOTime: '申購時間:',
// ICOTime: '申購時間:',
},
//me

Loading…
Cancel
Save