From f204d7d2e1ab6778c037e0888ec4e49c38903bc1 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 15:45:53 +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

---
 .../static/js/project/index.js                |  2 +-
 .../static/js/project/supply/index.js         | 11 +--
 newBusinessEntities/view/price/index.html     | 82 +++++++++----------
 3 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/newBusinessEntities/static/js/project/index.js b/newBusinessEntities/static/js/project/index.js
index 306bbd1..92faf0c 100644
--- a/newBusinessEntities/static/js/project/index.js
+++ b/newBusinessEntities/static/js/project/index.js
@@ -108,7 +108,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
 
                 content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit);
 
-                content[i].supplyMasterMap = serverApi + serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ;
+                content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ;
 
             }
 
diff --git a/newBusinessEntities/static/js/project/supply/index.js b/newBusinessEntities/static/js/project/supply/index.js
index 86748a1..9f8a964 100644
--- a/newBusinessEntities/static/js/project/supply/index.js
+++ b/newBusinessEntities/static/js/project/supply/index.js
@@ -55,6 +55,7 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp
         });
         tools.doGet(dictType + '/supply_demand_unit', {}, module.dictType , true);
         tools.doGet(productCategories , {}, module.projectList , true);
+        tools.getWebConfig();
     };
 
     module.dictType = function (data) {
@@ -93,7 +94,7 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp
 
                 content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit);
 
-                content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ;
+                content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ;
 
             }
 
@@ -112,7 +113,7 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp
 
                 content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit);
 
-                content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ;
+                content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ;
 
             }
 
@@ -130,7 +131,7 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp
 
                 content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit);
 
-                content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ;
+                content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ;
 
             }
             module.data.recommendList = content;
@@ -191,7 +192,7 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp
 
                 content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit);
 
-                content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ;
+                content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ;
 
             }
 
@@ -238,4 +239,4 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp
     }
 
     return module;
-})
\ No newline at end of file
+})
diff --git a/newBusinessEntities/view/price/index.html b/newBusinessEntities/view/price/index.html
index 0fccc9f..69330e6 100644
--- a/newBusinessEntities/view/price/index.html
+++ b/newBusinessEntities/view/price/index.html
@@ -78,59 +78,59 @@
                     <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>
                 </div>
-                <div style="height: 200px;"></div>
+                <div style="height: 30px;"></div>
                 <div class="recommendTit ">
                     <p class="fl"><i class="lvd"></i>产品分类</p>
                     <div class="clear"></div>