From 5d8a59692a133a583786b89d215a5f0605fce9a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Mon, 13 Mar 2023 08:56:52 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/notice/index.js                  |  45 +++++++++
 src/permission.js                        |   4 +
 src/router/index.js                      |  27 ++++++
 src/views/notice/index.vue               |  86 ++++++++++++++++-
 src/views/notice/inviteTendersDetail.vue | 111 ++++++++++++++++++++++
 src/views/notice/winTheBiddingDetail.vue |  78 +++++++++++++++
 src/views/project/index.vue              |   4 +-
 src/views/project/projectDetail.vue      |  19 +++-
 src/views/project/projectNeedsDetail.vue | 115 +++++++++++++++++++++++
 9 files changed, 484 insertions(+), 5 deletions(-)
 create mode 100644 src/views/notice/inviteTendersDetail.vue
 create mode 100644 src/views/notice/winTheBiddingDetail.vue
 create mode 100644 src/views/project/projectNeedsDetail.vue

diff --git a/src/api/notice/index.js b/src/api/notice/index.js
index 35c016bf..5246bb58 100644
--- a/src/api/notice/index.js
+++ b/src/api/notice/index.js
@@ -33,3 +33,48 @@ export function AttestationDetail(id) {
     method: 'get'
   })
 }
+
+//鉴证公告
+export function needProject(id,query) {
+  return request({
+    url: '/transaction/website/needProject/'+id,
+    method: 'get',
+    params: query
+  })
+}
+
+//招标公告
+export function tenderList(query) {
+  return request({
+    url: '/transaction/website/tender/publicity',
+    method: 'get',
+    params: query
+  })
+}
+
+//中标公告
+export function winList(query) {
+  return request({
+    url: '/transaction/website/win/publicity',
+    method: 'get',
+    params: query
+  })
+}
+
+//招标公告详情
+export function tenderDetail(id,query) {
+  return request({
+    url: '/transaction/website/tender/'+id,
+    method: 'get',
+    params: query
+  })
+}
+
+//中标公告详情
+export function tenderWinDetail(id,query) {
+  return request({
+    url: '/transaction/website/tenderWin/'+id,
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/permission.js b/src/permission.js
index 814e014a..21240fea 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -16,6 +16,10 @@ const whiteList = [
   '/news/index',
   '/news/newDetail',
   '/notice/index',
+  '/notice/inviteTendersDetail',
+  '/notice/winTheBiddingDetail',
+  '/project/projectNeedsDetail',
+
   '/supply/index',
   '/interaction/index',
   '/register/index',
diff --git a/src/router/index.js b/src/router/index.js
index d3cf7e36..b55e904e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -111,6 +111,33 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/project/projectDetail'], resolve)
   },
+  {
+    path: '/project/projectNeedsDetail',
+    name: 'projectNeedsDetail',
+    meta: {
+      title: '需求项目',
+      hidden: true
+    },
+    component: (resolve) => require(['@/views/project/projectNeedsDetail'], resolve)
+  },
+  {
+    path: '/notice/inviteTendersDetail',
+    name: 'inviteTendersDetail',
+    meta: {
+      title: '招标公告',
+      hidden: true
+    },
+    component: (resolve) => require(['@/views/notice/inviteTendersDetail'], resolve)
+  },
+  {
+    path: '/notice/winTheBiddingDetail',
+    name: 'winTheBiddingDetail',
+    meta: {
+      title: '中标公告',
+      hidden: true
+    },
+    component: (resolve) => require(['@/views/notice/winTheBiddingDetail'], resolve)
+  },
   {
     path: '/news/index',
     name: 'news',
diff --git a/src/views/notice/index.vue b/src/views/notice/index.vue
index ff90d3df..94b439e7 100644
--- a/src/views/notice/index.vue
+++ b/src/views/notice/index.vue
@@ -24,7 +24,7 @@
           </van-cell>
         </van-list>
       </van-tab>
-      <van-tab title="选项">
+      <van-tab>
         <template #title><van-icon name="records" size="18" style="top: 4px"/>鉴证公告</template>
         <van-list
           v-model="attestationLoading"
@@ -40,12 +40,44 @@
           </van-cell>
         </van-list>
       </van-tab>
+      <van-tab>
+        <template #title><van-icon name="description" size="18" style="top: 4px"/>招标公告</template>
+        <van-list
+          v-model="inviteTendersLoading"
+          :finished="inviteTendersFinished"
+          finished-text="没有更多了"
+          style="margin-top: 10px;"
+          @load="getinviteTendersList"
+        >
+          <van-cell v-for="(item,index) in inviteTendersList" :key="index" icon="play" :title="item.projectName" :to="{name:'inviteTendersDetail', query: {id:item.id}}">
+            <template #label>
+              招标方：{{item.tenderName}} <p style="float: right;">{{item.logintime}}</p>
+            </template>
+          </van-cell>
+        </van-list>
+      </van-tab>
+      <van-tab>
+        <template #title><van-icon name="completed" size="18" style="top: 4px"/>中标公告</template>
+        <van-list
+          v-model="winTheBiddingLoading"
+          :finished="winTheBiddingFinished"
+          finished-text="没有更多了"
+          style="margin-top: 10px;"
+          @load="getwinTheBiddingList"
+        >
+          <van-cell v-for="(item,index) in winTheBiddingList" :key="index" icon="play" :title="item.projectName" :to="{name:'winTheBiddingDetail', query: {id:item.id}}">
+            <template #label>
+              招标方：{{item.tenderName}} <p style="float: right;">{{item.dealTime}}</p>
+            </template>
+          </van-cell>
+        </van-list>
+      </van-tab>
     </van-tabs>
   </div>
 </template>
 
 <script>
-import { noticeList , Attestation } from "@/api/notice/index";
+import { noticeList , Attestation , tenderList , winList } from "@/api/notice/index";
 export default {
   name: "notice",
   data() {
@@ -58,8 +90,20 @@ export default {
       attestationLoading: false,
       //是否滚动到底部
       attestationFinished: false,
+      //是否显示加载
+      inviteTendersLoading: false,
+      //是否滚动到底部
+      inviteTendersFinished: false,
+      //是否显示加载
+      winTheBiddingLoading: false,
+      //是否滚动到底部
+      winTheBiddingFinished: false,
       //成交公告集合
       noticeList:[],
+      //招标公告集合
+      inviteTendersList:[],
+      //中标公告集合
+      winTheBiddingList:[],
       //鉴证公告集合
       attestationList:[],
       //成交公告查询参数
@@ -68,6 +112,18 @@ export default {
         pageNum:1,
         pageSize:10
       },
+      //招标公告查询参数
+      inviteTendersQueryParams: {
+        deptId:100,
+        pageNum:1,
+        pageSize:10
+      },
+      //招标公告查询参数
+      winTheBiddingQueryParams: {
+        deptId:100,
+        pageNum:1,
+        pageSize:10
+      },
       //鉴证公告查询参数
       attestationQueryParams: {
         deptId:100,
@@ -107,6 +163,32 @@ export default {
         this.attestationLoading = false;
       });
     },
+    //招标公告集合
+    getinviteTendersList(){
+      this.inviteTendersLoading = true;
+      tenderList(this.inviteTendersQueryParams).then(response => {
+        this.inviteTendersList = response.rows;
+        if(this.inviteTendersList.length >= response.total){
+          this.inviteTendersFinished = true;
+          return;
+        }
+        this.inviteTendersQueryParams.pageNum += 1 ;
+        this.inviteTendersLoading = false;
+      });
+    },
+    //招标公告集合
+    getwinTheBiddingList(){
+      this.winTheBiddingLoading = true;
+      winList(this.winTheBiddingQueryParams).then(response => {
+        this.winTheBiddingList = response.rows;
+        if(this.winTheBiddingList.length >= response.total){
+          this.winTheBiddingFinished = true;
+          return;
+        }
+        this.winTheBiddingQueryParams.pageNum += 1 ;
+        this.winTheBiddingLoading = false;
+      });
+    },
   },
 };
 </script>
diff --git a/src/views/notice/inviteTendersDetail.vue b/src/views/notice/inviteTendersDetail.vue
new file mode 100644
index 00000000..a17a8e30
--- /dev/null
+++ b/src/views/notice/inviteTendersDetail.vue
@@ -0,0 +1,111 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      title="招标公告"
+      left-arrow
+      fixed
+      placeholder
+      @click-left="onClickLeft"
+    />
+    <p class="title">{{attestationDetail.projectName}}</p>
+    <van-row>
+      <van-col>招标方名称：{{attestationDetail.tenderName}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>资金来源：{{attestationDetail.moneySource}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>招标代理公司：{{attestationDetail.agentName}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>联系人：{{attestationDetail.linkman}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>联系电话：{{attestationDetail.linkphone}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>联系地址：{{attestationDetail.linkaddress}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>招标方意见：{{attestationDetail.tenderOpinion}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>代理公司意见：{{attestationDetail.agentOpinion}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>建设地点：{{attestationDetail.address}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>建设工期：{{attestationDetail.timeLimit}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>项目规模：{{attestationDetail.scale}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>招标内容：{{attestationDetail.tenderContent}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>投标人要求：{{attestationDetail.condition}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>保证金：{{attestationDetail.deposit}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>招标文件价格(元)：{{attestationDetail.price}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>招标发布日期：{{attestationDetail.logintime}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>招标书领取开始日期：{{attestationDetail.startTime}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>招标书领取结束日期：{{attestationDetail.stopTime}}</van-col>
+    </van-row>
+  </div>
+</template>
+
+<script>
+import { tenderDetail } from "@/api/notice/index";
+export default {
+  name: "noticeDetail",
+  data() {
+    return {
+      attestationDetail:''
+    };
+  },
+  created() {
+    this.getDetail();
+  },
+  methods: {
+    //成交公告集合
+    getDetail(){
+      tenderDetail(this.$route.query.id,{translate_dict:1}).then(response => {
+        this.attestationDetail = response.data;
+        // //公司性质字典
+        // this.getDicts("company_nature").then(res => {
+        //   this.attestationDetail.companyNature = this.selectDictLabel(res.data,response.data.companyNature);
+        // });
+      });
+    },
+
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.app-container {
+  padding: 0.5rem 5%;
+}
+.title{
+  font-size: 0.5rem;
+  margin-bottom: 0.5rem;
+}
+.van-row{
+  margin-bottom: 0.4rem;
+}
+.van-col{
+  font-size: 0.4rem;
+  color: #666666;
+}
+</style>
diff --git a/src/views/notice/winTheBiddingDetail.vue b/src/views/notice/winTheBiddingDetail.vue
new file mode 100644
index 00000000..2961ce98
--- /dev/null
+++ b/src/views/notice/winTheBiddingDetail.vue
@@ -0,0 +1,78 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      title="中标公告"
+      left-arrow
+      fixed
+      placeholder
+      @click-left="onClickLeft"
+    />
+    <p class="title">{{attestationDetail.projectName}}</p>
+    <van-row>
+      <van-col>招标方名称：{{attestationDetail.tenderName}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>中标人：{{attestationDetail.assignee}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>建设单位：{{attestationDetail.bulidPart}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>项目负责人：{{attestationDetail.partLinkman}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>中标价格：{{attestationDetail.transactionPrice}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>中标日期：{{attestationDetail.dealTime}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>公示开始日期：{{attestationDetail.startTime}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>公示结束日期：{{attestationDetail.stopTime}}</van-col>
+    </van-row>
+  </div>
+</template>
+
+<script>
+import { tenderWinDetail } from "@/api/notice/index";
+export default {
+  name: "noticeDetail",
+  data() {
+    return {
+      attestationDetail:''
+    };
+  },
+  created() {
+    this.getDetail();
+  },
+  methods: {
+    //成交公告集合
+    getDetail(){
+      console.log(this.$route.query.id)
+      tenderWinDetail(this.$route.query.id,{translate_dict:1}).then(response => {
+        this.attestationDetail = response.data;
+      });
+    },
+
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.app-container {
+  padding: 0.5rem 5%;
+}
+.title{
+  font-size: 0.5rem;
+  margin-bottom: 0.5rem;
+}
+.van-row{
+  margin-bottom: 0.4rem;
+}
+.van-col{
+  font-size: 0.4rem;
+  color: #666666;
+}
+</style>
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index 111bd9f3..cc43b2a9 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -50,10 +50,10 @@
           </van-dropdown-item>
         </van-dropdown-menu>
         <van-list v-model="loading1" :finished="finished1" @load="getNeedProjectList" finished-text="没有更多了">
-          <router-link :to="{path:'project/projectDetail',query:{id:item.id}}" v-for="(item,index) in infoList1" :key="index">
+          <router-link :to="{path:'project/projectNeedsDetail',query:{id:item.id}}" v-for="(item,index) in infoList1" :key="index">
             <van-card :thumb="item.fileUrl?'/api'+item.fileUrl:'../../static/images/zwtpxw.jpg'" >
               <template #tags>
-                <p class="title">{{item.projectName}}</p>
+                <p class="title">{{ item.projectName }}</p>
                 <p class="type">{{ item.needname }}</p>
                 <p class="timeEnd">需求开始时间 {{ item.needStartTime }}</p>
                 <p class="timeEnd">需求结束时间 {{ item.needStopTime }}</p>
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index 220259c9..ee7ed722 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -67,11 +67,14 @@
           <van-row>
             <van-col span="24"><span>竞价方式：</span>{{ detail.biddingType }}</van-col>
           </van-row>
+          <van-row>
+            <van-col span="24"><span>竞价方向：</span>{{ detail.biddingDirect }}</van-col>
+          </van-row>
           <van-row>
             <van-col span="24"><span>阶梯价（加价幅度）：</span>{{ detail.ladderPrice }}</van-col>
           </van-row>
           <van-row>
-            <van-col span="24"><span>延时周期：</span>2分钟报名<van-icon name="question" size="15" style="top: 3px;left: 5px;" color="#CDCDCD"/></van-col>
+            <van-col span="24"><span>延时周期：</span>2分钟<van-icon name="question" size="15" style="top: 3px;left: 5px;" color="#CDCDCD"/></van-col>
           </van-row>
         </div>
       </van-tab>
@@ -336,6 +339,9 @@ export default {
         this.getDicts("bidding_type").then(res => {
           this.detail.biddingType = this.selectDictLabel(res.data,response.data.biddingType);
         });
+        this.getDicts("bidding_direct").then(res => {
+          this.detail.biddingDirect = this.selectDictLabel(res.data,response.data.biddingDirect);
+        });
         for(let i of this.detail.subjectList){
           this.getDicts("area_unit").then(res => {
             i.areaUnit = this.selectDictLabel(res.data,i.areaUnit);
@@ -346,6 +352,12 @@ export default {
         let signupStartTime =  Date.parse(this.detail.signupStartTime)+0
         let signupStopTime =  Date.parse(this.detail.signupStopTime)+0
         let nowDate = Date.parse(new Date());
+
+        console.log('biddingStartTime'+biddingStartTime)
+        console.log('biddingStopTime'+biddingStopTime)
+        console.log('signupStartTime'+signupStartTime)
+        console.log('signupStopTime'+signupStopTime)
+
         if(signupStartTime>nowDate){
           this.process= "报名未开始"
           this.tip=this.detail.signupStartTime+"开始报名"
@@ -474,6 +486,11 @@ export default {
       })
     },
     add(){
+      if (this.detail.biddingDirect == '反向竞价'){
+        if(this.detail.price<this.price){
+          return;
+        }
+      }
       this.detail.ladderPrice?this.price=this.price+this.detail.ladderPrice:this.price+=1
     },
     sub(){
diff --git a/src/views/project/projectNeedsDetail.vue b/src/views/project/projectNeedsDetail.vue
new file mode 100644
index 00000000..c3202b2f
--- /dev/null
+++ b/src/views/project/projectNeedsDetail.vue
@@ -0,0 +1,115 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      title="需求项目"
+      left-arrow
+      fixed
+      placeholder
+      @click-left="onClickLeft"
+    />
+    <p class="title">{{noticeDetail.projectName}}</p>
+    <van-row>
+      <van-col>需求项目类别：{{noticeDetail.projectNumber}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>需求价格描述：{{noticeDetail.price}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>需求方名称：{{noticeDetail.needname}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>需求方地址：{{noticeDetail.address}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>单位性质：{{noticeDetail.company}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>单位法人：{{noticeDetail.legalPerson}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>联系人：{{noticeDetail.realname}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>联系电话：{{noticeDetail.phone}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>身份证号：{{noticeDetail.idCardNum}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>邮箱：{{noticeDetail.email}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>需求开始时间：{{noticeDetail.needStartTime}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>需求结束时间：{{noticeDetail.needStopTime}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>用途与经营描述：{{noticeDetail.description}}</van-col>
+    </van-row>
+    <van-row>
+      <van-col>附件图片：</van-col>
+    </van-row>
+    <van-row>
+      <van-col><img :src="'/api'+item.fileUrl" v-for="(item , index) in noticeDetail.attachments" alt="" width="100%"></van-col>
+    </van-row>
+  </div>
+</template>
+
+<script>
+import { needProject } from "@/api/notice/index";
+export default {
+  name: "noticeDetail",
+  data() {
+    return {
+      noticeDetail:''
+    };
+  },
+  created() {
+    this.getDetail();
+
+  },
+  methods: {
+    //成交公告集合
+    getDetail(){
+      needProject(this.$route.query.id,{translate_dict:1}).then(response => {
+        this.noticeDetail = response.data;
+        //转出方式字典
+        // this.getDicts("rollout_type").then(res => {
+        //   this.noticeDetail.rollout = this.selectDictLabel(res.data,response.data.rollout);
+        // });
+        // //交易方式字典
+        // this.getDicts("deal_type").then(res => {
+        //   this.noticeDetail.dealType = this.selectDictLabel(res.data,response.data.dealType);
+        // });
+        // //面积单位字典
+        // this.getDicts("area_unit").then(res => {
+        //   this.noticeDetail.allCountUnit = this.selectDictLabel(res.data,response.data.allCountUnit);
+        // });
+        // //成交价格字典
+        // this.getDicts("price_unit").then(res => {
+        //   this.noticeDetail.unit = this.selectDictLabel(res.data,response.data.unit);
+        // });
+      });
+    },
+
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.app-container {
+  padding: 0.5rem 5%;
+}
+.title{
+  font-size: 0.5rem;
+  margin-bottom: 0.5rem;
+}
+.van-row{
+  margin-bottom: 0.4rem;
+}
+.van-col{
+  font-size: 0.4rem;
+  color: #666666;
+}
+</style>

From 4d5294f34dcf128f8c82f425788bb038e9742372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Mon, 13 Mar 2023 16:25:56 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=A7=E6=89=98=E7=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js                             |   3 +
 src/router/index.js                           |  27 ++
 .../shop/shopDepositDetail.vue                | 394 ++++++++++++++++
 .../agriculturalTrusteeship/shop/shopList.vue |  86 +++-
 .../shop/shopNeedsList.vue                    | 416 +++++++++++++++++
 .../shop/shopOrganizationDetail.vue           | 442 ++++++++++++++++++
 .../insurance/shop_icon_add2.png              | Bin 0 -> 1953 bytes
 .../insurance/shop_icon_see.png               | Bin 0 -> 2720 bytes
 .../insurance/shop_icon_see2.png              | Bin 0 -> 407 bytes
 .../insurance/shop_needs_icon.png             | Bin 0 -> 452 bytes
 .../insurance/shop_needs_icon01.png           | Bin 0 -> 446 bytes
 .../insurance/shop_needs_icon02.png           | Bin 0 -> 343 bytes
 .../insurance/shop_needs_icon03.png           | Bin 0 -> 377 bytes
 13 files changed, 1361 insertions(+), 7 deletions(-)
 create mode 100644 src/views/agriculturalTrusteeship/shop/shopDepositDetail.vue
 create mode 100644 src/views/agriculturalTrusteeship/shop/shopNeedsList.vue
 create mode 100644 src/views/agriculturalTrusteeship/shop/shopOrganizationDetail.vue
 create mode 100644 static/images/agriculturalTrusteeship/insurance/shop_icon_add2.png
 create mode 100644 static/images/agriculturalTrusteeship/insurance/shop_icon_see.png
 create mode 100644 static/images/agriculturalTrusteeship/insurance/shop_icon_see2.png
 create mode 100644 static/images/agriculturalTrusteeship/insurance/shop_needs_icon.png
 create mode 100644 static/images/agriculturalTrusteeship/insurance/shop_needs_icon01.png
 create mode 100644 static/images/agriculturalTrusteeship/insurance/shop_needs_icon02.png
 create mode 100644 static/images/agriculturalTrusteeship/insurance/shop_needs_icon03.png

diff --git a/src/permission.js b/src/permission.js
index 2bfb91bb..4560e313 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -170,6 +170,9 @@ const whiteList = [
   '/agriculturalTrusteeship/societyProjectList',//社会化产品列表
   '/agriculturalTrusteeship/societyProjectDetail',//社会化产品详情
   '/agriculturalTrusteeship/shopList',//保险列表首页
+  '/agriculturalTrusteeship/shopNeedsList',//保险列表首页
+  '/agriculturalTrusteeship/shopOrganizationDetail',//保险列表首页
+  '/agriculturalTrusteeship/shopDepositDetail',//保险列表首页
   '/agriculturalTrusteeship/shopDetail',//保险列表详情
   '/agriculturalTrusteeship/shopEdit',//保险列表详情
   '/agriculturalTrusteeship/shopAdd',//保险列表首页
diff --git a/src/router/index.js b/src/router/index.js
index e6d21bcd..d58d62b4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5137,6 +5137,33 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/agriculturalTrusteeship/shop/shopList'], resolve)
   },
+  {
+    path: '/agriculturalTrusteeship/shopNeedsList',
+    name: 'agriculturalTrusteeshipShopNeedsList',
+    meta: {
+      title: '贷款需求',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/agriculturalTrusteeship/shop/shopNeedsList'], resolve)
+  },
+  {
+    path: '/agriculturalTrusteeship/shopOrganizationDetail',
+    name: 'agriculturalTrusteeshipShopOrganizationDetail',
+    meta: {
+      title: '服务组织',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/agriculturalTrusteeship/shop/shopOrganizationDetail'], resolve)
+  },
+  {
+    path: '/agriculturalTrusteeship/shopDepositDetail',
+    name: 'agriculturalTrusteeshipShopDepositDetail',
+    meta: {
+      title: '托管主体',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/agriculturalTrusteeship/shop/shopDepositDetail'], resolve)
+  },
   {
     path: '/agriculturalTrusteeship/serviceEdit',
     name: 'agriculturalTrusteeshipServiceEdit',
diff --git a/src/views/agriculturalTrusteeship/shop/shopDepositDetail.vue b/src/views/agriculturalTrusteeship/shop/shopDepositDetail.vue
new file mode 100644
index 00000000..8920f180
--- /dev/null
+++ b/src/views/agriculturalTrusteeship/shop/shopDepositDetail.vue
@@ -0,0 +1,394 @@
+<template>
+  <div class="home_wrapper">
+    <!--  头部开始  -->
+    <div class="header">
+      <div class="header_left" @click="onClickLeft">
+        <img src="../../../../static/images/agriculturalTrusteeship/return.png">
+        <p>需求详情</p>
+      </div>
+    </div>
+    <!--  头部结束  -->
+
+    <!--  内容开始  -->
+    <div class="main">
+      <div class="main_content_right_list">
+        <div class="main_tit">
+          <i></i>
+          <p>家家加加加加加加加就爱简爱家合作社</p>
+        </div>
+        <p class="main_content">村口需要水牛石头诚招水牛贷款联系电话165822本人人品优良绝不拖欠还款。</p>
+        <div class="main_money">
+          <p><span>需求金额</span><span>￥</span>512,000.00</p>
+        </div>
+        <van-divider />
+
+        <van-field
+          readonly
+          label="负责人"
+          input-align="right"
+          :border="false"
+          placeholder="负责人"
+        />
+
+        <van-field
+          readonly
+          label="联系方式"
+          input-align="right"
+          :border="false"
+          placeholder="联系方式"
+        />
+
+        <van-field
+          readonly
+          label="地址"
+          input-align="right"
+          :border="false"
+          placeholder="地址"
+        />
+
+      </div>
+      <div class="main_content_right_list2">
+        <div>
+          <p>托管农户数（户）</p>
+          <p>366</p>
+        </div>
+        <div>
+          <p>托管面积（亩）</p>
+          <p>366</p>
+        </div>
+      </div>
+    </div>
+    <!--  内容结束  -->
+
+  </div>
+</template>
+<script>
+  import Cookies from "js-cookie";
+  import {productList, productOut, productIn, serviceGet, treeselect} from "@/api/agriculturalTrusteeship";
+  export default {
+    name: "shopOrganizationDetail",
+    data() {
+      return {
+
+      };
+    },
+    created() {
+
+    },
+    methods: {
+
+    },
+  }
+</script>
+<style scoped lang="scss">
+.home_wrapper{
+  background: #f9f9f9;
+  height: 100vh;
+  overflow: hidden;
+}
+  /*头部*/
+  .header{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    background-image: linear-gradient(to right , #6E93F3 , #7E89E9 , #54C6E4);
+    padding: 2vh 4% 2vh;
+    .header_left{
+      display: flex;
+      align-items: center;
+      p{
+        font-size: .4rem;
+        color: #ffffff;
+        line-height: 1;
+        margin-left: 10PX;
+      }
+    }
+    .header_right{
+      font-size: .35rem;
+      background: #334281;
+      padding: 2PX 10PX;
+      border-radius: 50PX;
+      /deep/ .van-checkbox__icon--checked .van-icon{
+        color: #334281;
+      }
+      /deep/ .van-checkbox__label{
+        color: #ffffff;
+      }
+      /deep/ .van-checkbox__icon .van-icon{
+        width: .9em;
+        height: .9em;
+        line-height: .9em;
+      }
+      /deep/ .van-icon-success::before{
+        width: .9em;
+        height: .9em;
+      }
+      /deep/ .van-checkbox__icon{
+        height: auto;
+      }
+    }
+  }
+
+  .main_btn{
+    display: flex;
+    background: #ffffff;
+    border-top-left-radius: 25PX;
+    border-top-right-radius: 25PX;
+    overflow: hidden;
+    padding: 4vw 4% 0;
+    justify-content: space-between;
+    .btn_box_01{
+      width: 48%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border: 1Px dashed #4E7FFF;
+      color: #4E7FFF;
+      font-size: .35rem;
+      line-height: 15vw;
+      border-radius: 10Px;
+      p:first-child{
+        font-weight: bold;
+        margin-right: 5PX;
+      }
+    }
+    .btn_box_02{
+      width: 48%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      background: rgba(78,127,255,0.17);
+      color: #1E49BB;
+      font-size: .35rem;
+      line-height: 15vw;
+      border-radius: 10Px;
+      p{
+        margin-left: 5PX;
+      }
+    }
+  }
+
+  .serviceName{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    span{
+      background: #E8E8E8;
+      padding: 0 8PX;
+      border-radius: 5PX;
+      color: #7A7A7A;
+      margin-right: 5PX;
+    }
+    .active{
+      background-image: linear-gradient(to right , #6E93F3 , #7E89E9 , #54C6E4);
+      color: #ffffff;
+    }
+  }
+
+  .nav{
+    background-image: linear-gradient(to right , #6E93F3 , #7E89E9 , #54C6E4);
+    padding-bottom: 15PX;
+    .tt{
+      font-size: .45rem;
+      color: #334281;
+    }
+    .content{
+      background: #ffffff;
+      width: 92%;
+      margin: 0 auto;
+      box-shadow: 0px 0px 10PX rgba(0,0,0,0.1);
+      border-radius: 25PX;
+      padding: 1.5vh 4%;
+    }
+    /deep/ .van-cell{
+      padding: 0;
+      margin-bottom: 10PX;
+      &:last-child{
+        margin: 0;
+      }
+    }
+  }
+
+  /* 内容 */
+  .main{
+    background-image: linear-gradient(to right , #6E93F3 , #7E89E9 , #54C6E4);
+    background-size: 100% 20PX;
+    background-repeat: no-repeat;
+    /deep/ .van-tabs__nav{
+      border-top-left-radius: 25PX;
+      border-top-right-radius: 25PX;
+      overflow: hidden;
+      background: #f9f9f9;
+    }
+    /deep/ .van-tabs__line{
+      background: #334281!important;
+    }
+    /deep/ .van-tab--active{
+      color: #334281;
+    }
+    /deep/ .van-tabs__content{
+      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;
+      margin-top: 2vh;
+      .content_tt{
+        font-size: .35rem;
+      }
+      .content_con{
+        display: flex;
+        justify-content: space-between;
+        margin-top: 1.5vh;
+        .content_con_left{
+          display: flex;
+          flex-direction:column;
+          justify-content: space-between;
+          p{
+            font-size: .35rem;
+            padding-left: 18PX;
+            &:nth-child(1){
+              background: url("../../../../static/images/agriculturalTrusteeship/insurance/insurance_list_project.png") no-repeat left center;
+            }
+            &:nth-child(2){
+              background: url("../../../../static/images/agriculturalTrusteeship/insurance/insurance_list_name.png") no-repeat left center;
+            }
+            &:nth-child(3){
+              background: url("../../../../static/images/agriculturalTrusteeship/insurance/insurance_list_iphone.png") no-repeat left center;
+            }
+          }
+        }
+        .content_con_right{
+          display: flex;
+          justify-content: end;
+          align-items: center;
+          img{
+            border-radius: 10PX;
+            width: 40%;
+            margin-left: 5%;
+            box-shadow: 0px 5PX 10PX rgba(0,0,0,0.2);
+            &:last-child{
+              width: auto;
+              box-shadow: none;
+            }
+          }
+        }
+      }
+    }
+    .main_content_right_list{
+      margin: 0 auto;
+      margin-bottom: 2vh;
+      width: 92%;
+      background: #ffffff;
+      padding: 15PX 3%;
+      border-radius: 10Px;
+      box-shadow: 0px 5PX 10PX rgba(0,0,0,0.1);
+      text-align: center;
+      /deep/ .van-cell{
+        padding: 0;
+        margin-bottom: 10PX;
+        &:last-child{
+          margin: 0;
+        }
+      }
+      .main_content{
+        font-size: .35rem;
+        line-height: .7rem;
+        margin-top: 10PX;
+        text-align: left;
+      }
+      .main_tit{
+        color: #4E7FFF;
+        font-size: .38rem;
+        display: flex;
+        align-items: center;
+        i{
+          display: block;
+          width: 16PX;
+          height: 16PX;
+          margin-right: 5PX;
+          flex-shrink: 0;
+          background: url("../../../../static/images/agriculturalTrusteeship/insurance/shop_needs_icon01.png");
+        }
+        p{
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 1;
+          word-break: break-all;
+          overflow: hidden;
+        }
+        span{
+          font-size: .3rem;
+          color: #8B8B8B;
+          flex-shrink: 0;
+        }
+      }
+      .main_money{
+        background: rgba(255,94,0,0.15);
+        display: inline-block;
+        padding: 5PX 15PX;
+        border-radius: 8PX;
+        margin: 10PX auto;
+        p{
+          &:nth-child(1){
+            color: #FF5E00;
+            font-size: .4rem;
+            span{
+              font-size: .3rem;
+            }
+          }
+          &:nth-child(2){
+            color: #8B8B8B;
+            font-size: .35rem;
+          }
+        }
+        span:nth-child(1){
+          margin-right: 5PX;
+        }
+      }
+    }
+    .main_content_right_list2{
+      margin: 0 auto;
+      margin-bottom: 2vh;
+      width: 92%;
+      display: flex;
+      justify-content: space-between;
+      div{
+        box-shadow: 0px 5PX 10PX rgba(0,0,0,0.1);
+        width: 48%;
+        background: #ffffff;
+        text-align: center;
+        padding: 10PX 0;
+        border-radius: 10Px;
+        p{
+          &:nth-child(1){
+            font-size: .38rem;
+            color: #8B8B8B;
+          }
+          &:nth-child(2){
+            font-size: .4rem;
+            color: #4E7FFF;
+            margin-top: 10PX;
+          }
+        }
+      }
+
+    }
+  }
+</style>
diff --git a/src/views/agriculturalTrusteeship/shop/shopList.vue b/src/views/agriculturalTrusteeship/shop/shopList.vue
index 9597eb7a..7763e11c 100644
--- a/src/views/agriculturalTrusteeship/shop/shopList.vue
+++ b/src/views/agriculturalTrusteeship/shop/shopList.vue
@@ -75,11 +75,31 @@
 
     <!--  内容开始  -->
     <div class="main">
-      <van-tabs v-model="active" sticky animated>
-        <van-tab title="服务中">
 
-          <img src="../../../../static/images/agriculturalTrusteeship/insurance/shop_icon_add.png" style="margin: 0 auto;display: block;width: 94%;" @click="$router.push({name:'agriculturalTrusteeshipShopAdd'})">
+      <div class="main_btn" v-if="serviceForm.financialType == '1'">
+        <div class="btn_box_01" @click="$router.push({name:'agriculturalTrusteeshipShopAdd'})">
+          <p>+</p>
+          <p>发布新产品</p>
+        </div>
+        <div class="btn_box_02" @click="$router.push({name:'agriculturalTrusteeshipShopNeedsList'})">
+          <img src="../../../../static/images/agriculturalTrusteeship/insurance/shop_icon_see2.png" alt="">
+          <p>查看贷款需求</p>
+        </div>
+<!--        <img src="../../../../static/images/agriculturalTrusteeship/insurance/shop_icon_add2.png" style="margin: 0 auto;display: block;" @click="$router.push({name:'agriculturalTrusteeshipShopAdd'})">-->
+<!--        <img src="../../../../static/images/agriculturalTrusteeship/insurance/shop_icon_see.png" style="margin: 0 auto;display: block;" @click="$router.push({name:'agriculturalTrusteeshipShopAdd'})">-->
+      </div>
+
+      <div class="main_btn" v-else>
+        <div class="btn_box_01" style="width: 100%;" @click="$router.push({name:'agriculturalTrusteeshipShopAdd'})">
+          <p>+</p>
+          <p>发布新产品</p>
+        </div>
+      </div>
+
+
 
+      <van-tabs v-model="active" sticky animated>
+        <van-tab title="服务中">
           <van-list
             v-model="loading"
             :finished="finished"
@@ -139,6 +159,7 @@
 <script>
   import Cookies from "js-cookie";
   import {productList, productOut, productIn, serviceGet, treeselect} from "@/api/agriculturalTrusteeship";
+  import {Dialog} from "vant";
   export default {
     name: "agriculturalTrusteeshipShopList",
     data() {
@@ -178,7 +199,19 @@
     methods: {
       getDetail(){
         serviceGet(Cookies.get('ACCESS-SESSION-ID')).then(response => {
-          this.serviceForm = response.data;
+          if (response.code == 200){
+            this.serviceForm = response.data;
+          }else{
+            Dialog.confirm({
+              title: '系统提示',
+              message: '登录状态已过期，请重新登录',
+              confirmButtonText: '重新登录',
+              cancelButtonText: '取消'
+            }).then(() => {
+              window.location.href = '/agriculturalTrusteeship/login';
+            });
+          }
+
         });
       },
       getList(){
@@ -260,6 +293,45 @@
     }
   }
 
+  .main_btn{
+    display: flex;
+    background: #ffffff;
+    border-top-left-radius: 25PX;
+    border-top-right-radius: 25PX;
+    overflow: hidden;
+    padding: 4vw 4% 0;
+    justify-content: space-between;
+    .btn_box_01{
+      width: 48%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border: 1Px dashed #4E7FFF;
+      color: #4E7FFF;
+      font-size: .35rem;
+      line-height: 15vw;
+      border-radius: 10Px;
+      p:first-child{
+        font-weight: bold;
+        margin-right: 5PX;
+      }
+    }
+    .btn_box_02{
+      width: 48%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      background: rgba(78,127,255,0.17);
+      color: #1E49BB;
+      font-size: .35rem;
+      line-height: 15vw;
+      border-radius: 10Px;
+      p{
+        margin-left: 5PX;
+      }
+    }
+  }
+
   .serviceName{
     display: flex;
     align-items: center;
@@ -305,9 +377,9 @@
   .main{
     background-image: linear-gradient(to right , #6E93F3 , #7E89E9 , #54C6E4);
     /deep/ .van-tabs__nav{
-      border-top-left-radius: 25PX;
-      border-top-right-radius: 25PX;
-      overflow: hidden;
+      /*border-top-left-radius: 25PX;*/
+      /*border-top-right-radius: 25PX;*/
+      /*overflow: hidden;*/
     }
     /deep/ .van-tabs__line{
       background: #334281!important;
diff --git a/src/views/agriculturalTrusteeship/shop/shopNeedsList.vue b/src/views/agriculturalTrusteeship/shop/shopNeedsList.vue
new file mode 100644
index 00000000..1777fc80
--- /dev/null
+++ b/src/views/agriculturalTrusteeship/shop/shopNeedsList.vue
@@ -0,0 +1,416 @@
+<template>
+  <div class="home_wrapper">
+    <!--  头部开始  -->
+    <div class="header">
+      <div class="header_left" @click="onClickLeft">
+        <img src="../../../../static/images/agriculturalTrusteeship/return.png">
+        <p>贷款需求</p>
+      </div>
+      <p class="header_right">
+        <van-checkbox v-model="checked" checked-color="#ffffff">只显示有资金需求</van-checkbox>
+      </p>
+    </div>
+    <!--  头部结束  -->
+
+    <!--  内容开始  -->
+    <div class="main">
+      <van-tabs v-model="active" sticky animated>
+        <van-tab title="服务组织（312）">
+          <van-list
+            v-model="loading"
+            :finished="finished"
+            finished-text="没有更多了"
+          >
+            <!--    @load="getList"        @load="onLoad"-->
+            <div class="main_content_right_list" v-for="(item,index) in 5" :key="index" @click="$router.push({name:'agriculturalTrusteeshipShopOrganizationDetail'})">
+              <div class="main_tit">
+                <i></i>
+                <p>家家加加加加加加加就爱简爱家合作社</p>
+              </div>
+              <div class="main_money">
+                <p><span>￥</span>512,000.00</p>
+                <p>查看详情 ></p>
+              </div>
+            </div>
+          </van-list>
+
+        </van-tab>
+        <van-tab title="托管主体（201）">
+
+          <van-list
+            v-model="loading"
+            :finished="finished"
+            finished-text="没有更多了"
+          >
+            <!--       @load="getList"     @load="onLoad"-->
+            <div class="main_content_right_list" v-for="(item,index) in 5" :key="index" @click="$router.push({name:'agriculturalTrusteeshipShopDepositDetail'})">
+              <div class="main_tit">
+                <i></i>
+                <p>家家加加加加加加加就爱简爱家合作社</p>
+              </div>
+              <div class="main_money">
+                <p><span>￥</span>512,000.00</p>
+                <p>查看详情 ></p>
+              </div>
+            </div>
+          </van-list>
+
+        </van-tab>
+      </van-tabs>
+    </div>
+    <!--  内容结束  -->
+
+  </div>
+</template>
+<script>
+  import Cookies from "js-cookie";
+  import {productList, productOut, productIn, serviceGet, treeselect} from "@/api/agriculturalTrusteeship";
+  export default {
+    name: "agriculturalTrusteeshipShopList",
+    data() {
+      return {
+        activeKey: 0,
+        active: 0,
+        loading: false,
+        finished: false,
+        checked: false,
+        productList:[],
+        productListYes:[],
+        productListNo:[],
+        query:{
+          financialServiceId:Cookies.get('ACCESS-SESSION-ID'),
+          pageNum:1,
+          pageSize:'10',
+        },
+        serviceForm:{},
+        deptOptions:[],
+        deptName:'张村',
+        showDeptId:false,
+        villageValue : '',
+        hcAreaInfoFieldName: {
+          text: "label",
+          value: "value",
+          children: "children",
+        },
+      };
+    },
+    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){
+            this.finished = true;
+            return;
+          }else{
+            this.loading = false;
+            this.query.pageNum += 1 ;
+          }
+        });
+      },
+      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()
+        });
+      },
+      //选择案件属地
+      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>
+<style scoped lang="scss">
+.home_wrapper{
+  background: #f9f9f9;
+  height: 100vh;
+  overflow: hidden;
+}
+  /*头部*/
+  .header{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    background-image: linear-gradient(to right , #6E93F3 , #7E89E9 , #54C6E4);
+    padding: 2vh 4% 2vh;
+    .header_left{
+      display: flex;
+      align-items: center;
+      p{
+        font-size: .4rem;
+        color: #ffffff;
+        line-height: 1;
+        margin-left: 10PX;
+      }
+    }
+    .header_right{
+      font-size: .35rem;
+      background: #334281;
+      padding: 2PX 10PX;
+      border-radius: 50PX;
+      /deep/ .van-checkbox__icon--checked .van-icon{
+        color: #334281;
+      }
+      /deep/ .van-checkbox__label{
+        color: #ffffff;
+      }
+      /deep/ .van-checkbox__icon .van-icon{
+        width: .9em;
+        height: .9em;
+        line-height: .9em;
+      }
+      /deep/ .van-icon-success::before{
+        width: .9em;
+        height: .9em;
+      }
+      /deep/ .van-checkbox__icon{
+        height: auto;
+      }
+    }
+  }
+
+  .main_btn{
+    display: flex;
+    background: #ffffff;
+    border-top-left-radius: 25PX;
+    border-top-right-radius: 25PX;
+    overflow: hidden;
+    padding: 4vw 4% 0;
+    justify-content: space-between;
+    .btn_box_01{
+      width: 48%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border: 1Px dashed #4E7FFF;
+      color: #4E7FFF;
+      font-size: .35rem;
+      line-height: 15vw;
+      border-radius: 10Px;
+      p:first-child{
+        font-weight: bold;
+        margin-right: 5PX;
+      }
+    }
+    .btn_box_02{
+      width: 48%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      background: rgba(78,127,255,0.17);
+      color: #1E49BB;
+      font-size: .35rem;
+      line-height: 15vw;
+      border-radius: 10Px;
+      p{
+        margin-left: 5PX;
+      }
+    }
+  }
+
+  .serviceName{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    span{
+      background: #E8E8E8;
+      padding: 0 8PX;
+      border-radius: 5PX;
+      color: #7A7A7A;
+      margin-right: 5PX;
+    }
+    .active{
+      background-image: linear-gradient(to right , #6E93F3 , #7E89E9 , #54C6E4);
+      color: #ffffff;
+    }
+  }
+
+  .nav{
+    background-image: linear-gradient(to right , #6E93F3 , #7E89E9 , #54C6E4);
+    padding-bottom: 15PX;
+    .tt{
+      font-size: .45rem;
+      color: #334281;
+    }
+    .content{
+      background: #ffffff;
+      width: 92%;
+      margin: 0 auto;
+      box-shadow: 0px 0px 10PX rgba(0,0,0,0.1);
+      border-radius: 25PX;
+      padding: 1.5vh 4%;
+    }
+    /deep/ .van-cell{
+      padding: 0;
+      margin-bottom: 10PX;
+      &:last-child{
+        margin: 0;
+      }
+    }
+  }
+
+  /* 内容 */
+  .main{
+    background-image: linear-gradient(to right , #6E93F3 , #7E89E9 , #54C6E4);
+    /deep/ .van-tabs__nav{
+      border-top-left-radius: 25PX;
+      border-top-right-radius: 25PX;
+      overflow: hidden;
+      background: #f9f9f9;
+    }
+    /deep/ .van-tabs__line{
+      background: #334281!important;
+    }
+    /deep/ .van-tab--active{
+      color: #334281;
+    }
+    /deep/ .van-tabs__content{
+      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;
+      margin-top: 2vh;
+      .content_tt{
+        font-size: .35rem;
+      }
+      .content_con{
+        display: flex;
+        justify-content: space-between;
+        margin-top: 1.5vh;
+        .content_con_left{
+          display: flex;
+          flex-direction:column;
+          justify-content: space-between;
+          p{
+            font-size: .35rem;
+            padding-left: 18PX;
+            &:nth-child(1){
+              background: url("../../../../static/images/agriculturalTrusteeship/insurance/insurance_list_project.png") no-repeat left center;
+            }
+            &:nth-child(2){
+              background: url("../../../../static/images/agriculturalTrusteeship/insurance/insurance_list_name.png") no-repeat left center;
+            }
+            &:nth-child(3){
+              background: url("../../../../static/images/agriculturalTrusteeship/insurance/insurance_list_iphone.png") no-repeat left center;
+            }
+          }
+        }
+        .content_con_right{
+          display: flex;
+          justify-content: end;
+          align-items: center;
+          img{
+            border-radius: 10PX;
+            width: 40%;
+            margin-left: 5%;
+            box-shadow: 0px 5PX 10PX rgba(0,0,0,0.2);
+            &:last-child{
+              width: auto;
+              box-shadow: none;
+            }
+          }
+        }
+      }
+    }
+    .main_content_right_list{
+      margin: 0 auto;
+      margin-bottom: 2vh;
+      width: 92%;
+      background: #ffffff;
+      padding: 15PX 3%;
+      border-radius: 10Px;
+      box-shadow: 0px 5PX 10PX rgba(0,0,0,0.1);
+      .main_tit{
+        font-size: .38rem;
+        display: flex;
+        align-items: center;
+        i{
+          display: block;
+          width: 16PX;
+          height: 16PX;
+          margin-right: 5PX;
+          flex-shrink: 0;
+          background: url("../../../../static/images/agriculturalTrusteeship/insurance/shop_needs_icon.png");
+        }
+        p{
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 1;
+          word-break: break-all;
+          overflow: hidden;
+        }
+      }
+      .main_money{
+        display: flex;
+        justify-content: space-between;
+        margin-top: 5PX;
+        p{
+          &:nth-child(1){
+            color: #FF5E00;
+            font-size: .4rem;
+            span{
+              font-size: .3rem;
+            }
+          }
+          &:nth-child(2){
+            color: #8B8B8B;
+            font-size: .35rem;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/views/agriculturalTrusteeship/shop/shopOrganizationDetail.vue b/src/views/agriculturalTrusteeship/shop/shopOrganizationDetail.vue
new file mode 100644
index 00000000..d73aa0ee
--- /dev/null
+++ b/src/views/agriculturalTrusteeship/shop/shopOrganizationDetail.vue
@@ -0,0 +1,442 @@
+<template>
+  <div class="home_wrapper">
+    <!--  头部开始  -->
+    <div class="header">
+      <div class="header_left" @click="onClickLeft">
+        <img src="../../../../static/images/agriculturalTrusteeship/return.png">
+        <p>需求详情</p>
+      </div>
+    </div>
+    <!--  头部结束  -->
+
+    <!--  内容开始  -->
+    <div class="main">
+      <div class="main_content_right_list">
+        <div class="main_tit">
+          <i></i>
+          <p>家家加加加加加加加就爱简爱家合作社</p>
+        </div>
+        <p class="main_content">村口需要水牛石头诚招水牛贷款联系电话165822本人人品优良绝不拖欠还款。</p>
+        <div class="main_money">
+          <p><span>需求金额</span><span>￥</span>512,000.00</p>
+        </div>
+        <van-divider />
+
+        <van-field
+          readonly
+          label="负责人"
+          input-align="right"
+          :border="false"
+          placeholder="负责人"
+        />
+
+        <van-field
+          readonly
+          label="联系方式"
+          input-align="right"
+          :border="false"
+          placeholder="联系方式"
+        />
+
+        <van-field
+          readonly
+          label="地址"
+          input-align="right"
+          :border="false"
+          placeholder="地址"
+        />
+
+      </div>
+      <div class="main_content_right_list2" v-for="(item,index) in 5" :key="index" @click="$router.push({name:'agriculturalTrusteeshipShopNeedsList'})">
+        <div class="main_tit">
+          <p>家家加加加加加加加就爱简爱家合作社</p>
+          <span>(1/10)</span>
+        </div>
+        <div class="main_content">
+          <p>玉米</p>
+          <p>32022亩</p>
+        </div>
+        <div class="main_money">
+          <p><i></i>丰田村</p>
+          <p><i></i>2023.03.15-2024.09.15</p>
+        </div>
+      </div>
+    </div>
+    <!--  内容结束  -->
+
+  </div>
+</template>
+<script>
+  import Cookies from "js-cookie";
+  import {productList, productOut, productIn, serviceGet, treeselect} from "@/api/agriculturalTrusteeship";
+  export default {
+    name: "shopOrganizationDetail",
+    data() {
+      return {
+
+      };
+    },
+    created() {
+
+    },
+    methods: {
+
+    },
+  }
+</script>
+<style scoped lang="scss">
+.home_wrapper{
+  background: #f9f9f9;
+  height: 100vh;
+  overflow: hidden;
+}
+  /*头部*/
+  .header{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    background-image: linear-gradient(to right , #6E93F3 , #7E89E9 , #54C6E4);
+    padding: 2vh 4% 2vh;
+    .header_left{
+      display: flex;
+      align-items: center;
+      p{
+        font-size: .4rem;
+        color: #ffffff;
+        line-height: 1;
+        margin-left: 10PX;
+      }
+    }
+    .header_right{
+      font-size: .35rem;
+      background: #334281;
+      padding: 2PX 10PX;
+      border-radius: 50PX;
+      /deep/ .van-checkbox__icon--checked .van-icon{
+        color: #334281;
+      }
+      /deep/ .van-checkbox__label{
+        color: #ffffff;
+      }
+      /deep/ .van-checkbox__icon .van-icon{
+        width: .9em;
+        height: .9em;
+        line-height: .9em;
+      }
+      /deep/ .van-icon-success::before{
+        width: .9em;
+        height: .9em;
+      }
+      /deep/ .van-checkbox__icon{
+        height: auto;
+      }
+    }
+  }
+
+  .main_btn{
+    display: flex;
+    background: #ffffff;
+    border-top-left-radius: 25PX;
+    border-top-right-radius: 25PX;
+    overflow: hidden;
+    padding: 4vw 4% 0;
+    justify-content: space-between;
+    .btn_box_01{
+      width: 48%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border: 1Px dashed #4E7FFF;
+      color: #4E7FFF;
+      font-size: .35rem;
+      line-height: 15vw;
+      border-radius: 10Px;
+      p:first-child{
+        font-weight: bold;
+        margin-right: 5PX;
+      }
+    }
+    .btn_box_02{
+      width: 48%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      background: rgba(78,127,255,0.17);
+      color: #1E49BB;
+      font-size: .35rem;
+      line-height: 15vw;
+      border-radius: 10Px;
+      p{
+        margin-left: 5PX;
+      }
+    }
+  }
+
+  .serviceName{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    span{
+      background: #E8E8E8;
+      padding: 0 8PX;
+      border-radius: 5PX;
+      color: #7A7A7A;
+      margin-right: 5PX;
+    }
+    .active{
+      background-image: linear-gradient(to right , #6E93F3 , #7E89E9 , #54C6E4);
+      color: #ffffff;
+    }
+  }
+
+  .nav{
+    background-image: linear-gradient(to right , #6E93F3 , #7E89E9 , #54C6E4);
+    padding-bottom: 15PX;
+    .tt{
+      font-size: .45rem;
+      color: #334281;
+    }
+    .content{
+      background: #ffffff;
+      width: 92%;
+      margin: 0 auto;
+      box-shadow: 0px 0px 10PX rgba(0,0,0,0.1);
+      border-radius: 25PX;
+      padding: 1.5vh 4%;
+    }
+    /deep/ .van-cell{
+      padding: 0;
+      margin-bottom: 10PX;
+      &:last-child{
+        margin: 0;
+      }
+    }
+  }
+
+  /* 内容 */
+  .main{
+    background-image: linear-gradient(to right , #6E93F3 , #7E89E9 , #54C6E4);
+    background-size: 100% 20PX;
+    background-repeat: no-repeat;
+    /deep/ .van-tabs__nav{
+      border-top-left-radius: 25PX;
+      border-top-right-radius: 25PX;
+      overflow: hidden;
+      background: #f9f9f9;
+    }
+    /deep/ .van-tabs__line{
+      background: #334281!important;
+    }
+    /deep/ .van-tab--active{
+      color: #334281;
+    }
+    /deep/ .van-tabs__content{
+      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;
+      margin-top: 2vh;
+      .content_tt{
+        font-size: .35rem;
+      }
+      .content_con{
+        display: flex;
+        justify-content: space-between;
+        margin-top: 1.5vh;
+        .content_con_left{
+          display: flex;
+          flex-direction:column;
+          justify-content: space-between;
+          p{
+            font-size: .35rem;
+            padding-left: 18PX;
+            &:nth-child(1){
+              background: url("../../../../static/images/agriculturalTrusteeship/insurance/insurance_list_project.png") no-repeat left center;
+            }
+            &:nth-child(2){
+              background: url("../../../../static/images/agriculturalTrusteeship/insurance/insurance_list_name.png") no-repeat left center;
+            }
+            &:nth-child(3){
+              background: url("../../../../static/images/agriculturalTrusteeship/insurance/insurance_list_iphone.png") no-repeat left center;
+            }
+          }
+        }
+        .content_con_right{
+          display: flex;
+          justify-content: end;
+          align-items: center;
+          img{
+            border-radius: 10PX;
+            width: 40%;
+            margin-left: 5%;
+            box-shadow: 0px 5PX 10PX rgba(0,0,0,0.2);
+            &:last-child{
+              width: auto;
+              box-shadow: none;
+            }
+          }
+        }
+      }
+    }
+    .main_content_right_list{
+      margin: 0 auto;
+      margin-bottom: 2vh;
+      width: 92%;
+      background: #ffffff;
+      padding: 15PX 3%;
+      border-radius: 10Px;
+      box-shadow: 0px 5PX 10PX rgba(0,0,0,0.1);
+      text-align: center;
+      /deep/ .van-cell{
+        padding: 0;
+        margin-bottom: 10PX;
+        &:last-child{
+          margin: 0;
+        }
+      }
+      .main_content{
+        font-size: .35rem;
+        line-height: .7rem;
+        margin-top: 10PX;
+        text-align: left;
+      }
+      .main_tit{
+        color: #4E7FFF;
+        font-size: .38rem;
+        display: flex;
+        align-items: center;
+        i{
+          display: block;
+          width: 16PX;
+          height: 16PX;
+          margin-right: 5PX;
+          flex-shrink: 0;
+          background: url("../../../../static/images/agriculturalTrusteeship/insurance/shop_needs_icon01.png");
+        }
+        p{
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 1;
+          word-break: break-all;
+          overflow: hidden;
+        }
+        span{
+          font-size: .3rem;
+          color: #8B8B8B;
+          flex-shrink: 0;
+        }
+      }
+      .main_money{
+        background: rgba(255,94,0,0.15);
+        display: inline-block;
+        padding: 5PX 15PX;
+        border-radius: 8PX;
+        margin: 10PX auto;
+        p{
+          &:nth-child(1){
+            color: #FF5E00;
+            font-size: .4rem;
+            span{
+              font-size: .3rem;
+            }
+          }
+          &:nth-child(2){
+            color: #8B8B8B;
+            font-size: .35rem;
+          }
+        }
+        span:nth-child(1){
+          margin-right: 5PX;
+        }
+      }
+    }
+    .main_content_right_list2{
+      margin: 0 auto;
+      margin-bottom: 2vh;
+      width: 92%;
+      background: #ffffff;
+      padding: 15PX 3%;
+      border-radius: 10Px;
+      box-shadow: 0px 5PX 10PX rgba(0,0,0,0.1);
+      .main_tit{
+        font-size: .38rem;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        p{
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 1;
+          word-break: break-all;
+          overflow: hidden;
+        }
+        span{
+          font-size: .3rem;
+          color: #8B8B8B;
+          flex-shrink: 0;
+        }
+      }
+      .main_money{
+        display: flex;
+        justify-content: space-between;
+        margin-top: 10PX;
+        p{
+          font-size: .35rem;
+          color: #8B8B8B;
+          display: flex;
+          align-items: center;
+          &:nth-child(1){
+            i{
+              display: inline-block;
+              width: 11PX;
+              height: 13Px;
+              margin-right: 2PX;
+              background: url("../../../../static/images/agriculturalTrusteeship/insurance/shop_needs_icon02.png");
+            }
+          }
+          &:nth-child(2){
+            i{
+              display: inline-block;
+              width: 13PX;
+              height: 13Px;
+              margin-right: 2PX;
+              background: url("../../../../static/images/agriculturalTrusteeship/insurance/shop_needs_icon03.png");
+            }
+          }
+        }
+      }
+      .main_content{
+        font-size: .35rem;
+        line-height: .6rem;
+        margin-top: 10PX;
+        display: flex;
+        justify-content: space-between;
+        p{
+          color: #4E7FFF;
+          &:nth-child(1){
+            background: rgba(78,127,255,0.13);
+            padding: 0 15PX;
+            border-radius: 5PX;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/static/images/agriculturalTrusteeship/insurance/shop_icon_add2.png b/static/images/agriculturalTrusteeship/insurance/shop_icon_add2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d208533aa5223df39ed3072f9897d27429bc4253
GIT binary patch
literal 1953
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

literal 0
HcmV?d00001

diff --git a/static/images/agriculturalTrusteeship/insurance/shop_icon_see.png b/static/images/agriculturalTrusteeship/insurance/shop_icon_see.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b81ae88b19f1fe0c288a8e9a7a7a2628e6a893d
GIT binary patch
literal 2720
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
auKXVj_|igFyaI;+0000<MNUMnLSTaD>?)K1

literal 0
HcmV?d00001

diff --git a/static/images/agriculturalTrusteeship/insurance/shop_icon_see2.png b/static/images/agriculturalTrusteeship/insurance/shop_icon_see2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1193b1b1ea5266733ae150e6c194a871691269b9
GIT binary patch
literal 407
zcmV;I0cie-P)<h;3K|Lk000e1NJLTq000sI000pP1^@s6&|3WY00004b3#c}2nYxW
zd<bNS0003_Nkl<ZI8V(~(N)4g5S-2PU+f@OK&U|c^$ErfVh2<J7aH(UfzUx7@%gPC
zqy+4M0wC*bOauu+<oV(L-QC{I?(EzNei@<D)>`o>Km<iRAB!^xuA9fL)2>Gl-UzB&
zD?#VQNp=*-D#&x(sUTu<w??a&u&O}~=*DSqmg9;S10EXl7yA#jXY*J((sLS0j<)Av
zM&^jkj+!_7nMoj#{z%mpx!~H%S^5b;rqiDQSrPvbs1!S(*wa(R_5>H-#!t`q1sLFS
z0)8=m!TF&na#Zi>SS)uFg>z|zm4`QTtDPA5nt-%OXv-R~Vn#!nSvSEpBT+or4h{K`
zI+<>tmo6V{TZC<0CQcT+t=V%}l&s4#X}Q~)5yB*(t`%ABiS&o+Dn{y*q_NyLar)jz
z+Z$>of_CNjXD6@6!1e+ae-8f}3f!XbNhSOtun+r6lMC*kX-@zE002ovPDHLkV1kG8
Bw1ofw

literal 0
HcmV?d00001

diff --git a/static/images/agriculturalTrusteeship/insurance/shop_needs_icon.png b/static/images/agriculturalTrusteeship/insurance/shop_needs_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a8a1c926716b1f966aa6a583d1a759b77371d20
GIT binary patch
literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0004dNkl<ZI8UvU-EG1!6ooN@H=@!F{1_=gr4uxnps)emAf2Ev0gR9hnhi=P
zC=vwatr;N|ypf-tgX}2Kn5SAo#=iG__b(P5!y1i7GnkfDRc(&P<1|gvtj$%lT`KVk
z;tA|4{3<~FHpm}<>$-CxL{Jokx8LtKQp(|AFjy0k=lL{AlC&B00)WUNqIzXnPAJxn
zgjkjp;`{`#-?Y^LB_1PH&r~mc0C{dggi7%phWlG$osEXz{IcC{BY~RNs5v_v4l`5a
z>qa|{6Lh;>PRJJ^ay)l*;>B*aW5bLK{*^YK0jh+t8dpGoYTAQ#M9n|CaRi{rueggi
zk-CX21%f#NYLst?@QL!q{Frd>5ePtZI-LSNP9p%mLx=*vC?xm{xL&sa9f;=F0G5F6
z*Sh}&pxzMl5K;O4XN?S&`2T3zw(R%&-=+*a03tN(3%iGXp#eC5u#wm$Ca{R(m;uh~
u;w>;juh)|_;Nhg~bYsjNh_mK9px-ZF&Jw8nxQtZ*0000<MNUMnLSTXl1jY*h

literal 0
HcmV?d00001

diff --git a/static/images/agriculturalTrusteeship/insurance/shop_needs_icon01.png b/static/images/agriculturalTrusteeship/insurance/shop_needs_icon01.png
new file mode 100644
index 0000000000000000000000000000000000000000..aaf4fa95265202656ffc87f35fb2a2fcf6fdb6d1
GIT binary patch
literal 446
zcmV;v0YUzWP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0004XNkl<ZI8UvU(N)4g5Jlf47JwC)4#WzK|AN>7b`TrDg$AUAbYKp6{1q#Z
z4x|M9CmG+YSx&%&FXt!c?9SYIGjAj4h=J3wD4rEq$AbI9$+j(3+75kjg?SZWWM2_z
zB)DmV`~eIn>Iltt5z;p&>ygu5Sz%Q}Ov$F%^Z>x(oRZU$ovk<|){vZ#>m8Le@AiPY
zxF54~*SwYk!Cey~p00R-;`~%`P!k|3cvw0qWH8YcFSjfncXd8qG?$#2Llws{z=pG3
zSdtyQIx%2p44;&1`V9}T5q3b|?9vFC0sL4cE<<7&<2x+Q0F?h21BE%VU!sjdfHQ!%
zQeeG4n9#S!w46z5K;{)3Hw$)l1AyLQCfTjil<Hgn9M5(N00P`Gz(!b1xwSg}7k~&k
zz0J9Uxmg<&M6`@uuejW#Qhc>4FsV_6f*by%tdtLH+5o&0Xiq!g{gh3tfsccK!8*{=
o#4gT&jcq#E?0u)I=6_&kKYL8^C*SmfPyhe`07*qoM6N<$g7o9P-T(jq

literal 0
HcmV?d00001

diff --git a/static/images/agriculturalTrusteeship/insurance/shop_needs_icon02.png b/static/images/agriculturalTrusteeship/insurance/shop_needs_icon02.png
new file mode 100644
index 0000000000000000000000000000000000000000..7191d82959648763e9af241afe949ff2cb4259db
GIT binary patch
literal 343
zcmV-d0jU0oP)<h;3K|Lk000e1NJLTq000XB000dL1^@s6fAy3*00004b3#c}2nYxW
zd<bNS0003FNkl<ZC{tZgyRm~X5PU~K>=Gz}66nB`poC9mckplrcE%^61iuQb5-5QZ
zNFji?tI^HKFr(4wZg+3FlOO*XV=i$VUqvKi>NpO&ZQI{Cj*DW1K~WSbKyN)BoP*%b
zFborOQrC5|@4F3?s-(3jin6wCXDQ2a#KYn-`VPP7ut4BNMbvYU^S<v5!3%<m_dJ1U
zyp3nqbtz-T5Ih5%pk)RtcL1nFfCaHZN6Q$POscAy)^&9gz%(XUxPgRAnn2kJQn`V`
z9C*Hy=v8NQH1MAQ+=zO`Ow(|tB%Et*&ff2nc9h_OACw<ZeY-gaGd29d!2btUUbOeM
p!7~A*;|%;#Rst8pSXZoh-v7$2!VZxawP^qV002ovPDHLkV1gb;kAVOH

literal 0
HcmV?d00001

diff --git a/static/images/agriculturalTrusteeship/insurance/shop_needs_icon03.png b/static/images/agriculturalTrusteeship/insurance/shop_needs_icon03.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8ba7d56b2b746b0372eb8f5f658ac34ef82c193
GIT binary patch
literal 377
zcmV-<0fzpGP)<h;3K|Lk000e1NJLTq000dD000dL1^@s6a_i)L00004b3#c}2nYxW
zd<bNS0003nNkl<ZC{uk>$!&!&6pTT@F-ZrMKsum<P=YTk$6o@eARJjP?jV#v2`+&W
z{t<D2%vd&Z68%`RY>(f(d7F6hR?{@{IF5HAL}B6eJkNRG_YbAi-I)qrq?9j7l6=8{
z?`|B&nK+!Ja3X1feRH@WRaLd%SON0WIEkVtou*0iU6y4A^#x9IV#0<bLCBpvupA2Q
zBTUqFJ;Q@?(l)F=B;v5u440&H7zPvOe@d3rAx!;<!~!tSD|wrH%Tu5TYY+r^-}kGp
z=90(X4S&ii%~0y7)FG!kaxz~0#VW>e%ogBk?ixMIgnNKkxDx*++t8@SwzRHKoB)MT
z3WUO3u4Nnl3E&k4Gm~;v&F0Vnd&V{sft6vu(V-vyk5bc$<S+~~R4;|{vTd98=Z-et
XS(Ce8$Sca{00000NkvXXu0mjfVBVs^

literal 0
HcmV?d00001


From d9a37b293ad16252c9795c77e5149f8684ddc791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Mon, 13 Mar 2023 17:37:20 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BD=91=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sunVillage_info/list_signature.vue | 13 +++++++++----
 src/views/user/signature/signatureList.vue   | 12 ++++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/views/sunVillage_info/list_signature.vue b/src/views/sunVillage_info/list_signature.vue
index a0a2ebaf..0913adfc 100644
--- a/src/views/sunVillage_info/list_signature.vue
+++ b/src/views/sunVillage_info/list_signature.vue
@@ -36,17 +36,22 @@
           <template #right>
             <div class="operation">
               <!-- delete 删除 edit编辑 view查看 list榜单 -->
-              <div class="opera_btn" style="margin-right: 10px;" v-if="!item.firstSigning" @click="openPopup(item.id)">
+
+              <div class="opera_btn" style="margin-right: 10px;" v-if="item.signingMode == '线上' && item.firstIsSign =='否' " @click="openPopup(item.id)">
                 <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>签名</p>
               </div>
-              <div class="opera_btn" style="margin-right: 10px;">
+              <div class="opera_btn" style="margin-right: 10px;" v-if="item.signingMode == '线上' && item.attachement !=  null ">
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>预览</p>
               </div>
-              <div class="opera_btn">
+              <div class="opera_btn" v-if="item.signingMode == '线上' && item.isArchive == '是' ">
+                <img src="../../assets/images/sunVillage_info/signature_icon_04.png" alt="" width="35">
+                <p>电子合同</p>
+              </div>
+              <div class="opera_btn" v-if="item.signingMode == '线下' ">
                 <img src="../../assets/images/sunVillage_info/signature_icon_04.png" alt="" width="35">
-                <p>下载</p>
+                <p>线下合同</p>
               </div>
             </div>
           </template>
diff --git a/src/views/user/signature/signatureList.vue b/src/views/user/signature/signatureList.vue
index 4a5610a2..e97aa169 100644
--- a/src/views/user/signature/signatureList.vue
+++ b/src/views/user/signature/signatureList.vue
@@ -35,17 +35,21 @@
           <template #right>
             <div class="operation">
               <!-- delete 删除 edit编辑 view查看 list榜单 -->
-              <div class="opera_btn" style="margin-right: 10px;" v-if="!item.firstSigning" @click="openPopup(item.id)">
+              <div class="opera_btn" style="margin-right: 10px;" v-if="item.signingMode == '线上' && item.firstIsSign =='否' " @click="openPopup(item.id)">
                 <img src="../../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>签名</p>
               </div>
-              <div class="opera_btn" style="margin-right: 10px;">
+              <div class="opera_btn" style="margin-right: 10px;" v-if="item.signingMode == '线上' && item.attachement !=  null ">
                 <img src="../../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>预览</p>
               </div>
-              <div class="opera_btn">
+              <div class="opera_btn" v-if="item.signingMode == '线上' && item.isArchive == '是' ">
                 <img src="../../../assets/images/sunVillage_info/signature_icon_04.png" alt="" width="35">
-                <p>下载</p>
+                <p>电子合同</p>
+              </div>
+              <div class="opera_btn" v-if="item.signingMode == '线下' ">
+                <img src="../../../assets/images/sunVillage_info/signature_icon_04.png" alt="" width="35">
+                <p>线下合同</p>
               </div>
             </div>
           </template>

From a552bd828b64bba5060e379a225f6890d182ddf4 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Mon, 13 Mar 2023 19:05:05 +0800
Subject: [PATCH 4/5] BUG

---
 src/views/user/signature/signatureList.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/user/signature/signatureList.vue b/src/views/user/signature/signatureList.vue
index e97aa169..986dd55d 100644
--- a/src/views/user/signature/signatureList.vue
+++ b/src/views/user/signature/signatureList.vue
@@ -20,11 +20,11 @@
           <div class="item" @click="goDetail(item.id)">
             <div class="info">
               <div class="title">
-                <i class="icon_box" v-if="item.firstSigning==null"></i>
-                <i class="icon_box1" v-if="item.firstSigning!=null"></i>
-                <p class="news_title" :style="{'color': item.firstSigning!=null?'#2bc30c':'#eb1616'}">{{item.contractCode}}</p>
-                <p class="tips_mark" :style="{'color': item.firstSigning!=null?'#79bc29':'#f8a83d','background': item.firstSigning!=null?'#e8ffcd':'#ffedcd'}">{{item.signingMode}}</p>
-                <p class="tips_mark2" :style="{'background': item.firstSigning!=null?'#2bc30c':'#eb1616'}">{{item.signingStatus}}</p>
+                <i class="icon_box" v-if="item.secondSigning==null"></i>
+                <i class="icon_box1" v-if="item.secondSigning!=null"></i>
+                <p class="news_title" :style="{'color': item.secondSigning!=null?'#2bc30c':'#eb1616'}">{{item.contractCode}}</p>
+                <p class="tips_mark" :style="{'color': item.secondSigning!=null?'#79bc29':'#f8a83d','background': item.secondSigning!=null?'#e8ffcd':'#ffedcd'}">{{item.signingMode}}</p>
+                <p class="tips_mark2" :style="{'background': item.secondSigning!=null?'#2bc30c':'#eb1616'}">{{item.signingStatus}}</p>
               </div>
               <div class="time">
                 <p>{{item.contractName}}</p>

From b3fd7f18c66c4f3c137f874035e5a424f8fb05e6 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Mon, 13 Mar 2023 19:11:00 +0800
Subject: [PATCH 5/5] BUG2

---
 src/views/user/signature/signatureList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/user/signature/signatureList.vue b/src/views/user/signature/signatureList.vue
index 986dd55d..4c60c14d 100644
--- a/src/views/user/signature/signatureList.vue
+++ b/src/views/user/signature/signatureList.vue
@@ -35,7 +35,7 @@
           <template #right>
             <div class="operation">
               <!-- delete 删除 edit编辑 view查看 list榜单 -->
-              <div class="opera_btn" style="margin-right: 10px;" v-if="item.signingMode == '线上' && item.firstIsSign =='否' " @click="openPopup(item.id)">
+              <div class="opera_btn" style="margin-right: 10px;" v-if="item.signingMode == '线上' && item.secondIsSign =='否' " @click="openPopup(item.id)">
                 <img src="../../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>签名</p>
               </div>