liang
/
samehome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

解决冲突

master
vee 3 years ago
parent
05ca8ab4d6 0668a3ebd1
commit
c5e5c17e07
15 changed files with 1389 additions and 946 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      App.vue
  2. 12
      components/tabBar/tabBar.vue
  3. 1
      pages/home/index.vue
  4. 2
      pages/me/changeWithdrawalPassword.vue
  5. 16
      pages/me/donateRecord.vue
  6. 150
      pages/me/myTeam.vue
  7. 51
      pages/mine/mine.vue
  8. 83
      pages/mine/mineDetails.vue
  9. 90
      pages/mine/mineRecord.vue
  10. 157
      pages/subscription/details.vue
  11. 201
      pages/subscription/index.vue
  12. 5
      pages/withdrawal/withdrawal.vue
  13. 2
      pages/withdrawal/withdrawalRecord.vue
  14. BIN
      static/me/myTeambg.png
  15. 8
      utils/language/en_US.js

7
App.vue
View File

@ -37,7 +37,12 @@ export default {
margin: 0;
}
/deep/ .u-empty{
position: absolute;
top: 150%;
left: 50%;
transform: translateX(-50%);
}
page {

12
components/tabBar/tabBar.vue
View File

@ -192,18 +192,6 @@ export default {
display: flex;
z-index: 8;
box-sizing: border-box;
&::after {
display: block;
position: absolute;
content: '';
background: #fff;
width: 268rpx;
height: 10rpx;
border-radius: 10rpx;
top: 140rpx;
left: 242rpx;
}
}
.tabbar_item {

1
pages/home/index.vue
View File

@ -152,7 +152,6 @@ Blame
this.baseURL = constant.BASE_URL
this.getbanner();
this.noticeList();
this.getContact()
},
onShow() {
// 生成播放器队列对象

2
pages/me/changeWithdrawalPassword.vue
View File

@ -13,7 +13,7 @@
:placeholder="i18n.confirmPassword">
</u-input>
<!-- 修改登录密码按钮 :disabled="disabled"-->
<u-button class="button" color="#00E8A2" throttleTime="500">
<u-button class="button" color="#00E8A2" throttleTime="500" @click="changePassword">
{{ i18n.Confirm }}
</u-button>
</view>

16
pages/me/donateRecord.vue
View File

@ -21,9 +21,11 @@
<script>
import api from '@/utils/api'
import KeyValueRow from '../../components/KeyValueRow/KeyValueRow.vue';
export default {
components: { KeyValueRow },
import KeyValueRow from '../../components/KeyValueRow/KeyValueRow.vue';
export default {
components: {
KeyValueRow
},
name: "donateRecord",
data() {
return {
@ -53,7 +55,7 @@ export default {
onLoad() {
this.getList()
},
onShow() { },
onShow() {},
methods: {
getList() {
this.isLoadMore = true
@ -92,11 +94,11 @@ export default {
})
},
},
}
}
</script>
<style lang="scss" scoped>
.main {
.main {
.body {
overflow: hidden;
@ -149,5 +151,5 @@ export default {
}
}
}
</style>

150
pages/me/myTeam.vue
View File

@ -3,23 +3,76 @@
<!-- nav -->
<navigation>{{ i18n.MyTeam }}</navigation>
<view class="body">
<view class="userItem" v-for="(item, index) in 4" :key="index">
<u-icon class="icon" :name="'../../static/me/Ellipse 85.png'" size="92rpx" width="92rpx"></u-icon>
<view>
<view class="email">krichjmadif0985@gmail.com</view>
<view class="date">2022/08/06</view>
<u-button class="button" color="#F2FE8D" throttleTime="500">{{ i18n.Fresh }}</u-button>
<view class="top flex">
<view class="item">
<view class="t1">
394
</view>
<view class="t2">
Number of clionts
</view>
</view>
<view class="item">
<view class="t1">
0
</view>
<view class="t2">
Earnlings yesterday
</view>
</view>
<view class="item">
<view class="t1">
9343492
</view>
<view class="t2">
Total income
</view>
</view>
</view>
<u-subsection :list="list" activeColor="#00E8A2" inactiveColor="#fff" :current="curNow"
@change="sectionChange" bgColor="#211F32"></u-subsection>
<view class="container">
<table class="table">
<thead class="thead">
<tr>
<td>User</td>
<td>Financial funds</td>
<td>Time</td>
</tr>
</thead>
<tbody class="tbody">
<tr>
<td>98374354705</td>
<td>349849</td>
<td>2021.10.14</td>
</tr>
<tr>
<td>98374354705</td>
<td>349849</td>
<td>2021.10.14</td>
</tr>
<tr>
<td>98374354705</td>
<td>349849</td>
<td>2021.10.14</td>
</tr>
</tbody>
</table>
</view>
</view>
</view>
</template>
<script>
export default {
export default {
name: "myTeam",
data() {
return {
list: ['My client', 'Income record'],
// 或者如下，也可以配置keyName参数修改对象键名
// list: [{name: '未付款'}, {name: '待评价'}, {name: '已付款'}],
curNow: 0,
};
},
computed: {
@ -27,22 +80,89 @@ export default {
return this.$t("me");
},
},
onLoad() {
},
onShow() { },
onLoad() {},
onShow() {},
methods: {
sectionChange(index) {
this.curNow = index;
}
},
}
}
</script>
<style lang="scss" scoped>
.main {
.table{
width: 100%;
text-align: center;
border-collapse: collapse;
.thead{
height: 84rpx;
line-height: 84rpx;
tr{
td{
color: #A1A0A8;
font-size: 24rpx;
}
}
}
.tbody{
tr{
height: 84rpx;
line-height: 84rpx;
border-top: 2rpx solid #323045 !important;
td{
color: #fff;
font-size: 24rpx;
}
}
}
}
.container {
padding: 0 32rpx;
}
/deep/ .u-subsection--button {
height: 80rpx;
}
/deep/ .u-subsection--button__bar {
background: #323045;
height: 80rpx;
}
.flex {
display: flex;
align-items: center;
justify-content: space-between;
}
.top {
padding: 68rpx 32rpx;
background: url('@/static/me/myTeambg.png') no-repeat;
background-size: cover;
.item {
text-align: center;
line-height: 60rpx;
}
.t2 {
font-size: 24rpx;
color: #A1A0A8;
}
.t1 {
color: #00E8A2;
font-size: 32rpx;
font-weight: bolder;
}
}
.main {
.body {
overflow: hidden;
margin-top: 200rpx;
padding: 0 32rpx;
.userItem {
position: relative;
@ -90,5 +210,5 @@ export default {
}
}
}
</style>

51
pages/mine/mine.vue
View File

@ -4,16 +4,19 @@
<navigation>{{ i18n.MinePool }}</navigation>
<view class="poolContent">
<!-- pool选择框 -->
<view class="pool-item" v-for="(item, index) in 4" :key="index">
<u-icon class="icon" :name="'../../static/mine/img_mine01.png'" size="92rpx" width="92rpx"></u-icon>
<view class="pool-item" v-for="(item, index) in mineCon.mineList" :key="index">
<u-icon class="icon" :name="mineCon.imgAddress+item.imgMobile" size="92rpx" width="92rpx"></u-icon>
<view class="right">
<view class="title">0.1 BTC 30 days</view>
<view class="description">every time lock 0.1 BTC,Lock 30 Mine poolLock,to produce 300 ACTA per 1
day</view>
<view class="title">{{item.name}}</view>
<view class="description">{{item.remarks}}</view>
</view>
<u-button class="button" @click="gotoDetails(index)" color="#00E8A2" throttleTime="500">{{ i18n.OpenMine }}</u-button>
<u-button class="button" @click="gotoDetails(item,index)" color="#00E8A2" throttleTime="500" :disabled="item.status!='open'">
{{ i18n.OpenMine }}</u-button>
</view>
<u-empty :text="i18n.Dataisempty" mode="data" v-if="mineCon.mineList.length==0"></u-empty>
<u-loadmore :status="loadStatus" :loading-text="loadingText" :loadmore-text="loadmoreText"
:nomore-text="nomoreText" v-if="mineCon.mineList.length" height="80" />
</view>
@ -22,16 +25,24 @@
</template>
<script>
export default {
import api from '@/utils/api'
import constant from '@/utils/constant.js';
export default {
name: "mine",
data() {
return {
mineCon:[],
pageState: 'coinRecharge',
coin: '',
USDTPopupShow: false,
USDTRadioValue: '',
selectNumberValue: 100,
selectMethod: '1',
isLoadMore: false, //是否加载中
loadStatus: 'loadmore',
loadingText: this.$t("login").toload,
loadmoreText: this.$t("login").pullup,
nomoreText: this.$t("login").Nomore,
};
},
computed: {
@ -40,22 +51,30 @@ export default {
},
},
onLoad() {
this.getMine()
},
onShow() { },
onShow() {},
methods: {
gotoDetails(index) {
console.log(index);
//获取挖矿产品列表
getMine() {
this.isLoadMore = true
api.mineList().then(res => {
this.mineCon=res
this.loadStatus = 'nomore'
})
},
gotoDetails(item,index) {
uni.navigateTo({
url: `/pages/mine/mineDetails?id=${index}`
url: `/pages/mine/mineDetails?id=${item.id}&imgAddress=${this.mineCon.imgAddress}`
});
},
},
}
}
</script>
<style lang="scss" scoped>
.main {
.main {
.poolContent {
overflow: hidden;
@ -104,7 +123,7 @@ export default {
.button {
height: 64rpx;
line-height:64rpx;
line-height: 64rpx;
font-size: 28rpx;
color: #15141F !important;
margin-top: 48rpx;
@ -113,7 +132,7 @@ export default {
font-weight: 600;
}
&:last-child{
&:last-child {
margin-bottom: 80rpx;
}
}
@ -121,5 +140,5 @@ export default {
}
}
}
</style>

83
pages/mine/mineDetails.vue
View File

@ -1,41 +1,45 @@
<template>
<view class="main">
<!-- nav -->
<navigation>{{ i18n.MineDetails }}<view slot="right" class="right" @click="goto('mineRecord')">{{ i18n.Record }}
<navigation>{{ i18n.MineDetails }}
<view slot="right" class="right" @click="goto('mineRecord')">{{ i18n.Record }}
</view>
</navigation>
<view class="content">
<view class="card">
<view class="top">
<u-icon class="icon" :name="'../../static/mine/coinLogo.png'" size="80rpx" width="80rpx"></u-icon>
<view class="title">{{ i18n.YourBTC }}</view>
<view class="coinValue">{{ coinValue }}</view>
<u-icon class="icon" :name="imgAddress+detail.mineDetails.imgMobile" size="80rpx" width="80rpx">
</u-icon>
<view class="title">{{ detail.mineDetails.name }}</view>
<view class="coinValue">{{ detail.userCapital }} <text
style="font-size: 26rpx;">{{detail.mineDetails.baseCoin}}</text> </view>
</view>
<view class="bottom">
<view class="item">
<view class="title">{{ i18n.LockBTC }}</view>
<view class="value">0.1</view>
<view class="value">{{ detail.mineDetails.limitMin }}</view>
</view>
<view class="item">
<view class="title">{{ i18n.dayproduce }}</view>
<view class="value">300 ACTA</view>
<view class="value">{{ detail.mineDetails.price }} {{ detail.mineDetails.profitCoin }}</view>
</view>
<view class="item">
<view class="title">{{ i18n.MinLockTime }}</view>
<view class="value">30{{ i18n.days }}</view>
<view class="value">{{ detail.mineDetails.day}}{{ i18n.days }}</view>
</view>
</view>
</view>
<input class="input" v-model="codeValue" focus :placeholder="i18n.invuteCode"
placeholder-style="color:#A1A0A8" />
<!-- <input class="input" v-model="info.inviteCode" focus :placeholder="i18n.invuteCode"
placeholder-style="color:#A1A0A8" :disabled="detail.inviteCode" /> -->
<view class="allItem">
<input class="input" v-model="coinQuantity" :placeholder="i18n.lockBTC"
<input class="input" v-model="info.amount" :placeholder="i18n.lockBTC"
placeholder-style="color:#A1A0A8" />
<view class="all">{{ i18n.ALL }}</view>
<view class="all" @click="info.amount=detail.userCapital">{{ i18n.ALL }}</view>
</view>
<u-button class="button" color="#00E8A2" throttleTime="500" :disabled="true">{{ i18n.LockBTCBtn }}
<u-button class="button" color="#00E8A2" throttleTime="500" :disabled="lockBTCBtned" @click="Lock">
{{ i18n.LockBTCBtn }}
</u-button>
</view>
@ -44,25 +48,64 @@
</template>
<script>
import uniCopy from '@/utils/uni-copy'
export default {
import uniCopy from '@/utils/uni-copy'
import api from '@/utils/api'
import constant from '@/utils/constant.js';
export default {
name: "mineDetails",
data() {
return {
id:null,
info: {
productId: null,
amount: null,
// inviteCode: null,
},
coinValue: 1000.001,
codeValue: '',
coinQuantity: '',
detail: {},
imgAddress: '',
};
},
computed: {
i18n() {
return this.$t("mine");
},
lockBTCBtned() {
if (!this.info.amount && !this.info.amount) {
return true;
} else {
return false;
}
}
},
onLoad() {
onLoad(res) {
this.id=res.id
this.getMineDetail(this.id)
this.imgAddress = res.imgAddress
},
onShow() { },
onShow() {},
methods: {
// 瓊슥뭔찜穀웁끓틔땐데
Lock() {
api.mineSubmit(this.info).then(res => {
uni.$u.toast(this.$t("login").Purchasesucceeded)
setTimeout(()=>{
this.getMineDetail(this.id)
},1200)
})
},
//삿혤穀웁끓틔圈헙
getMineDetail(id) {
api.showMineDetails({
mineId: id
}).then(res => {
this.detail = res
this.info.productId = this.detail.mineDetails.id
})
},
goto(page) {
// console.log(page);
let url = '';
@ -106,11 +149,11 @@ export default {
},
},
}
}
</script>
<style lang="scss" scoped>
.main {
.main {
.right {
position: absolute;
@ -148,7 +191,7 @@ export default {
.coinValue {
flex: 1;
text-align: right;
font-size: 68rpx;
font-size: 48rpx;
line-height: 144rpx;
padding-right: 20rpx;
}
@ -229,5 +272,5 @@ export default {
}
}
}
}
</style>

90
pages/mine/mineRecord.vue
View File

@ -2,37 +2,48 @@
<view class="main">
<!-- nav -->
<navigation>{{ i18n.MinePool }}</navigation>
<!-- 数据为空格显示 -->
<u-empty :show="dataList.length === 0" marginTop="350rpx" :text="i18n.NoData" textColor="#818197"
<u-empty :show="userInfoObj.length === 0" marginTop="350rpx" :text="i18n.NoData" textColor="#818197"
textSize="36rpx" icon="../../static/mine/img_data.png"></u-empty>
<!-- 列表 -->
<view class="content" v-if="dataList.length > 0">
<view class="dataBody" v-for="(item, index) in 4" :key="index">
<key-value-row :keyName="i18n.BaseCoin" :value="'100BTC'"></key-value-row>
<key-value-row :keyName="i18n.ProfitCoin" :value="'CEH'"></key-value-row>
<key-value-row :keyName="i18n.DayRebate" :value="'75000'"></key-value-row>
<view class="content" v-if="userInfoObj.length > 0">
<view class="dataBody" v-for="(item, index) in userInfoObj" :key="index">
<key-value-row :keyName="i18n.BaseCoin" :value="item.amount+item.baseCoin"></key-value-row>
<key-value-row :keyName="i18n.ProfitCoin" :value="item.profitCoin"></key-value-row>
<key-value-row :keyName="i18n.DayRebate" :value="item.price"></key-value-row>
<u-divider text="" lineColor="#B9C1D9"></u-divider>
<key-value-row :keyName="i18n.RebateDay" :value="'0/120'"></key-value-row>
<key-value-row :keyName="i18n.RebateAmount" :value="'150000/9000000'"></key-value-row>
<key-value-row :keyName="i18n.RebateDay" :value="item.rebateDay+'/'+item.day"></key-value-row>
<key-value-row :keyName="i18n.RebateAmount" :value="item.rebateAmount+'/'+item.deadAmount"></key-value-row>
<u-divider text="" lineColor="#B9C1D9"></u-divider>
<key-value-row :keyName="i18n.AddTime" :value="'2022/08/06 14:50:34'"></key-value-row>
<key-value-row :keyName="i18n.ReleaseTime" :value="'2022/08/06 14:50:34'"></key-value-row>
<key-value-row :keyName="i18n.AddTime" :value="item.timestr"></key-value-row>
<key-value-row :keyName="i18n.ReleaseTime" :value="item.timestr2"></key-value-row>
</view>
</view>
<u-loadmore :status="loadStatus" :loading-text="loadingText" :loadmore-text="loadmoreText"
:nomore-text="nomoreText" v-if="userInfoObj.length" height="80" />
</view>
</template>
<script>
import KeyValueRow from '../../components/KeyValueRow/KeyValueRow.vue';
import api from '@/utils/api'
import constant from '@/utils/constant.js';
export default {
components: { KeyValueRow },
name: "mineRecord",
data() {
return {
dataList: [{}],
form: {
pageNumber: 1,
pageSize: 20,
},
baseURL: '',
isLoadMore: false, //是否加载中
loadStatus: 'loadmore',
loadingText: this.$t("login").toload,
loadmoreText: this.$t("login").pullup,
nomoreText: this.$t("login").Nomore,
userInfoObj: [],
};
},
computed: {
@ -40,11 +51,60 @@ export default {
return this.$t("mine");
},
},
onReachBottom() {
if (!this.isLoadMore) {
this.form.pageNumber += 1
this.getList();
}
},
onLoad() {
this.getList()
},
onShow() { },
methods: {
getList() {
this.isLoadMore = true
api.mineRecord(this.form).then(res => {
if (res.content.length) {
if (this.form.pageNumber > 1) {
this.userInfoObj = this.userInfoObj.concat(res.content)
for (var i = 0; i < this.userInfoObj.length; i++) {
if (this.userInfoObj[i].addTime) {
this.userInfoObj[i].timestr = this.$index.formatyymmddhhmmss(this.userInfoObj[
i].addTime)
}
if (this.userInfoObj[i].releaseTime) {
this.userInfoObj[i].timestr2 = this.$index.formatyymmddhhmmss(this.userInfoObj[
i].releaseTime)
}
}
} else {
this.userInfoObj = res.content
for (var i = 0; i < this.userInfoObj.length; i++) {
if (this.userInfoObj[i].addTime) {
this.userInfoObj[i].timestr = this.$index.formatyymmddhhmmss(this.userInfoObj[
i].addTime)
}
if (this.userInfoObj[i].releaseTime) {
this.userInfoObj[i].timestr2 = this.$index.formatyymmddhhmmss(this.userInfoObj[
i].releaseTime)
}
}
}
if (this.userInfoObj.length >= Number(res.totalElements)) { // 判断接口返回数据量小于请求数据量，则表示此为最后一页
this.isLoadMore = true
this.loadStatus = 'nomore'
} else {
this.isLoadMore = false
}
} else {
this.isLoadMore = true
this.loadStatus = 'nomore'
this.userInfoObj = []
}
this.$forceUpdate()
})
},
},
}
</script>

157
pages/subscription/details.vue
View File

@ -7,36 +7,36 @@
<view class="countDown">
<view class="item">
<view class="title">{{ i18n.Days }}</view>
<view class="value">20</view>
<view class="value">{{day}}</view>
</view>
<view class="item">
<view class="title">{{ i18n.Hours }}</view>
<view class="value">8</view>
<view class="value">{{hr}}</view>
</view>
<view class="item">
<view class="title">{{ i18n.Minutes }}</view>
<view class="value">47</view>
<view class="value">{{min}}</view>
</view>
<view class="item">
<view class="title">{{ i18n.Seconds }}</view>
<view class="value">9</view>
<view class="value">{{sec}}</view>
</view>
</view>
<!-- input -->
<view class="input-item">
<u-input class="input" v-model="SubscribeCount" color="#A1A0A8" fontSize="32rpx" border="none"
:placeholder="i18n.PleaseChooseCoin">
:placeholder="i18n.PleaseChooseCoin" @focus="SubscribeCount=''">
</u-input>
<view class="selectCoin" @click="USDTPopupShow = true">USDT
<view class="selectCoin" @click="USDTPopupShow = true">{{deinfo.sysCoinInfo.coinCode}}
</view>
</view>
<!-- total -->
<key-value-row :keyName="i18n.Total" :value="'≈ 993.64069952 ACTA'" :size="'24rpx'" :leftColor="'#A1A0A8'"
:rightColor="'#A1A0A8'"></key-value-row>
<key-value-row :keyName="i18n.Total" :value="'≈'+coinPirce+deinfo.coins[0].code" :size="'24rpx'"
:leftColor="'#A1A0A8'" :rightColor="'#A1A0A8'"></key-value-row>
<!-- 按钮 -->
<u-button class="button" color="#00E8A2" throttleTime="500">{{
<u-button class="button" color="#00E8A2" throttleTime="500" :disabled="SubscribeNowed" @click="subscribe">{{
i18n.SubscribeNow
}}
</u-button>
@ -44,37 +44,31 @@
<!-- ProjectDetails -->
<view class="contentTitle">
<view class="ProjectDetails">{{ i18n.ProjectDetails }}</view>
<view class="videoBtn">{{ i18n.Video }}</view>
<view class="whiteBook">{{ i18n.WhiteBook }}</view>
<view class="videoBtn" @click="getContact('video')">{{ i18n.Video }}</view>
<view class="whiteBook" @click="getContact('book')">{{ i18n.WhiteBook }}</view>
</view>
<!-- 文字内容 -->
<view class="content">Access to COVID-19 Tools Accelerator (ACTA) is a fully decentralized financial (DeFi)
ecosystem with blockchain as the underlying architecture, 100% decentralized exchange, 100% free
trading, 100% customized trading model, 100% cross-chain support. We have pre-customized two trading
models, ACTA/BTC and ACTA/USDT. ACTA/BTC is the mainstream currency with stable appreciation space;
ACTA/USDT is a stable settlement virtual currency which can be 1:1 freely convertible with US dollars.
ACTA is the leader of the global digital encryption currency decentralized market.
Full name of the token: Access to COVID-19 Tools Accelerator
ACTA total circulation: 1,200,000,000.00
ICO Price: 0.02 USDT
ICO Time: From December 12,2021 to March 12, 2022</view>
<view class="content">{{des}}</view>
</view>
</view>
</template>
<script>
import KeyValueRow from '../../components/KeyValueRow/KeyValueRow.vue';
import UButton from '../../uview-ui/components/u-button/u-button'
export default {
import KeyValueRow from '../../components/KeyValueRow/KeyValueRow.vue';
import UButton from '../../uview-ui/components/u-button/u-button'
import api from '@/utils/api'
import constant from '@/utils/constant.js';
export default {
name: "subscriptionDetails",
data() {
return {
// 计算的价格
coinPirce: 0,
toLiveBtn: '',
_interval: null,
des: '',
SubscribeCount: 0,
DonatePopupShow: false,
USDTPopupShow: false,
@ -82,28 +76,120 @@ export default {
coinInfo: {},
rules: {},
radioValue: '',
baseURL: '',
deinfo: {},
day: '',
hr: '',
min: '',
sec: '',
};
},
computed: {
i18n() {
return this.$t("subscription");
},
SubscribeNowed() {
if (this.SubscribeCount == 0 || !this.SubscribeCount || isNaN(this.SubscribeCount)) {
return true
} else {
return false
}
}
},
onLoad() {
watch: {
SubscribeCount: {
handler(newName, oldName) {
this.SubscribeCount = newName
this.coinPirce = newName / this.deinfo.sysCoinInfo.initalPrice
this.coinPirce = parseFloat(this.coinPirce.toPrecision(10))
this.coinPirce = String(this.coinPirce)
this.coinPirce = this.coinPirce.substring(0, this.coinPirce.indexOf(".") + 9);
}
}
},
onLoad(res) {
this.baseURL = constant.BASE_URL
this.getDetail(res.id);
// console.log(this.$t('login.emailInputMessage'));
},
onShow() { },
onShow() {},
methods: {
//提交申购订单
subscribe() {
api.exchangeCoin({
baseSymbol: this.deinfo.coins[0].code,
coinSymbol: this.deinfo.sysCoinInfo.coinCode,
baseAmount: this.SubscribeCount,
}).then(res => {
uni.$u.toast(this.$t("login").Successfulsubscription)
})
},
//当离开页面时，清除倒计时
beforeDestroy() {
clearInterval(this._interval)
},
// 倒计时事件
countdown(e) {
const that = this
that._interval = setInterval(() => {
if (e == 0) {
// 计时结束，清除缓存
clearInterval(that._interval)
} else {
e--
let day = parseInt(e / 60 / 60 / 24)
let hr = parseInt(e / 60 / 60 % 24)
let min = parseInt(e / 60 % 60)
let sec = parseInt(e % 60)
this.day = day > 9 ? day : '0' + day
this.hr = hr > 9 ? hr : '0' + hr
this.min = min > 9 ? min : '0' + min
this.sec = sec > 9 ? sec : '0' + sec
that.toLiveBtn = `${this.day}天${this.hr}时${this.min}分${this.sec}秒`
}
}, 1000);
},
radioChange(e) {
// console.log(e);
},
// 跳转视频和pdfe
getContact(e) {
let url;
if (e == 'video') {
url = this.deinfo.sysCoinInfo.videoWebsite
} else {
url = this.deinfo.sysCoinInfo.whitePaperWebsite
}
// #ifdef APP-PLUS
plus.runtime.openURL(url);
// #endif
// #ifdef H5
window.location.href = url
// #endif
},
components: { UButton, KeyValueRow }
}
// 申购详情
getDetail(e) {
api.subscription({
coinCode: e,
}).then(res => {
this.deinfo = res;
this.des = this.deinfo.sysCoinInfo.info
this.deinfo.lefttime=this.deinfo.lefttime/1000
this.countdown(this.deinfo.lefttime)
})
},
},
components: {
UButton,
KeyValueRow
}
}
</script>
<style lang="scss" scoped>
.main {
.main {
.body {
overflow: hidden;
@ -124,7 +210,7 @@ export default {
box-sizing: border-box;
.item {
width: 140rpx;
// width: 140rpx;
height: 174rpx;
font-weight: bold;
@ -247,6 +333,7 @@ export default {
font-size: 24rpx;
color: #A1A0A8;
margin-bottom: 48rpx;
line-height: 40rpx;
}
@ -254,5 +341,5 @@ export default {
}
}
}
</style>

201
pages/subscription/index.vue
View File

@ -2,64 +2,77 @@
<view class="main">
<!-- nav -->
<view class="nav-head">
<view class="navItem" @click="pageState = 'product'" :class="{ select: pageState === 'product' }">
<view class="navItem" @click="pageState = 'product',getInfo('product')"
:class="{ select: pageState === 'product' }">
{{ i18n.Product }}
</view>
<view class="navItem" @click="pageState = 'pending'" :class="{ select: pageState === 'pending' }">
<view class="navItem" @click="pageState = 'pending',getInfo('pending')"
:class="{ select: pageState === 'pending' }">
{{ i18n.Pending }}
</view>
<view class="navItem" @click="pageState = 'complete'" :class="{ select: pageState === 'complete' }">
<view class="navItem" @click="pageState = 'complete',getInfo('complete')"
:class="{ select: pageState === 'complete' }">
{{ i18n.Complete }}
</view>
</view>
<!-- Product 产品列表 -->
<view class="cardList">
<view class="card" v-for="(item, index) in 10" :key="index" @click="gotoDetails(index)">
<view class="card" v-for="(item, index) in info" :key="index" @click="gotoDetails(item,index)"
v-if="pageState === 'product'">
<!-- 卡片条件渲染 -->
<!-- product -->
<card-header v-if="pageState === 'product'" :iconName="'../../static/maskets/bye.png'"
:title="'BTC(Bitcoin)'" :rightName="i18n.Subscribe" :hasBtn="true" :btnColor="'#00E8A2'">
<card-header v-if="pageState === 'product'" :iconName="baseURL+'/coins/'+item.coinCode+'.png'"
:title="item.fullName"
:rightName="item.status=='open'?'Subscribe':item.status=='close'?'Ended':'Coming soon'"
:hasBtn="true" :btnColor="item.status=='open'?'#00E8A2':item.status=='close'?'#A1A0A8':'#F2FE8D'">
</card-header>
<view class="dataBody" v-if="pageState === 'product'">
<key-value-row :keyName="i18n.STLTotalCirculation" :value="'23989'"></key-value-row>
<key-value-row :keyName="i18n.PrivateSalePrice" :value="'284145.61'"></key-value-row>
<key-value-row :keyName="i18n.ICOTime" :value="'2022/08/06-2022/08/31'"></key-value-row>
<key-value-row :keyName="i18n.STLTotalCirculation" :value="item.issueAmount"></key-value-row>
<key-value-row :keyName="i18n.PrivateSalePrice" :value="item.initalPrice+item.coinCode">
</key-value-row>
<key-value-row :keyName="i18n.ICOTime" :value="item.timestr"></key-value-row>
</view>
</view>
<view class="card" v-for="(item, index) in userInfoObj" :key="index" v-if="pageState === 'pending'">
<!-- pending -->
<card-header v-if="pageState === 'pending'" :iconName="'../../static/maskets/bye.png'"
:title="'973430980989323445'" :rightName="'Pending'" fontColor="#00E8A2">
<card-header v-if="pageState === 'pending'" :iconName="baseURL+'/coins/'+item.coinSymbol+'.png'"
:title="item.orderNo" :rightName="item.status" :fontColor="item.status=='undone'?'#A1A0A8':item.status=='cancel'?'#F4506A':'#00E8A2'">
</card-header>
<view class="dataBody" v-if="pageState === 'pending'">
<key-value-row :keyName="i18n.Price" :value="'284145.61'"></key-value-row>
<key-value-row :keyName="i18n.Quantity" :value="'1000'"></key-value-row>
<key-value-row :keyName="i18n.USDT" :value="'3166.61'"></key-value-row>
<key-value-row :keyName="i18n.Time" :value="'2022/08/06 14:51'"></key-value-row>
<key-value-row :keyName="i18n.Price" :value="item.pendingPrice"></key-value-row>
<key-value-row :keyName="i18n.Quantity" :value="item.pendingAmount"></key-value-row>
<key-value-row :keyName="i18n.USDT" :value="parseInt(item.usdtPrice,16)"></key-value-row>
<key-value-row :keyName="i18n.Time" :value="item.addTimeStr"></key-value-row>
</view>
</view>
<view class="card" v-for="(item, index) in userInfoObj" :key="index" v-if="pageState === 'complete'">
<!-- complete -->
<card-header v-if="pageState === 'complete'" :iconName="'../../static/maskets/bye.png'"
:title="'973430980989323445'" :rightName="'complete'" fontColor="#00E8A2">
<card-header v-if="pageState === 'complete'" :iconName="baseURL+'/coins/'+item.coinSymbol+'.png'"
:title="item.orderNo" :rightName="item.status" :fontColor="item.status=='undone'?'#A1A0A8':item.status=='cancel'?'#F4506A':'#00E8A2'">
</card-header>
<view class="dataBody" v-if="pageState === 'complete'">
<key-value-row :keyName="i18n.Price" :value="'284145.61'"></key-value-row>
<key-value-row :keyName="i18n.Quantity" :value="'1000'"></key-value-row>
<key-value-row :keyName="i18n.ConfirmAmount" :value="'999'" :leftColor="'#F2FE8D'"
<key-value-row :keyName="i18n.Price" :value="item.pendingPrice"></key-value-row>
<key-value-row :keyName="i18n.Quantity" :value="item.pendingAmount"></key-value-row>
<key-value-row :keyName="i18n.ConfirmAmount" :value="item.tradeAmount" :leftColor="'#F2FE8D'"
:rightColor="'#F2FE8D'"></key-value-row>
<key-value-row :keyName="i18n.USDT" :value="'3166.61'"></key-value-row>
<key-value-row :keyName="i18n.CheckTheNumberoOfUSDT" :value="'2000'" :leftColor="'#F2FE8D'"
<key-value-row :keyName="i18n.USDT" :value="parseInt(item.usdtPrice,16)"></key-value-row>
<key-value-row :keyName="i18n.CheckTheNumberoOfUSDT" :value="item.realAmount" :leftColor="'#F2FE8D'"
:rightColor="'#F2FE8D'">
</key-value-row>
<key-value-row :keyName="i18n.Time" :value="'2022/08/06 14:51'"></key-value-row>
<key-value-row :keyName="i18n.Time" :value="item.addTimeStr"></key-value-row>
</view>
</view>
</view>
<u-empty :text="i18n.Dataisempty" mode="data" v-if="info.length==0&&pageState=='product'"></u-empty>
<u-loadmore :status="loadStatus" :loading-text="loadingText" :loadmore-text="loadmoreText"
:nomore-text="nomoreText" v-if="info.length&&pageState=='product'" height="80" />
<!-- 申购记录的为空提示 -->
<u-empty :text="i18n.Dataisempty" mode="data" v-if="userInfoObj.length==0" v-show="pageState=='undone'||pageState=='complete'"></u-empty>
<u-loadmore :status="loadStatus2" :loading-text="loadingText2" :loadmore-text="loadmoreText2"
:nomore-text="nomoreText2" v-if="userInfoObj.length" height="80" />
<!-- tabBar -->
<tab-bar :selectActive="4"></tab-bar>
@ -67,43 +80,143 @@
</template>
<script>
import CardHeader from '../../components/cardHeader/cardHeader.vue';
import KeyValueRow from '../../components/KeyValueRow/KeyValueRow.vue';
export default {
components: { KeyValueRow, CardHeader },
import CardHeader from '../../components/cardHeader/cardHeader.vue';
import KeyValueRow from '../../components/KeyValueRow/KeyValueRow.vue';
import api from '@/utils/api'
import constant from '@/utils/constant.js';
export default {
components: {
KeyValueRow,
CardHeader
},
name: 'subscription',
data() {
return {
baseURL: '',
userInfoObj: [],
isLoadMore: false, //是否加载中
loadStatus: 'loadmore',
loadingText: this.$t("login").toload,
loadmoreText: this.$t("login").pullup,
nomoreText: this.$t("login").Nomore,
info: [],
pageState: 'product', // 当前页签状态
}
form: {
pageNumber: 1,
pageSize: 20,
status: '',
},
onLoad() {
// 用户申购记录的
isLoadMore2: false, //是否加载中
loadStatus2: 'loadmore',
loadingText2: this.$t("login").toload,
loadmoreText2: this.$t("login").pullup,
nomoreText2: this.$t("login").Nomore,
}
},
onLoad() {},
onShow() {
},
onHide() {
this.baseURL = constant.BASE_URL
this.getGoods();
},
onHide() {},
computed: {
i18n() {
return this.$t('subscription')
}
},
methods: {
gotoDetails(index) {
//看是获取用户申购记录还是申购列表 product 是获取申购列表 其它两个是获取记录
getInfo(e) {
this.info=[];
this.userInfoObj=[]
if (e == 'product') {
this.getGoods()
}
if (e == 'pending') {
this.form.status = 'undone'
this.getList()
}
if (e == 'complete') {
this.form.status = 'complete'
this.getList()
}
},
//用户申购记录
getList() {
this.isLoadMore2 = true
api.subscriptionRecord(this.form).then(res => {
if (res.content.length) {
if (this.form.pageNumber > 1) {
this.userInfoObj = this.userInfoObj.concat(res.content)
for (var i = 0; i < this.userInfoObj.length; i++) {
if (this.userInfoObj[i].addTime) {
this.userInfoObj[i].timestr = this.$index.formatyymmddhhmmss(this.userInfoObj[
i].addTime)
}
}
} else {
this.userInfoObj = res.content
for (var i = 0; i < this.userInfoObj.length; i++) {
if (this.userInfoObj[i].addTime) {
this.userInfoObj[i].timestr = this.$index.formatyymmddhhmmss(this.userInfoObj[
i].addTime)
}
}
}
if (this.userInfoObj.length >= Number(res.totalElements)) { // 判断接口返回数据量小于请求数据量，则表示此为最后一页
this.isLoadMore2 = true
this.loadStatus2 = 'nomore'
} else {
this.isLoadMore2 = false
}
} else {
this.isLoadMore2 = true
this.loadStatus2 = 'nomore'
this.userInfoObj = []
}
this.$forceUpdate()
})
},
//申购币列表
getGoods() {
api.subscriptionList().then(res => {
this.info = res;
this.isLoadMore = true
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[
i].startDate)
}
}
})
},
gotoDetails(i, index) {
if (this.pageState !== 'product') return
if (i.status == 'close') {
uni.$u.toast(this.$t("subscription").Subcompleted)
return;
}
if (i.status == 'unstart') {
uni.$u.toast(this.$t("subscription").Substarted)
return;
}
uni.navigateTo({
url: `/pages/subscription/details?id=${index}`
url: `/pages/subscription/details?id=${i.coinCode}`
});
}
}
}
}
</script>
<style lang="scss" scoped>
.main {
/deep/ .cardHeader .button {
width: 160rpx;
}
.main {
padding-bottom: 198rpx; // 避免底部TabBar盖住内容
.nav-head {
@ -160,5 +273,5 @@ export default {
}
}
</style>

5
pages/withdrawal/withdrawal.vue
View File

@ -166,6 +166,7 @@
import api from '@/utils/api'
import constant from '@/utils/constant.js';
import KeyValueRow from '../../components/KeyValueRow/KeyValueRow.vue';
import md5 from 'js-md5'
export default {
components: {
KeyValueRow
@ -255,14 +256,14 @@
tranAmt: this.coinInfo.tranAmt,
addressId: this.coinInfo.addressId,
coinCode: this.coinInfo.coinCode2,
payPassword: this.coinInfo.payPassword
payPassword:md5(this.coinInfo.payPassword),
}
}else{
info={
type: this.coinInfo.type,
tranAmt: this.coinInfo.tranAmt,
addressId: this.coinInfo.addressId,
payPassword: this.coinInfo.payPassword
payPassword:md5(this.coinInfo.payPassword),
}
}
api.withdraw(info).then(res => {

2
pages/withdrawal/withdrawalRecord.vue
View File

@ -64,7 +64,7 @@
<view style="padding:20rpx 32rpx;">
<key-value-row :keyName="i18n.USDTRate" :value="item.usdtRate"></key-value-row>
<!-- 问 -->
<key-value-row :keyName="i18n.USDT" :value="parseInt(item.channelAmount,16)"></key-value-row>
<key-value-row :keyName="i18n.USDT" :value="item.usdt"></key-value-row>
</view>
<view style="border-top: 2rpx solid #323045;padding:20rpx 32rpx;">
<key-value-row :keyName="i18n.CardNo" :value="item.acctId">

BIN
static/me/myTeambg.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 MiB

8
utils/language/en_US.js
View File

@ -10,6 +10,8 @@ export default {
},
// 登陆相关页面
login: {
Purchasesucceeded:'Purchase succeeded',
Successfulsubscription:'Successful subscription',
Withdrawalsucceeded:'Withdrawal succeeded',
Deletesucceeded:'Delete succeeded',
Savesucceeded:'Saved successfully',
@ -194,11 +196,12 @@ export default {
//mine
mine: {
Dataisempty:'Data is empty',
MinePool: 'Mine pool',
OpenMine: 'Open mine',
MineDetails: 'Mine details',
Record: 'Record',
Dataisempty:'Data is empty',
YourBTC: 'Your BTC',
LockBTC: 'Lock BTC',
dayproduce: '1 day produce',
@ -303,6 +306,9 @@ export default {
// 申购页面相关 subscription
subscription: {
Subcompleted:'Subscription has been completed',
Substarted:'Subscription has not started',
Dataisempty:'Data is empty',
// 公共
Product: 'Product',
Pending: 'Pending',

Write Preview
Loading…
Cancel
Save