From 2e53fdfa529467f6371244b96bb31859810c300f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Wed, 23 Oct 2024 16:34:34 +0800
Subject: [PATCH] =?UTF-8?q?task=20=E4=BA=A7=E4=BA=A4=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/index.js                         |   2 +-
 .../sunVillage_info/signature_icon_01z.png    | Bin 0 -> 513 bytes
 src/views/project/index.vue                   |  12 ++
 src/views/project/projectNeedsDetail.vue      |  13 +-
 .../userInformation/companyInformation.vue    |  80 ++++++------
 .../userInformation/userInformation.vue       |  13 +-
 src/views/user/signature/signatureDetail.vue  |  17 +--
 src/views/user/signature/signatureList.vue    |  14 +-
 src/views/user/supply/index.vue               |   2 +-
 src/views/user/supply/supplyAdd.vue           | 120 ++++++++----------
 10 files changed, 136 insertions(+), 137 deletions(-)
 create mode 100644 src/assets/images/sunVillage_info/signature_icon_01z.png

diff --git a/src/api/user/index.js b/src/api/user/index.js
index d073d7d3..9dbbf563 100644
--- a/src/api/user/index.js
+++ b/src/api/user/index.js
@@ -51,7 +51,7 @@ export function base64Attach(query){
 export function deleteUserImg(id){
   return request({
     url: '/transaction/member/deleteImg/attachId/'+id,
-    method: 'delete',
+    method: 'get',
   })
 }
 
diff --git a/src/assets/images/sunVillage_info/signature_icon_01z.png b/src/assets/images/sunVillage_info/signature_icon_01z.png
new file mode 100644
index 0000000000000000000000000000000000000000..13d01e43fe45b14988244a9f685f22f9543c44e3
GIT binary patch
literal 513
zcmV+c0{;DpP)<h;3K|Lk000e1NJLTq000vJ000vR1^@s6a!@wR00004b3#c}2nYxW
zd<bNS0005FNkl<ZI8U`yOHRU26uq}i3`P=RsA(hY09GKbK->Wi1ZEPda~vzbS;2v@
z0&xZ63S<cw8mHF8sF<|Z`^xW?uaJ0WZQeWgoO{lFn9o`%ASxqb2-YYfvVribRM#q_
zYiMM8HX!b<f#W;seD8!Sjj%0#qLH;|Qy>oj=;+4O+y4tDQ(nZ@NWUgQaqq`-TEeVN
zfF9+=MJWV`tOg@`Cxng+gn)<3pcMz=*SDH?$7jGinHSk!g4sTf0YyW?f*grSG-Nl4
zSs{2fkBY61$g;pyPMn|Zwi5U}2cU@RKy@xN26!Q$u1_XGY@9=8RjlbDBV$##DT6T_
zK(}OS(HWUVQ)3eTl4WwEr;@2B@|j+XH|BVB(g8JEG55Ou(5{dvR><uKqw3aIViXVl
z_fV?o$&EtGvQAl6gEvQv<3P-?Sl@4L1SZx89kg8)o;{fa)nZM{tq(T5m`__dRG>Tr
z>o8b+U9ct_l)5~#Vy*&r>}E{LUe4(Un}2>aX5>xV&a5$??X_2}j3<F-H5ie!4RW~I
zRm`Q{LQ3F63@|a>O#W5?3gX=ofhDAg#6bsJb+PaZCbsX324)E}00000NkvXXu0mjf
D!o}N!

literal 0
HcmV?d00001

diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index 2393b9a7..ac556aa9 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -159,6 +159,18 @@ export default {
   methods: {
     tabChange(e){
       console.log(e)
+
+      this.infoList = [];
+      this.infoList1 = [];
+
+      this.queryDatas.pageNum = 1;
+      this.infoList=[];
+      this.finished = false;
+
+      this.queryNeedDatas.pageNum = 1;
+      this.infoList1=[];
+      this.finished1 = false;
+
       if (e == 0){
         this.getList();
       }else{
diff --git a/src/views/project/projectNeedsDetail.vue b/src/views/project/projectNeedsDetail.vue
index ee6473c9..e5d2c48a 100644
--- a/src/views/project/projectNeedsDetail.vue
+++ b/src/views/project/projectNeedsDetail.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <navBar title="需求项目" background="0" positionType="fixed"></navBar>
     <div class="block_box">
-      <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }">{{noticeDetail.projectName}}</van-divider>
+      <div class="block_tt"><i></i>{{noticeDetail.projectName}}</div>
       <van-cell title="需求项目类别" :value="noticeDetail.projectNumber" />
       <van-cell title="需求价格描述" :value="noticeDetail.price" />
       <van-cell title="需求方名称" :value="noticeDetail.needname" />
@@ -19,7 +19,7 @@
 
     </div>
     <div class="block_box gnbg">
-      <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }">附件图片</van-divider>
+      <div class="block_tt"><i></i>附件图片</div>
       <img :src="'/api'+item.fileUrl" v-for="(item , index) in noticeDetail.attachments" alt="" width="100%">
     </div>
   </div>
@@ -82,15 +82,16 @@ export default {
   border-radius: 15Px;
   overflow: hidden;
   .block_tt{
-    font-size: 16Px;
+    font-size: 20Px;
     display: flex;
     align-items: center;
-    padding: 0 3vw;
+    padding: 1.6vh 3vw;
     line-height: 1;
+    font-weight: bold;
     i{
       display: block;
-      width: 3Px;
-      height: 14Px;
+      width: 4Px;
+      height: 16Px;
       background: #0CBEA6;
       margin-right: 5PX;
       border-radius: 5PX;
diff --git a/src/views/user/accountSetting/userInformation/companyInformation.vue b/src/views/user/accountSetting/userInformation/companyInformation.vue
index d0d68aa4..ee41b64a 100644
--- a/src/views/user/accountSetting/userInformation/companyInformation.vue
+++ b/src/views/user/accountSetting/userInformation/companyInformation.vue
@@ -13,49 +13,49 @@
         <van-field v-model="userForm.companyName" label="公司名称" placeholder="请输入公司名称" required :rules="[{ required:true }]"/>
         <van-field v-model="userForm.companyCode" label="社会信用代码" placeholder="请输入公司的社会信用代码"/>
 
-        <van-field
-          readonly
-          clickable
-          label="企业性质"
-          :value="companyNameValue"
-          placeholder="选择企业性质"
-          @click="showPickerPiker = true"
-        />
-        <van-popup v-model="showPickerPiker" round position="bottom">
-          <van-picker
-            show-toolbar
-            :columns="companyNameList"
-            @cancel="showPickerPiker = false"
-            @confirm="onConfirmCompany"
-          />
-        </van-popup>
-  <!--      <van-field v-model="userForm.companyNature" label="企业性质" placeholder="请输入企业性质" required :rules="[{ required:true }]" />-->
+<!--        <van-field-->
+<!--          readonly-->
+<!--          clickable-->
+<!--          label="企业性质"-->
+<!--          :value="companyNameValue"-->
+<!--          placeholder="选择企业性质"-->
+<!--          @click="showPickerPiker = true"-->
+<!--        />-->
+<!--        <van-popup v-model="showPickerPiker" round position="bottom">-->
+<!--          <van-picker-->
+<!--            show-toolbar-->
+<!--            :columns="companyNameList"-->
+<!--            @cancel="showPickerPiker = false"-->
+<!--            @confirm="onConfirmCompany"-->
+<!--          />-->
+<!--        </van-popup>-->
+<!--  &lt;!&ndash;      <van-field v-model="userForm.companyNature" label="企业性质" placeholder="请输入企业性质" required :rules="[{ required:true }]" />&ndash;&gt;-->
 
 
-        <van-field v-model="userForm.companyScope" label="经营范围" placeholder="请输入经营范围" />
-        <van-field v-model="userForm.companyTimeLimit" label="经营期限" placeholder="请输入经营期限" />
-        <van-field
-          readonly
-          clickable
-          label="成立时间"
-          :value="userForm.companySetupTime"
-          placeholder="选择成立时间"
-          @click="showPicker = true"
-        />
-        <van-popup v-model="showPicker" round position="bottom">
-          <van-datetime-picker
-            v-model="currentDate"
-            type="date"
-            title="选择年月日"
-            :min-date="minDate"
-            :max-date="maxDate"
-            @cancel="showPicker = false"
-            @confirm="onConfirm"
-          />
-        </van-popup>
+<!--        <van-field v-model="userForm.companyScope" label="经营范围" placeholder="请输入经营范围" />-->
+<!--        <van-field v-model="userForm.companyTimeLimit" label="经营期限" placeholder="请输入经营期限" />-->
+<!--        <van-field-->
+<!--          readonly-->
+<!--          clickable-->
+<!--          label="成立时间"-->
+<!--          :value="userForm.companySetupTime"-->
+<!--          placeholder="选择成立时间"-->
+<!--          @click="showPicker = true"-->
+<!--        />-->
+<!--        <van-popup v-model="showPicker" round position="bottom">-->
+<!--          <van-datetime-picker-->
+<!--            v-model="currentDate"-->
+<!--            type="date"-->
+<!--            title="选择年月日"-->
+<!--            :min-date="minDate"-->
+<!--            :max-date="maxDate"-->
+<!--            @cancel="showPicker = false"-->
+<!--            @confirm="onConfirm"-->
+<!--          />-->
+<!--        </van-popup>-->
 
-        <!--<van-field v-model="userForm.companySetupTime" label="成立时间" placeholder="请输入成立时间" required :rules="[{ required:true }]" />-->
-        <van-field v-model="userForm.companyCapital" label="注册资金" placeholder="请输入注册资金" />
+<!--        &lt;!&ndash;<van-field v-model="userForm.companySetupTime" label="成立时间" placeholder="请输入成立时间" required :rules="[{ required:true }]" />&ndash;&gt;-->
+<!--        <van-field v-model="userForm.companyCapital" label="注册资金" placeholder="请输入注册资金" />-->
         <van-field v-model="userForm.address" label="联系地址" placeholder="请输入联系地址" />
         <van-field v-model="userForm.realname" label="法人姓名" placeholder="请输入法人姓名" required :rules="[{ required:true }]"/>
         <van-field v-model="userForm.idCardNum" label="身份证号" placeholder="请输入法人身份证号" required :rules="[{ required:true }]"/>
diff --git a/src/views/user/accountSetting/userInformation/userInformation.vue b/src/views/user/accountSetting/userInformation/userInformation.vue
index 11d8f02f..4a1d75d1 100644
--- a/src/views/user/accountSetting/userInformation/userInformation.vue
+++ b/src/views/user/accountSetting/userInformation/userInformation.vue
@@ -3,7 +3,7 @@
     <navBar title="资料修改" background="0" positionType="fixed"></navBar>
     <van-form @submit="submitForm">
       <div class="block_box">
-        <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }">用户信息</van-divider>
+        <div class="block_tt"><i></i>用户信息</div>
         <van-field v-model="tel" readonly type="tel" label="手机号" placeholder="请输入手机号" readonly required :rules="[{ required:true }]" >
   <!--        <template #extra >-->
   <!--            <p style="color: #007e72" onclick="window.location='phoneInformation'">修改手机号</p>-->
@@ -48,7 +48,7 @@
       </div>
 
       <div class="block_box">
-        <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }">银行信息</van-divider>
+        <div class="block_tt"><i></i>银行信息</div>
         <van-field
           v-model="bankType"
           is-link
@@ -370,15 +370,16 @@ export default {
     border-radius: 15Px;
     overflow: hidden;
     .block_tt{
-      font-size: 16Px;
+      font-size: 20Px;
       display: flex;
       align-items: center;
-      padding: 0 3vw;
+      padding: 1.6vh 3vw;
       line-height: 1;
+      font-weight: bold;
       i{
         display: block;
-        width: 3Px;
-        height: 14Px;
+        width: 4Px;
+        height: 16Px;
         background: #0CBEA6;
         margin-right: 5PX;
         border-radius: 5PX;
diff --git a/src/views/user/signature/signatureDetail.vue b/src/views/user/signature/signatureDetail.vue
index 0fa47d94..edc0f793 100644
--- a/src/views/user/signature/signatureDetail.vue
+++ b/src/views/user/signature/signatureDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="home_wrapper">
-    <navBar title="合同网签" background="0" positionType="fixed"></navBar>
+    <navBar title="合同详情" background="0" positionType="fixed"></navBar>
 
     <div class="block_box">
-      <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }">合同信息</van-divider>
+      <div class="block_tt"><i></i>合同信息</div>
       <van-field readonly v-model="form.contractCode" label="合同编号" placeholder="合同编号" input-align="right" :border="false" />
       <van-field readonly v-model="form.contractName" label="合同名称" placeholder="合同名称" input-align="right" :border="false" />
       <van-field readonly v-model="form.contractType" label="合同类别" placeholder="合同类别" input-align="right" :border="false" />
@@ -20,7 +20,7 @@
     </div>
 
     <div class="block_box gnbg">
-      <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }">甲方信息</van-divider>
+      <div class="block_tt"><i></i>甲方信息</div>
       <van-field readonly v-model="form.firstIsSign" label="甲方已签" placeholder="甲方已签" input-align="right" :border="false" />
       <van-field readonly v-model="form.firstPartyAt" label="甲方签字日期" placeholder="甲方签字日期" input-align="right" :border="false" />
       <van-field readonly label="甲方签字" input-align="right" :border="false" />
@@ -30,7 +30,7 @@
     </div>
 
     <div class="block_box orbg">
-      <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }">乙方信息</van-divider>
+      <div class="block_tt"><i style="background-color: #FD683F;"></i>乙方信息</div>
       <van-field readonly v-model="form.secondIsSign" label="乙方已签" placeholder="乙方已签" input-align="right" :border="false" />
       <van-field readonly v-model="form.secondPartyAt" label="乙方签字日期" placeholder="乙方签字日期" input-align="right" :border="false" />
       <van-field readonly label="乙方签字" input-align="right" :border="false" />
@@ -222,15 +222,16 @@
     border-radius: 15Px;
     overflow: hidden;
     .block_tt{
-      font-size: 16Px;
+      font-size: 20Px;
       display: flex;
       align-items: center;
-      padding: 0 3vw;
+      padding: 1.6vh 3vw;
       line-height: 1;
+      font-weight: bold;
       i{
         display: block;
-        width: 3Px;
-        height: 14Px;
+        width: 4Px;
+        height: 16Px;
         background: #0CBEA6;
         margin-right: 5PX;
         border-radius: 5PX;
diff --git a/src/views/user/signature/signatureList.vue b/src/views/user/signature/signatureList.vue
index 35764c81..68eda3d9 100644
--- a/src/views/user/signature/signatureList.vue
+++ b/src/views/user/signature/signatureList.vue
@@ -10,20 +10,20 @@
         @load="getList"
       >
         <!----1-->
-        <van-swipe-cell v-for="(item,index) in applicationList" :key="index" :disabled="item.secondIsSign =='是'&&item.attachement ==  null&&item.isArchive == '否'" >
+        <van-swipe-cell v-for="(item,index) in applicationList" :key="index" :disabled="item.secondIsSign !='否'&&item.attachement ==  null&&item.isArchive != '是'" >
           <div class="item" @click="goDetail(item.id)">
             <span class="tag_i" :style="{'background': item.secondSigning!=null?'#0DBCAA':'#FF2D2D'}">{{item.signingStatus}}</span>
             <div class="info">
               <div class="title">
-                <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>
+                <i class="icon_box"></i>
+<!--                <i class="icon_box1" v-if="item.secondSigning!=null"></i> v-if="item.secondSigning==null"-->
+                <p class="news_title" :style="{'color': '#7368E4'}">{{item.contractCode}}</p>
               </div>
               <div class="time">
                 <p>{{item.contractName}}</p>
               </div>
               <div class="time">
-                <p class="tips_mark" :style="{'color': item.secondSigning!=null?'rgba(13,188,170)':'rgba(115,104,228)','background': item.secondSigning!=null?'rgba(13,188,170,.2)':'rgba(115,104,228,.2)'}">{{item.signingMode}}</p>
+                <p class="tips_mark" :style="{'color': item.signingMode=='线上'?'rgba(13,188,170)':'rgba(115,104,228)','background': item.signingMode=='线上'?'rgba(13,188,170,.2)':'rgba(115,104,228,.2)'}">{{item.signingMode}}</p>
                 <p style="color:#eb1616;font-size: 16px;"><span style="font-size: 12px;">￥</span>{{item.contractMoney.toFixed(2)}}</p>
               </div>
             </div>
@@ -31,7 +31,7 @@
           <template #right>
             <div class="operation">
               <!-- delete 删除 edit编辑 view查看 list榜单 -->
-              <div class="opera_btn" @click="openPopup(item.id)" v-if="item.signingMode == '线上' && item.attachement != null && item.secondIsSign =='否' ">
+              <div class="opera_btn" @click="openPopup(item.id)" v-if="item.signingMode == '线上' && item.attachement != null && item.secondIsSign == '否' ">
                 <img src="../../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>签名</p>
               </div>
@@ -345,7 +345,7 @@
               width: 34px;
               display: block;
               height: 30px;
-              background: url('../../../assets/images/sunVillage_info/signature_icon_01.png') no-repeat;
+              background: url('../../../assets/images/sunVillage_info/signature_icon_01z.png') no-repeat;
               background-size: 100% 100%;
               margin-right: 10px;
               flex-shrink: 0;
diff --git a/src/views/user/supply/index.vue b/src/views/user/supply/index.vue
index b7fe6f69..1f63ca48 100644
--- a/src/views/user/supply/index.vue
+++ b/src/views/user/supply/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <navBar title="我的供求" background="0" positionType="fixed"></navBar>
+    <navBar title="我的供求" background="0" positionType="fixed" backUrl="/userSupply"></navBar>
     <van-tabs animated :swipeable="true">
       <van-tab title="供应信息">
         <van-list
diff --git a/src/views/user/supply/supplyAdd.vue b/src/views/user/supply/supplyAdd.vue
index 2d5ecb97..428399f8 100644
--- a/src/views/user/supply/supplyAdd.vue
+++ b/src/views/user/supply/supplyAdd.vue
@@ -94,24 +94,25 @@ export default {
   methods: {
     afterRead(file) {
       // 此时可以自行将文件上传至服务器
-      let params1 = {
-        file:file.content
-      }
-      base64Upload(params1).then((r1) => {
-        this.upLoadList.push(r1.fileName);
-      })
-
-      // for ( var i = 0 ; i < this.fileList.length ; i++){
-      //   if(this.fileList[i].url == undefined&&this.fileList!='') {
-      //     this.fileList[i] = {url:this.fileList[i].content, id: '', isImage: true};
-      //   }
+      // let params1 = {
+      //   file:file.content
       // }
+      // base64Upload(params1).then((r1) => {
+      //   this.upLoadList.push(r1.fileName);
+      // })
+
+      for ( var i = 0 ; i < this.fileList.length ; i++){
+        if(this.fileList[i].url == undefined&&this.fileList!='') {
+          this.fileList[i] = {url:this.fileList[i].content, id: '', isImage: true};
+        }
+      }
     },
     deleteFile(elIndex){
       // deleteUserImg(elIndex.id).then(response => {});
-      // if(elIndex.id != ''){
-      //   deleteUserImg(elIndex.id).then(response => {});
-      // }
+      if(elIndex.id != ''){
+        deleteUserImg(elIndex.id).then(response => {});
+      }
+      //
       return (file, name) => {
         let fileIndex = name.index
         this.fileList[elIndex].splice(fileIndex, 1)
@@ -153,40 +154,31 @@ export default {
     },
     submitInteraction(){
       this.form.logintime = this.getNowFormatDate();
-      this.form.fileUrl = this.upLoadList.join(',');
       if(this.$route.query.type == 'update'){
         this.file.tableId = this.$route.query.id ;
         updateDemand(this.form).then(response => {
-          // this.$toast.loading({
-          //   message: "上传中...",
-          //   forbidClick: true,
-          //   duration: 0,
-          // });
-          // for (var i = 0 ; i < this.fileList.length ; i++){
-          //   if(this.fileList[i].url.indexOf('http://') == -1&&this.fileList!=''){
-          //     this.file.files.push(this.fileList[i].url);
-          //   }
-          // }
-          Dialog.confirm({
-            title: '系统提示',
-            message: '修改成功',
-            confirmButtonText: '确定',
-            showCancelButton:false
-          }).then(() => {
-            self.location=document.referrer;
-          })
-          // base64Attach(this.file).then(response => {
-          //   if (response.code == 200){
-          //     Dialog.confirm({
-          //       title: '系统提示',
-          //       message: '修改成功',
-          //       confirmButtonText: '确定',
-          //       showCancelButton:false
-          //     }).then(() => {
-          //       self.location=document.referrer;
-          //     })
-          //   }
-          // });
+          this.$toast.loading({
+            message: "上传中...",
+            forbidClick: true,
+            duration: 0,
+          });
+          for (var i = 0 ; i < this.fileList.length ; i++){
+            if(this.fileList[i].url.indexOf('/api') == -1&&this.fileList!=''){
+              this.file.files.push(this.fileList[i].url);
+            }
+          }
+          base64Attach(this.file).then(response => {
+            if (response.code == 200){
+              Dialog.confirm({
+                title: '系统提示',
+                message: '修改成功',
+                confirmButtonText: '确定',
+                showCancelButton:false
+              }).then(() => {
+                history.back(-1);
+              })
+            }
+          });
         });
       }else{
         userDemand(this.form).then(response => {
@@ -196,29 +188,21 @@ export default {
             forbidClick: true,
             duration: 0,
           });
-          // for(var i = 0 ; i < this.fileList.length ; i++){
-          //   this.file.files.push(this.fileList[i].url);
-          // }
-          Dialog.confirm({
-            title: '系统提示',
-            message: '发布成功',
-            confirmButtonText: '确定',
-            showCancelButton:false
-          }).then(() => {
-            self.location=document.referrer;
-          })
-          // base64Attach(this.file).then(response => {
-          //   if (response.code == 200){
-          //     Dialog.confirm({
-          //       title: '系统提示',
-          //       message: '发布成功',
-          //       confirmButtonText: '确定',
-          //       showCancelButton:false
-          //     }).then(() => {
-          //       self.location=document.referrer;
-          //     })
-          //   }
-          // });
+          for(var i = 0 ; i < this.fileList.length ; i++){
+            this.file.files.push(this.fileList[i].url);
+          }
+          base64Attach(this.file).then(response => {
+            if (response.code == 200){
+              Dialog.confirm({
+                title: '系统提示',
+                message: '发布成功',
+                confirmButtonText: '确定',
+                showCancelButton:false
+              }).then(() => {
+                history.back(-1);
+              })
+            }
+          });
         });
       }
     },