mirror of
http://112.124.100.131/GFRS/ebiz-h5.git
synced 2025-12-07 19:26:43 +08:00
解决echart.js文件引入冲突
This commit is contained in:
@@ -12,11 +12,7 @@
|
||||
<link rel="icon" href="<%= BASE_URL %>favicon.ico" />
|
||||
<title></title>
|
||||
<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/echarts.min.js"></script>
|
||||
>>>>>>> a851764d4ddf6a6e9d18b8c70bc692e77556ab41
|
||||
</head>
|
||||
<body>
|
||||
<noscript>
|
||||
@@ -25,11 +21,7 @@
|
||||
<div id="app"></div>
|
||||
<!-- built files will be auto injected -->
|
||||
<!-- <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>-->
|
||||
|
||||
>>>>>>> a851764d4ddf6a6e9d18b8c70bc692e77556ab41
|
||||
</body>
|
||||
</html>
|
||||
|
||||
22
public/js/4.2.1-rc1_echarts.min.js
vendored
22
public/js/4.2.1-rc1_echarts.min.js
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user