From 394680088918c050f208ab2544328be0a037253e Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Sun, 26 Sep 2021 14:52:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=A4=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/index.js | 2 +- pages.json | 27 ++ pages/wallet/addCard.vue | 180 +++++++++ pages/wallet/extract.vue | 739 +++++++++++++++++----------------- pages/wallet/fragment.vue | 87 ++-- pages/wallet/property.vue | 131 ++++-- pages/wallet/selectCard.vue | 120 ++++++ pages/wallet/withdrawList.vue | 398 ++++++++++++++++++ static/imgs/bankLogo.png | Bin 0 -> 4471 bytes 9 files changed, 1237 insertions(+), 447 deletions(-) create mode 100644 pages/wallet/addCard.vue create mode 100644 pages/wallet/selectCard.vue create mode 100644 pages/wallet/withdrawList.vue create mode 100644 static/imgs/bankLogo.png 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 0000000000000000000000000000000000000000..eeda7bba99c9e77ebff2fe9b7ba3ee89e5ef994c GIT binary patch literal 4471 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 JPDHLkV1i17Y>)r| literal 0 HcmV?d00001 From d455049e5f7753f8fa1c5b1df790bd2ef0fe4602 Mon Sep 17 00:00:00 2001 From: zhangmanman <994797151@qq.com> Date: Sun, 26 Sep 2021 16:13:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=91=E7=8E=B0=E6=9B=B4=E5=A4=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/interfaces/crystal.js | 2 +- pages/found/index.vue | 767 ++++++++++---------------- pages/instrument/Spread.vue | 8 +- pages/user/code.vue | 9 +- static/icons/store_codeBack.png | Bin 92904 -> 100252 bytes static/icons/store_contBack.png | Bin 24917 -> 65820 bytes static/user/sign_arrow.png | Bin 0 -> 14663 bytes static/user/sign_icon.png | Bin 0 -> 5241 bytes static/user/sign_icon_active.png | Bin 0 -> 4970 bytes static/user/sign_icon_last.png | Bin 0 -> 4025 bytes static/user/sign_icon_last_active.png | Bin 0 -> 3874 bytes static/user/sign_img_54.png | Bin 0 -> 2715 bytes static/user/sign_privilege.png | Bin 0 -> 1677 bytes static/user/sign_tips.png | Bin 0 -> 32987 bytes 14 files changed, 305 insertions(+), 481 deletions(-) create mode 100644 static/user/sign_arrow.png create mode 100644 static/user/sign_icon.png create mode 100644 static/user/sign_icon_active.png create mode 100644 static/user/sign_icon_last.png create mode 100644 static/user/sign_icon_last_active.png create mode 100644 static/user/sign_img_54.png create mode 100644 static/user/sign_privilege.png create mode 100644 static/user/sign_tips.png diff --git a/apis/interfaces/crystal.js b/apis/interfaces/crystal.js index 96f97f6..4ac815a 100644 --- a/apis/interfaces/crystal.js +++ b/apis/interfaces/crystal.js @@ -34,7 +34,7 @@ const category = () => { // 水晶任务 const task = () => { return request({ - url: 'crystal/task' + url: 'tasks' }) } diff --git a/pages/found/index.vue b/pages/found/index.vue index 706aafc..6d87ba2 100644 --- a/pages/found/index.vue +++ b/pages/found/index.vue @@ -1,141 +1,106 @@ diff --git a/pages/instrument/Spread.vue b/pages/instrument/Spread.vue index 48c53b6..946a64f 100644 --- a/pages/instrument/Spread.vue +++ b/pages/instrument/Spread.vue @@ -1,7 +1,7 @@