hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-10 12:46:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

提交echart.js冲突解决

Browse Source
This commit is contained in:
庞兴月
2021-04-06 15:11:57 +08:00
parent 3a5b30e64f a851764d4d
commit 99741e1bcc
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/index.html
View File

@@ -12,7 +12,11 @@
<link rel="icon" href="<%= BASE_URL %>favicon.ico" /> <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
<title></title> <title></title>
<script src="<%= BASE_URL %>js/EWebBridge.js"></script> <script src="<%= BASE_URL %>js/EWebBridge.js"></script>
<<<<<<< HEAD
<script src="<%= BASE_URL %>js/4.2.1-rc1_echarts.min.js"></script> <script src="<%= BASE_URL %>js/4.2.1-rc1_echarts.min.js"></script>
=======
<script src="<%= BASE_URL %>js/echarts.min.js"></script>
>>>>>>> a851764d4ddf6a6e9d18b8c70bc692e77556ab41
</head> </head>
<body> <body>
<noscript> <noscript>
@@ -21,6 +25,11 @@
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
<!-- <script src="https://cdn.bootcss.com/vue/2.6.10/vue.min.js"></script> --> <!-- <script src="https://cdn.bootcss.com/vue/2.6.10/vue.min.js"></script> -->
<<<<<<< HEAD
<!-- <script src="https://cdn.bootcss.com/echarts/4.2.1-rc1/echarts.min.js"></script> --> <!-- <script src="https://cdn.bootcss.com/echarts/4.2.1-rc1/echarts.min.js"></script> -->
=======
<!-- <script src="https://cdn.bootcss.com/echarts/4.2.1-rc1/echarts.min.js"></script>-->
>>>>>>> a851764d4ddf6a6e9d18b8c70bc692e77556ab41
</body> </body>
</html> </html>

22
public/js/echarts.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long