style: 样式修改

src/web/staticres/css/ele-reset.css

@@ -123,7 +123,7 @@ li.el-select-dropdown__item {
     display: flex;
     align-items: center;
     justify-content: center;
-    padding: 7px 50px;
+    padding: 10px 50px;
     font-size: 16px;
     color: #686868;
     border: 1px solid #e0e0e0;

src/web/staticres/css/selector/selector.css

@@ -344,7 +344,7 @@
     justify-content: space-between;
 }
 .article-item .a-i-tags {
-    margin-right: 14px;
+    margin-right: 6px;
 }
 .article-item .a-i-tag {
     display: flex;

src/web/staticres/frontRouter/pc/collection/css/index-pc.css

@@ -161,6 +161,11 @@
 .list-item {
     border-bottom: 1px solid #ECECEC;
 }
+.list-item:hover,
+.list-item:hover .a-i-title {
+    color: #2abed1;
+}
+
 .list-index {
     margin-right: 2px;
 }
@@ -242,4 +247,21 @@
 }
 .tag-drawer .el-tag {
     margin: 6px;
+    padding: 1px 8px;
+    height: auto;
+    background-color: #f5f6f7;
+    border: 1px solid #ececec;
+    border-radius: 5px;
+    line-height: 22px;
+}
+.tag-drawer .el-tag .el-icon-close {
+    font-weight: 700;
+}
+.select-title {
+    color: #686868;
+    font-size: 14px;
+    line-height: 22px;
 }
+.el-select + .select-title {
+    margin-left: 14px;
+}

src/web/staticres/frontRouter/pc/collection/js/index-pc.js

@@ -21,6 +21,10 @@ var vm = new Vue({
             tagList: [],
             tagSelectList: [],
             buyerPhoneOptions: [
+                {
+                    label: '不限',
+                    value: 0
+                },
                 {
                     label: '有联系方式',
                     value: 1
@@ -35,15 +39,15 @@ var vm = new Vue({
                 timeStart: 0,
                 timeEnd: 0,
                 buyerclass: [],
-                buyerPhone: '', // 采购单位联系方式
-                bidPhone: '', // 中标企业联系方式
+                buyerPhone: 0, // 采购单位联系方式
+                bidPhone: 0, // 中标企业联系方式
             },
             listState: {
                 listType: 'line', // line/table
                 loaded: false, // 是否已经搜索过
                 loading: false,
                 pageNum: 1, // 当前页
-                pageSize: 10, // 每页多少条数据
+                pageSize: 50, // 每页多少条数据
                 total: 0, // 一共多少条数据
                 list: [] // 查询请求返回的数据
             },
@@ -92,6 +96,9 @@ var vm = new Vue({
         },
         checkPower: function () {
             this.power = this.powerInfo.entniche || this.powerInfo.member || this.powerInfo.vip !== 0
+            if (!this.power) {
+                this.listState.pageSize = 100
+            }
         },
         getTagList: function () {
             $.ajax({
@@ -109,9 +116,9 @@ var vm = new Vue({
             var _this = this
             var data = {
                 pagenum: this.listState.pageNum,
+                pagesize: this.listState.pageSize,
                 label: this.filterState.tags.join(','),
-                colltime_start: this.filterState.timeStart / 1000,
-                colltime_end: this.filterState.timeEnd / 1000,
+                selectTime: this.filterState.timeStart / 1000 + '_' + this.filterState.timeEnd / 1000,
                 buyerclass: this.filterState.buyerclass.join(','),
                 buyPhone: this.filterState.buyPhone ? this.filterState.buyPhone : 0,
                 bidPhone: this.filterState.bidPhone ? this.filterState.bidPhone : 0
@@ -128,7 +135,6 @@ var vm = new Vue({
                 success: function (res) {
                     if (res.error_code === 0 && res.data) {
                         var list = res.data.res
-                        this.listState.pageSize = res.data.pageSize
                         if (res.data.count) {
                             this.listState.total = res.data.count
                         }
@@ -230,7 +236,9 @@ var vm = new Vue({
         dataExport: function () {
             var info = this.getSelectedIdArr()
             var ids = info.ids
-            window.open('/front/dataExport/superSearchExport?selectIds=' + ids.join(','))
+            if (ids.length !== 0) {
+                return window.open('/front/dataExport/superSearchExport?selectIds=' + ids.join(','))
+            }
         },
         // 批量取消收藏
         unStarSelected: function () {

src/web/staticres/js/ent-search-index-pc.js

@@ -261,6 +261,9 @@ var vm = new Vue({
         initDOMEvents: function () {
             ewmMoveHover()
             refreshEwmText(this.searchContent)
+            setTimeout(function () {
+                tabHover()
+            }, 300)
         },
         isFilterShow: function () {
             if (this.filterShow) {
@@ -437,9 +440,32 @@ var vm = new Vue({
                 return '-'
             }
         },
+        getEntStatus: function (status) {
+            if (status === '吊销') {
+                return 'tag-danger'
+            } else if (status === '注销') {
+                return 'tag-danger'
+            } else if (status === '撤销') {
+                return 'tag-disabled'
+            } else {
+                return ''
+            }
+        },
+        randomBgc: function () {
+            var arr = ['default', 'blue', 'orange', 'green']
+            var randomIndex = utils.getRandomNumber(0, arr.length - 1)
+            return 'bgc-' + arr[randomIndex]
+        }
     }
 })
 
+function tabHover () {
+    $('#tab-zb').on('mouseover', function () {
+        $(this).siblings('.el-tabs__active-bar').css({transform: 'translateX(0)'})
+    }).on('mouseout', function () {
+        $(this).siblings('.el-tabs__active-bar').css({transform: 'translateX(96px)'})
+    })
+}
 function refreshEwmText (text) {
     if (text && text.trim().length > 0) {
         $(".wx-inner-title").html("扫码关注企业");

src/web/staticres/js/selector/article-item-pc.js

@@ -1,21 +1,23 @@
-var articleItemComponentTemplate = `
-<div class="article-item">
-    <div class="a-i-left a-i-title ellipsis">{{ title }}</div>
-    <div class="a-i-right">
-        <div class="a-i-tags">
-            <div
-                class="a-i-tag"
-                v-for="(tag, index) in tags"
-                :key="index"
-            >{{ tag }}</div>
-        </div>
-        <div class="a-i-time-container">
-            <span class="icon-time"></span>
-            <span class="icon-text">{{ dateFromNow(time * 1000) }}</span>
-        </div>
-    </div>
-</div>
-`
+// var articleItemComponentTemplate = `
+// <div class="article-item">
+//     <div class="a-i-left a-i-title ellipsis">{{ title }}</div>
+//     <div class="a-i-right">
+//         <div class="a-i-tags">
+//             <div
+//                 class="a-i-tag"
+//                 v-for="(tag, index) in tags"
+//                 :key="index"
+//             >{{ tag }}</div>
+//         </div>
+//         <div class="a-i-time-container">
+//             <span class="icon-time" style="display: none;"></span>
+//             <span class="icon-text">{{ dateFromNow(time * 1000) }}</span>
+//         </div>
+//     </div>
+// </div>
+// `
+
+var articleItemComponentTemplate = '<div class="article-item"><div class="a-i-left a-i-title ellipsis">{{ title }}</div><div class="a-i-right"><div class="a-i-tags"><div class="a-i-tag" v-for="(tag, index) in tags" :key="index">{{ tag }}</div></div><div class="a-i-time-container"><span class="icon-time" style="display: none;"></span><span class="icon-text">{{ dateFromNow(time * 1000) }}</span></div></div></div>'
 
 var articleItemComponent = {
     name: 'article-item-pc',

src/web/staticres/pccss/ent-search-index-pc.css

@@ -31,7 +31,7 @@
 }
 
 .search-header-content {
-    padding-left: 100px;
+    padding-left: 125px;
 }
 .search-header-top {
     display: flex;
@@ -50,6 +50,24 @@
 .input-container {
     position: relative;
 }
+
+.el-input__prefix {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    left: 18px;
+}
+.el-input--prefix .el-input__inner {
+    padding-left: 50px;
+}
+.input-prefix-icon {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.input-prefix-icon img {
+    display: block;
+}
 .input-container .el-input-group {
     width: 640px;
 }
@@ -213,12 +231,28 @@
 }
 
 .ent-info-item .ei-i-l-container {
-    width: 60px;
+    padding: 8px 12px;
     height: 60px;
+    width: 60px;
+    color: #fff;
+    font-size: 18px;
+    line-height: 22px;
     overflow: hidden;
     border-radius: 5px;
-    background-color: #ececec;
 }
+.ent-info-item .ei-i-l-container.bgc-default {
+    background-color: #2cb7ca;
+}
+.ent-info-item .ei-i-l-container.bgc-blue {
+    background-color: #f5af5c;
+}
+.ent-info-item .ei-i-l-container.bgc-orange {
+    background-color: #58a1e7;
+}
+.ent-info-item .ei-i-l-container.bgc-green {
+    background-color: #51cea2;
+}
+
 .ent-info-item .ei-i-l-container > img {
     display: block;
     width: 100%;
@@ -260,6 +294,21 @@
     background-color: rgba(44,183,202,0.08);
     border-radius: 5px;
 }
+.ei-r-tag.tag-danger {
+    color: #ff3a20;
+    border: 1px solid #ff3a20;
+    background-color: rgba(255,58,32,0.08);
+}
+.ei-r-tag.tag-warning {
+    color: #ff9f40;
+    border: 1px solid #ff9f40;
+    background: rgba(255,159,64,0.08);
+    background-color: transparent;
+}
+.ei-r-tag.tag-disabled {
+    color: #aaa;
+    border: 1px solid #aaa;
+}
 
 .ent-info-list {
     min-height: 400px;
@@ -273,3 +322,13 @@
     height: 36px;
     width: 132px;
 }
+
+.select-title {
+    margin-left: 18px;
+    color: #686868;
+    font-size: 14px;
+    line-height: 22px;
+}
+.el-select + .select-title {
+    margin-left: 14px;
+}

src/web/templates/frontRouter/pc/collection/sess/index.html

@@ -97,7 +97,8 @@
                 <div class="selector-card">
                     <div class="selector-card-header">其他筛选条件：</div>
                     <div class="selector-card-content flex mini-select other-filter">
-                        <el-select v-model="filterState.buyerPhone" @change="otherFilterChange" clearable placeholder="采购单位联系方式">
+                        <div class="select-title">采购单位联系方式</div>
+                        <el-select v-model="filterState.buyerPhone" @change="otherFilterChange" placeholder="采购单位联系方式">
                             <el-option
                                 v-for="item in buyerPhoneOptions"
                                 :key="item.value"
@@ -105,7 +106,8 @@
                                 :value="item.value">
                             </el-option>
                         </el-select>
-                        <el-select v-model="filterState.bidPhone" @change="otherFilterChange" clearable placeholder="中标企业联系方式">
+                        <div class="select-title">采购单位联系方式</div>
+                        <el-select v-model="filterState.bidPhone" @change="otherFilterChange" placeholder="中标企业联系方式">
                             <el-option
                                 v-for="item in buyerPhoneOptions"
                                 :key="item.value"
@@ -147,7 +149,7 @@
                 </div>
                 <div class="collect-list-content no-select">
                     <div class="list collect-line-list" v-loading="listState.loading" v-show="listState.listType === 'line'">
-                        <div class="list-item flex" v-for="(item, index) in listState.list" :key="item._id">
+                        <div class="list-item flex" v-for="(item, index) in listState.list" :key="item._id" @click="toListDetail(item)">
                             <div class="pre-container flex">
                                 <el-checkbox v-model="item.selected" @change="listItemCheckboxChange"></el-checkbox>
                                 <div class="list-index">${ item.index }. </div>
@@ -156,7 +158,6 @@
                                 :title="item.title"
                                 :time="item.publishtime"
                                 :tags="calcArticleItemTags(item)"
-                                @click="toListDetail(item)"
                             ></article-item-component>
                             <div class="append-container">
                                 <span class="j-icon" :class="item.star ? 'icon-star-active' : 'icon-star'" @click.prevent.stop="unStarThis(item)"></span>

src/web/templates/pc/entsearchindex.html

@@ -44,6 +44,11 @@
                                 @blur="preSearch.focus=false"
                                 @input="getPreSearchList"
                                 @keyup.enter.native="doSearch">
+                                <template slot="prefix">
+                                    <div class="input-prefix-icon">
+                                        <img src="/images/biddingSearch/search-icon1.png">
+                                    </div>
+                                </template>
                                 <template slot="append">
                                     <div class="search-button no-select" @click="doSearch">搜 索</div>
                                 </template>
@@ -141,6 +146,7 @@
                             <span class="icon-hot-vip"></span>
                         </div>
                         <div class="selector-card-content flex mini-select">
+                            <div class="select-title">中标区域</div>
                             <el-select v-model="filterState.biddingArea" @change="zbFilterChange" clearable placeholder="中标区域">
                                 <el-option
                                     v-for="item in zblyFilterOption.zbAreaOptions"
@@ -149,6 +155,7 @@
                                     :value="item.value">
                                 </el-option>
                             </el-select>
+                            <div class="select-title">单位类型</div>
                             <el-select v-model="filterState.entClass" @change="zbFilterChange" clearable placeholder="单位类型">
                                 <el-option
                                     v-for="item in zblyFilterOption.dwlxOptions"
@@ -157,6 +164,7 @@
                                     :value="item.value">
                                 </el-option>
                             </el-select>
+                            <div class="select-title">联系方式</div>
                             <el-select v-model="filterState.entContact" @change="zbFilterChange" clearable placeholder="联系方式">
                                 <el-option
                                     v-for="item in zblyFilterOption.lxfsOptions"
@@ -179,14 +187,12 @@
                             @click="toDetail(item.id)"
                             :key="item.id">
                             <div class="ei-i-left">
-                                <div class="ei-i-l-container">
-                                    <img src="" alt="">
-                                </div>
+                                <div class="ei-i-l-container" :class="randomBgc()">${ item.company_name.slice(0,4) }</div>
                             </div>
                             <div class="ei-i-right">
                                 <div class="ei-r-title-container flex">
                                     <div class="ei-r-title">${ item.company_name }</div>
-                                    <div class="ei-r-tag" v-if="item.company_status">${ item.company_status }</div>
+                                    <div class="ei-r-tag" :class="getEntStatus(item.company_status)" v-if="item.company_status">${ item.company_status }</div>
                                 </div>
                                 <div class="ei-r-info-container">
                                     <div class="ei-r-info-item">