Merge branch 'dev/v4.8.83_cyl' of qmx/jy into feature/v4.8.83

src/web/staticres/js/index/index_charts.js

@@ -116,12 +116,21 @@ var pageChartsConf = {
     }
   },
   created: function () {
-    this.initData()
+    this.getData()
   },
   methods: {
-    initData: function () {
-      this.biddingTrendList = pageData.biddingTrend
-      this.changeTab1(0)
+    getData: function () {
+      var _this = this
+      $.ajax({
+        url: '/homePage/analysisRegional',
+        method: 'GET',
+        success: function (res) {
+          if (res && $.isArray(res.data)) {
+            _this.biddingTrendList = res.data
+            _this.changeTab1(0)
+          }
+        }
+      })
     },
     changeTab1: function (index) {
       this.biddingAreaList = this.biddingTrendList[index].areaArr
@@ -182,5 +191,3 @@ $(function () {
   var pageCharts = new Vue(pageChartsConf)
   window.pageCharts = pageCharts
 })
-
-

src/web/staticres/pccss/index_pc.css

@@ -778,6 +778,7 @@
 .notice-card {
     border-radius: 8px;
     border: 1px solid #2ABED1;
+    background: linear-gradient(180deg, #FFF 0%, #F9F9F9 100%);
 }
 .notice-card-header,
 .notice-card-title {
@@ -1011,8 +1012,11 @@
     line-height: 24px;
     border-radius: 4px;
 }
-.service-desc-button:hover {
+.to-learn-more.j-s-button:hover,
+.service-desc-button.s-plain:hover {
     text-decoration: none;
+    color: #fff;
+    background: linear-gradient(90deg, #2ABED1 0%, rgba(27, 143, 250, 0.96) 99.98%);
 }
 .service-desc-button.s-main {
     color: #2ABED1;

src/web/templates/pc/template/index/data-service-module.html

@@ -25,9 +25,9 @@
         </footer>
       </section>
       <div class="service-button-list clearfix">
-        <a class="service-desc-button pointer s-plain" href="/front/dataExport/toSieve" target="_blank">数据导出</a>
-        <a class="service-desc-button button-blink pointer s-confirm" href="/front/dataMarket/customExport" target="_blank">定制服务</a>
-        <a class="service-desc-button pointer s-plain" href="/front/dataMarket/dataInterface" target="_blank">对接服务</a>
+        <a class="service-desc-button button-blink pointer s-plain" href="/front/dataExport/toSieve" target="_blank">数据导出</a>
+        <a class="service-desc-button button-blink pointer s-plain" href="/front/dataMarket/customExport" target="_blank">定制服务</a>
+        <a class="service-desc-button button-blink pointer s-plain" href="/front/dataMarket/dataInterface" target="_blank">对接服务</a>
       </div>
     </div>
     <div class="service-module-content-right">

src/web/templates/pc/template/index/hot-buyer-card.html

@@ -35,7 +35,7 @@
         <div class="buyer-list-cell-ft">
           <p class="buyer-list-cell-num-container">
             <span class="buyer-list-cell-num-container">
-              采购标讯：<i class="highlight-text">{{$v.count}}</i> 条
+              采购标讯：<i class="highlight-text">{{$v.count}}</i>&nbsp;条
             </span>
           </p>
         </div>

src/web/templates/pc/template/index/user-info-card.html

@@ -15,7 +15,7 @@
     </div>
   </main>
   <footer class="user-info-footer">
-    <button class="j-s-button plain to-learn-more open-customer">了解详情</button>
+    <button class="j-s-button plain to-learn-more button-blink open-customer">了解详情</button>
   </footer>
 </section>
 {{else}}