Merge remote-tracking branch 'origin/master'

291bc6d3 · youjj · 50c415df · 8311e786 · 291bc6d3 · 291bc6d3
Commit 291bc6d3 authored May 14, 2019 by youjj
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 387 additions and 1 deletion

index.html index.html +0 -1

index.js src/router/index.js +7 -0

campsite.vue src/views/baseInfo/campsite/campsite.vue +380 -0

No files found.
--- a/index.html
+++ b/index.html
@@ -10,7 +10,6 @@
 <body>
 <script src=<%= htmlWebpackPlugin.options.path %>/jquery.min.js></script>
 <script src=<%= htmlWebpackPlugin.options.path %>/tinymce/tinymce.min.js></script>
-<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=gvQPveN9YrlPSgKUMPK2u2u2BA4yQFRm"></script>
 <div id="app"></div>
 <!-- built files will be auto injected -->
 </body>

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,6 +46,13 @@ export const constantRouterMap = [{
  hidden: true
  // authority: 'stockCrowd'
 },
+{
+  path: '/campsite',
+  component: _import('baseInfo/campsite/campsite'),
+  name: '营地',
+  hidden: true
+  // authority: 'stockCrowd'
+},
 {
  path: '/companyInfo',
  component: _import('baseInfo/companyInfo/index'),

--- a/src/views/baseInfo/campsite/campsite.vue
+++ b/src/views/baseInfo/campsite/campsite.vue