From 4300b5c714bb7e09f53f7d722c953dec9c809d8e Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Mon, 04 Jan 2021 17:08:59 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master
---
hive-app/pages/mine/index.vue | 73 +++++++++++++++++++++++++++---------
1 files changed, 55 insertions(+), 18 deletions(-)
diff --git a/hive-app/pages/mine/index.vue b/hive-app/pages/mine/index.vue
index 19cfa5d..afd239a 100644
--- a/hive-app/pages/mine/index.vue
+++ b/hive-app/pages/mine/index.vue
@@ -5,22 +5,24 @@
<view class="status_bar"></view>
<!-- #endif -->
<view class="header">
- <navigator url="./setting" class="icon white iconfont iconshezhi right"></navigator>
+ <view class="right">
+ <text class=" white iconfont iconshezhi icon" @click="toSetting"></text>
+ </view>
<view class="flex align-center">
- <image class="header-img ml-15" src="../../static/images/head-img.jpg"></image>
- <view class="flex flex-v ml-20">
+ <image class="header-img ml-10" :src="userInfo.photo?userInfo.photo:'../../static/images/default-avatar.png'"></image>
+ <view class="flex flex-v ml-15">
<view>
- <text class="font-18 white mr-5">222是个帅哥</text>
+ <text class="font-18 white mr-5">{{userInfo.name}}</text>
<text class="white icon iconfont iconxiugai"></text>
</view>
<view class="flex mt-10">
- <view class="mr-20">
+ <view class="mr-20 ellipsis ellipsis-rolename">
<text class="white mr-5 font-14">职位:</text>
- <text class="white font-14">靓仔</text>
+ <text class="white font-14">{{userInfo.roleName}}</text>
</view>
- <view>
+ <view class="ellipsis ellipsis-shopname">
<text class="white mr-5 font-14">门店:</text>
- <text class="white font-14">梅溪湖店</text>
+ <text class="white font-14">{{userInfo.shopName}}</text>
</view>
</view>
</view>
@@ -31,7 +33,9 @@
<view class="tab-box">
<h-tabs
class="tab"
+ :activeIndex="type-1"
:tabData="tabs"
+ @tabClick="tabChange"
:config="{
color: '#abb1cc',
activeColor: '#518EFF',
@@ -45,29 +49,29 @@
<view class="performance-content">
<view class="flex justify-around">
<view class="flex flex-v align-center performance-item">
- <text class="font-16 red">600.00</text>
+ <text class="font-16 red">{{userAchieve.orderCash | formatNum}}</text>
<text class="mt-5">订单业绩</text>
</view>
<view class="flex flex-v align-center performance-item">
- <text class="font-16 green">600.00</text>
+ <text class="font-16 green">{{userAchieve.cash | formatNum}}</text>
<text class="mt-5">现金业绩</text>
</view>
<view class="flex flex-v align-center performance-item">
- <text class="font-16 purple">600.00</text>
+ <text class="font-16 purple">{{userAchieve.cardUse | formatNum}}</text>
<text class="mt-5">划扣业绩</text>
</view>
</view>
<view class="flex justify-around mt-15">
<view class="flex flex-v align-center performance-item">
- <text class="font-16 blueness">600.00</text>
- <text class="mt-5">本金业绩</text>
+ <text class="font-16 blueness">{{userAchieve.hisConsume | formatNum}}</text>
+ <text class="mt-5">本金消耗</text>
</view>
<view class="flex flex-v align-center performance-item">
- <text class="font-16 orange">600.00</text>
+ <text class="font-16 orange">{{userAchieve.freeConsume | formatNum}}</text>
<text class="mt-5">赠送消耗</text>
</view>
<view class="flex flex-v align-center performance-item">
- <text class="font-16 yellow">600.00</text>
+ <text class="font-16 yellow">{{userAchieve.projCommission | formatNum}}</text>
<text class="mt-5">服务提成</text>
</view>
</view>
@@ -111,17 +115,37 @@
name: '上月'
},
],
+ userAchieve: {},
+ userInfo: {}
}
},
onShow() {
- this.getUserInfo()
+ this.getUserAchieve();
+ this.getUserInfo();
},
methods: {
getUserInfo(){
+ let roleInfo = this.$httpUtils.getRoleInfo();
+ this.userInfo = roleInfo || {};
+ },
+ getUserAchieve(){
this.$httpUtils.request('/api/user/findUserAchieve/'+this.type).then((res) => {
if(res.status == 200){
-
+ let {achieve} = res.mapInfo;
+ this.userAchieve = achieve || {};
+ }else{
+ this.userAchieve = {};
}
+ })
+ },
+ tabChange(e){
+ this.type = e + 1;
+ this.getUserAchieve()
+ },
+ toSetting(){
+ let isLogin = (JSON.stringify(this.userInfo) !== '{}')?1:0;
+ uni.navigateTo({
+ url: './setting?isLogin='+isLogin
})
}
}
@@ -140,7 +164,7 @@
background: #518EFF;
border-bottom-left-radius: 20px;
border-bottom-right-radius: 20px;
- padding: 15px;
+ padding: 15px 10px;
}
.icon {
font-size: 18px;
@@ -150,6 +174,7 @@
width: 64px;
height: 64px;
border-radius: 50%;
+ flex: 0 0 64px;
}
.content{
padding: 0 10px;
@@ -183,4 +208,16 @@
background: #FFFFFF;
font-size: 15px;
}
+ .ellipsis{
+ color: #FFFFFF;
+ overflow: hidden;
+ text-overflow:ellipsis;
+ white-space: nowrap;
+ }
+ .ellipsis-rolename{
+ max-width: 125px;
+ }
+ .ellipsis-shopname{
+ max-width: 90px;
+ }
</style>
--
Gitblit v1.9.1