diff --git a/src/views/member/income/member_income_incomedetails_controller.js b/src/views/member/income/member_income_incomedetails_controller.js index 55142f5..ce40a2b 100644 --- a/src/views/member/income/member_income_incomedetails_controller.js +++ b/src/views/member/income/member_income_incomedetails_controller.js @@ -19,11 +19,19 @@ export default { total_page: 0, income_name_text: "", - isLoading:false + isLoading:false, + + + page_params: {}, + content_type: 'all', }; }, activated() { + this.page_params = Object.assign(this.$route.params, this.$route.query); + this.content_type = this.page_params.content_type || 'all'; + + this.toi = this.fun.getKeyByI(); this.sType = ""; //初始化 this.initData(); @@ -57,7 +65,11 @@ export default { //获取数据 getData() { let that = this; - let json = { income_type: this.sType, page: this.page }; + let json = { + income_type: this.sType, + page: this.page, + content_type: this.content_type + }; that.isLoadMore = false; $http.get("finance.income.get-income-list", json, "加载中...").then( @@ -90,7 +102,7 @@ export default { $http .get( "finance.income.get-income-list", - { income_type: this.sType, page: this.page }, + { income_type: this.sType, page: this.page,content_type: this.content_type }, "加载中..." ) .then( diff --git a/src/views/member/income/member_income_withdrawal_controller.js b/src/views/member/income/member_income_withdrawal_controller.js index f7362a0..e3ece4c 100644 --- a/src/views/member/income/member_income_withdrawal_controller.js +++ b/src/views/member/income/member_income_withdrawal_controller.js @@ -216,10 +216,13 @@ export default { is_show_signing: false, signing_url: '', + page_params: {}, + content_type: 'all', }; }, activated() { + this.page_params = Object.assign(this.$route.params, this.$route.query); this.income_type = null; this.selectBol = true; this.clicktag = 0; @@ -242,6 +245,8 @@ export default { this.poundage_hj = "0.00"; this.actual_amount = "0.00"; + this.content_type = this.page_params.content_type || 'all'; + this.getData(); // 初始化数据 this.getWithdrawType(false); // 获取提现方式 @@ -841,9 +846,10 @@ export default { getData() { // validate_page 实名认证判断 $http - .get( - "finance.income-withdraw.get-withdraw", {validate_page: 1}, "正在获取列表" - ) + .get("finance.income-withdraw.get-withdraw", { + validate_page: 1, + content_type: this.content_type + }, "正在获取列表") .then( (response)=> { if (response.result === 1) { diff --git a/src/views/member/weight_value/detailed.vue b/src/views/member/weight_value/detailed.vue index a90987c..8d731a0 100644 --- a/src/views/member/weight_value/detailed.vue +++ b/src/views/member/weight_value/detailed.vue @@ -90,8 +90,11 @@ || page_params.key_name === 'ecological_services'">
-
{{ item.order_sn }}
-
{{ item.created_at }}
+
服务收益
+
贡献收益
+
生态建设
+
生态服务
+
{{ item.created_at }}
+ {{ item.amount }}
@@ -206,7 +209,7 @@ export default { case 'contribution_value':title = '贡献值明细';break; case 'area_performance':title = '小区业绩明细';break; case 'team_performance':title = '团队总业绩明细';break; - case 'weight_income':title = '加权收益明细';break; + case 'weight_income':title = '权证兑换明细';break; case 'shareholding_income':title = '股权收益明细';break; case 'share_reward':title = '生态发展明细';break; case 'ecological_construction':title = '生态建设明细';break; @@ -222,6 +225,7 @@ export default { case 'peer_level_reward':title = '平级奖励明细';break; case 'weight_value':title = '权重值明细';break; case 'order_money':case 'order_num':title = '订单明细';break; + case 'shareholding':title = '股权收益明细';break; } } diff --git a/src/views/member/weight_value/home.vue b/src/views/member/weight_value/home.vue index 4352126..8345dfd 100644 --- a/src/views/member/weight_value/home.vue +++ b/src/views/member/weight_value/home.vue @@ -28,7 +28,7 @@
我的收入
-
去易出
+
去易出
@@ -43,7 +43,7 @@