Signed-off-by: yanl <yanl@xmmakeit.com>

src/App.vue

@@ -22,4 +22,13 @@
         align-items: center;
         background: #F8F8F8;
     }
+
+    .about-code {
+        li {
+            width: 130px;
+            height: 130px;
+            margin: 0;
+            padding: 0;
+        }
+    }
 </style>
\ No newline at end of file

src/common/js/rule/atom.js

@@ -10,7 +10,8 @@ let output = {
         return regExp.test(value)
     },
     isMoney: function (value) {
-        let regExp = new RegExp('^(([1-9][0-9]*\.[0-9][0-9]*)|([0]\.[0-9][0-9]*)|([1-9][0-9]*)|([0]{1}))$')
+        let regExp = new RegExp('^[0-9]+(.[0-9]{1,2})?$')
+        console.log('isMoney', regExp.test(value))
         return regExp.test(value)
     },
 

src/components/currency-footer.vue

 <template>
     <!-- 通用组件 - 底部 -->
     <div class="components-footer col align-c">
-        <div class="line"></div>
+        <!-- <div class="line"></div> -->
         <div class="global-maxwidth row con-b align-s">
             <div class="company-info">
                 <div class="logo">
@@ -62,14 +62,15 @@
                 imageLogo: iImageLogo,
                 imageCode: iImageCode,
             }
-        }
+        },
     }
 </script>
 
 <style lang="less">
     .components-footer {
         width: 100%;
-        height: 260px;
+        min-height: 260px;
+        padding-top: 40px;
         background-image: url('~@/assets/bg-05.png');
 
         .line {
@@ -92,7 +93,7 @@
                 margin-bottom: 16px;
 
                 img {
-                    width: 350px;
+                    width: 400px;
                     height: 40px;
                 }
             }
@@ -130,6 +131,10 @@
 
         .follow-us {
             margin-bottom: 28px;
+            .el-image {
+                width: 96px;
+                height: 96px;
+            }
 
             .other-link-item {
                 width: 96px;

src/components/currency-header.vue

@@ -5,7 +5,7 @@
             <div class="about row align-c">
                 <el-dropdown>
                     <span class="global-cursor" @click="$router.push('/about')">关注我们</span>
-                    <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-menu class="about-code" slot="dropdown">
                         <el-dropdown-item>
                             <img src="../assets/code.png" alt="">
                         </el-dropdown-item>
@@ -295,6 +295,10 @@
             }
         }
 
+        .about-code {
+            border: 1px red solid;
+        }
+
         .search {
             .el-input__inner {
                 line-height: 1.4;

src/components/currency-navigation.vue

@@ -103,20 +103,18 @@
         background: #FFFFFF;
 
         .logo img {
-            width: 350px;
+            width: 400px;
             height: 40px;
         }
 
         .navigation {
-            // width: 734px;
-
             .el-menu-demo {
                 border: none;
             }
 
             .el-menu-item,
             .el-submenu {
-                width: 66px;
+                width: 60px;
                 margin: 0 26px;
                 padding: 0;
                 color: #000000;

src/components/notice-file.vue

@@ -45,7 +45,7 @@
                 // window.open(iHost.base + funcItem.url)
 
                 // 预览组件
-                let routeData = this.$router.resolve({　path:'/file?file=' + funcItem.url })
+                let routeData = this.$router.resolve({　path:'/file?file=' + encodeURIComponent(funcItem.url) })
                 window.open(routeData.href, '_blank')
             }
         }

src/view/pdf.vue

@@ -42,7 +42,7 @@
             };
         },
         created() {
-            this.src = iHost.resources + this.$route.query.file
+            this.src = iHost.resources + decodeURIComponent(this.$route.query.file)
         },
         methods: {
             initPageTotal: function (funcValue) {

src/view/personal/supplier-auction.vue

@@ -31,7 +31,7 @@
                             <span class="global-cursor project-title">{{item.projectName}}</span>
                         </div>
                         <div class="row align-c">
-                            <span class="global-color-green">{{item.isWin ? '中标' : ''}}</span>
+                            <span class="global-color-green">{{item.isWin ? '成交' : ''}}</span>
                             <span v-if="item.projectState === 1" class="project-state">竞标中</span>
                             <span v-if="item.projectState === 2" class="project-state">竞标中</span>
                             <span v-if="item.projectState === 3" class="project-state">已截止</span>

src/view/personal/supplier-notice.js

@@ -54,7 +54,7 @@ let output = function (thisVue, id, type) {
                     'timeTimestampClose': 1577808000000,
                     'contentTitle': '内容说明',
                     'contentHtml': funcResponse.biddingExplain,
-                    'isOnline': true
+                    'isOnline': true,
                 }
                 thisVue.$store.commit('componentProject', funcProject)
 

src/view/personal/supplier-notice.vue

@@ -8,7 +8,7 @@
 
         <!-- 公告标题 -->
         <div class="info-title row">
-            <span v-show="projectWin" class="global-color-green">中标</span>
+            <span v-show="projectWin" class="global-color-green">{{componentProject.noticeType === 0 ? '成交' : '中标'}}</span>
             <span>{{componentProject.projectName}}</span>
         </div>
 
@@ -71,7 +71,7 @@
                     <template slot-scope="scope">
                         <div class="global-cursor row">
                             <span v-if="!scope.row.isChild" class="global-color-blue" @click="onQueryQuoteRecord(scope.row, scope.$index)">报价记录</span>
-                            <span v-if="scope.row.isWin" class="is-win global-color-green">中标</span>
+                            <span v-if="scope.row.isWin" class="is-win global-color-green">成交</span>
                         </div>
                     </template>
                 </el-table-column>
@@ -392,6 +392,8 @@
                 this.componentContract = funcPackage
                 this.componentNotice = funcOther
 
+                console.log(this.componentProject)
+
                 // 公告状态设置
                 let funcIndex = 0
                 for (funcIndex; funcIndex < this.componentProgress.timestamp.length; funcIndex++) {

src/view/public/bid-notice.js

@@ -59,7 +59,8 @@ let output = function (thisVue, id, type, isPreview) {
                     'timeTimestampClose': 1577808000000,
                     'contentTitle': '内容说明',
                     'contentHtml': funcResponse.biddingExplain,
-                    'isOnline': true
+                    'isOnline': true,
+                    'isRoll': funcResponse.roll === '1' ? true : false,
                 }
                 thisVue.$store.commit('componentProject', funcProject)
 

src/view/public/bid-notice.vue

@@ -14,12 +14,14 @@
             <!-- 项目进度 -->
             <div v-if="[0, 2, 3].indexOf(noticeType) >= 0" class="info-item">
                 <noticeProgress @entered="onEntered()" @document="onDocument()" @offer="onQuote()"></noticeProgress>
-                <div v-if="[0].indexOf(noticeType) >= 0 && quoteList.length > 0" class="quote-new row align-c">
-                    <img src="../../assets/broadcast.png" alt="">
-                    <span>最新报价</span>
-                    <span class="quote-price">{{quoteList[quoteIndex].name}}</span>
-                    <span class="quote-price ">最高报价：<span class="global-color-red">{{quoteList[quoteIndex].maxQuote}}</span>　元</span>
-                    <span class="quote-price ">最低报价：<span class="global-color-blue">{{quoteList[quoteIndex].minQuote}}</span>　元</span>
+                <div v-if="[0].indexOf(noticeType) >= 0 && quoteList.length > 0 && componentProject.isRoll" class="quote-new col">
+                    <div v-for="(item, index) in quoteListLoop" :key="index">
+                        <img src="../../assets/broadcast.png" alt="">
+                        <span>最新报价</span>
+                        <span class="quote-price">{{item.name}}</span>
+                        <span class="quote-price ">最高报价：<span class="global-color-red">{{item.maxQuote}}</span>　元</span>
+                        <span class="quote-price ">最低报价：<span class="global-color-blue">{{item.minQuote}}</span>　元</span>
+                    </div>
                 </div>
             </div>
 
@@ -34,7 +36,7 @@
             <!-- 竞价结果 -->
             <div v-if="[1].indexOf(noticeType) >= 0" class="info-item">
                 <div class="title title-decorate row align-c">
-                    <span>中标信息</span>
+                    <span>成交信息</span>
                 </div>
                 <div v-for="(item, index) in componentContract" :key="index">
                     <el-table :data="[componentContract[index]]" stripe :header-cell-style="tableHeaderStyle">
@@ -42,13 +44,13 @@
                         <el-table-column prop="object" label="标的" width="200"></el-table-column>
                         <el-table-column prop="requirement" label="参数要求" min-width="230"></el-table-column>
                         <el-table-column prop="quantity" label="数量" width="120" align="center"></el-table-column>
-                        <el-table-column prop="resultName" label="中标人" width="200">
+                        <el-table-column prop="resultName" label="成交人" width="200">
                             <template slot-scope="scope">
                                 <span v-if="scope.row.resultName !== '流标'">{{scope.row.resultName}}</span>
                                 <span class="global-color-red" v-if="scope.row.resultName === '流标'">{{scope.row.resultName}}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="resultPrice" label="中标金额（元）" min-width="140"></el-table-column>
+                        <el-table-column prop="resultPrice" label="成交金额（元）" min-width="140"></el-table-column>
                     </el-table>
                 </div>
             </div>
@@ -323,6 +325,7 @@
                     'minQuote': '',
                     'maxQuote': '',
                 }],
+                quoteListLoop: [],
                 quoteIndex: 0,
                 quoteTimer: 0,
 
@@ -402,14 +405,29 @@
                                     funcList.push(funcItem)
                                 }
                                 this.quoteList = funcList
-
+                                for (let i = 0; i < 3; i++) {
+                                    if (this.quoteList[i]) {
+                                        this.quoteListLoop.push(this.quoteList[i])
+                                    }
+                                }
                                 
                                 // 设置报价轮播
                                 this.quoteTimer = setInterval(() => {
-                                    if (this.quoteIndex < this.quoteList.length - 1) {
+                                    // 当前报价小于三个不轮播
+                                    if (this.quoteList.length < 3) return
+
+                                    // 当前报价大于三个索引递增循环
+                                    this.quoteListLoop = []
+                                    let funcActiveIndex = 0
+                                    while (funcActiveIndex < 3) {
+                                        if (this.quoteList[this.quoteIndex]) {
+                                            this.quoteListLoop[funcActiveIndex] = this.quoteList[this.quoteIndex]
+                                        } else {
+                                            this.quoteIndex = 0
+                                            this.quoteListLoop[funcActiveIndex] = this.quoteList[this.quoteIndex]
+                                        }
                                         this.quoteIndex = this.quoteIndex + 1
-                                    } else {
-                                        this.quoteIndex = 0
+                                        funcActiveIndex = funcActiveIndex + 1
                                     }
                                 }, 2000)
                             } else {
@@ -971,25 +989,25 @@
 
             .quote-new {
                 width: 100%;
-                height: 44px;
-                padding-left: 24px;
+                min-height: 44px;
+                padding: 12px 0 12px 24px;
                 border: 1px #E5E5E5 solid;
 
                 img {
                     margin-right: 10px;
                 }
 
-                > span:nth-child(2) {
+                span:nth-child(2) {
                     margin-right: 20px;
                 }
 
-                > span:nth-child(3) {
+                span:nth-child(3) {
                     min-width: 160px;
                     margin-right: 20px;
                 }
 
-                > span:nth-child(4),
-                > span:nth-child(5) {
+                span:nth-child(4),
+                span:nth-child(5) {
                     margin-right: 40px;
                 }
 

src/view/register-supplier.vue

@@ -64,7 +64,6 @@
                                 :action="uploadOption.license.url"
                                 :data="uploadOption.license.params"
                                 :on-preview="onUploadPreviewFile"
-                                :before-upload="(file) => { ononUploadBefore('license', file) }"
                                 :on-remove="(file, fileList) => { onUploadRemove('license', file, fileList) }"
                                 :on-change="(file, fileList) => { onUploadChange('license', file, fileList) }"
                                 :on-success="(respons, file, fileList) => { onUploadSuccess('license', respons, file, fileList) }"