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 @@
- | 山芋粉 | -大果 | -中果 | -小果 | -小果 | -小果 | -小果 | -小果 | -小果 | -小果 | +玉米 | +小麦 | +大豆 | +水稻 | +梨 | +苹果 | +葡萄 | +大白菜 | +生菜 | +空心菜 |
指导价格 | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | +26元/500g | +1.58元/500g | +1.21元/500g | +1.2元/500g | +6.2元/500g | +8元/500g | +9元/500g | +3.2元/500g | +3.5元/500g | +5.1元/500g |
最新价格 | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | +27元/500g | +1.58元/500g | +1.2元/500g | +1.2元/500g | +6元/500g | +8元/500g | +8元/500g | +3.5元/500g | +3.8元/500g | +5元/500g |
日均价格 | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | -2.5/500g | +25.6元/500g | +1.6元/500g | +1.21元/500g | +1.22元/500g | +5.94元/500g | +7.64元/500g | +7.75元/500g | +3元/500g | +4元/500g | +4.8元/500g |
产品分类