From d7d405ecd6599bb3e75337553089762058847fbf Mon Sep 17 00:00:00 2001 From: LightZhang <978854603@qq.com> Date: Sun, 28 Oct 2018 12:29:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=B6=E4=BB=96=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 ++-- package-lock.json | 10 +++ package.json | 4 +- src/assets/static/config.js | 22 +++---- src/component.js | 4 ++ src/components/i_content.vue | 0 src/components/leftMenu.vue | 68 +++++++++++++++++++-- src/main.js | 8 ++- src/router.js | 7 +-- src/views/aboutUs/cooperateWithUs.vue | 0 src/views/aboutUs/propystTechnology.vue | 0 src/views/fulEdge/mobileSolution.vue | 0 src/views/fulEdge/other.vue | 0 src/views/infoDtl.vue | 28 +++++++++ src/views/ourPlan/estateManagement.vue | 28 +++++++++ src/views/ourPlan/facilityManagement.vue | 28 +++++++++ src/views/ourPlan/iot.vue | 28 +++++++++ src/views/ourPlan/reaEstate.vue | 28 +++++++++ src/views/ourPlan/technologyIntegration.vue | 28 +++++++++ src/views/solution.vue | 59 ------------------ 20 files changed, 275 insertions(+), 86 deletions(-) create mode 100644 src/components/i_content.vue create mode 100644 src/views/aboutUs/cooperateWithUs.vue create mode 100644 src/views/aboutUs/propystTechnology.vue create mode 100644 src/views/fulEdge/mobileSolution.vue create mode 100644 src/views/fulEdge/other.vue create mode 100644 src/views/infoDtl.vue create mode 100644 src/views/ourPlan/estateManagement.vue create mode 100644 src/views/ourPlan/facilityManagement.vue create mode 100644 src/views/ourPlan/iot.vue create mode 100644 src/views/ourPlan/reaEstate.vue create mode 100644 src/views/ourPlan/technologyIntegration.vue delete mode 100644 src/views/solution.vue diff --git a/README.md b/README.md index d1a1613..7176ae9 100644 --- a/README.md +++ b/README.md @@ -9,15 +9,14 @@ #### 安装教程 -1. xxxx -2. xxxx -3. xxxx +1. npm install 安装依赖项 +2 #### 使用说明 -1. xxxx -2. xxxx -3. xxxx + +2. npm run serve 运行项目 +3. npm run build 编译项目 #### 参与贡献 diff --git a/package-lock.json b/package-lock.json index e0ac70e..fced032 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4106,6 +4106,11 @@ "is-symbol": "^1.0.1" } }, + "es6-promise": { + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz", + "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==" + }, "escape-html": { "version": "1.0.3", "resolved": "http://registry.npm.taobao.org/escape-html/download/escape-html-1.0.3.tgz", @@ -12149,6 +12154,11 @@ "integrity": "sha1-3EJpcTMwLOMBdSQ1amxht7abShg=", "dev": true }, + "vuex": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.0.1.tgz", + "integrity": "sha512-wLoqz0B7DSZtgbWL1ShIBBCjv22GV5U+vcBFox658g6V0s4wZV9P4YjCNyoHSyIBpj1f29JBoNQIqD82cR4O3w==" + }, "watchpack": { "version": "1.6.0", "resolved": "http://registry.npm.taobao.org/watchpack/download/watchpack-1.6.0.tgz", diff --git a/package.json b/package.json index 6035758..dbb3e03 100644 --- a/package.json +++ b/package.json @@ -8,10 +8,12 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "es6-promise": "^4.2.5", "vue": "^2.5.17", "vue-awesome-swiper": "^3.1.3", "vue-router": "^3.0.1", - "vue-swiper": "^0.5.0" + "vue-swiper": "^0.5.0", + "vuex": "^3.0.1" }, "devDependencies": { "@vue/cli-plugin-babel": "^3.0.3", diff --git a/src/assets/static/config.js b/src/assets/static/config.js index 67b2a98..d919578 100644 --- a/src/assets/static/config.js +++ b/src/assets/static/config.js @@ -6,39 +6,39 @@ window.config = { }, { name: "我们的方案", - url: "/solution", + url: "/facilityManagement", child: [{ name: "设施管理", - url: "/solution", + url: "/facilityManagement", }, { name: "房地产", - url: "/solution", + url: "/reaEstate", }, { name: "物业管理", - url: "/solution", + url: "/estateManagement", }, { name: "系统智能建筑和物联网（iot）", - url: "/solution", + url: "/iot", }, { name: "技术和集成", - url: "/solution", + url: "/technologyIntegration", }, ] }, { name: "前沿", - url: "/cuttingEdge", + url: "/mobileSolution", child: [{ name: "移动解决方案", - url: "/cuttingEdge", + url: "/mobileSolution", }, { name: "其他", - url: "/cuttingEdge", + url: "/other", } ] }, @@ -47,11 +47,11 @@ window.config = { url: "/aboutUs", child: [{ name: "与我们合作", - url: "/aboutUs", + url: "/acooperateWithUs", }, { name: "丙维科技", - url: "/aboutUs", + url: "/PropystTechnology", }, ] }, diff --git a/src/component.js b/src/component.js index 91875a9..631b551 100644 --- a/src/component.js +++ b/src/component.js @@ -1,6 +1,8 @@ import Vue from 'vue' import i_head from './components/i_head.vue' import i_footer from './components/i_footer.vue' +import i_content from './components/i_content.vue' +import leftMenu from './components/leftMenu.vue' import { swiper, swiperSlide } from 'vue-awesome-swiper' class Component { @@ -8,6 +10,8 @@ class Component { register() { Vue.component("i_head", i_head); Vue.component("i_footer", i_footer); + Vue.component("i_content", i_content); + Vue.component("leftMenu", leftMenu); Vue.component("swiper", swiper); Vue.component("swiperSlide", swiperSlide); diff --git a/src/components/i_content.vue b/src/components/i_content.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/components/leftMenu.vue b/src/components/leftMenu.vue index 41972f5..6222375 100644 --- a/src/components/leftMenu.vue +++ b/src/components/leftMenu.vue @@ -1,14 +1,74 @@ + + + + diff --git a/src/main.js b/src/main.js index 1bcfb39..d910a85 100644 --- a/src/main.js +++ b/src/main.js @@ -5,18 +5,24 @@ import 'swiper/dist/css/swiper.css' import './assets/static/config.js' import './assets/static/jquery.js' import './assets/static/common.js' - +import 'es6-promise/auto' import Vue from 'vue' import App from './App.vue' +import Vuex from 'vuex' import router from './router' + import {component} from './component' Vue.config.productionTip = false; +Vue.use(Vuex) + component.register(); + + new Vue({ router, render: h => h(App) diff --git a/src/router.js b/src/router.js index d4f0e15..535d0f4 100644 --- a/src/router.js +++ b/src/router.js @@ -2,7 +2,7 @@ import Vue from 'vue' import Router from "vue-router" import index from './views/index' -import solution from './views/solution' +import infoDtl from './views/infoDtl' Vue.use(Router); @@ -22,9 +22,8 @@ export default new Router({ component: index }, { - path: '/solution', - - component: solution + path: '/infoDtl', + component: infoDtl }, ] }) diff --git a/src/views/aboutUs/cooperateWithUs.vue b/src/views/aboutUs/cooperateWithUs.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/aboutUs/propystTechnology.vue b/src/views/aboutUs/propystTechnology.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/fulEdge/mobileSolution.vue b/src/views/fulEdge/mobileSolution.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/fulEdge/other.vue b/src/views/fulEdge/other.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/infoDtl.vue b/src/views/infoDtl.vue new file mode 100644 index 0000000..6c9a22d --- /dev/null +++ b/src/views/infoDtl.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/views/ourPlan/estateManagement.vue b/src/views/ourPlan/estateManagement.vue new file mode 100644 index 0000000..6c9a22d --- /dev/null +++ b/src/views/ourPlan/estateManagement.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/views/ourPlan/facilityManagement.vue b/src/views/ourPlan/facilityManagement.vue new file mode 100644 index 0000000..6c9a22d --- /dev/null +++ b/src/views/ourPlan/facilityManagement.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/views/ourPlan/iot.vue b/src/views/ourPlan/iot.vue new file mode 100644 index 0000000..6c9a22d --- /dev/null +++ b/src/views/ourPlan/iot.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/views/ourPlan/reaEstate.vue b/src/views/ourPlan/reaEstate.vue new file mode 100644 index 0000000..6c9a22d --- /dev/null +++ b/src/views/ourPlan/reaEstate.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/views/ourPlan/technologyIntegration.vue b/src/views/ourPlan/technologyIntegration.vue new file mode 100644 index 0000000..6c9a22d --- /dev/null +++ b/src/views/ourPlan/technologyIntegration.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/views/solution.vue b/src/views/solution.vue deleted file mode 100644 index 8b1f082..0000000 --- a/src/views/solution.vue +++ /dev/null @@ -1,59 +0,0 @@ - - - - - -