diff --git a/src/api/agriculturalTrusteeship/index.js b/src/api/agriculturalTrusteeship/index.js
index 26bf2a62..63918288 100644
--- a/src/api/agriculturalTrusteeship/index.js
+++ b/src/api/agriculturalTrusteeship/index.js
@@ -372,3 +372,39 @@ export function entityEdit(data) {
     data: data
   })
 }
+
+//贷款需求列表
+export function loanDemandList(query) {
+  return request({
+    url: '/depositm/financialService/loanDemandList',
+    headers: {
+      "ACCESS-SESSION-ID": Cookies.get('ACCESS-SESSION-ID')
+    },
+    method: 'get',
+    params: query
+  })
+}
+
+//贷款需求列表
+export function thirdDetail(id,query) {
+  return request({
+    url: '/depositm/financialService/thirdDetail/'+id,
+    headers: {
+      "ACCESS-SESSION-ID": Cookies.get('ACCESS-SESSION-ID')
+    },
+    method: 'get',
+    params: query
+  })
+}
+
+//贷款需求列表
+export function subjectDetail(id,query) {
+  return request({
+    url: '/depositm/financialService/subjectDetail/'+id,
+    headers: {
+      "ACCESS-SESSION-ID": Cookies.get('ACCESS-SESSION-ID')
+    },
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/agriculturalTrusteeship/shop/shopDepositDetail.vue b/src/views/agriculturalTrusteeship/shop/shopDepositDetail.vue
index 8920f180..2db255a9 100644
--- a/src/views/agriculturalTrusteeship/shop/shopDepositDetail.vue
+++ b/src/views/agriculturalTrusteeship/shop/shopDepositDetail.vue
@@ -14,11 +14,11 @@
       <div class="main_content_right_list">
         <div class="main_tit">
           <i></i>
-          <p>家家加加加加加加加就爱简爱家合作社</p>
+          <p>{{stockBase.economicName}}</p>
         </div>
-        <p class="main_content">村口需要水牛石头诚招水牛贷款联系电话165822本人人品优良绝不拖欠还款。</p>
+        <p class="main_content">{{stockBase.remark}}</p>
         <div class="main_money">
-          <p><span>需求金额</span><span>￥</span>512,000.00</p>
+          <p><span>需求金额</span><span>￥</span>{{stockBase.financeAmount}}</p>
         </div>
         <van-divider />
 
@@ -28,6 +28,7 @@
           input-align="right"
           :border="false"
           placeholder="负责人"
+          v-model="stockBase.legalPerson"
         />
 
         <van-field
@@ -36,6 +37,7 @@
           input-align="right"
           :border="false"
           placeholder="联系方式"
+          v-model="stockBase.legalPersonPhone"
         />
 
         <van-field
@@ -44,17 +46,18 @@
           input-align="right"
           :border="false"
           placeholder="地址"
+          v-model="stockBase.shareholdersAddress"
         />
 
       </div>
       <div class="main_content_right_list2">
         <div>
           <p>托管农户数（户）</p>
-          <p>366</p>
+          <p>{{depositTghtNum}}</p>
         </div>
         <div>
           <p>托管面积（亩）</p>
-          <p>366</p>
+          <p>{{depositArea}}</p>
         </div>
       </div>
     </div>
@@ -64,19 +67,27 @@
 </template>
 <script>
   import Cookies from "js-cookie";
-  import {productList, productOut, productIn, serviceGet, treeselect} from "@/api/agriculturalTrusteeship";
+  import {subjectDetail} from "@/api/agriculturalTrusteeship";
   export default {
     name: "shopOrganizationDetail",
     data() {
       return {
-
+        stockBase:{},
+        depositTghtNum:'',
+        depositArea:'',
       };
     },
     created() {
-
+      this.getDetail();
     },
     methods: {
-
+      getDetail(){
+        subjectDetail(this.$route.query.id,{translate_dict:1}).then(response => {
+          this.stockBase = response.data.stockBase;
+          this.depositTghtNum = response.data.depositTghtNum;
+          this.depositArea = response.data.depositArea;
+        });
+      }
     },
   }
 </script>
diff --git a/src/views/agriculturalTrusteeship/shop/shopNeedsList.vue b/src/views/agriculturalTrusteeship/shop/shopNeedsList.vue
index 1777fc80..f353c5f7 100644
--- a/src/views/agriculturalTrusteeship/shop/shopNeedsList.vue
+++ b/src/views/agriculturalTrusteeship/shop/shopNeedsList.vue
@@ -15,41 +15,43 @@
     <!--  内容开始  -->
     <div class="main">
       <van-tabs v-model="active" sticky animated>
-        <van-tab title="服务组织（312）">
+        <van-tab :title="'服务组织（'+depositThirdNum+'）'">
           <van-list
             v-model="loading"
             :finished="finished"
             finished-text="没有更多了"
+            @load="getList"
           >
-            <!--    @load="getList"        @load="onLoad"-->
-            <div class="main_content_right_list" v-for="(item,index) in 5" :key="index" @click="$router.push({name:'agriculturalTrusteeshipShopOrganizationDetail'})">
+            <!--           @load="onLoad"-->
+            <div class="main_content_right_list" v-for="(item,index) in depositThirdList" :key="index" @click="$router.push({name:'agriculturalTrusteeshipShopOrganizationDetail',query:{id:item.id}})">
               <div class="main_tit">
                 <i></i>
-                <p>家家加加加加加加加就爱简爱家合作社</p>
+                <p>{{item.thirdName}}</p>
               </div>
               <div class="main_money">
-                <p><span>￥</span>512,000.00</p>
+                <p><span>￥</span>{{item.financeAmount}}</p>
                 <p>查看详情 ></p>
               </div>
             </div>
           </van-list>
 
         </van-tab>
-        <van-tab title="托管主体（201）">
+        <van-tab :title="'托管主体（'+stockBaseNum+'）'" >
 
           <van-list
-            v-model="loading"
-            :finished="finished"
+            v-model="loading2"
+            :finished="finished2"
             finished-text="没有更多了"
+            @load="getStockBaseList"
           >
-            <!--       @load="getList"     @load="onLoad"-->
-            <div class="main_content_right_list" v-for="(item,index) in 5" :key="index" @click="$router.push({name:'agriculturalTrusteeshipShopDepositDetail'})">
+            <!--            @load="onLoad"-->
+            <div class="main_content_right_list" v-for="(item,index) in stockBaseList" :key="item.bookId" @click="$router.push({name:'agriculturalTrusteeshipShopDepositDetail',query:{id:item.bookId}})">
               <div class="main_tit">
                 <i></i>
-                <p>家家加加加加加加加就爱简爱家合作社</p>
+                <p>{{item.economicName}}</p>
               </div>
               <div class="main_money">
-                <p><span>￥</span>512,000.00</p>
+                <p><span>￥</span>{{item.financeAmount}}</p>
                 <p>查看详情 ></p>
               </div>
             </div>
@@ -64,66 +66,45 @@
 </template>
 <script>
   import Cookies from "js-cookie";
-  import {productList, productOut, productIn, serviceGet, treeselect} from "@/api/agriculturalTrusteeship";
+  import {loanDemandList} from "@/api/agriculturalTrusteeship";
   export default {
-    name: "agriculturalTrusteeshipShopList",
+    name: "agriculturalTrusteeshipShopNeedsList",
     data() {
       return {
-        activeKey: 0,
         active: 0,
+        depositThirdNum: 0,
+        stockBaseNum: 0,
         loading: false,
         finished: false,
+        loading2: false,
+        finished2: false,
         checked: false,
-        productList:[],
-        productListYes:[],
-        productListNo:[],
+        depositThirdList: [],
+        stockBaseList: [],
         query:{
           financialServiceId:Cookies.get('ACCESS-SESSION-ID'),
           pageNum:1,
           pageSize:'10',
+          isFinance:'N'
         },
-        serviceForm:{},
-        deptOptions:[],
-        deptName:'张村',
-        showDeptId:false,
-        villageValue : '',
-        hcAreaInfoFieldName: {
-          text: "label",
-          value: "value",
-          children: "children",
+        query2:{
+          financialServiceId:Cookies.get('ACCESS-SESSION-ID'),
+          pageNum:1,
+          pageSize:'10',
+          isFinance:'N'
         },
       };
     },
     created() {
-      this.getDetail();
-      treeselect().then(res=>{
-        if (res.code == 200) {
-          this.deptOptions = res.data;
-        }
-      })
+
     },
     methods: {
-      getDetail(){
-        serviceGet(Cookies.get('ACCESS-SESSION-ID')).then(response => {
-          this.serviceForm = response.data;
-        });
-      },
       getList(){
-        productList(this.query).then(response => {
-          response.rows.map(res=>{
-            if (res.mainImg){
-              let supplyMasterMap = res.mainImg.split( "," )
-              res.mainImg = '/api'+supplyMasterMap[0]
-            }
-            if(res.sysYesNo == 'Y'){
-              this.productListYes.push(res);
-            }
-            if(res.sysYesNo == 'N'){
-              this.productListNo.push(res);
-            }
-            this.productList.push(res);
-          })
-          if(this.productList.length >= response.total){
+        loanDemandList(this.query).then(response => {
+          this.depositThirdNum = response.data.depositThirdList.length;
+          this.stockBaseNum = response.data.stockBaseList.length;
+          this.depositThirdList = response.data.depositThirdList;
+          if(this.depositThirdList.length >= response.data.depositThirdList.length){
             this.finished = true;
             return;
           }else{
@@ -132,27 +113,19 @@
           }
         });
       },
-      productIn(id){
-        productIn(id).then(response => {
-          this.$notify({ type: 'success', message: '上架成功' });
-          location.reload()
-        });
-      },
-      productOut(id){
-        productOut(id).then(response => {
-          this.$notify({ type: 'success', message: '下架成功' });
-          location.reload()
+      getStockBaseList(){
+        loanDemandList(this.query2).then(response => {
+          this.stockBaseList = response.data.stockBaseList;
+          if(this.stockBaseList.length >= response.data.stockBaseList.length){
+            this.finished2 = true;
+            return;
+          }else{
+            this.loading2 = false;
+            this.query2.pageNum += 1 ;
+          }
         });
       },
-      //选择案件属地
-      onConfirmDept({ selectedOptions }){
-        this.query.deptId = selectedOptions[selectedOptions.length-1].value;
-        this.deptName = selectedOptions[selectedOptions.length-1].label;
-        this.showDeptId = false
-        this.productListYes = [];
-        this.productListNo = [];
-        this.getList();
-      },
+
     },
   }
 </script>
@@ -160,7 +133,7 @@
 .home_wrapper{
   background: #f9f9f9;
   height: 100vh;
-  overflow: hidden;
+  /*overflow: hidden;*/
 }
   /*头部*/
   .header{
@@ -291,7 +264,7 @@
     /deep/ .van-tabs__nav{
       border-top-left-radius: 25PX;
       border-top-right-radius: 25PX;
-      overflow: hidden;
+      /*overflow: hidden;*/
       background: #f9f9f9;
     }
     /deep/ .van-tabs__line{
@@ -304,21 +277,6 @@
       background: #f9f9f9;
       padding-top: 2vh;
     }
-    .search{
-       display: flex;
-       justify-content: space-between;
-       align-items: center;
-       width: 92%;
-       margin: 0PX auto;
-       border: 1px solid #6E93F3;
-       padding: 1PX 1PX 1PX 12PX ;
-       border-radius: 50PX;
-       input{
-         flex: 1;
-         background: transparent;
-         margin-left: 10PX;
-       }
-    }
     .content{
       width: 92%;
       margin: 0 auto;
diff --git a/src/views/agriculturalTrusteeship/shop/shopOrganizationDetail.vue b/src/views/agriculturalTrusteeship/shop/shopOrganizationDetail.vue
index d73aa0ee..9b289a24 100644
--- a/src/views/agriculturalTrusteeship/shop/shopOrganizationDetail.vue
+++ b/src/views/agriculturalTrusteeship/shop/shopOrganizationDetail.vue
@@ -14,11 +14,11 @@
       <div class="main_content_right_list">
         <div class="main_tit">
           <i></i>
-          <p>家家加加加加加加加就爱简爱家合作社</p>
+          <p>{{depositThird.thirdName}}</p>
         </div>
-        <p class="main_content">村口需要水牛石头诚招水牛贷款联系电话165822本人人品优良绝不拖欠还款。</p>
+        <p class="main_content">{{depositThird.remark}}</p>
         <div class="main_money">
-          <p><span>需求金额</span><span>￥</span>512,000.00</p>
+          <p><span>需求金额</span><span>￥</span>{{depositThird.financeAmount}}</p>
         </div>
         <van-divider />
 
@@ -28,6 +28,7 @@
           input-align="right"
           :border="false"
           placeholder="负责人"
+          v-model="depositThird.linker"
         />
 
         <van-field
@@ -36,6 +37,7 @@
           input-align="right"
           :border="false"
           placeholder="联系方式"
+          v-model="depositThird.phone"
         />
 
         <van-field
@@ -44,21 +46,22 @@
           input-align="right"
           :border="false"
           placeholder="地址"
+          v-model="depositThird.address"
         />
 
       </div>
-      <div class="main_content_right_list2" v-for="(item,index) in 5" :key="index" @click="$router.push({name:'agriculturalTrusteeshipShopNeedsList'})">
+      <div class="main_content_right_list2" v-for="(item,index) in depositFwhtList" :key="index">
         <div class="main_tit">
-          <p>家家加加加加加加加就爱简爱家合作社</p>
-          <span>(1/10)</span>
+          <p>{{item.contractionName}}</p>
+          <span>({{index+1}}/{{depositFwhtList.length}})</span>
         </div>
         <div class="main_content">
-          <p>玉米</p>
-          <p>32022亩</p>
+          <p>{{item.cropType}}</p>
+          <p>{{item.cropArea}}亩</p>
         </div>
         <div class="main_money">
-          <p><i></i>丰田村</p>
-          <p><i></i>2023.03.15-2024.09.15</p>
+          <p><i></i>{{item.addressA}}</p>
+          <p><i></i>{{item.startAt}} ~ {{item.endAt}}</p>
         </div>
       </div>
     </div>
@@ -68,18 +71,25 @@
 </template>
 <script>
   import Cookies from "js-cookie";
-  import {productList, productOut, productIn, serviceGet, treeselect} from "@/api/agriculturalTrusteeship";
+  import {thirdDetail} from "@/api/agriculturalTrusteeship";
   export default {
-    name: "shopOrganizationDetail",
+    name: "agriculturalTrusteeshipShopOrganizationDetail",
     data() {
       return {
-
+        depositThird:{},
+        depositFwhtList:[]
       };
     },
     created() {
-
+      this.getDetail();
     },
     methods: {
+      getDetail(){
+        thirdDetail(this.$route.query.id,{translate_dict:1}).then(response => {
+          this.depositThird = response.data.depositThird;
+          this.depositFwhtList = response.data.depositFwhtList;
+        });
+      }
 
     },
   }