From 63d154add75d0fe6638b371bf63554cebb74770a 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, 19 Dec 2022 17:31:37 +0800
Subject: [PATCH 1/2] =?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/utils/request.js                          |  5 +-
 .../agriculturalTrusteeship/buyer/allBill.vue |  2 +-
 .../agriculturalTrusteeship/buyer/index.vue   |  2 +-
 src/views/agriculturalTrusteeship/index.vue   | 17 ++++--
 .../insurance/insuranceList.vue               |  2 +-
 .../insurance/insuranceProjectList.vue        |  2 +-
 src/views/agriculturalTrusteeship/login.vue   | 54 ++++++++++++-------
 .../shop/serviceEdit.vue                      |  2 +-
 .../agriculturalTrusteeship/shop/shopAdd.vue  | 47 ++++++----------
 .../shop/shopDetail.vue                       |  2 +-
 .../agriculturalTrusteeship/shop/shopEdit.vue | 31 +++--------
 .../agriculturalTrusteeship/shop/shopList.vue | 13 ++---
 .../socialization/bill.vue                    | 14 ++---
 .../socialization/billOrder.vue               |  2 +-
 .../socialization/projectDetail.vue           |  6 ++-
 .../socialization/projectEdit.vue             | 24 ++++++---
 .../society/societyList.vue                   |  4 +-
 .../society/societyProjectDetail.vue          | 13 +++--
 .../society/societyProjectList.vue            |  2 +-
 19 files changed, 129 insertions(+), 115 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 593730ee..af3daf43 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -95,11 +95,12 @@ service.interceptors.response.use(res => {
             window.location.href = '/sunVillage/login';
           } else if (window.location.href.indexOf('/homestead/') != -1) {
             window.location.href = '/homestead/login';
-          } else {
+          } else if (window.location.href.indexOf('yinnong') != -1){
             window.location.href = '/yinnongLogin';
             //window.location.href = '/zjdLogin';
-
             /*window.location.href = '/index';*/
+          } else {
+            window.location.href = '/agriculturalTrusteeship/login';
           }
         })
       })
diff --git a/src/views/agriculturalTrusteeship/buyer/allBill.vue b/src/views/agriculturalTrusteeship/buyer/allBill.vue
index 18442fe4..d9fb1ef9 100644
--- a/src/views/agriculturalTrusteeship/buyer/allBill.vue
+++ b/src/views/agriculturalTrusteeship/buyer/allBill.vue
@@ -64,7 +64,7 @@
             <div class="main_content_right_list_content">
               <p class="tt">{{item.demandName}}</p>
               <div class="tab">
-                <p>￥<span>{{item.unitPrice}}</span>.00/{{item.unit}}</p>
+                <p>￥<span>{{item.realityServiceMoney}}</span>.00</p>
               </div>
               <p class="name">
                 <span>数量：{{item.serviceNum}}</span>
diff --git a/src/views/agriculturalTrusteeship/buyer/index.vue b/src/views/agriculturalTrusteeship/buyer/index.vue
index 4d3425b7..95c0eb1d 100644
--- a/src/views/agriculturalTrusteeship/buyer/index.vue
+++ b/src/views/agriculturalTrusteeship/buyer/index.vue
@@ -89,7 +89,7 @@
             @load="getList"
           >
 <!--            @load="onLoad"  @click="$router.push({name:'agriculturalTrusteeshipPlaceOrder'})"-->
-            <div class="main_content_right_list" v-for="(item,index) in supplyDemandListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipPlaceOrder',query:{id:item.id}})">
+            <div class="main_content_right_list" v-for="(item,index) in supplyDemandListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipSocietyProjectDetail',query:{id:item.id}})">
               <img v-if="item.supplyMasterMap" :src="item.supplyMasterMap">
               <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png">
               <div class="main_content_right_list_content">
diff --git a/src/views/agriculturalTrusteeship/index.vue b/src/views/agriculturalTrusteeship/index.vue
index 8c40c8bd..6d3fa497 100644
--- a/src/views/agriculturalTrusteeship/index.vue
+++ b/src/views/agriculturalTrusteeship/index.vue
@@ -76,7 +76,7 @@
             </van-tabs>
           </div>
           <div class="main_content_right_nav" v-if="activeKey!=0">
-            <p v-for="(item,index) in productListChildren" :key="index">{{item.dictName}}</p>
+            <p :class="{'active':query.productType == item.id}" @click="tabChange(item.id)" v-for="(item,index) in productListChildren" :key="index">{{item.dictName}}</p>
           </div>
 
           <van-list
@@ -198,7 +198,12 @@
         }
         this.supplyDemandListYes = [];
         this.getList();
-      }
+      },
+      tabChange(val){
+        this.query.productType = val;
+        this.supplyDemandListYes=[];
+        this.getList();
+      },
     },
   }
 </script>
@@ -345,13 +350,19 @@
         }
         .main_content_right_nav{
           display: flex;
-          justify-content: space-between;
+          flex-wrap: wrap;
           margin-top: 2vh;
           p{
             padding: 5PX 10PX;
             background: #F5F5F5;
             color: #8F8F8F;
             border-radius: 4PX;
+            margin-right: 10PX;
+            margin-bottom: 10PX;
+            &.active{
+              background: #E2E9FD;
+              color: #1B5DEA;
+            }
           }
         }
         .main_content_right_list{
diff --git a/src/views/agriculturalTrusteeship/insurance/insuranceList.vue b/src/views/agriculturalTrusteeship/insurance/insuranceList.vue
index 753c67ce..4f3180fd 100644
--- a/src/views/agriculturalTrusteeship/insurance/insuranceList.vue
+++ b/src/views/agriculturalTrusteeship/insurance/insuranceList.vue
@@ -61,7 +61,7 @@
             @load="getList"
           >
             <!--            @load="onLoad"-->
-            <div class="main_content_right_list" v-for="(item,index) in productListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipInsuranceProjectDetail',query:{id:item.id}})">
+            <div class="main_content_right_list" v-for="(item,index) in productListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipSocietyProjectDetail',query:{id:item.id}})">
               <img v-if="item.mainImg" :src="item.mainImg" style="width: 18vw;height: 18vw;">
               <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 18vw;height: 18vw;">
               <div class="main_content_right_list_content">
diff --git a/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue b/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue
index 6d5d4e66..76a811e4 100644
--- a/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue
+++ b/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue
@@ -24,7 +24,7 @@
         @load="getList"
       >
         <!--            @load="onLoad"-->
-        <div class="main_content_right_list" v-for="(item,index) in productListYes" @click="$router.push({name:'agriculturalTrusteeshipInsuranceProjectDetail',query:{id:item.id}})">
+        <div class="main_content_right_list" v-for="(item,index) in productListYes" @click="$router.push({name:'agriculturalTrusteeshipSocietyProjectDetail',query:{id:item.id}})">
           <img v-if="item.mainImg" :src="item.mainImg" style="width: 18vw;height: 18vw;">
           <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 18vw;height: 18vw;">
           <div class="main_content_right_list_content">
diff --git a/src/views/agriculturalTrusteeship/login.vue b/src/views/agriculturalTrusteeship/login.vue
index b857adbb..a29834bc 100644
--- a/src/views/agriculturalTrusteeship/login.vue
+++ b/src/views/agriculturalTrusteeship/login.vue
@@ -95,25 +95,25 @@
             <div class="clear"></div>
           </div>
 <!--          $router.push({name:'agriculturalTrusteeshipShopList'})-->
-          <p class="submit_btn" v-if="loginType == 'mj'" @click="handleLogin">登录1</p>
+          <p class="submit_btn" v-if="loginType == 'mj'" @click="handleLogin">登录</p>
           <p class="submit_btn" v-else @click="goLogin">登录</p>
         </van-tab>
         <van-tab name="register" title="注册" v-if="loginType != 'mj'">
         <!--保险机构注册-->
           <template v-if="loginType == 'bxjg' || loginType == 'dkjg' || loginType == 'ndjg'">
-            <van-field v-model="serviceForm.financialName" center :border="false" placeholder="请输入机构名称" >
+            <van-field v-model="serviceForm.financialName" required center :border="false" placeholder="请输入机构名称" >
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_01.png" alt="">
               </template>
             </van-field>
 
-            <van-field v-model="serviceForm.linker" center :border="false" placeholder="请输入联系人">
+            <van-field v-model="serviceForm.linker" required center :border="false" placeholder="请输入联系人">
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_04.png" alt="">
               </template>
             </van-field>
 
-            <van-field v-model="serviceForm.address" center :border="false" placeholder="请输入地址" >
+            <van-field v-model="serviceForm.address" required center :border="false" placeholder="请输入地址" >
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_02.png" alt="">
               </template>
@@ -125,37 +125,37 @@
 <!--              </template>-->
 <!--            </van-field>-->
 
-            <van-field v-model="serviceForm.phone" center :border="false" placeholder="请输入电话">
+            <van-field v-model="serviceForm.phone" required center :border="false" placeholder="请输入电话">
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_07.png" alt="">
               </template>
             </van-field>
 
-            <van-field v-model="serviceForm.username" center :border="false" placeholder="请输入用户名" >
+            <van-field v-model="serviceForm.username" required center :border="false" placeholder="请输入用户名" >
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_06.png" alt="">
               </template>
             </van-field>
 
-            <van-field v-model="serviceForm.password" center :border="false" placeholder="请输入密码" >
+            <van-field v-model="serviceForm.password" required center :border="false" placeholder="请输入密码" >
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_08.png" alt="">
               </template>
             </van-field>
 
-            <van-field v-model="serviceForm.passwordReal" center :border="false" placeholder="请确认密码">
+            <van-field v-model="serviceForm.passwordReal" required center :border="false" placeholder="请确认密码">
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_08.png" alt="">
               </template>
             </van-field>
 
-            <van-field v-model="serviceForm.fax" center :border="false" placeholder="请输入传真">
+            <van-field v-model="serviceForm.fax" required center :border="false" placeholder="请输入传真">
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_05.png" alt="">
               </template>
             </van-field>
 
-            <van-field v-model="serviceForm.description" center :border="false" placeholder="请输入简要描述">
+            <van-field v-model="serviceForm.description" required center :border="false" placeholder="请输入简要描述">
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_03.png" alt="">
               </template>
@@ -166,7 +166,7 @@
 
           </template>
           <template v-if="loginType == 'fwzz'">
-            <van-field v-model="entityForm.entityName" center :border="false" placeholder="请输入主体名称" >
+            <van-field v-model="entityForm.entityName" required center :border="false" placeholder="请输入主体名称" >
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_01.png" alt="">
               </template>
@@ -274,7 +274,7 @@
               />
             </van-popup>
 
-            <van-field v-model="entityForm.entityAddress" center :border="false" placeholder="请输入主体地址" >
+            <van-field v-model="entityForm.entityAddress" required center :border="false" placeholder="请输入主体地址" >
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_02.png" alt="">
               </template>
@@ -307,31 +307,31 @@
               />
             </van-popup>
 
-            <van-field v-model="entityForm.principalName" center :border="false" placeholder="请输入负责人姓名">
+            <van-field v-model="entityForm.principalName" required center :border="false" placeholder="请输入负责人姓名">
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_06.png" alt="">
               </template>
             </van-field>
 
-            <van-field v-model="entityForm.tal" center :border="false" placeholder="请输入联系方式">
+            <van-field v-model="entityForm.tal" required center :border="false" placeholder="请输入联系方式">
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_07.png" alt="">
               </template>
             </van-field>
 
-            <van-field v-model="entityForm.userName" center :border="false" placeholder="请输入账号">
+            <van-field v-model="entityForm.userName" required center :border="false" placeholder="请输入账号">
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_06.png" alt="">
               </template>
             </van-field>
 
-            <van-field v-model="entityForm.password" center :border="false" placeholder="请输入密码">
+            <van-field v-model="entityForm.password" required center :border="false" placeholder="请输入密码">
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_08.png" alt="">
               </template>
             </van-field>
 
-            <van-field v-model="entityForm.passwordReal" center :border="false" placeholder="请确认密码">
+            <van-field v-model="entityForm.passwordReal" required center :border="false" placeholder="请确认密码">
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_08.png" alt="">
               </template>
@@ -455,7 +455,7 @@
 
           this.formData.username = encrypt(this.username);
           this.formData.password = encrypt(this.password);
-          this.formData.financialType = '2';
+          this.formData.financialType = this.financialType;
           serviceLogin(this.formData).then(response => {
             Cookies.set("ACCESS-SESSION-ID", response.data.id);
             Cookies.set("ServiceInformation", response.data);
@@ -476,7 +476,16 @@
         }
       },
       tabsChange(name){
-        console.log(name)
+        this.serviceForm = {};
+        this.entityForm = {};
+        this.statisticsTypeId = '';
+        this.industryClassificationType = '';
+        this.modelSocietyType = '';
+        this.deptName = '';
+        this.mainImgArr = [];
+        this.mainImgArrEntity = [];
+        this.mainImgUploader = [];
+        this.mainImgUploader2 = [];
         if ( name == 'register' ){
           this.position = 'relative';
           this.top = '40px';
@@ -901,4 +910,11 @@
       border-radius: 50PX;
     }
   }
+  /deep/ .van-cell--required::before{
+    left: 20PX;
+    color: rgb(30, 103, 255);
+  }
+  /deep/ .van-cell__value{
+    padding-left: 10PX;
+  }
 </style>
diff --git a/src/views/agriculturalTrusteeship/shop/serviceEdit.vue b/src/views/agriculturalTrusteeship/shop/serviceEdit.vue
index ec6ecb06..3b732c99 100644
--- a/src/views/agriculturalTrusteeship/shop/serviceEdit.vue
+++ b/src/views/agriculturalTrusteeship/shop/serviceEdit.vue
@@ -2,7 +2,7 @@
   <div class="home_wrapper">
     <!--  头部开始  -->
     <van-nav-bar
-      title="编辑保险公司信息"
+      title="编辑公司信息"
       fixed
       placeholder
       left-arrow
diff --git a/src/views/agriculturalTrusteeship/shop/shopAdd.vue b/src/views/agriculturalTrusteeship/shop/shopAdd.vue
index 794c3c61..ae0ee7ef 100644
--- a/src/views/agriculturalTrusteeship/shop/shopAdd.vue
+++ b/src/views/agriculturalTrusteeship/shop/shopAdd.vue
@@ -11,41 +11,24 @@
     <!--  头部结束  -->
 
 
-    <!--  内容开始  -->
-    <div class="main">
-      <van-field label="产品名称" v-model="product.productName" input-align="right" placeholder="请输入产品名称" />
-      <van-field
-        readonly
-        clickable
-        required
-        :rules="[{ required: true , message:'请选择产品类型'}]"
-        v-model="productType"
-        label="产品类型"
-        placeholder="请选择产品类型"
-        @click="showProductType = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showProductType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="productTypeOptions"
-          @confirm="onConfirmProductType"
-          @cancel="showProductType = false"
-        />
-      </van-popup>
+    <van-form @submit="submitForm" ref="formData" show-error :show-error-message="false">
+      <!--  内容开始  -->
+      <div class="main">
+        <van-field label="产品名称" required :rules="[{ required: true }]" v-model="product.productName" input-align="right" placeholder="请输入产品名称" />
 
-      <van-field label="简介" type="textarea" autosize v-model="product.productLink" input-align="right" placeholder="请输入简介" />
-      <van-field label="图片" :border="false" input-align="right" readonly />
-      <div style="padding: 0 4% 2vh;">
-        <van-uploader v-model="product.mainImgList" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" />
+        <van-field label="产品类型" required :rules="[{ required: true }]" v-model="product.productType" input-align="right" placeholder="请输入产品类型" />
+
+        <van-field label="产品描述" required :rules="[{ required: true }]" type="textarea" autosize v-model="product.productLink" input-align="right" placeholder="请输入产品描述" />
+        <van-field label="图片" :border="false" input-align="right" readonly />
+        <div style="padding: 0 4% 2vh;">
+          <van-uploader v-model="product.mainImgList" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" />
+        </div>
       </div>
-    </div>
 
-    <div class="main_btn">
-      <p @click="submitForm">发布</p>
-    </div>
+      <div class="main_btn" @click="$refs.formData.submit()">
+        <p>发布</p>
+      </div>
+    </van-form>
     <!--  内容结束  -->
   </div>
 </template>
diff --git a/src/views/agriculturalTrusteeship/shop/shopDetail.vue b/src/views/agriculturalTrusteeship/shop/shopDetail.vue
index e6c0246e..8fe4e38a 100644
--- a/src/views/agriculturalTrusteeship/shop/shopDetail.vue
+++ b/src/views/agriculturalTrusteeship/shop/shopDetail.vue
@@ -2,7 +2,7 @@
   <div class="home_wrapper">
     <!--  头部开始  -->
     <van-nav-bar
-      title="发布商品"
+      title="查看商品"
       fixed
       placeholder
       left-arrow
diff --git a/src/views/agriculturalTrusteeship/shop/shopEdit.vue b/src/views/agriculturalTrusteeship/shop/shopEdit.vue
index 2a7ebc0e..cc149167 100644
--- a/src/views/agriculturalTrusteeship/shop/shopEdit.vue
+++ b/src/views/agriculturalTrusteeship/shop/shopEdit.vue
@@ -2,7 +2,7 @@
   <div class="home_wrapper">
     <!--  头部开始  -->
     <van-nav-bar
-      title="发布商品"
+      title="修改商品"
       fixed
       placeholder
       left-arrow
@@ -13,29 +13,12 @@
 
     <!--  内容开始  -->
     <div class="main">
-      <van-field label="产品名称" v-model="product.productName" input-align="right" placeholder="无" />
-      <van-field
-        readonly
-        clickable
-        required
-        :rules="[{ required: true , message:'请选择产品类型'}]"
-        v-model="productType"
-        label="产品类型"
-        placeholder="请选择产品类型"
-        @click="showProductType = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showProductType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="productTypeOptions"
-          @confirm="onConfirmProductType"
-          @cancel="showProductType = false"
-        />
-      </van-popup>
-      <van-field label="简介" type="textarea" autosize v-model="product.productLink" input-align="right" placeholder="无" />
+      <van-field label="产品名称" required :rules="[{ required: true }]" v-model="product.productName" input-align="right" placeholder="请输入产品名称" />
+
+      <van-field label="产品类型" required :rules="[{ required: true }]" v-model="product.productType" input-align="right" placeholder="请输入产品类型" />
+
+      <van-field label="产品描述" required :rules="[{ required: true }]" type="textarea" autosize v-model="product.productLink" input-align="right" placeholder="请输入产品描述" />
+
       <van-field label="图片" :border="false" input-align="right" readonly />
       <div style="padding: 0 4% 2vh;">
         <van-uploader v-model="product.mainImgList" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" />
diff --git a/src/views/agriculturalTrusteeship/shop/shopList.vue b/src/views/agriculturalTrusteeship/shop/shopList.vue
index 828e3d67..090c16f3 100644
--- a/src/views/agriculturalTrusteeship/shop/shopList.vue
+++ b/src/views/agriculturalTrusteeship/shop/shopList.vue
@@ -17,26 +17,26 @@
             <p class="tt">公司信息</p>
           </template>
           <template #right-icon>
-            <img src="../../../../static/images/agriculturalTrusteeship/insurance/shop_icon_edit.png" @click="$router.push({name:'agriculturalTrusteeshipServiceEdit'})">
+            <img v-if="serviceForm.auditStatus != '3'" src="../../../../static/images/agriculturalTrusteeship/insurance/shop_icon_edit.png" @click="$router.push({name:'agriculturalTrusteeshipServiceEdit'})">
           </template>
         </van-cell>
 
         <van-field
           readonly
-          :value="serviceForm.financialName"
           label="机构名称"
           left-icon="../../../../static/images/agriculturalTrusteeship/insurance/shop_icon_com.png"
           input-align="right"
           :border="false"
-          placeholder="机构名称"
-        >
-          <template #input>
+        />
+
+        <van-cell :border="false">
+          <template #title>
             <div class="serviceName">
               <span :class="{'active':serviceForm.auditStatus == '3'}">{{serviceForm.auditStatus == '1'?'待审核':serviceForm.auditStatus == '3'?'已通过':serviceForm.auditStatus == '2'?'驳回':''}}</span>
               <p>{{serviceForm.financialName}}</p>
             </div>
           </template>
-        </van-field>
+        </van-cell>
 
         <van-field
           readonly
@@ -228,6 +228,7 @@
   .serviceName{
     display: flex;
     align-items: center;
+    justify-content: space-between;
     span{
       background: #E8E8E8;
       padding: 0 8PX;
diff --git a/src/views/agriculturalTrusteeship/socialization/bill.vue b/src/views/agriculturalTrusteeship/socialization/bill.vue
index 6ffa2d2c..290f0431 100644
--- a/src/views/agriculturalTrusteeship/socialization/bill.vue
+++ b/src/views/agriculturalTrusteeship/socialization/bill.vue
@@ -206,22 +206,24 @@
       });
       let query = {
         parentId : null,
-        tree:true
+        tree:false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
       });
       let query2 = {
         parentId : null,
-        tree:false
+        tree:true
       }
       productTypes(query2).then(response => {
         response.data.map(res=>{
-          res.children.map(rr=>{
-            rr.active = false;
-          })
+          console.log(res.children)
+          // res.children.map(rr=>{
+          //   rr.active = false;
+          // })
+          this.productList2.push(response.data);
         })
-        this.productList2 = response.data;
+        // this.productList2 = response.data;
       });
       this.getDicts("crop_type").then(response => {
           this.cropTypeOptions = response.data;
diff --git a/src/views/agriculturalTrusteeship/socialization/billOrder.vue b/src/views/agriculturalTrusteeship/socialization/billOrder.vue
index a8fa0452..f56a9472 100644
--- a/src/views/agriculturalTrusteeship/socialization/billOrder.vue
+++ b/src/views/agriculturalTrusteeship/socialization/billOrder.vue
@@ -130,7 +130,7 @@
       },
       clickNo(){
         supplyorderReject(this.$route.query.id).then(response => {
-          this.$notify({ type: 'success', message: '接单成功' });
+          this.$notify({ type: 'success', message: '拒单成功' });
           setTimeout(function(){
             history.back(-1);
           },2000)
diff --git a/src/views/agriculturalTrusteeship/socialization/projectDetail.vue b/src/views/agriculturalTrusteeship/socialization/projectDetail.vue
index 39ffb827..b79cfd5c 100644
--- a/src/views/agriculturalTrusteeship/socialization/projectDetail.vue
+++ b/src/views/agriculturalTrusteeship/socialization/projectDetail.vue
@@ -82,10 +82,12 @@
     },
     created() {
       let query = {
-        parentId : ''
+        parentId : null,
+        tree:true
       }
       let query1 = {
-        tree : true
+        parentId : null,
+        tree : false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
diff --git a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
index 38a69b17..e046ea34 100644
--- a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
+++ b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
@@ -70,11 +70,10 @@
       <van-field label="单位" v-model="supplyDemand.unit" input-align="right" placeholder="请输入单位" />
       <van-field label="联系电话" v-model="supplyDemand.supplyDemandTal" input-align="right" placeholder="请输入联系电话" />
       <van-field label="联系人" v-model="supplyDemand.linker" input-align="right" placeholder="请输入联系人" />
-      <van-field label="服务区域" v-model="supplyDemand.serviceDeptName" input-align="right" placeholder="请输入服务区域" />
       <van-field label="地址" v-model="supplyDemand.address" input-align="right" placeholder="请输入地址" />
       <van-field label="简介" v-model="supplyDemand.introduction" input-align="right" placeholder="请输入简介" />
       <van-field label="详情" v-model="supplyDemand.particulars" input-align="right" placeholder="请输入详情" />
-      <van-field label="图片" :border="false" input-align="right" placeholder="请输入图片" />
+      <van-field label="图片" readonly :border="false" input-align="right" />
       <div style="padding: 0 4% 2vh;">
         <van-uploader v-model="supplyDemand.supplyMasterMapList" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" />
       </div>
@@ -88,15 +87,21 @@
     </div>
 
     <div class="main_btn">
-      <p @click="submitForm">发布</p>
-      <p>存稿</p>
+      <p @click="submitForm('3')">发布</p>
+      <p @click="submitForm('2')">存稿</p>
     </div>
     <!--  内容结束  -->
   </div>
 </template>
 <script>
   import Cookies from "js-cookie";
-  import {supplyDemandGet, productTypes, commonUpload, supplyDemandEdit} from "@/api/agriculturalTrusteeship";
+  import {
+    supplyDemandGet,
+    productTypes,
+    commonUpload,
+    supplyDemandEdit,
+    supplyDemandAdd
+  } from "@/api/agriculturalTrusteeship";
   export default {
     name: "agriculturalTrusteeshipSocializationRelease",
     data() {
@@ -130,10 +135,11 @@
     },
     created() {
       let query = {
-        parentId : ''
+        parentId : null,
+        tree:true
       }
       let query1 = {
-        tree : true
+        tree : false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
@@ -191,8 +197,10 @@
         this.supplyMasterMapArr.splice(detail.index,1);
         this.supplyDemand.supplyMasterMapList.splice(detail.index,1);
       },
-      submitForm(){
+      submitForm(publishStatus){
         this.supplyDemand.supplyMasterMap = this.supplyMasterMapArr.join(',')
+        this.supplyDemand.supplyDemandType = '1';
+        this.supplyDemand.publishStatus = publishStatus;
         supplyDemandEdit(this.supplyDemand).then((res) => {
           if(res.code=="200"){
             this.$notify({ type: 'success', message: '发布成功' });
diff --git a/src/views/agriculturalTrusteeship/society/societyList.vue b/src/views/agriculturalTrusteeship/society/societyList.vue
index abd7d744..329480fd 100644
--- a/src/views/agriculturalTrusteeship/society/societyList.vue
+++ b/src/views/agriculturalTrusteeship/society/societyList.vue
@@ -92,8 +92,8 @@
                 finished-text="没有更多了"
                 @load="getList"
               >
-                <!--            @load="onLoad"-->
-                <div class="main_content_right_list" v-for="(item,index) in supplyDemandListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipSocializationProjectDetail',query:{id:item.id}})">
+                <!--            @load="onLoad" agriculturalTrusteeshipSocializationProjectDetail-->
+                <div class="main_content_right_list" v-for="(item,index) in supplyDemandListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipSocietyProjectDetail',query:{id:item.id}})">
                   <img v-if="item.supplyMasterMap" :src="item.supplyMasterMap" style="width: 25vw;height: 25vw;">
                   <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 25vw;height: 25vw;">
                   <div class="main_content_right_list_content">
diff --git a/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue b/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue
index 465504f3..04ace279 100644
--- a/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue
+++ b/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue
@@ -23,7 +23,7 @@
           <p><span>销 {{supplyDemand.orderNum}}</span><span>分 {{supplyDemand.orderScore}}</span></p>
         </div>
         <p class="tt">{{supplyDemand.supplyDemandName}}</p>
-        <p class="name">{{supplyDemand.entityName}}</p>
+        <p class="name">{{supplyDemand.entityName}}<span>{{supplyDemand.createTime.substr(0,10)}}</span></p>
       </div>
 
       <div class="main_box">
@@ -31,7 +31,7 @@
         <van-cell title="产品规格" :border="false" :value="supplyDemand.specification" />
         <van-cell title="产品数量" :border="false" :value="supplyDemand.number" />
         <van-cell title="服务区域" :border="false" :value="supplyDemand.serviceDeptName" />
-        <van-cell title="产品简介" :border="false" :value="supplyDemand.introduction" />
+        <van-cell title="产品简介" type="textarea" autosize :border="false" :value="supplyDemand.introduction" />
         <van-cell title="公司地址" :border="false" :value="supplyDemand.address" />
       </div>
 
@@ -53,7 +53,7 @@
     <!--  底部提交按钮  -->
     <div class="footer">
       <p>温馨提示：下单前请先与商家沟通联系</p>
-      <img src="../../../../static/images/agriculturalTrusteeship/insurance/submit_shop_btn.png">
+      <img src="../../../../static/images/agriculturalTrusteeship/insurance/submit_shop_btn.png" @click="$router.push({name:'agriculturalTrusteeshipPlaceOrder',query:{id:$route.query.id}})">
     </div>
   </div>
 </template>
@@ -187,6 +187,13 @@
         color: #4E7FFF;
         background: url("../../../../static/images/agriculturalTrusteeship/index/name_icon.png") no-repeat left center;
         padding-left: 18PX;
+        display: flex;
+        span{
+          color: #334281;
+          margin-left: auto;
+          padding:0 0 0 18PX;
+          background: url("../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_clock.png") no-repeat left center
+        }
       }
       .tab{
         display: flex;
diff --git a/src/views/agriculturalTrusteeship/society/societyProjectList.vue b/src/views/agriculturalTrusteeship/society/societyProjectList.vue
index 56c1aab6..d186b325 100644
--- a/src/views/agriculturalTrusteeship/society/societyProjectList.vue
+++ b/src/views/agriculturalTrusteeship/society/societyProjectList.vue
@@ -43,7 +43,7 @@
             @load="getList"
           >
             <!--            @load="onLoad"-->
-            <div class="main_content_right_list" v-for="(item,index) in supplyDemandListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipSocializationProjectDetail',query:{id:item.id}})">
+            <div class="main_content_right_list" v-for="(item,index) in supplyDemandListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipSocietyProjectDetail',query:{id:item.id}})">
               <img v-if="item.supplyMasterMap" :src="item.supplyMasterMap" style="width: 18vw;height: 18vw;">
               <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 18vw;height: 18vw;">
               <div class="main_content_right_list_content">

From 1838d40304847bbf4c934e6e858021c056cb19ea Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Mon, 26 Dec 2022 15:19:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sunVillage_info/index.vue | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/views/sunVillage_info/index.vue b/src/views/sunVillage_info/index.vue
index f9352877..74739b04 100644
--- a/src/views/sunVillage_info/index.vue
+++ b/src/views/sunVillage_info/index.vue
@@ -45,6 +45,7 @@
         </div>
         <div class="index_info">
             <div class="title"></div>
+
             <div class="nav_list">
               <div class="nav_list_box">
                 <van-cell style="border-radius: 6px;">
@@ -54,14 +55,12 @@
                 </van-cell>
                 <router-link :to="{name:'sunVillageInfoListFinance'}" class="nav_item n_1">财务公开榜</router-link>
                 <router-link :to="{name:'sunVillageInfoListTourists'}" class="nav_item n_2">零工公开榜</router-link>
+                <router-link :to="{name:'sunVillageInfoListRegister'}" class="nav_item n_8">零工登记</router-link>
                 <router-link :to="{name:'sunVillageInfoListIssues'}" class="nav_item n_3">重大事项</router-link>
-                <router-link :to="{name:'sunVillageInfoListBalanceRanking'}" class="nav_item n_4">科目余额表</router-link>
                 <router-link :to="{name:'sunVillageInfoListVote'}" class="nav_item n_5">发布投票</router-link>
-                <router-link :to="{name:'sunVillageInfoFixedAssets'}" class="nav_item n_6">资产登记</router-link>
-                <router-link :to="{name:'sunVillageInfoInformation'}" class="nav_item n_7">合同登记</router-link>
-                <router-link :to="{name:'sunVillageInfoListRegister'}" class="nav_item n_8">零工登记</router-link>
               </div>
             </div>
+
             <div class="nav_list">
               <div class="nav_box">
                 <van-cell style="border-radius: 6px;">
@@ -124,15 +123,31 @@
                     </div>
                     <p style="margin-top: 5px;color: #666666;">开户行</p>
                   </van-grid-item>
+                  <!--
                   <van-grid-item text="重大事项" :to="{name:'sunVillageApprovalList13'}" >
                     <div class="icon" slot="default" style="background:#c568f5;" >
                       <img src="../../../static/images/onlineHome/icon_Y3.png" alt />
                     </div>
                     <p style="margin-top: 5px;color: #666666;">重大事项</p>
                   </van-grid-item>
+                  -->
                 </van-grid>
               </div>
             </div>
+
+          <div class="nav_list">
+            <div class="nav_list_box">
+              <van-cell style="border-radius: 6px;">
+                <template #title>
+                  <p style="font-weight: bold;font-size: 18px;display: inline-block">财务信息</p>
+                </template>
+              </van-cell>
+              <router-link :to="{name:'sunVillageInfoListBalanceRanking'}" class="nav_item n_4">科目余额表</router-link>
+              <router-link :to="{name:'sunVillageInfoFixedAssets'}" class="nav_item n_6">固定资产</router-link>
+              <router-link :to="{name:'sunVillageInfoInformation'}" class="nav_item n_7">合同信息</router-link>
+            </div>
+          </div>
+
         </div>
         <div class="footer">
             技术支持：北京农燊高科信息技术有限公司