From ff563bd3fb4713132de22ea2c1f2a6ca4849b618 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Thu, 3 Apr 2025 14:17:39 +0800
Subject: [PATCH] =?UTF-8?q?task=2042621=20=E5=89=8D=E7=AB=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 newBusinessEntities/index.html                | 131 ++++++++++--------
 newBusinessEntities/static/css/index.css      |  24 +++-
 newBusinessEntities/static/css/supply.css     |  16 ++-
 newBusinessEntities/static/js/api/index.js    |   7 +
 .../static/js/project/index.js                |   4 +-
 .../static/js/project/supplyChain/index.js    |  14 +-
 .../view/supplyChain/index.html               |  18 +--
 7 files changed, 132 insertions(+), 82 deletions(-)

diff --git a/newBusinessEntities/index.html b/newBusinessEntities/index.html
index 0f0bbb7..3df385a 100644
--- a/newBusinessEntities/index.html
+++ b/newBusinessEntities/index.html
@@ -53,7 +53,7 @@
                             <p class="font36 newBox_list_titBg">NOTICE</p>
                             <p class="newBox_list_tit">通知公告</p>
                         </div>
-                        <p class="fr font16 more">更多<span class="jiantou"></span></p>
+<!--                        <p class="fr font16 more">更多<span class="jiantou"></span></p>-->
                         <div class="clear"></div>
                     </div>
                     <script id="noticeData" type="text/html">
@@ -61,7 +61,7 @@
                             {{if 3 > i}}
                                 <li>
                                     <a href="javascript:void(0);" class="fl">· {{value.title}}</a>
-                                    <span class="fr font14">{{value.releaseTime.substr(0,10)}}</span>
+                                    <span class="fr font14">{{value.releaseTime?value.releaseTime.substr(0,10):""}}</span>
                                     <div class="clear"></div>
                                 </li>
                             {{/if}}
@@ -74,7 +74,7 @@
                             <p class="font36 newBox_list_titBg">NEWS</p>
                             <p class="newBox_list_tit">新闻舆情</p>
                         </div>
-                        <p class="fr font16 more">更多<span class="jiantou"></span></p>
+<!--                        <a href="view/train/index.html" class="fr font16 more">更多<span class="jiantou"></span></a>-->
                         <div class="clear"></div>
                     </div>
                     <script id="newData" type="text/html">
@@ -82,7 +82,7 @@
                             {{if 3 > i}}
                                 <li>
                                     <a href="javascript:void(0);" class="fl">· {{value.title}}</a>
-                                    <span class="fr font14">{{value.releaseTime.substr(0,10)}}</span>
+                                    <span class="fr font14">{{value.releaseTime?value.releaseTime.substr(0,10):""}}</span>
                                     <div class="clear"></div>
                                 </li>
                             {{/if}}
@@ -97,7 +97,7 @@
                             <p class="font36 newBox_list_titBg">ACTIVITY</p>
                             <p class="newBox_list_tit">培训活动</p>
                         </div>
-                        <p class="fr font16 more">更多<span class="jiantou"></span></p>
+                        <a href="view/train/index.html" class="fr font16 more">更多<span class="jiantou"></span></a>
                         <div class="clear"></div>
                     </div>
                     <script id="trainingData" type="text/html">
@@ -113,7 +113,7 @@
                                     <td width="500"><p>{{value.trainingName}}</p></td>
                                     <td>{{value.keynoteSpeaker}}</td>
                                     <td width="200"><p>{{value.trainingSite}}</p></td>
-                                    <td>{{value.startTime.substr(0,10)}}</td>
+                                    <td>{{value.startTime?value.startTime.substr(0,10):""}}</td>
                                 </tr>
                             {{/if}}
                         {{/each}}
@@ -190,55 +190,55 @@
                 <table width="100%" cellspacing="0" cellpadding="0">
                     <tr>
                         <td></td>
-                        <td>山芋粉</td>
-                        <td>大果</td>
-                        <td>中果</td>
-                        <td>小果</td>
-                        <td>小果</td>
-                        <td>小果</td>
-                        <td>小果</td>
-                        <td>小果</td>
-                        <td>小果</td>
-                        <td>小果</td>
+                        <td>玉米</td>
+                        <td>小麦</td>
+                        <td>大豆</td>
+                        <td>水稻</td>
+                        <td>梨</td>
+                        <td>苹果</td>
+                        <td>葡萄</td>
+                        <td>大白菜</td>
+                        <td>生菜</td>
+                        <td>空心菜</td>
                     </tr>
                     <tr>
                         <td>指导价格</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
+                        <td>26元/500g</td>
+                        <td>1.58元/500g</td>
+                        <td>1.21元/500g</td>
+                        <td>1.2元/500g</td>
+                        <td>6.2元/500g</td>
+                        <td>8元/500g</td>
+                        <td>9元/500g</td>
+                        <td>3.2元/500g</td>
+                        <td>3.5元/500g</td>
+                        <td>5.1元/500g</td>
                     </tr>
                     <tr>
                         <td>最新价格</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
+                        <td>27元/500g</td>
+                        <td>1.58元/500g</td>
+                        <td>1.2元/500g</td>
+                        <td>1.2元/500g</td>
+                        <td>6元/500g</td>
+                        <td>8元/500g</td>
+                        <td>8元/500g</td>
+                        <td>3.5元/500g</td>
+                        <td>3.8元/500g</td>
+                        <td>5元/500g</td>
                     </tr>
                     <tr>
                         <td>日均价格</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
-                        <td>2.5/500g</td>
+                        <td>25.6元/500g</td>
+                        <td>1.6元/500g</td>
+                        <td>1.21元/500g</td>
+                        <td>1.22元/500g</td>
+                        <td>5.94元/500g</td>
+                        <td>7.64元/500g</td>
+                        <td>7.75元/500g</td>
+                        <td>3元/500g</td>
+                        <td>4元/500g</td>
+                        <td>4.8元/500g</td>
                     </tr>
                 </table>
 
@@ -249,7 +249,7 @@
                     <p class="fl">资源库</p>
                     <div class="clear"></div>
                 </div>
-                <p class="fr font16 more2">更多<span class="jiantou"></span></p>
+<!--                <p class="fr font16 more2">更多<span class="jiantou"></span></p>-->
                 <div class="clear"></div>
                 <div class="resourcesTab">
                     <p class="active">专家库</p>
@@ -258,22 +258,22 @@
                 </div>
                 <ul>
                     <li>
-                        <p class="fileBox_list_tit fl"><span class="sanjiao-right m-r-5"></span>111111111111111111111</p>
+                        <p class="fileBox_list_tit fl"><span class="sanjiao-right m-r-5"></span>王祖力‌</p>
                         <p class="fr">2020-01-01</p>
                         <div class="clear"></div>
                     </li>
                     <li>
-                        <p class="fileBox_list_tit fl"><span class="sanjiao-right m-r-5"></span>111111111111111111111</p>
+                        <p class="fileBox_list_tit fl"><span class="sanjiao-right m-r-5"></span>彭梅‌</p>
                         <p class="fr">2020-01-01</p>
                         <div class="clear"></div>
                     </li>
                     <li>
-                        <p class="fileBox_list_tit fl"><span class="sanjiao-right m-r-5"></span>111111111111111111111</p>
+                        <p class="fileBox_list_tit fl"><span class="sanjiao-right m-r-5"></span>姜红岩‌</p>
                         <p class="fr">2020-01-01</p>
                         <div class="clear"></div>
                     </li>
                     <li>
-                        <p class="fileBox_list_tit fl"><span class="sanjiao-right m-r-5"></span>111111111111111111111</p>
+                        <p class="fileBox_list_tit fl"><span class="sanjiao-right m-r-5"></span>孙宁‌</p>
                         <p class="fr">2020-01-01</p>
                         <div class="clear"></div>
                     </li>
@@ -289,7 +289,7 @@
                         <p class="font36 newBox_list_titBg">SUPPLY</p>
                         <p class="newBox_list_tit">供应信息</p>
                     </div>
-                    <p class="fr font16 more">更多<span class="jiantou"></span></p>
+                    <a href="view/supply/index.html?type=gongying" class="fr font16 more">更多<span class="jiantou"></span></a>
                     <div class="clear"></div>
                 </div>
 
@@ -325,7 +325,7 @@
                     <p class="fl">政策文件</p>
                     <div class="clear"></div>
                 </div>
-                <p class="fr font16 more2">更多<span class="jiantou"></span></p>
+<!--                <p class="fr font16 more2">更多<span class="jiantou"></span></p>-->
                 <div class="clear"></div>
                 <script id="policyData" type="text/html">
                     {{each policyList as value i}}
@@ -333,13 +333,13 @@
                             {{if 3 > i }}
                                 <li>
                                     <p class="fileBox_list_tit hotFile"><i class="hotFile_icon m-r-5"></i>{{value.title}}</p>
-                                    <p class="fl fileBox_list_time">{{value.releaseTime.substr(0,10)}}</p><img src="static/images/icon_down.png" class="fr" alt=""/>
+                                    <p class="fl fileBox_list_time">{{value.releaseTime?value.releaseTime.substr(0,10):""}}</p><img src="static/images/icon_down.png" class="fr" alt=""/>
                                     <div class="clear"></div>
                                 </li>
                             {{else}}
                                 <li>
                                     <p class="fileBox_list_tit"><span class="sanjiao-right m-r-5"></span>{{value. title}}</p>
-                                    <p class="fl fileBox_list_time">{{value.releaseTime.substr(0,10)}}</p><img src="static/images/icon_down.png" class="fr" alt=""/>
+                                    <p class="fl fileBox_list_time">{{value.releaseTime?value.releaseTime.substr(0,10):""}}</p><img src="static/images/icon_down.png" class="fr" alt=""/>
                                     <div class="clear"></div>
                                 </li>
                             {{/if}}
@@ -359,7 +359,7 @@
                             <p class="font36 newBox_list_titBg">WANT</p>
                             <p class="newBox_list_tit">求购信息</p>
                         </div>
-                        <p class="fr font16 more">更多<span class="jiantou"></span></p>
+                        <a href="view/supply/index.html?type=qiugou" class="fr font16 more">更多<span class="jiantou"></span></a>
                         <div class="clear"></div>
                     </div>
                     <script id="managementData" type="text/html">
@@ -389,12 +389,20 @@
                     <ul id="managementContent"></ul>
                 </div>
                 <div class="supplyBox m-t-15">
+                    <div class="titBox">
+                        <div class="fl">
+                            <p class="font36 newBox_list_titBg">SUPPLY</p>
+                            <p class="newBox_list_tit">供应信息</p>
+                        </div>
+                        <a href="view/supply/index.html?type=gongying" class="fr font16 more">更多<span class="jiantou"></span></a>
+                        <div class="clear"></div>
+                    </div>
                     <div class="titBox">
                         <div class="fl">
                             <p class="font36 newBox_list_titBg">SERVICE</p>
                             <p class="newBox_list_tit">服务信息</p>
                         </div>
-                        <p class="fr font16 more">更多<span class="jiantou"></span></p>
+                        <a href="view/supply/index.html?type=fuwu" class="fr font16 more">更多<span class="jiantou"></span></a>
                         <div class="clear"></div>
                     </div>
                     <script id="serviceData" type="text/html">
@@ -425,12 +433,13 @@
                 </div>
             </div>
             <div class="fileBox fr fileBoxSecond">
+
                 <div class="fileBox_title fl">
                     <img src="static/images/icon_supply.png" class="fl" alt=""/>
                     <p class="fl">经营主体</p>
                     <div class="clear"></div>
                 </div>
-                <p class="fr font16 more2">更多<span class="jiantou"></span></p>
+<!--                <p class="fr font16 more2">更多<span class="jiantou"></span></p>-->
                 <div class="clear"></div>
                 <script id="entityMainData" type="text/html">
                     {{each entityMainList as value i}}
@@ -440,12 +449,12 @@
                         <tr>
                             <td rowspan="5">
                                 {{if value.masterMap.indexOf(null) == -1}}
-                                <img src="{{value.masterMap}}" width="92" height="109" style="border-radius: 5px;" alt=""/>
+                                <img src="{{value.masterMap}}" height="109" style="border-radius: 5px;" alt=""/>
                                 {{else}}
-                                <img src="static/images/zwtp.png" width="92" height="109" style="border-radius: 5px;" alt=""/>
+                                <img src="static/images/zwtp.png" height="109" style="border-radius: 5px;" alt=""/>
                                 {{/if}}
                             </td>
-                            <td colspan="2" class="fileBoxSecond_table_title">{{value.entityName}}</td>
+                            <td colspan="2" class="fileBoxSecond_table_title"><p>{{value.entityName}}</p></td>
                         </tr>
                         <tr>
                             <td>负责人</td>
diff --git a/newBusinessEntities/static/css/index.css b/newBusinessEntities/static/css/index.css
index b341910..f242094 100644
--- a/newBusinessEntities/static/css/index.css
+++ b/newBusinessEntities/static/css/index.css
@@ -242,6 +242,13 @@
 .supplyNat{
     padding: 12px 8px;
 }
+.supplyNat p{
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    word-break: break-all;
+    overflow: hidden;
+}
 .supplyNat_type{
     padding: 2px 4px;
     background: #168a44;
@@ -318,7 +325,7 @@
     padding: 20px 15px 0px;
 }
 .fileBox ul li{
-    margin-top: 12px;
+    margin-top: 10px;
 }
 .fileBox ul li:hover p{
     color: #168a44!important;
@@ -331,7 +338,7 @@
 .supplyBox ul li:hover .supplyNat p:first-child{
     color: #168a44!important;
 }
-.supplyBox ul li .supplyNat p:first-child{
+.supplyBox ul li .supplyNat p:first-child,.supplyBox ul li .supplyNat p:nth-child(2){
     display: -webkit-box;
     -webkit-box-orient: vertical;
     -webkit-line-clamp: 1;
@@ -348,14 +355,25 @@
 .fileBoxSecond table tr td{
     color: #666666;
 }
+
+.fileBoxSecond table tr td img{
+    width: 100%;
+}
 .fileBoxSecond_table_title{
     color: #000!important;
 }
+.fileBoxSecond_table_title p{
+    width: 100%;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
 .fileBoxSecond_table{
     padding: 0px 15px;
 }
 .fileBoxSecond table{
     margin: 28px 0;
+    table-layout: fixed;
 }
 .bottomLink {
     background: #e8e8e8;
@@ -596,4 +614,4 @@
     background: #168a43;
     color: #ffffff;
     cursor: pointer;
-}
\ No newline at end of file
+}
diff --git a/newBusinessEntities/static/css/supply.css b/newBusinessEntities/static/css/supply.css
index 2bf766c..6d10907 100644
--- a/newBusinessEntities/static/css/supply.css
+++ b/newBusinessEntities/static/css/supply.css
@@ -410,6 +410,20 @@ input[type = 'radio']{
     margin-top: 15px;
     position: relative;
 }
+
+.directoriesList ul li table tr td p{
+    width: 75%;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: inline-block;
+    vertical-align: middle;
+}
+
+.directoriesList ul li table{
+    table-layout: fixed;
+}
+
 .watchBtn{
     position: absolute;
     bottom: 5px;
@@ -454,4 +468,4 @@ input[type = 'radio']{
 .submitBtn{
     text-align: center;
     margin-top: 20px;
-}
\ No newline at end of file
+}
diff --git a/newBusinessEntities/static/js/api/index.js b/newBusinessEntities/static/js/api/index.js
index e8869d6..f937d24 100644
--- a/newBusinessEntities/static/js/api/index.js
+++ b/newBusinessEntities/static/js/api/index.js
@@ -73,3 +73,10 @@ var productDetails = '/open/webSite/operators/productDetails'  //产品分类子
 var supplyDetails = '/open/webSite/operators/supplyDetails'  //产品分类子集查询
 
 var dictType = '/open/webSite/operators/data/type'  //首页-字典查询
+
+
+/*
+@purl /transaction/website/config
+@param
+*/
+var webConfig = '/transaction/website/config'//查询网站配置信息
diff --git a/newBusinessEntities/static/js/project/index.js b/newBusinessEntities/static/js/project/index.js
index 1c8b616..4a5e846 100644
--- a/newBusinessEntities/static/js/project/index.js
+++ b/newBusinessEntities/static/js/project/index.js
@@ -26,6 +26,8 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
         tools.doGet(dictType + '/supply_demand_unit', {}, module.dictType , true);
         tools.doGet(dictType + '/Industrial_classification_type', {}, module.dictTypeSecond , true);
 
+        tools.getWebConfig();
+
 
     };
 
@@ -247,4 +249,4 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
         tools.skip('view/interact/interactList.html?keyWord='+$('#interactInput').val());
     }
     return module;
-});
\ No newline at end of file
+});
diff --git a/newBusinessEntities/static/js/project/supplyChain/index.js b/newBusinessEntities/static/js/project/supplyChain/index.js
index 933707c..247e6bc 100644
--- a/newBusinessEntities/static/js/project/supplyChain/index.js
+++ b/newBusinessEntities/static/js/project/supplyChain/index.js
@@ -20,6 +20,8 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp
 
         tools.doGet(dictType + '/Industrial_classification_type', {}, module.dictType , true);
 
+        tools.getWebConfig();
+
         var tabs = $('.tab').find('li');
         var informationBox = $("#listBox > div");
         tabs.on('click', function (e) {
@@ -67,9 +69,9 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp
 
     module.dictType = function (data) {
         module.data.industryClassOptions = data.data;
-        tools.doPost(entityMain, {}, module.entityMain , true);
-        tools.doPost(supplyChainAgent, {}, module.supplyChainAgent , true);
-        tools.doGet(supplyChainPurchaser, {}, module.supplyChainPurchaser , true);
+        tools.doPost(entityMain, {pageNum:1,pageSize:10}, module.entityMain , true);
+        tools.doPost(supplyChainAgent, {pageNum:1,pageSize:10}, module.supplyChainAgent , true);
+        tools.doPost(supplyChainPurchaser, {pageNum:1,pageSize:10}, module.supplyChainPurchaser , true);
     }
 
     //经营主体
@@ -86,9 +88,7 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp
                     }
                     content[i].industryClassificationType = secondArray;
                 }
-                console.log(content[i].industryClassificationType)
-                content[i].masterMap = serverApi + content[i].masterMap ;
-
+                content[i].masterMap = serverApi + ((content[i].masterMap || content[i].masterMap != '')?content[i].masterMap: 'null') ;
             }
 
             module.data.entityMainList = content;
@@ -215,4 +215,4 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp
     }
 
     return module;
-})
\ No newline at end of file
+})
diff --git a/newBusinessEntities/view/supplyChain/index.html b/newBusinessEntities/view/supplyChain/index.html
index 5e1edfa..c720813 100644
--- a/newBusinessEntities/view/supplyChain/index.html
+++ b/newBusinessEntities/view/supplyChain/index.html
@@ -106,7 +106,7 @@
                                 {{/if}}
                                 <table class="fr" width="63%">
                                     <tr>
-                                        <td colspan="2" class="font16 color-333">{{value.entityName}}<i class="bq">合作社</i></td>
+                                        <td colspan="2" class="font16 color-333"><p>{{value.entityName}}</p><i class="bq">合作社</i></td>
                                     </tr>
                                     <tr>
                                         <td width="70">主营业务</td>
@@ -118,7 +118,7 @@
                                     </tr>
                                     <tr>
                                         <td>地址</td>
-                                        <td>{{value.entityAddress}}</td>
+                                        <td><p>{{value.entityAddress}}</p></td>
                                     </tr>
                                     <tr>
                                         <td>成立时间</td>
@@ -130,7 +130,7 @@
                                     </tr>
                                 </table>
                                 <div class="clear"></div>
-                                <a href="detail.html" class="watchBtn">查看</a>
+<!--                                <a href="detail.html" class="watchBtn">查看</a>-->
                             </li>
                             {{/each}}
                             <div class="clear"></div>
@@ -182,7 +182,7 @@
                                 {{/if}}
                                 <table class="fr" width="63%">
                                     <tr>
-                                        <td colspan="2" class="font16 color-333">{{value.entityName}}<i class="bq">合作社</i></td>
+                                        <td colspan="2" class="font16 color-333"><p>{{value.entityName}}</p><i class="bq">合作社</i></td>
                                     </tr>
                                     <tr>
                                         <td width="70">主营业务</td>
@@ -194,7 +194,7 @@
                                     </tr>
                                     <tr>
                                         <td>地址</td>
-                                        <td>{{value.entityAddress}}</td>
+                                        <td><p>{{value.entityAddress}}</p></td>
                                     </tr>
                                     <tr>
                                         <td>成立时间</td>
@@ -206,7 +206,7 @@
                                     </tr>
                                 </table>
                                 <div class="clear"></div>
-                                <a href="detail.html" class="watchBtn">查看</a>
+<!--                                <a href="detail.html" class="watchBtn">查看</a>-->
                             </li>
                             {{/each}}
                             <div class="clear"></div>
@@ -257,7 +257,7 @@
                                 {{/if}}
                                 <table class="fr" width="63%">
                                     <tr>
-                                        <td colspan="2" class="font16 color-333">{{value.entityName}}<i class="bq">合作社</i></td>
+                                        <td colspan="2" class="font16 color-333"><p>{{value.entityName}}</p><i class="bq">合作社</i></td>
                                     </tr>
                                     <tr>
                                         <td width="70">主营业务</td>
@@ -269,7 +269,7 @@
                                     </tr>
                                     <tr>
                                         <td>地址</td>
-                                        <td>{{value.entityAddress}}</td>
+                                        <td><p>{{value.entityAddress}}</p></td>
                                     </tr>
                                     <tr>
                                         <td>成立时间</td>
@@ -281,7 +281,7 @@
                                     </tr>
                                 </table>
                                 <div class="clear"></div>
-                                <a href="detail.html" class="watchBtn">查看</a>
+<!--                                <a href="detail.html" class="watchBtn">查看</a>-->
                             </li>
                             {{/each}}
                             <div class="clear"></div>