From 06b40477dfd482c29984d5d65d9b883fc49ae53f Mon Sep 17 00:00:00 2001 From: "20932067@zju.edu.cn" Date: Sat, 20 Mar 2021 20:11:24 +0800 Subject: [PATCH] 11 --- build/utils.js | 4 +- config/index.js | 2 +- index.html | 5 +- package.json | 2 +- .../assets}/img/aboutUs-article-pic01.jpg | Bin .../assets}/img/aboutUs-article-pic02.jpg | Bin .../assets}/img/aboutUs-header-bg.jpg | Bin {static => src/assets}/img/banner1.jpg | Bin {static => src/assets}/img/banner2.jpg | Bin {static => src/assets}/img/banner3.jpg | Bin {static => src/assets}/img/banner4.jpg | Bin {static => src/assets}/img/banner5.jpg | Bin .../img/customer-service-question1.png | Bin .../img/customer-service-question2.png | Bin .../img/customer-service-question3.png | Bin src/assets/img/home-QQ.jpg | Bin 0 -> 43622 bytes {static => src/assets}/img/home-news-pic1.jpg | Bin {static => src/assets}/img/home-news-pic2.jpg | Bin {static => src/assets}/img/home-news-pic3.jpg | Bin {static => src/assets}/img/loading.gif | Bin .../assets}/img/login-Verification-1.png | Bin .../assets}/img/login-Verification-2.png | Bin .../assets}/img/login-Verification-3.png | Bin .../assets}/img/login-Verification-4.png | Bin {static => src/assets}/img/login-qq.png | Bin {static => src/assets}/img/logo.ico | Bin src/assets/img/wechat.png | Bin 0 -> 158131 bytes src/components/AppHeader.vue | 2 +- src/components/aboutUs/AboutUs.vue | 102 ------- src/components/aboutUs/myStory.vue | 102 ------- src/components/aboutus/AboutUs.vue | 78 ++++++ .../{aboutUs => aboutus}/advantage.vue | 0 src/components/aboutus/myStory.vue | 131 +++++++++ .../{aboutUs => aboutus}/topArticle.vue | 0 src/components/admin/admin_login.vue | 166 ----------- .../{allOrder => allorder}/allOrderList.vue | 0 .../{allPerson => allperson}/AllUser.vue | 0 .../{allPerson => allperson}/personList.vue | 0 .../admin/{joinUs => joinus}/JoinUsApply.vue | 0 .../{joinUs => joinus}/JoinUsHistoryApply.vue | 0 .../customerService/CustomerService.vue | 142 ---------- .../customerservice/CustomerService.vue | 144 ++++++++++ .../Question.vue | 0 .../ServerCall.vue | 44 +-- .../ServerHeader.vue | 0 src/components/footer/CopyRight.vue | 16 +- src/components/footer/Footer.vue | 258 ++++++++++-------- src/components/home/Home.vue | 135 ++++----- src/components/home/News.vue | 4 +- src/components/home/WeCanDo.vue | 57 ++-- .../ForgotPassword.vue | 0 .../Login.vue | 0 .../LoginRegister.vue | 2 +- .../Register.vue | 0 src/router/index.js | 2 +- static/img/home-QQ.jpg | Bin 33825 -> 0 bytes static/img/home-weCanDo-title-bg.jpg | Bin 11246 -> 0 bytes static/img/info-header.png | Bin 2903 -> 0 bytes static/img/wechat.png | Bin 39140 -> 0 bytes 59 files changed, 623 insertions(+), 775 deletions(-) rename {static => src/assets}/img/aboutUs-article-pic01.jpg (100%) rename {static => src/assets}/img/aboutUs-article-pic02.jpg (100%) rename {static => src/assets}/img/aboutUs-header-bg.jpg (100%) rename {static => src/assets}/img/banner1.jpg (100%) rename {static => src/assets}/img/banner2.jpg (100%) rename {static => src/assets}/img/banner3.jpg (100%) rename {static => src/assets}/img/banner4.jpg (100%) rename {static => src/assets}/img/banner5.jpg (100%) rename {static => src/assets}/img/customer-service-question1.png (100%) rename {static => src/assets}/img/customer-service-question2.png (100%) rename {static => src/assets}/img/customer-service-question3.png (100%) create mode 100644 src/assets/img/home-QQ.jpg rename {static => src/assets}/img/home-news-pic1.jpg (100%) rename {static => src/assets}/img/home-news-pic2.jpg (100%) rename {static => src/assets}/img/home-news-pic3.jpg (100%) rename {static => src/assets}/img/loading.gif (100%) rename {static => src/assets}/img/login-Verification-1.png (100%) rename {static => src/assets}/img/login-Verification-2.png (100%) rename {static => src/assets}/img/login-Verification-3.png (100%) rename {static => src/assets}/img/login-Verification-4.png (100%) rename {static => src/assets}/img/login-qq.png (100%) rename {static => src/assets}/img/logo.ico (100%) create mode 100644 src/assets/img/wechat.png delete mode 100644 src/components/aboutUs/AboutUs.vue delete mode 100644 src/components/aboutUs/myStory.vue create mode 100644 src/components/aboutus/AboutUs.vue rename src/components/{aboutUs => aboutus}/advantage.vue (100%) create mode 100644 src/components/aboutus/myStory.vue rename src/components/{aboutUs => aboutus}/topArticle.vue (100%) delete mode 100644 src/components/admin/admin_login.vue rename src/components/admin/{allOrder => allorder}/allOrderList.vue (100%) rename src/components/admin/{allPerson => allperson}/AllUser.vue (100%) rename src/components/admin/{allPerson => allperson}/personList.vue (100%) rename src/components/admin/{joinUs => joinus}/JoinUsApply.vue (100%) rename src/components/admin/{joinUs => joinus}/JoinUsHistoryApply.vue (100%) delete mode 100644 src/components/customerService/CustomerService.vue create mode 100644 src/components/customerservice/CustomerService.vue rename src/components/{customerService => customerservice}/Question.vue (100%) rename src/components/{customerService => customerservice}/ServerCall.vue (76%) rename src/components/{customerService => customerservice}/ServerHeader.vue (100%) rename src/components/{loginRegister => loginregister}/ForgotPassword.vue (100%) rename src/components/{loginRegister => loginregister}/Login.vue (100%) rename src/components/{loginRegister => loginregister}/LoginRegister.vue (98%) rename src/components/{loginRegister => loginregister}/Register.vue (100%) delete mode 100644 static/img/home-QQ.jpg delete mode 100644 static/img/home-weCanDo-title-bg.jpg delete mode 100644 static/img/info-header.png delete mode 100644 static/img/wechat.png 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 @@