diff --git a/apis/interfaces/mine.js b/apis/interfaces/mine.js
index d154f62..e838a28 100644
--- a/apis/interfaces/mine.js
+++ b/apis/interfaces/mine.js
@@ -69,7 +69,7 @@ const browsers = (page) => {
// 修改用户头像或昵称
const resetUserInfo= (data) => {
return request({
- url: 'user/'+data.key,
+ url: 'user/setting/'+data.key,
method: 'PUT',
data:{
value:data.value
diff --git a/apis/interfaces/setting.js b/apis/interfaces/setting.js
index 6f59950..f903b7c 100644
--- a/apis/interfaces/setting.js
+++ b/apis/interfaces/setting.js
@@ -25,7 +25,7 @@ const wechatbind = (data) => {
// 修改用户头像或昵称
const resetUserInfo = (data) => {
return request({
- url: 'user/' + data.key,
+ url: 'user/setting/' + data.key,
method: 'PUT',
data: {
value: data.value
diff --git a/pages.json b/pages.json
index 500a99a..3727567 100644
--- a/pages.json
+++ b/pages.json
@@ -218,6 +218,15 @@
"style": {
"navigationBarTitleText": "营销推广码"
}
+ }, {
+ "path": "pages/wallet/fragment",
+ "style": {
+ "navigationBarTitleText": "能量碎片记录",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#774ffd",
+ "navigationBarTextStyle": "white"
+ },
+ "name": "Fragment"
}],
"globalStyle": {
"navigationStyle": "custom",
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 993b4c5..c3de68a 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -135,8 +135,8 @@
能量球钱包
{{userData.account.coins || 0}}
-
- 能量碎片
+
+ 能量碎片
{{userData.account.score || 0}}
diff --git a/pages/wallet/extract.vue b/pages/wallet/extract.vue
index 1823bf8..bf4858d 100644
--- a/pages/wallet/extract.vue
+++ b/pages/wallet/extract.vue
@@ -1,7 +1,7 @@
- 账户能量球将提现到银行卡
+ 能量球提现至银行卡
diff --git a/pages/wallet/property.vue b/pages/wallet/property.vue
index 5583158..f732923 100644
--- a/pages/wallet/property.vue
+++ b/pages/wallet/property.vue
@@ -1,13 +1,15 @@
+
能量球 (≈ {{ price || '0' }} CNY)
{{ balance.balance || '0' }}
{{ balance.frozen || '0' }} 冻结中
区块链地址
- 我的私钥
+
+ 能量球提现
@@ -241,18 +243,31 @@
position: relative;
padding-top: var(--status-bar-height);
background-image: linear-gradient(to right, #7c52fc, #976dff);
-
- &::before {
+ position: relative;
+ overflow: hidden;
+ .record-bg {
position: absolute;
- left: 0;
- top: 0;
- width: 100%;
- height: 100%;
- content: " ";
- background-image: url(@/static/background/wallet-back.png);
- background-size: 100%;
- background-repeat: no-repeat;
+ width: 120%;
+ height: 300rpx;
+ bottom: -10rpx;
+ right: -20rpx;
+ z-index: 1;
+ opacity: .5;
+ transform:rotate(-7deg);
}
+ // &::before {
+ // position: absolute;
+ // left: 0;
+ // top: 0;
+ // width: 100%;
+ // height: 100%;
+ // content: " ";
+ // background-image: url(@/static/imgs/account-bg.png);
+ // background-size: 100%;
+ // background-repeat: no-repeat;
+ // opacity: .5;
+ // transform:rotate(0deg);
+ // }
.propery-content {
position: relative;
@@ -266,8 +281,8 @@
}
.balance {
- font-size: $title-size * 2;
- padding: ($padding / 2) 0;
+ font-size: $title-size * 2.5;
+ padding: $padding 0;
color: white;
}
@@ -275,18 +290,17 @@
background: rgba($color: #000000, $alpha: .1);
color: rgba($color: white, $alpha: .7);
display: inline-block;
- padding: 0 $padding;
- font-size: $title-size-m;
- height: 50rpx;
- line-height: 50rpx;
+ font-size: 24rpx;
+ padding: 6rpx $padding;
border-radius: $radius-m;
border: solid 1rpx rgba($color: white, $alpha: .4)
+
}
.balance-flex {
display: flex;
justify-content: center;
- margin-top: $margin * 3;
+ margin-top: $margin * 2;
.balance-flex-item {
background-color: white;
@@ -296,7 +310,7 @@
color: $text-price;
margin: 0 $margin;
border-radius: $radius-m;
- font-size: $title-size;
+ font-size: 28rpx;
}
}
}
diff --git a/static/imgs/account-bg.png b/static/imgs/account-bg.png
new file mode 100644
index 0000000..166699c
Binary files /dev/null and b/static/imgs/account-bg.png differ
diff --git a/static/imgs/record-icon.png b/static/imgs/record-icon.png
new file mode 100644
index 0000000..9464afb
Binary files /dev/null and b/static/imgs/record-icon.png differ