diff --git a/build/utils.js b/build/utils.js index 05e26b9..c37bbc9 100644 --- a/build/utils.js +++ b/build/utils.js @@ -60,9 +60,9 @@ exports.cssLoaders = function (options) { css: generateLoaders(), postcss: generateLoaders(), less: generateLoaders('less'), - sass: generateLoaders('sass', + sass: generateLoaders('sass', { indentedSyntax: true, - includePaths: [path.resolve(__dirname, '../node_modules/compass-mixins/lib')] + includePaths: [path.resolve(__dirname, '../node_modules/compass-mixins/lib')] }), scss: generateLoaders('sass', { includePaths: [path.resolve(__dirname, '../node_modules/compass-mixins/lib')] }), diff --git a/config/index.js b/config/index.js index 0ad9d3e..00690c6 100644 --- a/config/index.js +++ b/config/index.js @@ -60,7 +60,7 @@ module.exports = { // Paths assetsRoot: path.resolve(__dirname, '../dist'), - assetsSubDirectory: './', + assetsSubDirectory: 'static', assetsPublicPath: '/', /** diff --git a/index.html b/index.html index 41d481b..d352d0a 100644 --- a/index.html +++ b/index.html @@ -2,12 +2,11 @@ - - + 校园小飞侠 -- 快递代拿系统 diff --git a/src/components/aboutUs/myStory.vue b/src/components/aboutUs/myStory.vue deleted file mode 100644 index fee53dd..0000000 --- a/src/components/aboutUs/myStory.vue +++ /dev/null @@ -1,102 +0,0 @@ - - - - - diff --git a/src/components/aboutus/AboutUs.vue b/src/components/aboutus/AboutUs.vue new file mode 100644 index 0000000..6dd0ed8 --- /dev/null +++ b/src/components/aboutus/AboutUs.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/src/components/aboutUs/advantage.vue b/src/components/aboutus/advantage.vue similarity index 100% rename from src/components/aboutUs/advantage.vue rename to src/components/aboutus/advantage.vue diff --git a/src/components/aboutus/myStory.vue b/src/components/aboutus/myStory.vue new file mode 100644 index 0000000..9160c39 --- /dev/null +++ b/src/components/aboutus/myStory.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/src/components/aboutUs/topArticle.vue b/src/components/aboutus/topArticle.vue similarity index 100% rename from src/components/aboutUs/topArticle.vue rename to src/components/aboutus/topArticle.vue diff --git a/src/components/admin/admin_login.vue b/src/components/admin/admin_login.vue deleted file mode 100644 index 0083be7..0000000 --- a/src/components/admin/admin_login.vue +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - diff --git a/src/components/admin/allOrder/allOrderList.vue b/src/components/admin/allorder/allOrderList.vue similarity index 100% rename from src/components/admin/allOrder/allOrderList.vue rename to src/components/admin/allorder/allOrderList.vue diff --git a/src/components/admin/allPerson/AllUser.vue b/src/components/admin/allperson/AllUser.vue similarity index 100% rename from src/components/admin/allPerson/AllUser.vue rename to src/components/admin/allperson/AllUser.vue diff --git a/src/components/admin/allPerson/personList.vue b/src/components/admin/allperson/personList.vue similarity index 100% rename from src/components/admin/allPerson/personList.vue rename to src/components/admin/allperson/personList.vue diff --git a/src/components/admin/joinUs/JoinUsApply.vue b/src/components/admin/joinus/JoinUsApply.vue similarity index 100% rename from src/components/admin/joinUs/JoinUsApply.vue rename to src/components/admin/joinus/JoinUsApply.vue diff --git a/src/components/admin/joinUs/JoinUsHistoryApply.vue b/src/components/admin/joinus/JoinUsHistoryApply.vue similarity index 100% rename from src/components/admin/joinUs/JoinUsHistoryApply.vue rename to src/components/admin/joinus/JoinUsHistoryApply.vue diff --git a/src/components/customerService/CustomerService.vue b/src/components/customerService/CustomerService.vue deleted file mode 100644 index 626d6db..0000000 --- a/src/components/customerService/CustomerService.vue +++ /dev/null @@ -1,142 +0,0 @@ - - - - - diff --git a/src/components/customerservice/CustomerService.vue b/src/components/customerservice/CustomerService.vue new file mode 100644 index 0000000..fdccab3 --- /dev/null +++ b/src/components/customerservice/CustomerService.vue @@ -0,0 +1,144 @@ + + + + + diff --git a/src/components/customerService/Question.vue b/src/components/customerservice/Question.vue similarity index 100% rename from src/components/customerService/Question.vue rename to src/components/customerservice/Question.vue diff --git a/src/components/customerService/ServerCall.vue b/src/components/customerservice/ServerCall.vue similarity index 76% rename from src/components/customerService/ServerCall.vue rename to src/components/customerservice/ServerCall.vue index 9d2cc32..0077dfe 100644 --- a/src/components/customerService/ServerCall.vue +++ b/src/components/customerservice/ServerCall.vue @@ -4,32 +4,32 @@

联系客服

- - +
7x24 专业在线咨询

小新期待为您解决遇到的问题

- - + 立即咨询 - - -
+ + +
- - +
-
服务热线 : 5201314
+
服务热线 : 10086

24小时服务

@@ -49,10 +49,10 @@ export default { diff --git a/src/components/footer/Footer.vue b/src/components/footer/Footer.vue index c63b937..de8cbc1 100644 --- a/src/components/footer/Footer.vue +++ b/src/components/footer/Footer.vue @@ -1,138 +1,156 @@ - diff --git a/src/components/home/Home.vue b/src/components/home/Home.vue index 9bce065..9228cbb 100644 --- a/src/components/home/Home.vue +++ b/src/components/home/Home.vue @@ -1,13 +1,13 @@ diff --git a/src/components/home/News.vue b/src/components/home/News.vue index 76c0c45..6f26cd6 100644 --- a/src/components/home/News.vue +++ b/src/components/home/News.vue @@ -1,7 +1,7 @@