diff --git a/pages.json b/pages.json
index 4c6acb9..0fccc91 100644
--- a/pages.json
+++ b/pages.json
@@ -184,7 +184,17 @@
"navigationBarTextStyle": "white"
},
"name": "ResetPassword"
- } ],
+ },{
+ "path": "pages/wallet/fragment",
+ "style": {
+ "navigationBarTitleText": "能量碎片记录",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#774ffd",
+ "navigationBarTextStyle": "white"
+ },
+ "name": "Fragment"
+ }
+ ],
"globalStyle": {
"navigationStyle": "custom",
"backgroundColor": "#F5F5F5"
diff --git a/pages/user/index.vue b/pages/user/index.vue
index c996934..453afb5 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..afd839a 100644
--- a/pages/wallet/extract.vue
+++ b/pages/wallet/extract.vue
@@ -1,7 +1,7 @@
- 账户能量球将提现到银行卡
+ 能量球提现至银行卡
+
+
+
+
+ 年账单
+ 月账单
+ 日账单
+
+
+
+ 碎片个数
+ {{account || '0.00'}} 个
+
+
+
+
+ {{date?date:'选择日期'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完成任务获得碎片完成任务获得碎片完成任务获得碎片完成任务获得碎片完成任务获得碎片完成任务获得碎片
+ {{cointype==='in'?'+':'-'}}5
+
+ 2021-12-22 12:12:12
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/wallet/property.vue b/pages/wallet/property.vue
index 5583158..25d426d 100644
--- a/pages/wallet/property.vue
+++ b/pages/wallet/property.vue
@@ -266,8 +266,8 @@
}
.balance {
- font-size: $title-size * 2;
- padding: ($padding / 2) 0;
+ font-size: $title-size * 2.5;
+ padding: $padding 0;
color: white;
}
@@ -275,18 +275,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 +295,7 @@
color: $text-price;
margin: 0 $margin;
border-radius: $radius-m;
- font-size: $title-size;
+ font-size: 28rpx;
}
}
}
diff --git a/scss/globa.scss b/scss/globa.scss
index f63b05f..e4906a3 100644
--- a/scss/globa.scss
+++ b/scss/globa.scss
@@ -76,7 +76,7 @@ $padding: 30rpx;
-webkit-line-clamp: 2;
}
-.ellipsis {
+.ellipsis-1 {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
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..4480415
Binary files /dev/null and b/static/imgs/record-icon.png differ