From 8e18254cd6301ef3c8cdb6591c80e7a3e72e938f Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 8 Dec 2023 15:27:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=96=87=E5=88=9B?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4=E7=9B=B8=E5=85=B3=E7=BB=9F=E8=AE=A1=E5=92=8C?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E7=BB=9F=E8=AE=A1=E5=88=86=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member_income_incomedetails_controller.js  | 18 +++++++++++++++---
 .../member_income_withdrawal_controller.js     | 12 +++++++++---
 src/views/member/weight_value/detailed.vue     | 10 +++++++---
 src/views/member/weight_value/home.vue         | 18 +++++++++---------
 .../weight_value/legumes/record_list.vue       |  4 ++--
 5 files changed, 42 insertions(+), 20 deletions(-)

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'">
             <div class="list-block" v-for="(item,index) in list" :key="index">
               <div class="left">
-                <div class="left-title">{{ item.order_sn }}</div>
-                  <div class="left-time">{{ item.created_at }}</div>
+                <div class="left-title" v-if="page_params.key_name === 'service_income'">服务收益</div>
+                <div class="left-title" v-else-if="page_params.key_name === 'contribution_income'">贡献收益</div>
+                <div class="left-title" v-else-if="page_params.key_name === 'ecological_construction'">生态建设</div>
+                <div class="left-title" v-else-if="page_params.key_name === 'ecological_services'">生态服务</div>
+                <div class="left-time">{{ item.created_at }}</div>
               </div>
               <div class="right">
                 <div class="right-increase">+ {{ item.amount }}</div>
@@ -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 @@
         <div class="my-income box-item">
           <div class="income-top">
             <div class="left-title">我的收入</div>
-            <div class="right-btn" @click="goToPage('withdrawal')">去易出<i class="fa fa-angle-right"></i></div>
+            <div class="right-btn" @click="goToPage('withdrawal',{},{ content_type: 'cultural_space' })">去易出<i class="fa fa-angle-right"></i></div>
           </div>
           <div class="income-list">
             <div class="income-list-block" v-for="(item,index) in income_list" :key="index" @click="goToPage(item.path_name,{},item.query)">
@@ -43,7 +43,7 @@
       <template v-else>
         <!--可提现金额&团队人数-->
         <div class="money-and-team box-item">
-          <div class="team-block" @click="goToPage('withdrawal')">
+          <div class="team-block" @click="goToPage('withdrawal',{},{ content_type: 'broker' })">
             <div class="team-block-title">
               可提现(元)<i class="fa fa-angle-right"></i>
             </div>
@@ -65,7 +65,7 @@
               <div class="top-income">{{ total_income }}</div>
             </div>
             <div class="top-block">
-              <div class="top-title" @click="goToPage('incomedetails')">
+              <div class="top-title" @click="goToPage('incomedetails',{},{ content_type: 'broker' })">
                 收入明细<i class="fa fa-angle-right"></i>
               </div>
             </div>
@@ -82,7 +82,7 @@
       <!--常用工具-->
       <div class="tool-title">常用工具</div>
       <div class="tool-content box-item">
-        <div class="tool-block" v-for="(item,index) in tool_list" :key="index" @click="toolGoToPage(item.path_name)">
+        <div class="tool-block" v-for="(item,index) in tool_list" :key="index" @click="toolGoToPage(item.path_name,{}, item.query)">
           <div class="tool-left">
             <img class="tool-icon" :src="require('../../../assets/images/weight_value/' + item.icon)" />
           </div>
@@ -120,14 +120,14 @@ export default {
       cultural_space_tool_list: [
         { title: '我的客户', sub_title: '团队客户明细', icon: '003.png', path_name: 'myRelationship' },
         { title: '分享二维码', sub_title: '生成分享码', icon: '004.png', path_name: 'qrcode' },
-        { title: '团队业绩', sub_title: '团队累计业绩', icon: '005.png', path_name: 'incomedetails' },
+        { title: '团队业绩', sub_title: '团队累计业绩', icon: '005.png', path_name: 'incomedetails',query: { content_type: 'cultural_space' } },
       ],
       broker_tool_list:[
         { title: '我的权重值', sub_title: '查看权重值', icon: '001.png', path_name: 'weight_value' },
         // { title: '我的典藏', sub_title: '我的画作', icon: '002.png', path_name: 'collection_room' },
         { title: '我的客户', sub_title: '团队客户明细', icon: '003.png', path_name: 'myRelationship' },
         { title: '分享二维码', sub_title: '生成分享码', icon: '004.png', path_name: 'qrcode' },
-        { title: '团队业绩', sub_title: '团队累计业绩', icon: '005.png', path_name: 'incomedetails' },
+        { title: '团队业绩', sub_title: '团队累计业绩', icon: '005.png', path_name: 'incomedetails',query: { content_type: 'broker' } },
       ],
       tool_list: [],
       // 海报
@@ -145,7 +145,7 @@ export default {
         {title: '消费增值', sub_title: '查看文创豆收益', icon: '1.png', path_name: 'legumes_center_withdrawal_record', query: {} },
         {title: '生态发展收益', sub_title: '好友购买得奖励', icon: '2.png', path_name: 'legumes_center_record_list', query: { type_name: 'ecological' } },
         {title: '贡献分红', sub_title: '贡献值分红', icon: '3.png', path_name: 'legumes_center_record_list', query: { type_name: 'contribution' } },
-        {title: '股权收益', sub_title: '懂事参与分股权', icon: '4.png', path_name: 'legumes_center_record_list', query: { type_name: 'shareholding' } },
+        {title: '权证兑换', sub_title: '懂事参与分股权', icon: '4.png', path_name: 'legumes_center_record_list', query: { type_name: 'shareholding' } },
       ]
     };
   },
@@ -221,10 +221,10 @@ export default {
       }
     },
     // 工具跳转处理
-    toolGoToPage(pathName){
+    toolGoToPage(pathName,params = {}, query = {}){
       if(pathName === 'weight_value') this.goToPage('weight_value',{},{ team_level_id: this.page_params.team_level_id});
       else if(pathName === 'qrcode') this.getPoster();
-      else this.goToPage(pathName);
+      else this.goToPage(pathName,params,query);
     },
     // 生成分享二维码海报
     getPoster(e) {
diff --git a/src/views/member/weight_value/legumes/record_list.vue b/src/views/member/weight_value/legumes/record_list.vue
index fccfb42..9916623 100644
--- a/src/views/member/weight_value/legumes/record_list.vue
+++ b/src/views/member/weight_value/legumes/record_list.vue
@@ -49,7 +49,7 @@
         <div class="top-info-content" v-else-if="page_params.type_name == 'shareholding'">
           <div class="hold-info">
             <div class="hold-num">{{ info.weight_income }}</div>
-            <div class="hold-desc">股权收益明细<i class="fa fa-angle-right"></i></div>
+            <div class="hold-desc" @click="goToPage('weight_value_detailed',{},{key_name: 'weight_income',content_type: 'cultural_space'})">权证兑换明细<i class="fa fa-angle-right"></i></div>
           </div>
           <div class="statistics-list">
             <div class="statistics-block">
@@ -151,7 +151,7 @@ export default {
       title_list: {
         ecological: '生态发展收益',
         contribution: '贡献分红',
-        shareholding: '股权收益',
+        shareholding: '权证兑换',
       },
       info: {},
       // 分页信息