瀏覽代碼

Merge branch 'feature/v4.8.49' into dev/v4.8.49_zsy

zhangsiya 2 年之前
父節點
當前提交
edf8f3d523

+ 6 - 4
src/jfw/front/classificationTag.go

@@ -438,11 +438,13 @@ func NewIndexbids(session *httpsession.Session, r *http.Request) []map[string]in
 				v1["budget"] = ConversionMoeny(v1["bidamount"])
 			}
 		}
+		if bytes, err := json.Marshal(*lists); err == nil && bytes != nil {
+			_ = redis.PutBytes(RedisNameNew, "jyNewIndexbids", &bytes, 5*60)
+		}
+		return *lists
 	}
-	if bytes, err := json.Marshal(*lists); err == nil && bytes != nil {
-		_ = redis.PutBytes(RedisNameNew, "jyNewIndexbids", &bytes, 5*60)
-	}
-	return *lists
+
+	return nil
 }
 
 // 格式输出数据

+ 3 - 4
src/web/staticres/frontRouter/pc/customExport/css/index.css

@@ -206,21 +206,20 @@ h2.title{
   color:rgba(255, 255, 255, 0.88);
   margin-top:12px;
 }
-.title{
+.custom-export-index .title{
   margin:40px auto;
   background: url(/frontRouter/pc/customExport/image/export-b-title.png) no-repeat center;
   background-size: contain;
-  height:162px!important;
 }
 
-.core-advantage-box{
+.custom-export-index .core-advantage-box{
   padding-top:68px;
   height:642px;
   width: 100%;
   background-image:url(/frontRouter/pc/customExport/image/core-bg.png);
   color: rgba(30, 30, 30, 0.88);
 }
-.core-advantage-box h2{
+.custom-export-index .core-advantage-box h2{
   margin:0 auto;
   background-image: url(/frontRouter/pc/customExport/image/core-title.png);
 }

二進制
src/web/staticres/images/msgCenter/dyxx.png


二進制
src/web/staticres/images/msgCenter/fwtz.png


二進制
src/web/staticres/images/msgCenter/fxbg.png


二進制
src/web/staticres/images/msgCenter/hdtz.png


二進制
src/web/staticres/images/msgCenter/jyxt.png


二進制
src/web/staticres/images/msgCenter/qbxx.png


二進制
src/web/staticres/images/msgCenter/qydt.png


二進制
src/web/staticres/images/msgCenter/sx.png


二進制
src/web/staticres/images/msgCenter/xmdt.png


二進制
src/web/staticres/images/msgCenter/xttz.png


+ 2 - 2
src/web/templates/dataMarket/customExport/index.html

@@ -94,7 +94,7 @@
     <!--数据定制导出方案B-->
     <section class="custom-report-box-b CfadeInUp">
       <div class="w1200">
-        <h2 class="title"></h2>
+        <h2 class="title" style="height:162px"></h2>
         <div class="content f-space-between">
           <div class="con-row">
             <div class="row-text">
@@ -336,7 +336,7 @@
         <div class="common-custom-btn btn-cell btn-light" onClick="needSubmitHandle('pc_data_custom_data')">立即定制</div>
       </div>
     </section>
-    <div class="i-need-more fixed">
+    <div class="i-need-more fixed" style="z-index: 99;">
       <div class="i-n-m-bg bg-contain w1200">
         <div class="get-data-example-button bg-contain" onClick="needSubmitHandle('pc_data_custom_export')"></div>
       </div>