diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..5ee8b9d
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,11 @@
+{
+ "requires": true,
+ "lockfileVersion": 1,
+ "dependencies": {
+ "lodash": {
+ "version": "4.17.21",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+ }
+ }
+}
diff --git a/static/img/contract/bubble.png b/static/img/contract/bubble.png
new file mode 100644
index 0000000..3509978
Binary files /dev/null and b/static/img/contract/bubble.png differ
diff --git a/static/img/contract/setting.png b/static/img/contract/setting.png
new file mode 100644
index 0000000..de9b4cd
Binary files /dev/null and b/static/img/contract/setting.png differ
diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue
index 397c7e1..f4fdfba 100644
--- a/subpkg/finance/finance.vue
+++ b/subpkg/finance/finance.vue
@@ -3,20 +3,23 @@
-
- 张三
-
+
+ {{userInfo.nickname}}
+
账户充值
-
+
账户总金额(元)
- 1338.96
- 可提现金额
+ 1338.96
+
+
+ 可提现金额100.00元
+
@@ -26,10 +29,17 @@
export default {
data() {
return {
-
+ userInfo:{}
}
},
- onLoad() {},
+ onLoad() {
+ // console.log(this.userInfo);
+ this.userInfo = this.$store.state.app.userInfo;
+ uni.setNavigationBarColor({
+ frontColor: '#ffffff',
+ backgroundColor: '#3175f9'
+ })
+ },
onShow() {},
methods: {
naviTo(url) {
@@ -57,13 +67,17 @@ export default {
padding: 10rpx 28rpx;
.left{
display: flex;
+ align-items: center;
flex: 1;
font-size: 28rpx;
font-weight: 500;
color: #FFFFFF;
+ .name{
+ margin: 0 17.5rpx;
+ }
image{
- width: 30rpx;
- height: 30rpx;
+ width: 40rpx;
+ height: 40rpx;
}
}
.right{
@@ -74,6 +88,29 @@ export default {
}
.center{
color: #fff;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ .title{
+ font-size: 25rpx;
+ font-weight: 400;
+ line-height: 39rpx;
+ }
+ .price{
+ font-size: 60rpx;
+ font-weight: bold;
+ line-height: 39rpx;
+ margin-top: 28rpx;
+ margin-bottom: 14rpx;
+ }
+ .bubble{
+ padding: 20rpx 28rpx 10rpx 28rpx;
+ background-image: url('../../static/img/contract/bubble.png');
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ .text{
+ }
+ }
}
}
diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue
index 6512400..956f8ce 100644
--- a/subpkg/topUp/topUp.vue
+++ b/subpkg/topUp/topUp.vue
@@ -21,7 +21,7 @@
v-for="(item, index) in priceList" :key="index">{{item}}
-
+
注意事项
@@ -33,17 +33,26 @@