From 45fb4b11ad51bb38306765b11a6747402e382cee Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 20 Feb 2021 17:37:33 +0800
Subject: [PATCH] fix
---
hive-app/pages/workbench/index.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/hive-app/pages/workbench/index.vue b/hive-app/pages/workbench/index.vue
index 63540aa..b2314e5 100644
--- a/hive-app/pages/workbench/index.vue
+++ b/hive-app/pages/workbench/index.vue
@@ -7,7 +7,7 @@
<view class="header">
<text class="font-16 dark-gray">{{userInfo.shopName}}</text>
<view class="flex align-center">
- <text class="icon gray iconfont iconsousuo mr-15" @click="linkToMember"></text>
+ <text class="icon gray iconfont iconsousuo" @click="linkToMember"></text>
<text class="icon gray iconfont iconjia" @click.stop="isShow=!isShow"></text>
</view>
<popover class="popup-content" v-show="isShow">
@@ -31,11 +31,11 @@
</text>
</view>
<view class="flex flex-v align-center">
- <text class="font-17">¥ {{handleAssets(userAchieve.orderCash)}}</text>
+ <text class="font-17">¥ {{handleAssets(userAchieve.orderCash,userAchieve.cash)}}</text>
<text>今日订单</text>
</view>
<view class="flex flex-v align-center">
- <text class="font-17">¥ {{handleAssets(userAchieve.hisConsume)}}</text>
+ <text class="font-17">¥ {{handleAssets(userAchieve.freeConsume,userAchieve.hisConsume)}}</text>
<text>今日消耗</text>
</view>
<view class="flex flex-v align-center">
@@ -195,9 +195,9 @@
toggleAssets(){
this.isShowAssets = !this.isShowAssets;
},
- handleAssets(val){
+ handleAssets(val, val2 = 0){
if(this.isShowAssets){
- return this.$filters.formatNum(val);
+ return this.$filters.formatNum(val+val2);
}
return '***';
},
@@ -229,13 +229,14 @@
}
.header .icon {
font-size: 16px;
+ padding-left: 15px;
text-align: center;
font-family: texticons;
}
.condition{
position: relative;
background: #518EFF;
- padding: 15px 20px;
+ padding: 20px 20px;
border-radius: 4px;
font-size: 14px;
color: #FFFFFF;
@@ -292,7 +293,7 @@
}
.popup-content-item .text{
border-bottom: 1px solid gray;
- line-height: 32px;
+ line-height: 38px;
display: inline-block;
}
.popup-content-item:nth-last-of-type(1) .text{
--
Gitblit v1.9.1