Merge branch 'devModify'
# Conflicts: # components/footer.vue # components/menu.vue # nuxt.config.js # pages/tour.vue
Showing
assets/code.json
0 → 100644
This diff is collapsed.
assets/images/company.png
0 → 100644
981 KB
components/findMenu.vue
0 → 100644
This diff is collapsed.
package-lock.json
0 → 100644
This diff is collapsed.
... | ... | @@ -30,8 +30,10 @@ |
"muse-ui": "^2.1.0", | ||
"nuxt": "^1.0.0", | ||
"swiper": "^4.0.7", | ||
"v-viewer": "^1.4.2", | ||
"vue-infinite-loading": "^2.4.4", | ||
"vue-infinite-scroll": "^2.0.2" | ||
"vue-infinite-scroll": "^2.0.2", | ||
"vue-router": "^3.0.7" | ||
}, | ||
"devDependencies": { | ||
"across-env": "^2.0.1", | ||
... | ... |
pages/company.vue
0 → 100644
pages/findList/all.vue
0 → 100644
This diff is collapsed.
pages/findList/findNew.vue
0 → 100644
pages/findList/findTour.vue
0 → 100644
This diff is collapsed.
pages/indexWeb.vue
0 → 100644
This diff is collapsed.
plugins/viewer.js
0 → 100644