From f0ba62891ec1c23e9451d246e175fd8353387efa Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Thu, 16 Nov 2023 12:07:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=85=88=E6=B3=A8=E6=8E=89=E6=B2=A1?= =?UTF-8?q?=E7=94=A8=E4=B8=8A=E7=9A=84echart,=E5=BD=B1=E5=93=8D=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E6=95=88=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/js/common/main.js | 3 ++- static/js/project/index.js | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/static/js/common/main.js b/static/js/common/main.js index 8838883..c345545 100644 --- a/static/js/common/main.js +++ b/static/js/common/main.js @@ -15,7 +15,8 @@ requirejs.config({ popup: 'lib/dialog/popup', swiper: 'lib/swiper/swiper.min', //焦点图插件 nprogress: 'lib/nprogress/nprogress', //页面加载loading组件 - echarts: 'lib/echarts/echarts.min', //echarts组件 + //echarts: 'lib/echarts/echarts.min', //echarts组件 + echarts: '', //echarts组件 laydata:'lib/laydata/laydata', paging:'lib/paging/page_common',//分页插件 cupload:'lib/cupload/cupload',//上传图片插件 diff --git a/static/js/project/index.js b/static/js/project/index.js index 3e0d292..3458b97 100644 --- a/static/js/project/index.js +++ b/static/js/project/index.js @@ -274,6 +274,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa } } +/* 经检查，这没用上，先注释掉 module.statisticsContent = function(data){ //console.log(module.option) //console.log(data) @@ -290,6 +291,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa var myChart = echarts.init(chartDom); module.option && myChart.setOption(module.option); } + */ //互动交流 module.communicateList = function (data) { From 4b6849fbc493a511cc9fecda8f9a125adfc08759 Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Mon, 20 Nov 2023 14:16:06 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=BB=B6=E6=97=B6=E6=96=87=E6=A1=88?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/listingItems/itemsDetail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/listingItems/itemsDetail.html b/view/listingItems/itemsDetail.html index 7805ae7..cc8d0a2 100644 --- a/view/listingItems/itemsDetail.html +++ b/view/listingItems/itemsDetail.html @@ -310,7 +310,7 @@ {{if outProjectInformationDetail.delayPeriod!=0}} - 延时周期：{{outProjectInformationDetail.delayPeriod}}秒? + 延时周期：{{outProjectInformationDetail.delayPeriod}}秒? {{/if}} {{if outProjectInformationDetail.biddingType == '阶梯竞价'}} 阶梯价(增减幅度)： From d6193d6555dcc4f4c38119ea5e5b3787845a0dc7 Mon Sep 17 00:00:00 2001 From: sunfengxiang Date: Wed, 22 Nov 2023 09:59:19 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=A9=BA=E7=99=BD?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86,=E5=8E=BB=E6=8E=89echarts?= =?UTF-8?q?=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/js/project/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/js/project/index.js b/static/js/project/index.js index 3458b97..700f852 100644 --- a/static/js/project/index.js +++ b/static/js/project/index.js @@ -1,7 +1,7 @@ /** * Created by Administrator on 2021/4/5. */ -define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, template, Tools, echarts, swiper) { +define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, swiper) { //数据存储 var module = { data: { From a20570a5f07eafc78bd42d4d52a56222ded2bc3f Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Fri, 1 Dec 2023 13:29:37 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E5=90=AB=E5=BB=B6=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/listingItems/itemsDetail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/listingItems/itemsDetail.html b/view/listingItems/itemsDetail.html index cc8d0a2..d121cf3 100644 --- a/view/listingItems/itemsDetail.html +++ b/view/listingItems/itemsDetail.html @@ -302,7 +302,7 @@ 竞价开始时间：{{outProjectInformationDetail.biddingStartTime}} - 竞价结束时间：{{outProjectInformationDetail.biddingStopTime}} + 竞价结束时间{{if outProjectInformationDetail.delayPeriod!=0}}（含延期）{{/if}}：{{outProjectInformationDetail.biddingStopTime}} 竞价方式：{{outProjectInformationDetail.biddingType}}? From 14f9296ca71aec179b8690d36cbd9822ed9cb291 Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Fri, 1 Dec 2023 14:15:03 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E3=8E=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- infoport/homestead.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infoport/homestead.html b/infoport/homestead.html index 77dde05..9294ec9 100644 --- a/infoport/homestead.html +++ b/infoport/homestead.html @@ -100,7 +100,7 @@ 宅基地代码 - 宗地面积（亩） + 宗地面积（㎡） 使用状态 From 3682d94efbd8d2dcdb2be81ec3d6828024db5753 Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Mon, 4 Dec 2023 14:54:15 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=A7=84=E5=88=99=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=AF=B7=E7=9C=8B=E4=B8=8B=E8=BE=B9=E7=9A=84=E7=AB=9E=E4=B9=B0?= =?UTF-8?q?=E9=A1=BB=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/listingItems/itemsDetail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/listingItems/itemsDetail.html b/view/listingItems/itemsDetail.html index d121cf3..e33f859 100644 --- a/view/listingItems/itemsDetail.html +++ b/view/listingItems/itemsDetail.html @@ -305,7 +305,7 @@ 竞价结束时间{{if outProjectInformationDetail.delayPeriod!=0}}（含延期）{{/if}}：{{outProjectInformationDetail.biddingStopTime}} - 竞价方式：{{outProjectInformationDetail.biddingType}}? + 竞价方式：{{outProjectInformationDetail.biddingType}}? 竞价方向：{{outProjectInformationDetail.biddingDirect}}