diff --git a/apis/index.js b/apis/index.js index dd9661c..b8e5669 100644 --- a/apis/index.js +++ b/apis/index.js @@ -32,7 +32,7 @@ const request = (parameter) => { 'Authorization': store.getters.getToken || '' } - console.log('parameterDbug', parameter) + // console.log('parameterDbug', parameter) // 加载提示 uni.showLoading({ diff --git a/pages.json b/pages.json index f00470f..259312e 100644 --- a/pages.json +++ b/pages.json @@ -178,6 +178,33 @@ "navigationBarTextStyle": "white" }, "name": "Fragment" + },{ + "path": "pages/wallet/addCard", + "style": { + "navigationBarTitleText": "添加银行卡", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#774ffd", + "navigationBarTextStyle": "white" + }, + "name": "addCard" + },{ + "path": "pages/wallet/selectCard", + "style": { + "navigationBarTitleText": "银行卡列表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#774ffd", + "navigationBarTextStyle": "white" + }, + "name": "selectCard" + },{ + "path": "pages/wallet/withdrawList", + "style": { + "navigationBarTitleText": "提现记录", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#774ffd", + "navigationBarTextStyle": "white" + }, + "name": "withdrawList" } ], "globalStyle": { diff --git a/pages/wallet/addCard.vue b/pages/wallet/addCard.vue new file mode 100644 index 0000000..02446ee --- /dev/null +++ b/pages/wallet/addCard.vue @@ -0,0 +1,180 @@ + + + + + diff --git a/pages/wallet/extract.vue b/pages/wallet/extract.vue index bf4858d..053a33b 100644 --- a/pages/wallet/extract.vue +++ b/pages/wallet/extract.vue @@ -1,393 +1,408 @@ diff --git a/pages/wallet/fragment.vue b/pages/wallet/fragment.vue index 60857ee..8554eb6 100644 --- a/pages/wallet/fragment.vue +++ b/pages/wallet/fragment.vue @@ -188,6 +188,52 @@ background-color: #fff; } + .record-list { + padding: 20rpx 30rpx; + + .record-list-item { + padding: 30rpx 0; + border-bottom: solid 1rpx #f7f7f7; + display: flex; + flex-direction: row; + align-items: center; + justify-content: flex-start; + box-sizing: border-box; + .record-icon{ + width: 60rpx; + margin-right: 20rpx; + } + .record-list-item-top { + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + width: 600rpx; + + .title { + font-size: 28rpx; + width: 600rpx; + color: #444; + } + + .money { + color: #ee4c47; + font-size: 40rpx; + font-weight: bold; + // padding-top: 20rpx; + position: relative; + top: 20rpx; + } + } + + .record-list-item-date { + font-size: 26rpx; + color: #a6a6a6; + margin-top: 10rpx; + } + } + } .record-top { width: calc(100% - 60rpx); height: 360rpx; @@ -292,47 +338,6 @@ } } - .record-list { - padding: 20rpx 30rpx; - .record-list-item { - padding: 20rpx 0; - border-bottom: solid 1rpx #f7f7f7; - display: flex; - flex-direction: row; - align-items: flex-start; - justify-content: flex-start; - box-sizing: border-box; - .record-icon{ - width: 60rpx; - margin-right: 20rpx; - } - .record-list-item-top { - display: flex; - flex-direction: row; - align-items: center; - justify-content: space-between; - box-sizing: border-box; - width: 600rpx; - .title { - font-size: 28rpx; - width: 600rpx; - color: #444; - } - - .money { - color: #ee4c47; - font-size: 32rpx; - font-weight: bold; - } - } - - .record-list-item-date { - font-size: 26rpx; - color: #a6a6a6; - margin-top: 10rpx; - } - } - } diff --git a/pages/wallet/property.vue b/pages/wallet/property.vue index f732923..bf4bf93 100644 --- a/pages/wallet/property.vue +++ b/pages/wallet/property.vue @@ -3,9 +3,11 @@ - 能量球 (≈ {{ price || '0' }} CNY) - {{ balance.balance || '0' }} - {{ balance.frozen || '0' }} 冻结中 + 能量球钱包 + + + {{ balance.balance || '0.00' }} + {{ balance.frozen || '0.00' }} 冻结中 区块链地址 @@ -29,7 +31,7 @@ 验证密码 - + 取消 @@ -67,45 +69,76 @@ }; }, onShow() { - Promise.all([ - sum(), - price(), - logs() - ]).then(res => { - this.balance = res[0] - this.price = res[1] - this.logs = res[2] - }).catch(err => { - uni.showToast({ - icon: 'none', - title: err.message - }) - }) + this.getsum() + this.getlog() + this.getprice() }, methods: { + getsum() { + sum().then(res => { + this.balance = res + }).catch(err => { + uni.showToast({ + icon: 'none', + title: err.message + }) + }) + }, + getprice() { + price().then(res => { + console.log(res,'87..........') + this.price = res + }).catch(err => { + uni.showToast({ + icon: 'none', + title: err.message + }) + }) + }, + getlog() { + logs().then(res => { + console.log(res,'98 ...........') + this.logs = res + }).catch(err => { + uni.showToast({ + icon: 'none', + title: err.message + }) + }) + }, // 弹出私钥 - showPrivatekey(pages){ + showPrivatekey(pages) { this.passwordPages = pages this.$refs.showPassword.open('center') }, // 验证私钥 - payPassword(type){ - if(type === 'confirm'){ - if(this.password === '') { + payPassword(type) { + if (type === 'confirm') { + if (this.password === '') { uni.showToast({ title: '请输入安全密码', - icon : 'none' + icon: 'none' }) return } securityCheck(this.password).then(res => { this.$refs.showPassword.close() - switch (this.passwordPages){ + switch (this.passwordPages) { case 'privatekey': - this.$Router.push({name:'Privatekey', params: {password: this.password}}) + this.$Router.push({ + name: 'Privatekey', + params: { + password: this.password + } + }) break; case 'resetPassword': - this.$Router.push({name:'ResetPassword', params: {password: this.password}}) + this.$Router.push({ + name: 'ResetPassword', + params: { + password: this.password + } + }) break; } this.password = '' @@ -135,10 +168,11 @@ uni.showModal({ title: '我的区块链地址', content: '\n地址可以理解为银行卡卡号，与他人转账时是区块链上的两个地址间的交易行为\n\n' + this.balance.address, - cancelText: '复制', - cancelColor: '#b11eff', + confirmText: '复制', + confirmColor: '#b11eff', + showCancel:false, success: (res) => { - if (res.cancel) { + if (res.confirm) { uni.setClipboardData({ data: this.balance.address }) @@ -173,26 +207,30 @@ diff --git a/pages/wallet/withdrawList.vue b/pages/wallet/withdrawList.vue new file mode 100644 index 0000000..338cf5f --- /dev/null +++ b/pages/wallet/withdrawList.vue @@ -0,0 +1,398 @@ + + + + + diff --git a/static/imgs/bankLogo.png b/static/imgs/bankLogo.png new file mode 100644 index 0000000..eeda7bb Binary files /dev/null and b/static/imgs/bankLogo.png differ