task 产交手机端问题修改

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"

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;

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;

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>
 

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;

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;

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;

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>

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;

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;

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;

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;

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;" />距结束：

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>

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" />

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>

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;

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;