From 564d5921bcf233166f5021370a3ea81f12d9f949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Sun, 12 Jun 2022 12:43:05 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=85=AC=E7=AB=8B=E4=BA=BA=E7=94=9F?=
=?UTF-8?q?=E8=AE=A1=E6=97=B6=E5=99=A8=E8=B0=83=E6=95=B4=EF=BC=8C=E4=BC=9A?=
=?UTF-8?q?=E5=91=98=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apis/interfaces/user.js | 5 +-
pages.json | 2 +-
pages/account/dt.vue | 4 +-
pages/account/resetPassword.vue | 5 +-
pages/account/transfer.vue | 2 +-
pages/auth/auth.vue | 4 +-
pages/invitation/invitation.vue | 8 +-
pages/life/life.vue | 50 +-
pages/user/index.vue | 97 +-
pages/vip/vip.vue | 53 +-
.../dist/dev/app-plus/app-config-service.js | 2 +-
unpackage/dist/dev/app-plus/app-service.js | 13259 ++++++++--------
unpackage/dist/dev/app-plus/app-view.js | 6997 ++++----
13 files changed, 10423 insertions(+), 10065 deletions(-)
diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js
index 802ba34..ceef1e4 100644
--- a/apis/interfaces/user.js
+++ b/apis/interfaces/user.js
@@ -15,9 +15,10 @@ const info = () =>{
}
// 导出助记词
-const chainSeed = () => {
+const chainSeed = (data) => {
return request({
- url: 'chain/safe/seed'
+ url: 'chain/safe/seed',
+ data
})
}
diff --git a/pages.json b/pages.json
index 68525b3..c3e54c6 100644
--- a/pages.json
+++ b/pages.json
@@ -259,7 +259,7 @@
"app-plus": {
"titleNView": {
"buttons": [{
- "text": "充值",
+ "text": "收款",
"width": "60",
"fontSize": "14"
}]
diff --git a/pages/account/dt.vue b/pages/account/dt.vue
index 3293ae1..4b3d30c 100644
--- a/pages/account/dt.vue
+++ b/pages/account/dt.vue
@@ -5,7 +5,7 @@
DT积分余额
{{score}}
-
+
@@ -79,7 +79,7 @@
},
onNavigationBarButtonTap() {
this.$Router.push({
- name: 'AccountRecharge'
+ name: 'AccountCode'
})
}
}
diff --git a/pages/account/resetPassword.vue b/pages/account/resetPassword.vue
index 190a555..593db7a 100644
--- a/pages/account/resetPassword.vue
+++ b/pages/account/resetPassword.vue
@@ -8,11 +8,11 @@
-
+
-
+
@@ -104,7 +104,6 @@
}
})
}).catch(err => {
- console.log(err)
uni.showToast({
icon: 'none',
title: err.message
diff --git a/pages/account/transfer.vue b/pages/account/transfer.vue
index e42be75..bdbff30 100644
--- a/pages/account/transfer.vue
+++ b/pages/account/transfer.vue
@@ -65,7 +65,7 @@
if(!res.has_transfer_password){
uni.showModal({
title : '提示',
- content : '暂未设置账户密码，无法发起转账，请设置后重试',
+ content : '暂未设置账户支付密码，无法发起转账，请设置后重试',
cancelText : '稍后设置',
confirmText : '立即设置',
success : modalRes => {
diff --git a/pages/auth/auth.vue b/pages/auth/auth.vue
index fef89cf..6437a3c 100644
--- a/pages/auth/auth.vue
+++ b/pages/auth/auth.vue
@@ -13,9 +13,9 @@
-
+
diff --git a/pages/invitation/invitation.vue b/pages/invitation/invitation.vue
index 09d46bb..ec84c97 100644
--- a/pages/invitation/invitation.vue
+++ b/pages/invitation/invitation.vue
@@ -69,9 +69,9 @@
provider: 'weixin',
scene : 'WXSceneSession',
type : 0,
- href : 'http://invite.uzchain.tech?invitation_code=' + this.invite,
+ href : 'https://invite.gongli.vip?invitation_code=' + this.invite,
title : '共力生态',
- summary : '共力生态 共力 共赢 共享 带你进入web3.0！',
+ summary : '共商 共建 共享 共赢 带您进入Web 3.0！推动全体成员共同富裕',
imageUrl: 'https://gl-ecological.oss-cn-zhangjiakou.aliyuncs.com/images/2022/06/11/3b7e6e330f465ecbf136d15def1039fd.jpg',
fail(err) {
uni.showToast({
@@ -86,8 +86,8 @@
provider: 'weixin',
scene : 'WXSceneTimeline',
type : 0,
- href : 'http://invite.uzchain.tech?invitation_code=' + this.invite,
- title : '共力生态 共力 共赢 共享',
+ href : 'https://invite.gongli.vip?invitation_code=' + this.invite,
+ summary : '共商 共建 共享 共赢 带您进入Web 3.0！推动全体成员共同富裕',
imageUrl: 'https://gl-ecological.oss-cn-zhangjiakou.aliyuncs.com/images/2022/06/11/3b7e6e330f465ecbf136d15def1039fd.jpg',
fail(err) {
uni.showToast({
diff --git a/pages/life/life.vue b/pages/life/life.vue
index 41e5c94..d713410 100644
--- a/pages/life/life.vue
+++ b/pages/life/life.vue
@@ -13,11 +13,11 @@
{{isSign ? 'GLF': '签到'}}
-
+
{{base_hour}}
GLF/h
-
+
{{ timeData.hours > 9 ? timeData.hours: '0'+timeData.hours}}:
{{ timeData.minutes > 9 ? timeData.minutes: '0'+timeData.minutes }}:
@@ -25,7 +25,7 @@
-
+
@@ -66,20 +66,20 @@
-
+
邀请朋友
- 加速共力值增长
+ 加速共力分增长
@@ -90,14 +90,14 @@
{{order.all || '暂无订单'}}
-
+
@@ -121,10 +121,10 @@
},
message: 0,
order: {
- all: 0,
- init: 0,
- pay: 0,
- delivered: 0
+ all : 0,
+ init : 0,
+ pay : 0,
+ delivered : 0
},
nextSignAt : 0,
glz : 0,
@@ -142,6 +142,11 @@
TimeDown(e){
this.timeData = e
},
+ // 倒计时结束
+ TimeFinish(){
+ this.isSign = false
+ clearInterval(account)
+ },
// 共力人生
getLife(){
life().then(res => {
@@ -168,10 +173,22 @@
},
// 计时器
outTime(){
- account = setInterval(() =>{
- let newGlz = (Number(this.glz) + this.base_seconds)
- this.glz = newGlz.toFixed(4)
- }, 1000)
+ this.$nextTick(() => {
+ try{
+ // 计算数值
+ account = setInterval(() =>{
+ let newGlz = (Number(this.glz) + this.base_seconds)
+ this.glz = newGlz.toFixed(4)
+ }, 1000)
+ // 签到开始倒计时
+ this.$refs.countDown.start();
+ }catch(e){
+ uni.showToast({
+ title: e,
+ icon : 'none'
+ })
+ }
+ })
},
// 签到
onSign(){
@@ -213,6 +230,7 @@
},
onHide() {
clearInterval(account)
+ this.$refs.countDown.pause();
}
}
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 118d880..91c5a4a 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -26,7 +26,7 @@
- 共力会员
+ {{serial === '' ? '共力会员': 'NO:' + serial}}
@@ -52,19 +52,23 @@
我的订单
-
+
+ {{order.init}}
待付款
-
+
+ {{order.paid}}
待发货
-
+
+ {{order.delivered}}
待收货
-
+
+ {{order.refund}}
退换货
@@ -119,7 +123,17 @@
mode="widthFix">
-
+
+
+
+
+
+
+
+
+
@@ -128,6 +142,9 @@
info,
chainSeed
} from '@/apis/interfaces/user';
+ import {
+ payPassword
+ } from '@/apis/interfaces/account.js'
import {
getVersions
} from '@/apis/interfaces/versions.js'
@@ -151,7 +168,17 @@
dt : 0.00
},
mnemonic : '',
- wordsShow: false
+ wordsShow: false,
+ order : {
+ init : 0,
+ paid : 0,
+ delivered: 0,
+ refund : 0
+ },
+ serial : '',
+ hasPassword : false,
+ showIv : false,
+ iv : ''
};
},
onShow() {
@@ -162,18 +189,22 @@
getInfo() {
if (this.$store.state.token === '') return;
info().then(res => {
+ console.log(res)
uni.setNavigationBarTitle({
title: res.nickname
});
- this.cardText = res.identity_array
- this.userInfo = {
+ this.cardText = res.identity_array
+ this.userInfo = {
nickname : res.nickname,
addr : res.addr,
avatar : res.avatar,
isOpenVip : res.is_open_vip,
+ username : res.username
}
- this.identity = res.identity
- this.account = res.account
+ this.identity = res.identity
+ this.account = res.account
+ this.serial = res.serial
+ this.hasPassword = res.has_transfer_password
})
.catch(err => {
uni.showToast({
@@ -184,8 +215,32 @@
},
// 导出助记词
onMnemonic(){
- chainSeed().then(res => {
+ if(!this.hasPassword){
+ uni.showModal({
+ title : '提示',
+ content : '暂未设置账户支付密码，无法导出助记词，请设置密码后重试',
+ cancelText : '稍后设置',
+ confirmText : '立即设置',
+ success : modalRes => {
+ if(modalRes.confirm){
+ this.$Router.push({name: 'AccountResetPassword', params: {phone: this.userInfo.username}})
+ return
+ }
+ this.showIv = false
+ }
+ })
+ return
+ }
+ this.showIv = true
+
+ },
+ // 验证支付密码
+ validationIv(){
+ chainSeed({
+ password: this.iv
+ }).then(res => {
this.mnemonic = res.seed
+ this.showIv = false
this.wordsShow = true
}).catch(err => {
uni.showToast({
@@ -461,7 +516,8 @@
display: flex;
justify-content: space-between;
- &-item {
+ &-item {
+ position: relative;
width: 25%;
padding: $padding $padding/2;
text-align: center;
@@ -475,7 +531,20 @@
.title {
font-size: $title-size-sm;
margin-top: $margin/3;
- }
+ }
+
+ .number{
+ position: absolute;
+ top: 22rpx;
+ z-index: 2;
+ right: 20%;
+ background: $text-price;
+ color: white;
+ font-size: 22rpx;
+ min-width: 30rpx;
+ line-height: 30rpx;
+ border-radius: 50%;
+ }
}
}
diff --git a/pages/vip/vip.vue b/pages/vip/vip.vue
index 3277f7c..1a33847 100644
--- a/pages/vip/vip.vue
+++ b/pages/vip/vip.vue
@@ -2,10 +2,10 @@
-
+
{{user.nickname}}
到期日期：{{endedAt}}
- 续费
+ 续费
@@ -42,8 +42,28 @@
会员折扣说明
- 前{{item.open_number}} - {{item.open_number + item.stock}}名享开通会员折扣价{{item.price}}元
- 10000后会员恢复原价199.00元
+
+
+ 10
+ 59.0
+ 10
+
+
+ 10
+ 59.0
+ 10
+
+
+ 10
+ 59.0
+ 10
+
+