Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/views/notice/index.vue

@@ -24,6 +24,7 @@
           </van-cell>
         </van-list>
       </van-tab>
+
       <van-tab>
         <template #title><van-icon name="records" size="18" style="top: 4px"/>鉴证公告</template>
         <van-list
@@ -40,6 +41,7 @@
           </van-cell>
         </van-list>
       </van-tab>
+
       <van-tab>
         <template #title><van-icon name="description" size="18" style="top: 4px"/>招标公告</template>
         <van-list
@@ -56,6 +58,7 @@
           </van-cell>
         </van-list>
       </van-tab>
+
       <van-tab>
         <template #title><van-icon name="completed" size="18" style="top: 4px"/>招标结果</template>
         <van-list
@@ -68,10 +71,15 @@
           <van-cell v-for="(item,index) in winTheBiddingList" :key="index" icon="play" :title="item.projectName" :to="{name:'winTheBiddingDetailCJ', query: {id:item.id}}">
             <template #label>
               <div v-if="item.dealType=='1'">
-              中标方：{{item.assignee}} <p style="float: right;">{{item.dealTime}}</p>
+                中标方：{{item.assignee}} <p style="float: right;">{{item.dealTime}}</p>
               </div>
-              <div v-else>
-              <p style="color: #c12e2a;">招标失败</p>
+
+              <div v-else-if="item.dealType=='3'">
+                <p style="color: #c12e2a;">项目变更</p>
+              </div>
+
+              <div v-else> <!-- 未成功 2 -->
+                <p style="color: #c12e2a;">招标失败</p>
               </div>
             </template>
           </van-cell>

src/views/notice/winTheBiddingDetail.vue

@@ -12,21 +12,32 @@
     <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="中标人" :value="attestationDetail.assignee" />
+      <van-cell title="建设单位" :value="attestationDetail.bulidPart" />
+      <van-cell title="项目负责人" :value="attestationDetail.partLinkman" />
+      <van-cell title="中标金额(元)" :value="attestationDetail.price" />
 
-    <van-cell title="竟价方式" :value="attestationDetail.biddingType" />
-    <van-cell v-if="attestationDetail.biddingType == '单价'" title="中标单价(元)" :value="attestationDetail.transactionPrice" />
-    <van-cell v-if="attestationDetail.biddingType == '单价'" title="数量/面积" :value="attestationDetail.areaCount" />
-    <van-cell v-if="attestationDetail.biddingType == '单价'" title="数量单位" :value="attestationDetail.priceUnit" />
+      <van-cell title="竟价方式" :value="attestationDetail.biddingType" />
+      <van-cell v-if="attestationDetail.biddingType == '单价'" title="中标单价(元)" :value="attestationDetail.transactionPrice" />
+      <van-cell v-if="attestationDetail.biddingType == '单价'" title="数量/面积" :value="attestationDetail.areaCount" />
+      <van-cell v-if="attestationDetail.biddingType == '单价'" title="数量单位" :value="attestationDetail.priceUnit" />
 
-    <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="中标日期" :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>
+
+    <div v-if="attestationDetail.dealType == '变更'">
+      <van-cell title="变更说明" :value="attestationDetail.changeRecord" />
+      <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>
@@ -34,7 +45,8 @@
         </template>
       </van-cell>
     </div>
-    <div v-else>
+
+    <div v-else> <!-- 未成功 -->
       <van-cell title="中标情况" :value="attestationDetail.dealType" />
       <van-cell title="未中标原因" :value="attestationDetail.dealFailReason" />
       <van-cell title="备注" :value="attestationDetail.dealRemark" />