From 58f944e74c0fc663ee78f962eff53395a09220da Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Fri, 25 Dec 2020 18:02:28 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app

---
 hive-app/pages/mine/index.vue |   37 ++++++++++++++++++++++++++++---------
 1 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/hive-app/pages/mine/index.vue b/hive-app/pages/mine/index.vue
index 19cfa5d..2c18582 100644
--- a/hive-app/pages/mine/index.vue
+++ b/hive-app/pages/mine/index.vue
@@ -31,7 +31,9 @@
 			<view class="tab-box">
 				<h-tabs 
 					class="tab"
+					:activeIndex="type-1"
 					:tabData="tabs" 
+					@tabClick="tabChange"
 					:config="{
 						color: '#abb1cc',
 						activeColor: '#518EFF',
@@ -45,29 +47,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,18 +113,35 @@
 						name: '上月'
 					},
 				],
+				userAchieve: {}
 	      }  
 	    },
 		onShow() {
-			this.getUserInfo()
+			this.getUserAchieve()
 		},
 	    methods: {
 			getUserInfo(){
 				this.$httpUtils.request('/api/user/findUserAchieve/'+this.type).then((res) => {
 					if(res.status == 200){
-						
+						let {achieve} = res.mapInfo;
+						this.userAchieve = achieve || {};
 					}
 				})
+			},
+			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){
+				console.log(e)
+				this.type = e + 1;
+				this.getUserAchieve()
 			}
 	    }
 	}

--
Gitblit v1.9.1