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

src/jfw/front/index.go

@@ -238,7 +238,7 @@ func (nIndex *NewIndex) NewIndex() error {
 	//政府招标
 	nIndex.T["governmentBidding"] = GovernmentTender(15)
 	nIndex.T["importBidding"] = GetImportBidding()
-	nIndex.T["biddingTrend"] = HomeBiddingTrends()
+	//nIndex.T["biddingTrend"] = HomeBiddingTrends()
 	nIndex.T["hotBuyerData"] = PurchasingData()
 	nIndex.T["simpleTemplateData"] = map[string]interface{}{"XwebVer": nIndex.T["XwebVer"]}
 	return nIndex.Render("/pc/newIndex.html", &nIndex.T)

src/web/templates/pc/newIndex.html

@@ -218,12 +218,7 @@
   <script type="text/javascript" src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
   <script type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index/seo_helper.js?v={{Msg "seo" "version"}}'></script>
   <script type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index/index_swiper.js?v={{Msg "seo" "version"}}'></script>
-  <script>
-    var pageData = {
-      biddingTrend: {{ .T.biddingTrend }}
-    }
-  </script>
-  </script>
+
   <script type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index/index_2023.12.js?v={{Msg "seo" "version"}}'></script>
   <script defer src=//cdn-common.jianyu360.com/cdn/lib/echarts/4.8.0/echarts.min.js></script>
   <script defer type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index/index_charts.js?v={{Msg "seo" "version"}}'></script>

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

@@ -16,11 +16,19 @@
           <div class="buyer-list-cell-info">
             <p class="buyer-list-cell-info-item">
               <span class="buyer-list-cell-info-item-label">所在地：</span>
+              {{if not $v.city }}
+              <span class="buyer-list-cell-info-item-value">--</span>
+              {{else}}
               <span class="buyer-list-cell-info-item-value">{{$v.city}}</span>
+              {{end}}
             </p>
             <p class="buyer-list-cell-info-item">
               <span class="buyer-list-cell-info-item-label">采购单位类型：</span>
+              {{if not $v.buyerclass }}
+              <span class="buyer-list-cell-info-item-value">--</span>
+              {{else}}
               <span class="buyer-list-cell-info-item-value">{{$v.buyerclass}}</span>
+              {{end}}
             </p>
           </div>
         </div>