diff --git a/pages/user/index.vue b/pages/user/index.vue index 44189f1..d93da78 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -162,7 +162,7 @@ - 我的下级 + 我的团队 {{userInfo.bd_spread_count||0}} diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index bdb659e..4def2d5 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -569,6 +569,14 @@ title: '可用余额:', payStatus: this.$store.getters.globalData.yue_pay_status, }, + { + "name": "佣金支付", + "icon": "icon-yinhangqia", + value: 'brokerage', + title: '佣金支付:', + payStatus: 1, + // payStatus: this.$store.getters.globalData.yue_pay_status, + }, { name: "支付宝支付", icon: "icon-icon34", diff --git a/pages/users/user_spread_money/index.vue b/pages/users/user_spread_money/index.vue index 05a9ae7..452b4ce 100644 --- a/pages/users/user_spread_money/index.vue +++ b/pages/users/user_spread_money/index.vue @@ -4,6 +4,22 @@ + + + + 收入 + + + + 支出 + + + + 冻结 + + + + @@ -102,7 +118,10 @@ userInfo:'', times: [], start: "", - stop: "" + stop: "", + activeIndex:0, + status:null, + pm:1 }; }, computed: mapGetters(['isLogin','viewColor']), @@ -133,6 +152,21 @@ this.getRecordList(); }, methods: { + getStatus(val){ + + if(val!=2){ + this.status=null; + this.pm=val; + if(val==1){this.activeIndex=0;} + if(val==0){this.activeIndex=1;} + + }else{ + this.status=0; + this.pm=null; + this.activeIndex=2 + } + this.getRecordList(); + }, spreadInfo(){ spreadInfo().then(res => { this.userInfo = res.data @@ -167,7 +201,9 @@ page: page, limit: limit, start: start, - stop: stop + stop: stop, + status:that.status, + pm:that.pm }, recordType).then(res => { let len = res.data.list.length; let recordListData = res.data.list; @@ -182,7 +218,9 @@ page: page, limit: limit, start: start, - stop: stop + stop: stop, + status:that.status, + pm:that.pm }).then(res => { let len = res.data.list.length; let recordListData = res.data.list; @@ -239,4 +277,26 @@ margin-right: 6rpx; font-weight: normal; } + .statusList{ + + display: flex; + justify-content: space-between; + padding-top:10rpx; + background-color: #fff; + .statusItem{ + flex:1; + text-align: center; + .flag{ + width:40rpx; + height:10rpx; + background-color: #116636; + border-radius: 10px; + margin:0 auto; + margin-top:20rpx; + } + } + } + .active{ + color:#116636; + }