user-serve

api/user.js

@@ -767,7 +767,7 @@ export function getGqList(data) {
 }
 
 export function getStaffInfo(data) {
-	return request.get('userShareholding',data);
+	return request.get('member',data);
 }
 
 //股权提现
@@ -777,4 +777,11 @@ export function equityWithdrawal(data) {
 
 export function getYjList(data) {
 	return request.get('getPerformanceList',data);
+}
+//阶梯
+export function getJt(data) {
+	return request.get('group_data',data);
+}
+export function getmember(data) {
+	return request.get('member',data);
 }

pages/user/index.vue

@@ -436,6 +436,14 @@
 			    <view class="iconfont icon-xiangyou"></view>
 			  </view>
 			</view>
+			<view class="item acea-row row-between-wrapper" hover-class="none"
+			  @click="goMenuPage('/pages/users/user_spread_money/index?type=7', '阶梯奖励')">
+			  <image src="/static/images/jtjl.png"></image>
+			  <view class="text acea-row row-between-wrapper">
+			    <view>阶梯奖励</view>
+			    <view class="iconfont icon-xiangyou"></view>
+			  </view>
+			</view>
 			<view class="item acea-row row-between-wrapper" hover-class="none"
 			  @click="goMenuPage('/pages/users/user_spread_money/index?type=4', '我的提现')">
 			  <image src="/static/images/staffTarget.png"></image>

pages/users/user_payment/index.vue

@@ -332,8 +332,12 @@
 				getStaffInfo({
 					uid: that.userinfo.uid
 				}).then(res => {
-					that.staffInfo = res.data.list[0]
-					
+					// that.staffInfo = res.data.list[0]
+					res.data.list.forEach(item => {
+						if(item.uid == that.userinfo.uid) {
+							that.staffInfo = item
+						}
+					})
 				})
 			},
 			changePayType: function(e) {

pages/users/user_spread_money/index.vue

@@ -2,7 +2,7 @@
 	<view :style="colorStyle">
 		<view class='commission-details'>
 			<view class='search acea-row row-between-wrapper'
-				v-if="recordType != 1 && recordType != 4 && recordType!=5 && recordType!= 6">
+				v-if="recordType != 1 && recordType != 4 && recordType!=5 && recordType!= 6 && recordType!= 7">
 				<view class='input'>
 					<text class="iconfont icon-sousuo4"></text>
 					<input placeholder='搜索用户名称' placeholder-class='placeholder' v-model="keyword" @confirm="submitForm"
@@ -17,21 +17,32 @@
 					手工业绩
 				</view>
 			</view>
-			<timeSlot @changeTime="changeTime" v-if="recordType!=5"></timeSlot>
+			<view class="nav" v-if="recordType==7">
+				<view class="nav-item" :class="{'action': sevenType == 51}" @click="getJt('re',51)">
+					销售业绩
+				</view>
+				<view class="nav-item" :class="{'action': sevenType == 70}" @click="getJt('re',70)">
+					手工业绩
+				</view>
+			</view>
+			<timeSlot @changeTime="changeTime" v-if="recordType!=5 && recordType!=7"></timeSlot>
 			<view class='sign-record'>
-				<view class="top_num" v-if="recordType != 4 && recordList.length && recordType!=5 && recordType!=6">
+				<view class="top_num" v-if="recordType != 4 && recordList.length && recordType!=5 && recordType!=6 && recordType!=7">
 					支出：¥{{expend || 0}} &nbsp;&nbsp;&nbsp; 收入：¥{{income || 0}}
 				</view>
 				<view class="top_num" v-if="recordType==6">
 					销售业绩：{{sale_sum || 0}} &nbsp;&nbsp;&nbsp; 手工业绩：{{craft_sum || 0}}
 				</view>
+				<view class="top_num" v-if="recordType==7">
+					销售业绩：{{ staffInfo.sale_performance || 0}} &nbsp;&nbsp;&nbsp; 手工业绩：{{staffInfo.craft_performance || 0}}
+				</view>
 				<view class="top_num top_num_2" v-if="recordType == 5">
 					当前股权：{{staffInfo.shareholding}}
 					<view class="tx" @click="navto('/pages/users/user_payment/index?is_gq=1')">
 						提现
 					</view>
 				</view>
-				<view class="box">
+				<view class="box" v-if="recordType !=7">
 					<block v-for="(item,index) in recordList" :key="index" v-if="recordList.length>0">
 						<view class='list' @click="showDetail(item)">
 							<view class='item'>
@@ -43,12 +54,10 @@
 											<view class='name line2'>
 												<text v-if="recordType!=5 && recordType!=6">{{item.title}}</text>
 												<text v-else>{{item.content}}</text>
-												<!-- <text class="status_badge success" v-if="recordType == 4 && item.status == 1">审核通过</text> -->
 												<text class="status_badge default"
 													v-if="recordType == 4 && item.status == 0">待审核</text>
 												<text class="status_badge error"
 													v-if="recordType == 4 && item.status == 2">未通过</text>
-												<!-- 提现记录： 0 待审核 1 通过 2 未通过 -->
 											</view>
 											<view class="mark" v-if="recordType == 4 && item.mark && item.status !== 1">
 												{{item.mark}}</view>
@@ -76,12 +85,26 @@
 						</view>
 					</block>
 				</view>
-
-				<view class='loadingicon acea-row row-center-wrapper' v-if="recordList.length">
-					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-				</view>
-				<view v-if="recordList.length < 1 && page > 1">
-					<emptyPage title='暂无数据~'></emptyPage>
+				<view class="box" v-else>
+					<block v-for="(item,index) in recordList" :key="index" v-if="recordList.length>0">
+						<view class='list' @click="showDetail(item)">
+							<view class='item'>
+								<view class='listn'>
+									<view class='itemn1 acea-row row-between-wrapper'>
+										<view class="flex-g">
+											<view class='name line2'>
+												业绩达到{{item.step}},奖励股权{{item.shareholding}}
+											</view>
+										</view>
+										<template>
+											<view class='num ' v-if="sevenType == 51" :class="{'font-color': staffInfo.sale_performance*1 < item.step*1}">{{staffInfo.sale_performance*1 >= item.step*1 ?  '已完成': '未达到'}}</view>
+											<view class='num font-color' v-if="sevenType == 70" :class="{'font-color': staffInfo.craft_performance*1 < item.step*1}">{{staffInfo.craft_performance*1 >= item.step*1 ?  '已完成': '未达到'}}</view>
+										</template>
+									</view>
+								</view>
+							</view>
+						</view>
+					</block>
 				</view>
 			</view>
 		</view>
@@ -99,7 +122,8 @@
 		getGqList,
 		getStaffInfo,
 		getUserInfo,
-		getYjList
+		getYjList,
+		getJt
 	} from '@/api/user.js';
 	import {
 		toLogin
@@ -120,6 +144,7 @@
 		mixins: [colors],
 		data() {
 			return {
+				sevenType: 51,
 				sixType: 1,
 				sale_sum: 0,
 				craft_sum: 0,
@@ -197,6 +222,13 @@
 
 				this.getStaffInfo()
 				// this.getYjList()
+			} else if(type == 7) {
+				uni.setNavigationBarTitle({
+					title: "阶梯奖励"
+				});
+				this.recordType = 7;
+				this.name = '阶梯奖励';
+				this.getStaffInfo()
 			} else {
 				uni.showToast({
 					title: '参数错误',
@@ -220,6 +252,22 @@
 			}
 		},
 		methods: {
+			getJt(type,id) {
+				if(type == 're') {
+					this.recordList = []
+				}
+				if(id) {
+					this.sevenType = id
+				}
+				getJt({
+					gid:this.sevenType,
+					page: 1,
+					limit: 100
+				}).then(res => {
+					console.log(res)
+					this.recordList = res.data.list
+				})
+			},
 			getYjList(type, sixType) {
 				let that = this;
 				if (sixType) {
@@ -360,10 +408,18 @@
 					getStaffInfo({
 						uid: res.data.uid
 					}).then(ress => {
-						that.staffInfo = ress.data.list[0]
-						if (this.recordType == 6) {
+						
+						ress.data.list.forEach(item => {
+							if(item.uid == res.data.uid) {
+								that.staffInfo = item
+							}
+						})
+						if (that.recordType == 6) {
 							that.getYjList()
 						}
+						if(that.recordType == 7) {
+							that.getJt('re',51)
+						}
 					})
 				})