共有 2 个文件被更改，包括 4 次插入 和 1 次删除
合并视图
Diff 选项
-
+2 -1static/js/common/main.js
-
+2 -0static/js/project/index.js
+ 2
- 1
static/js/common/main.js
查看文件
| @@ -15,7 +15,8 @@ requirejs.config({ | |||||
| popup: 'lib/dialog/popup', | popup: 'lib/dialog/popup', | ||||
| swiper: 'lib/swiper/swiper.min', //焦点图插件 | swiper: 'lib/swiper/swiper.min', //焦点图插件 | ||||
| nprogress: 'lib/nprogress/nprogress', //页面加载loading组件 | nprogress: 'lib/nprogress/nprogress', //页面加载loading组件 | ||||
| echarts: 'lib/echarts/echarts.min', //echarts组件 | |||||
| //echarts: 'lib/echarts/echarts.min', //echarts组件 | |||||
| echarts: '', //echarts组件 | |||||
| laydata:'lib/laydata/laydata', | laydata:'lib/laydata/laydata', | ||||
| paging:'lib/paging/page_common',//分页插件 | paging:'lib/paging/page_common',//分页插件 | ||||
| cupload:'lib/cupload/cupload',//上传图片插件 | cupload:'lib/cupload/cupload',//上传图片插件 | ||||
+ 2
- 0
static/js/project/index.js
查看文件
| @@ -274,6 +274,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa | |||||
| } | } | ||||
| } | } | ||||
| /* 经检查，这没用上，先注释掉 | |||||
| module.statisticsContent = function(data){ | module.statisticsContent = function(data){ | ||||
| //console.log(module.option) | //console.log(module.option) | ||||
| //console.log(data) | //console.log(data) | ||||
| @@ -290,6 +291,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa | |||||
| var myChart = echarts.init(chartDom); | var myChart = echarts.init(chartDom); | ||||
| module.option && myChart.setOption(module.option); | module.option && myChart.setOption(module.option); | ||||
| } | } | ||||
| */ | |||||
| //互动交流 | //互动交流 | ||||
| module.communicateList = function (data) { | module.communicateList = function (data) { | ||||