From 3a871649650daa1d58dd3def581fbfb0c3b1d72b 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 13:38:20 +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/views/index.vue                           |   4 +-
 src/views/news/newDetail.vue                  |  15 +-
 src/views/notice/attestationDetail.vue        |  21 +--
 src/views/notice/index.vue                    |  23 ++--
 src/views/notice/inviteTendersDetail.vue      |  17 ++-
 src/views/notice/noticeDetail.vue             |  41 +++---
 src/views/notice/winTheBiddingDetail.vue      |  30 ++--
 src/views/project/projectDetail.vue           |  23 ++--
 src/views/register/companyRegister.vue        |  13 +-
 src/views/register/userRegister.vue           |  14 +-
 src/views/supply/supplyDetail.vue             |  11 +-
 .../userInformation/companyInformation.vue    |  13 +-
 src/views/user/application/index.vue          |   9 +-
 src/views/user/bidding/index.vue              |  46 ++-----
 src/views/user/index.vue                      |  20 +--
 src/views/user/interaction/index.vue          |   4 +-
 src/views/user/interaction/interactionAdd.vue |  11 +-
 src/views/user/supply/supplyAdd.vue           | 130 +++++++++++-------
 static/images/icon/news_icon_clock.png        | Bin 0 -> 361 bytes
 .../transaction_new/notic/notic_icon_04.png   | Bin 2252 -> 2323 bytes
 .../transaction_new/notic/notic_icon_06.png   | Bin 0 -> 2200 bytes
 21 files changed, 230 insertions(+), 215 deletions(-)
 create mode 100644 static/images/icon/news_icon_clock.png
 create mode 100644 static/images/transaction_new/notic/notic_icon_06.png

diff --git a/src/views/index.vue b/src/views/index.vue
index 90f1ce62..dcbc71d9 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -4,7 +4,7 @@
 <!--      <van-col span="2">-->
 <!--        <van-image src="../../static/images/index/logo.png" />-->
 <!--      </van-col>-->
-      <van-col span="24" style="line-height: 29px;font-size: 20px;text-align: center;">{{titleHead}}</van-col>
+      <van-col span="24" style="line-height: 29px;font-size: 20px;text-align: center;font-weight: bold;">{{titleHead}}</van-col>
     </van-row>
     <van-swipe class="my-swipe" :autoplay="3000" height="200" indicator-color="white" :show-indicators="false">
       <van-swipe-item v-for="(item,index) in bannerList" :key="index">
@@ -45,7 +45,7 @@
       </van-grid>
     </div>
     <div class="block_box">
-      <p class="block_tt"><i></i>新闻资讯</p>
+      <p class="block_tt"><i></i>新闻资讯 <span style="margin-left: auto;color: #A5A5A5;">更多</span></p>
       <van-list
         v-model="loading"
         :finished="finished"
diff --git a/src/views/news/newDetail.vue b/src/views/news/newDetail.vue
index 2399c70f..2dc1c0e4 100644
--- a/src/views/news/newDetail.vue
+++ b/src/views/news/newDetail.vue
@@ -3,11 +3,9 @@
     <navBar title="新闻资讯" background="0" positionType="fixed"></navBar>
     <div class="content">
       <p class="title">{{detail.title}}</p>
-      <van-row style="text-align: center;margin: 0.3rem 0;">
-        <van-col span="2"></van-col>
-        <van-col span="10">{{detail.createTime}}</van-col>
-        <van-col span="10">数据来源：{{detail.createBy}}</van-col>
-        <van-col span="2"></van-col>
+      <van-row style="margin: 0.3rem 0;font-size: 1.4vh;color: #AAB1B5;">
+        <van-col span="12" style="text-align: left;"><img src="../../../static/images/icon/news_icon_clock.png" alt="" style="margin-right: 5px;">{{detail.createTime}}</van-col>
+        <van-col span="12" style="text-align: right;">数据来源：{{detail.createBy}}</van-col>
       </van-row>
       <div id="content"></div>
 
@@ -44,6 +42,7 @@ export default {
       newDetails(this.$route.query.id).then(response => {
         console.log(response)
         this.detail = response.data
+        response.data.content = response.data.content.replace(new RegExp('<img', 'g'), `$& width="100%"`);
         document.getElementById('content').innerHTML = response.data.content;
 
         if(response.data.attachment){
@@ -77,14 +76,14 @@ export default {
   }
   #content{
     overflow: hidden;
+    img{
+      width: 100%;
+    }
   }
 
   iframe{
     width: 100%;
   }
-  img{
-    width: 100%;
-  }
   /deep/.van-cell__title, .van-cell__value{
     display: -webkit-box;
     -webkit-box-orient: vertical;
diff --git a/src/views/notice/attestationDetail.vue b/src/views/notice/attestationDetail.vue
index ea47494a..a4172a3e 100644
--- a/src/views/notice/attestationDetail.vue
+++ b/src/views/notice/attestationDetail.vue
@@ -3,7 +3,7 @@
     <navBar title="鉴证详情" background="0" positionType="fixed"></navBar>
 <!--    <p class="title">{{attestationDetail.projectName}}成交公示</p>-->
     <div class="block_box">
-      <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }">鉴证详情信息</van-divider>
+      <div class="block_tt"><i></i>鉴证详情信息</div>
       <van-cell title="鉴证书编号" :value="attestationDetail.jzsNumOne+'第'+attestationDetail.jzsNumTwo+'号'" />
       <van-cell title="项目名称" :value="attestationDetail.projectName" />
       <van-cell title="项目编号" :value="attestationDetail.projectCode" />
@@ -16,14 +16,17 @@
       <van-cell title="转出方式" :value="attestationDetail.rollout" />
       <van-cell title="交易方式" :value="attestationDetail.dealType" />
       <van-cell title="交易底价" :value="attestationDetail.price+attestationDetail.unit" />
-      <van-cell title="成交金额" :value="attestationDetail.dealMoneySum+'元'" />
+      <van-cell title="成交金额" >
+        <template slot="default"><p style="color: #c60000;">{{attestationDetail.dealMoneySum}}元</p></template>
+      </van-cell>
       <van-cell title="合同签署日期" :value="attestationDetail.contractDate" />
       <van-cell title="合同编号" :value="attestationDetail.contractCode" />
       <van-cell title="附记" :value="attestationDetail.jzsRemark" />
 
     </div>
     <div class="block_box gnbg">
-      <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }">转出方信息</van-divider>
+      <div class="block_tt"><i></i>转出方信息</div>
+<!--      <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }"></van-divider>-->
       <van-cell title="转出方" :value="attestationDetail.outName" />
       <van-cell title="转出行为批准机构名称" :value="attestationDetail.pzjg" />
       <van-cell title="法定代表人（转出方）" :value="attestationDetail.legalPerson" />
@@ -31,7 +34,8 @@
     </div>
 
     <div class="block_box orbg">
-      <van-divider :style="{ borderColor: '#FD683F', padding: '0 16px' }">受让方信息</van-divider>
+      <div class="block_tt"><i style="background-color: #FD683F"></i>受让方信息</div>
+<!--      <van-divider :style="{ borderColor: '#FD683F', padding: '0 16px' }">受让方信息</van-divider>-->
       <van-cell title="受让方" :value="attestationDetail.inName" />
       <van-cell title="单位性质" :value="attestationDetail.companyNature" />
       <van-cell title="法定代表人（受让方）" :value="attestationDetail.realname" />
@@ -115,15 +119,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/notice/index.vue b/src/views/notice/index.vue
index b69106ee..3998c0fd 100644
--- a/src/views/notice/index.vue
+++ b/src/views/notice/index.vue
@@ -16,7 +16,7 @@
               <div v-if="item.projectStatus == '2'" style="color: #c12e2a;">项目终止</div>
               <div v-else style="display: flex;align-items: center;justify-content: space-between;">
                 <p style="display: flex;align-items: center;color: #0DBCAA;"><img src="../../../static/images/transaction_new/notic/notic_icon_01.png" alt="" style="margin-right: 5px;"/>{{item.projectCode}}</p>
-                <p style="color: #AAB1B5;font-size: 14px;">{{item.dealTime.substr(0,10)}}</p>
+                <p style="color: #AAB1B5;font-size: 14px;"><img src="../../../static/images/icon/news_icon_clock.png" alt="" style="margin-right: 5px;" />{{item.dealTime.substr(0,10)}}</p>
               </div>
             </template>
             <template #label>
@@ -39,7 +39,7 @@
             <template #title>
               <div style="display: flex;align-items: center;justify-content: space-between;">
                 <p style="display: flex;align-items: center;color: #7368E4;"><img src="../../../static/images/transaction_new/notic/notic_icon_02.png" alt="" style="margin-right: 5px;"/>{{item.jzsNumOne}} - {{item.jzsNumTwo}}</p>
-                <p style="color: #AAB1B5;font-size: 14px;">{{item.jzsSignDate}}</p>
+                <p style="color: #AAB1B5;font-size: 14px;"><img src="../../../static/images/icon/news_icon_clock.png" alt="" style="margin-right: 5px;" />{{item.jzsSignDate}}</p>
               </div>
             </template>
             <template #label>
@@ -62,7 +62,7 @@
             <template #title>
               <div style="display: flex;align-items: center;justify-content: space-between;">
                 <p style="display: flex;align-items: center;color: #2D87E8;"><img src="../../../static/images/transaction_new/notic/notic_icon_03.png" alt="" style="margin-right: 5px;"/>{{item.tenderName}}</p>
-                <p style="color: #AAB1B5;font-size: 14px;">{{item.logintime}}</p>
+                <p style="color: #AAB1B5;font-size: 14px;"><img src="../../../static/images/icon/news_icon_clock.png" alt="" style="margin-right: 5px;" />{{item.logintime}}</p>
               </div>
             </template>
             <template #label>
@@ -83,22 +83,17 @@
         >
           <van-cell v-for="(item,index) in winTheBiddingList" :key="index" :title="item.projectName" :to="{name:'winTheBiddingDetailCJ', query: {id:item.id}}" style="margin-bottom: 1vh;position:relative;">
             <template #label>
-              <div v-if="item.dealType=='1'" style="display: flex;justify-content: space-between;align-items: center;">
-                中标方：{{item.assignee}} <p>{{item.dealTime}}</p>
-              </div>
-
-              <div v-else-if="item.dealType=='3'">
-                <p style="color: #c12e2a;">项目变更</p>
-              </div>
-
-              <div v-else> <!-- 未成功 2 -->
-                <p style="color: #c12e2a;">招标失败</p>
+              <div v-if="item.dealType=='1'" style="display: flex;justify-content: space-between;align-items: center;color: #0DBCAA;">
+                中标方：{{item.assignee}} <p style="color: #AAB1B5;"><img src="../../../static/images/icon/news_icon_clock.png" alt="" style="margin-right: 5px;" />{{item.dealTime}}</p>
               </div>
+              <div v-else style="display: flex;justify-content: space-between;align-items: center;">&nbsp;</div>
             </template>
 
             <template #right-icon>
               <div style="width: 5%;">
-                <img src="../../../static/images/transaction_new/notic/notic_icon_04.png" style="position:absolute;right: 0;top: 0;height: 100%;" alt="">
+                <img v-if="item.dealType=='1'" src="../../../static/images/transaction_new/notic/notic_icon_04.png" style="position:absolute;right: 0;top: 0;height: 100%;" alt="">
+                <img v-if="item.dealType=='3'" src="../../../static/images/transaction_new/notic/notic_icon_06.png" style="position:absolute;right: 0;top: 0;height: 100%;" alt="">
+                <img v-if="item.dealType=='2'" src="../../../static/images/transaction_new/notic/notic_icon_05.png" style="position:absolute;right: 0;top: 0;height: 100%;" alt="">
               </div>
             </template>
 
diff --git a/src/views/notice/inviteTendersDetail.vue b/src/views/notice/inviteTendersDetail.vue
index 18bcfc04..65110f2c 100644
--- a/src/views/notice/inviteTendersDetail.vue
+++ b/src/views/notice/inviteTendersDetail.vue
@@ -3,7 +3,7 @@
     <navBar title="招标公告" background="0" positionType="fixed"></navBar>
 <!--    <p class="title">{{attestationDetail.projectName}}</p>-->
     <div class="block_box">
-      <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }">招标详情信息</van-divider>
+      <div class="block_tt"><i></i>招标详情信息</div>
       <van-cell title="项目编号" :value="attestationDetail.tenderCode" />
       <van-cell title="招标评审时间" :value="attestationDetail.revieveAt" />
       <van-cell title="招标评审地点" :value="attestationDetail.revieveAddress" />
@@ -21,7 +21,9 @@
       <van-cell title="招标内容" :value="attestationDetail.tenderContent" />
       <van-cell title="投标人要求" :value="attestationDetail.condition" />
   <!--    <van-cell title="保证金" :value="attestationDetail.deposit" />-->
-      <van-cell title="预算总额(元)" :value="attestationDetail.price" />
+      <van-cell title="预算总额(元)">
+        <template slot="default"><p style="color: #c60000;">{{attestationDetail.price}}</p></template>
+      </van-cell>
       <van-cell title="竞价方式" :value="attestationDetail.biddingType" />
       <van-cell v-if="attestationDetail.biddingType == '单价'" title="单价(元)" :value="attestationDetail.tenderPrice" />
       <van-cell v-if="attestationDetail.biddingType == '单价'" title="数量单位" :value="attestationDetail.priceUnit" />
@@ -32,7 +34,7 @@
     </div>
 
     <div class="block_box">
-      <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }">相关附件</van-divider>
+      <div class="block_tt"><i></i>相关附件</div>
       <van-cell :title="item.fileName" :url="'/api'+item.fileUrl" is-link v-for="(item,index) in attachmentQueryList">
         <!-- 使用 right-icon 插槽来自定义右侧图标 -->
         <template #icon>
@@ -103,15 +105,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/notice/noticeDetail.vue b/src/views/notice/noticeDetail.vue
index 97fd6b33..e066bf5c 100644
--- a/src/views/notice/noticeDetail.vue
+++ b/src/views/notice/noticeDetail.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
-    <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-cell title="项目名称" :value="noticeDetail.projectName" />
 
       <van-cell v-if="noticeDetail.projectStatus == '2'" title="终止原因" type="textarea" :value="noticeDetail.terminateReason" />
@@ -20,7 +20,9 @@
       <van-cell title="转出面积/数量" :value="noticeDetail.allCount+noticeDetail.allCountUnit" />
       <van-cell title="转出年限" :value="noticeDetail.outStartTime+'至'+noticeDetail.outStopTime" />
       <van-cell title="成交价格" :value="noticeDetail.dealMoney+noticeDetail.unit" />
-      <van-cell title="成交金额" :value="noticeDetail.dealMoneySum" />
+      <van-cell title="成交金额" >
+        <template slot="default"><p style="color: #c60000;">{{noticeDetail.dealMoneySum}}</p></template>
+      </van-cell>
       </template>
       <div v-if="noticeDetail.projectStatus == '2'">
         <van-divider>附件</van-divider>
@@ -103,22 +105,23 @@ export default {
    padding: 3vw 0;
    border-radius: 15Px;
    overflow: hidden;
-   .block_tt{
-     font-size: 16Px;
-     display: flex;
-     align-items: center;
-     padding: 0 3vw;
-     line-height: 1;
-     i{
-       display: block;
-       width: 3Px;
-       height: 14Px;
-       background: #0CBEA6;
-       margin-right: 5PX;
-       border-radius: 5PX;
-     }
-     /*border-left: 3Px solid #0CBEA6;*/
-   }
+  .block_tt{
+    font-size: 20Px;
+    display: flex;
+    align-items: center;
+    padding: 1.6vh 3vw;
+    line-height: 1;
+    font-weight: bold;
+    i{
+      display: block;
+      width: 4Px;
+      height: 16Px;
+      background: #0CBEA6;
+      margin-right: 5PX;
+      border-radius: 5PX;
+    }
+    /*border-left: 3Px solid #0CBEA6;*/
+  }
  }
 .title{
   font-size: 0.5rem;
diff --git a/src/views/notice/winTheBiddingDetail.vue b/src/views/notice/winTheBiddingDetail.vue
index 50192e0a..faa1b402 100644
--- a/src/views/notice/winTheBiddingDetail.vue
+++ b/src/views/notice/winTheBiddingDetail.vue
@@ -3,14 +3,16 @@
 <!--    <p class="title">{{attestationDetail.projectName}}</p>-->
     <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-cell title="项目名称" :value="attestationDetail.projectName" />
       <van-cell title="招标方名称" :value="attestationDetail.tenderName" />
       <div v-if="attestationDetail.dealType == '成功'">
         <van-cell title="中标人" :value="attestationDetail.assignee" />
         <van-cell title="建设单位" :value="attestationDetail.bulidPart" />
         <van-cell title="项目负责人" :value="attestationDetail.partLinkman" />
-        <van-cell title="中标金额(元)" :value="attestationDetail.price" />
+        <van-cell title="中标金额(元)" >
+          <template slot="default"><p style="color: #c60000;">{{attestationDetail.price}}</p></template>
+        </van-cell>
 
         <van-cell title="竟价方式" :value="attestationDetail.biddingType" />
         <van-cell v-if="attestationDetail.biddingType == '单价'" title="中标单价(元)" :value="attestationDetail.transactionPrice" />
@@ -20,14 +22,13 @@
         <van-cell title="中标日期" :value="attestationDetail.dealTime" />
         <van-cell title="公示开始日期" :value="attestationDetail.startTime" />
         <van-cell title="公示结束日期" :value="attestationDetail.stopTime" />
-        <van-divider>附件</van-divider>
-
-          <van-cell :title="item.fileName" :url="'/api'+item.fileUrl" is-link v-for="(item,index) in attachmentQueryList">
-            <!-- 使用 right-icon 插槽来自定义右侧图标 -->
-            <template #icon>
-              <img src="../../assets/images/file_icon.png" style="display: block;width: 24px;margin-right: 5px;" alt="">
-            </template>
-          </van-cell>
+        <div class="block_tt"><i></i>附件</div>
+        <van-cell :title="item.fileName" :url="'/api'+item.fileUrl" is-link v-for="(item,index) in attachmentQueryList">
+          <!-- 使用 right-icon 插槽来自定义右侧图标 -->
+          <template #icon>
+            <img src="../../assets/images/file_icon.png" style="display: block;width: 24px;margin-right: 5px;" alt="">
+          </template>
+        </van-cell>
       </div>
 
       <div v-if="attestationDetail.dealType == '变更'">
@@ -112,15 +113,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/project/projectDetail.vue b/src/views/project/projectDetail.vue
index dbb79cc9..d20f3025 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -3,17 +3,17 @@
     <navBar title="项目详情" background="0" positionType="relative"></navBar>
     <van-tabs scrollspy sticky >
       <van-tab title="竞拍信息" title-style="font-size:12px;">
-<!--        <van-swipe class="my-swipe" height="235" indicator-color="white" @change="onChange">-->
-<!--          <template v-if="detail.fileUrlList !== undefined &&detail.fileUrlList.length>0">-->
-<!--            <van-swipe-item v-for="(item,index) in detail.fileUrlList" :key="index"><van-image :src="item.fileUrl?'/api'+item.fileUrl:'../../static/images/zwtp.jpg'" height="235" /></van-swipe-item>-->
-<!--          </template>-->
-<!--          <template v-else>-->
-<!--            <van-swipe-item><van-image src="../../static/images/zwtp.jpg" height="235" /></van-swipe-item>-->
-<!--          </template>-->
-<!--          <template #indicator>-->
-<!--            <div class="custom-indicator">{{ current + 1 }}/{{ detail.fileUrlList !== undefined &&detail.fileUrlList.length>0 ? detail.fileUrlList.length:1 }}</div>-->
-<!--          </template>-->
-<!--        </van-swipe>-->
+        <van-swipe class="my-swipe" height="235" indicator-color="white" @change="onChange">
+          <template v-if="detail.fileUrlList !== undefined &&detail.fileUrlList.length>0">
+            <van-swipe-item v-for="(item,index) in detail.fileUrlList" :key="index"><van-image :src="item.fileUrl?'/api'+item.fileUrl:'../../static/images/zwtp.jpg'" height="235" /></van-swipe-item>
+          </template>
+          <template v-else>
+            <van-swipe-item><van-image src="../../static/images/zwtp.jpg" height="235" /></van-swipe-item>
+          </template>
+          <template #indicator>
+            <div class="custom-indicator">{{ current + 1 }}/{{ detail.fileUrlList !== undefined &&detail.fileUrlList.length>0 ? detail.fileUrlList.length:1 }}</div>
+          </template>
+        </van-swipe>
 
         <van-notice-bar color="#fff" background="#21B6AB" left-icon="clock-o">
           {{ process }}&nbsp&nbsp&nbsp&nbsp<span id="timeData"></span>
@@ -44,6 +44,7 @@
             <p>{{biddinglistInformation[0].money}}{{detail.unit}}</p>
             <p>领先</p>
           </template>
+          <p v-else style="margin: 0 auto;">暂无出价</p>
         </div>
         <div class="detail">
           <van-row>
diff --git a/src/views/register/companyRegister.vue b/src/views/register/companyRegister.vue
index b6421731..d0d970ac 100644
--- a/src/views/register/companyRegister.vue
+++ b/src/views/register/companyRegister.vue
@@ -4,7 +4,7 @@
     <van-form @submit="getSubmit">
 
       <div class="block_box">
-        <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }">基本信息</van-divider>
+        <div class="block_tt"><i></i>基本信息</div>
         <van-popup v-model="showPicker" position="bottom">
           <van-picker
             show-toolbar
@@ -36,7 +36,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 name="uploader" label="开户证明" required>
           <template #input>
             <van-uploader :after-read="afterReadKHZM" :before-delete="deleteFileKHZM" v-model="fileListKHZM" multiple :max-count="1" />
@@ -436,15 +436,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/register/userRegister.vue b/src/views/register/userRegister.vue
index ad942ed4..25790de2 100644
--- a/src/views/register/userRegister.vue
+++ b/src/views/register/userRegister.vue
@@ -12,8 +12,7 @@
     <van-form @submit="getSubmit">
       <div class="block_box">
 
-<!--        <div class="block_tt"><i></i>用户信息</div> color: '#0CBEA6',-->
-        <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }">用户信息</van-divider>
+        <div class="block_tt"><i></i>用户信息</div>
 
         <van-field v-model="form.phone" type="tel" label="手机号" placeholder="请输入手机号，作为登录账号" required :rules="[{ required:true }]" />
 <!--      <van-field-->
@@ -46,7 +45,7 @@
 <!--      <van-divider>银行信息</van-divider>-->
       <div class="block_box">
 
-        <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }">银行信息</van-divider>
+        <div class="block_tt"><i></i>银行信息</div>
         <van-field name="uploader" label="银行卡" required :border="false"></van-field>
         <van-field name="uploader">
           <template #input>
@@ -411,15 +410,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/supply/supplyDetail.vue b/src/views/supply/supplyDetail.vue
index c55a8236..7742b3e9 100644
--- a/src/views/supply/supplyDetail.vue
+++ b/src/views/supply/supplyDetail.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' }">供应详情信息</van-divider>
+      <div class="block_tt"><i></i>供求详情信息</div>
       <van-cell title="项目名称" :value="supplyDetails.projectName" />
       <van-cell title="项目地址" :value="supplyDetails.location" />
       <van-cell title="姓名" :value="supplyDetails.realname" />
@@ -58,15 +58,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 244c52e4..d0d68aa4 100644
--- a/src/views/user/accountSetting/userInformation/companyInformation.vue
+++ b/src/views/user/accountSetting/userInformation/companyInformation.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="请输入手机号" required :rules="[{ required:true }]" >
   <!--        <template #extra >-->
   <!--          <p style="color: #007e72" onclick="window.location='phoneInformation'">修改手机号</p>-->
@@ -103,7 +103,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
@@ -510,15 +510,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/application/index.vue b/src/views/user/application/index.vue
index bdc2f20d..003700a5 100644
--- a/src/views/user/application/index.vue
+++ b/src/views/user/application/index.vue
@@ -9,8 +9,13 @@
     >
       <van-cell v-for="(item , index) in supplyList" :key="index" :to="{path:'project/projectDetail',query:{id:item.projectId}}">
         <template #title>
-          {{item.projectName}}
-          <span class="tag_i" :style="{color:item.depositStatus == '1' ? '#0DBCAA':'#7368E4',background:item.depositStatus == '1' ? 'rgba(13,188,170,.15)':'rgba(115,104,228,.15)'}">{{item.depositStatus}}</span>
+          <p style="width: 80%;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 1;
+          word-break: break-all;
+          overflow: hidden;">{{item.projectName}}</p>
+          <span class="tag_i" :style="{color:item.depositStatus == '报名成功' ? '#0DBCAA':'#7368E4',background:item.depositStatus == '报名成功' ? 'rgba(13,188,170,.15)':'rgba(115,104,228,.15)'}">{{item.depositStatus}}</span>
         </template>
         <template #label>
           <p class="active_time"><van-icon name="bell" style="margin-right: 5PX;" />距结束：
diff --git a/src/views/user/bidding/index.vue b/src/views/user/bidding/index.vue
index c3550e80..24f419f9 100644
--- a/src/views/user/bidding/index.vue
+++ b/src/views/user/bidding/index.vue
@@ -38,11 +38,11 @@
             <div class="list_li_time">
               <p :style="{
                       color: {
-                        '正在报名': '#007E72',
-                        '等待竞价': '#848484',
-                        '等待成交': '#848484',
-                        '已经成交': '#848484',
-                        '正在竞价': '#c21F3a',
+                        '正在报名': '#2D87E8',
+                        '等待竞价': '#7368E4',
+                        '等待成交': '#E6AA0B',
+                        '已经成交': '#FD683F',
+                        '正在竞价': '#0DBCAA',
                       }[item.projectShowStatus]}">{{item.projectShowStatus}}</p>
             </div>
           </div>
@@ -50,36 +50,15 @@
             <div class="list_li_time">
               <p>
                 <span style="color: #848484">当前价格</span>
-                <span :style="{'font-size':'14px',
-                      color: {
-                        '正在报名': '#007E72',
-                        '等待竞价': '#848484',
-                        '等待成交': '#848484',
-                        '已经成交': '#848484',
-                        '正在竞价': '#c21F3a',
-                      }[item.projectShowStatus]}" v-if="item.biddingType=='1'&&item.projectShowStatus=='正在竞价'">
+                <span style="font-size:14px;color:#848484" v-if="item.biddingType=='1'&&item.projectShowStatus=='正在竞价'">
                         *
                       </span>
 
-                <span :style="{'font-size':'14px',
-                      color: {
-                        '正在报名': '#007E72',
-                        '等待竞价': '#848484',
-                        '等待成交': '#848484',
-                        '已经成交': '#848484',
-                        '正在竞价': '#c21F3a',
-                      }[item.projectShowStatus]}" v-if="(item.biddingType=='1'&&item.projectShowStatus!='正在竞价'&&item.money) || (item.biddingType!='1'&&item.money)">
+                <span  style="font-size:14px;color:#848484" v-if="(item.biddingType=='1'&&item.projectShowStatus!='正在竞价'&&item.money) || (item.biddingType!='1'&&item.money)">
                         {{item.money}}{{item.unit}}
                       </span>
 
-                <span :style="{'font-size':'14px',
-                      color: {
-                        '正在报名': '#007E72',
-                        '等待竞价': '#848484',
-                        '等待成交': '#848484',
-                        '已经成交': '#848484',
-                        '正在竞价': '#c21F3a',
-                      }[item.projectShowStatus]}" v-if="(item.biddingType!='1'&&!item.money) || (item.biddingType=='1'&&item.projectShowStatus!='正在竞价'&&!item.money)">
+                <span  style="font-size:14px;color:#848484" v-if="(item.biddingType!='1'&&!item.money) || (item.biddingType=='1'&&item.projectShowStatus!='正在竞价'&&!item.money)">
                         暂无出价
                 </span>
               </p>
@@ -87,14 +66,7 @@
             <div class="list_li_time">
               <p @click="$router.push({name:'projectDetailCJ', query: {id:item.id}})">
                 <span style="color: #848484">我的出价</span>
-                <span :style="{'font-size':'14px',
-                  color: {
-                    '正在报名': '#007E72',
-                    '等待竞价': '#848484',
-                    '等待成交': '#848484',
-                    '已经成交': '#848484',
-                    '正在竞价': '#c21F3a',
-                  }[item.projectShowStatus]}" v-if="item.biddingType!='自由竞价'&&item.money">
+                <span style="font-size:14px;color:#848484" v-if="item.biddingType!='自由竞价'&&item.money">
                     {{item.memberMoney}}{{item.unit}}
                 </span>
               </p>
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 685c651a..5c767cb4 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -29,8 +29,8 @@
       </van-row>
     </div>
     <div class="user_nav">
-      <p class="tt">我的报名<span>12</span></p>
-      <p class="time">截止 2024.06.30</p>
+      <p class="tt">易操作 易成功</p>
+      <p class="time">招投标信息查询交易平台</p>
       <img src="../../../static/images/transaction_new/user/user_icon_04.png" style="position:absolute;transform: translateY(-30%);right: 0;top: 0;" alt="">
     </div>
     <div style="width: 96%;margin: 1vh auto 0;border-radius: 0.4rem;overflow: hidden;">
@@ -81,14 +81,14 @@
           <van-cell title="审批状态" :border="false" value-class="cell_value">
             {{ auditStatusFormat(item.auditStatus) }}
           </van-cell>
-          <van-cell title="审批对象" :border="false" value-class="cell_value">
-            <span v-if="item.auditType === '1'">
-              角色: {{ item.roleName }}
-            </span>
-            <span v-else-if="item.auditType === '2'">
-              用户: {{ item.nickName }}
-            </span>
-          </van-cell>
+<!--          <van-cell title="审批对象" :border="false" value-class="cell_value">-->
+<!--            <span v-if="item.auditType === '1'">-->
+<!--              角色: {{ item.roleName }}-->
+<!--            </span>-->
+<!--            <span v-else-if="item.auditType === '2'">-->
+<!--              用户: {{ item.nickName }}-->
+<!--            </span>-->
+<!--          </van-cell>-->
           <van-cell title="审批人" v-model="item.auditBy" :border="false" value-class="cell_value" />
           <van-cell title="审批时间" v-model="item.auditTime" :border="false" value-class="cell_value" />
           <van-cell title="审批意见" v-model="item.auditRemark" :border="false" value-class="cell_value" />
diff --git a/src/views/user/interaction/index.vue b/src/views/user/interaction/index.vue
index 57f5e39b..71e8b5d1 100644
--- a/src/views/user/interaction/index.vue
+++ b/src/views/user/interaction/index.vue
@@ -23,8 +23,8 @@
           <p style="display: flex;align-items: center;">
             <img src="../../../../static/images/transaction_new/interaction/interaction_icon_01.png" alt="" style="margin-right: 5px;"/>
             <span>{{item.content}}</span>
-            <span style="font-size: 12px;color: #007E72;margin-left: auto;" v-if="item.reply">已回复</span>
-            <span style="font-size: 12px;color: #c21F3a;margin-left: auto;" v-if="!item.reply">未回复</span>
+            <span style="font-size: 12px;color: #007E72;margin-left: auto;flex-shrink: 0;" v-if="item.reply">已回复</span>
+            <span style="font-size: 12px;color: #c21F3a;margin-left: auto;flex-shrink: 0;" v-if="!item.reply">未回复</span>
           </p>
         </template>
         <template #label>
diff --git a/src/views/user/interaction/interactionAdd.vue b/src/views/user/interaction/interactionAdd.vue
index 52753349..b8094eda 100644
--- a/src/views/user/interaction/interactionAdd.vue
+++ b/src/views/user/interaction/interactionAdd.vue
@@ -3,7 +3,7 @@
     <navBar :title="pageTit" background="0" positionType="fixed"></navBar>
     <van-form @submit="submitInteraction">
       <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="form.title" label="标题" placeholder="请输入标题" required :rules="[{ required:true }]"/>
         <van-field v-model="form.realname" label="姓名" placeholder="请输入姓名" required :rules="[{ required:true }]"/>
         <van-field v-model="form.phone" label="联系电话" placeholder="请输入联系电话" required :rules="[{ required:true }]"/>
@@ -118,15 +118,16 @@ import navBar from "@/components/common/nav_bar.vue";
     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/supply/supplyAdd.vue b/src/views/user/supply/supplyAdd.vue
index bde98ef5..2d5ecb97 100644
--- a/src/views/user/supply/supplyAdd.vue
+++ b/src/views/user/supply/supplyAdd.vue
@@ -3,7 +3,7 @@
     <navBar :title="pageTit" background="0" positionType="fixed"></navBar>
     <van-form @submit="submitInteraction">
       <div class="block_box">
-        <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }">发布信息</van-divider>
+        <div class="block_tt"><i></i>发布信息</div>
         <van-field
           readonly
           clickable
@@ -30,10 +30,11 @@
         <van-field v-model="form.projectContent" label="项目详情" type="textarea" autosize placeholder="请输入项目详情" required :rules="[{ required:true }]"/>
       </div>
       <div class="block_box">
-        <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }">上传相关附件</van-divider>
+        <div class="block_tt"><i></i>上传相关附件</div>
         <div style="padding: 0 16px;">
-          <van-uploader :after-read="afterRead" :before-delete="deleteFile" v-model="fileList" multiple :max-count="5" />
+          <van-uploader :after-read="afterRead" :before-delete="deleteFile" v-model="fileList" :max-count="5" />
         </div>
+        <p style="color: #FE1313;margin-top: 20PX;padding-left: 15px;">*请上传jpg/png文件，文件大小不超过5MB</p>
       </div>
       <div class="submit">
         <van-button round block type="info" color="#0DBCAA" native-type="submit">发布</van-button>
@@ -47,6 +48,7 @@ import { getMember , userDemand , updateDemand , selectDemand , base64Attach , s
 import { getInfo } from "@/api/login/index";
 import {Dialog} from "vant";
 import navBar from "@/components/common/nav_bar.vue";
+import {base64Upload} from "@/api/register";
 export default {
   name: "supplyAdd",
   components: { navBar },
@@ -92,18 +94,24 @@ export default {
   methods: {
     afterRead(file) {
       // 此时可以自行将文件上传至服务器
-
-      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)
@@ -145,31 +153,40 @@ 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);
-            }
-          }
-          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('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;
+          //     })
+          //   }
+          // });
         });
       }else{
         userDemand(this.form).then(response => {
@@ -179,21 +196,29 @@ export default {
             forbidClick: true,
             duration: 0,
           });
-          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(() => {
-              })
-            }
-          });
+          // 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;
+          //     })
+          //   }
+          // });
         });
       }
     },
@@ -215,15 +240,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/static/images/icon/news_icon_clock.png b/static/images/icon/news_icon_clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c560dee38db758e1b86a7748c9e86525d985fb0
GIT binary patch
literal 361
zcmV-v0ha!WP)<h;3K|Lk000e1NJLTq000XB000XJ1^@s6sjPP<00004b3#c}2nYxW
zd<bNS0003XNkl<Z7*}nPF;c@Y5Jh)oLSY&o!AA%;a7xAujvF&{If8EhM~F|5bPT4j
zoIyj0I0-(2n@|AOvMb_@CxZ%UwEOq%UkTx`>c-3o;U0k!K#Yi>QwZBL7gl+`=tYLI
z)jP8S2WwDJ&W2D+^09f11LaEM;&XSANDPI@C3Z$(JQC{G=psv(0(#!Pl;j{Qme&iE
z1dDZXlWvceT4Pz9Oz+&e#9EtvO7*r*#80hx@SZtAO!@OJT>v5iu(w(21>;OSa4h6*
zAeG$ZSKXLAJsGk_qz<J8V<V=Q|B0LCE&9g&$3Vd)%H>P#Edp-1pqdsOgbg9Si!JZf
z2i2zrB95bVKw@c*1S<|yqkk_x4kEv(z`w6T>VJknPiOfB7=e`*4Xm6U00000NkvXX
Hu0mjfhiZ`@

literal 0
HcmV?d00001

diff --git a/static/images/transaction_new/notic/notic_icon_04.png b/static/images/transaction_new/notic/notic_icon_04.png
index 026ee9ba2ed59698c18455c5076e7df5d04a1fa1..c0e1b5e44678fd47290d335afb237cff87db938d 100644
GIT binary patch
delta 2295
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
R&2Rt!002ovPDHLkV1h(LR>%MV

delta 2224
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

diff --git a/static/images/transaction_new/notic/notic_icon_06.png b/static/images/transaction_new/notic/notic_icon_06.png
new file mode 100644
index 0000000000000000000000000000000000000000..62f32f17d5c6f375f28a55c1a4ff6d8ec203beb6
GIT binary patch
literal 2200
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
ab^iiT(O7v5(KEFG0000<MNUMnLSTZge;UOA

literal 0
HcmV?d00001