From 83f026e8d39b4631b0cbed792a269a7ea17a3c72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E5=8D=96=E6=8A=A5=E7=9A=84=E5=B0=8F?= =?UTF-8?q?=E8=A1=8C=E5=AE=B6?= Date: Mon, 15 Jul 2019 20:11:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/controller/homepageController.js | 4 ++++ project/routes/test.js | 3 ++- project/views/CH/Notpaying.ejs | 22 +--------------------- project/views/CH/Order.ejs | 21 +-------------------- project/views/CH/Paymenthasbeen.ejs | 22 +--------------------- project/views/CH/completed.ejs | 22 +--------------------- project/views/CH/showOders.ejs | 22 +--------------------- project/views/FYK/account.ejs | 21 +-------------------- project/views/FYK/address.ejs | 21 +-------------------- project/views/FYK/collect.ejs | 21 +-------------------- project/views/FYK/editinfo.ejs | 21 +-------------------- project/views/FYK/me.ejs | 21 +-------------------- project/views/common/personalNav.ejs | 21 +++++++++++++++++++++ 13 files changed, 37 insertions(+), 205 deletions(-) create mode 100644 project/views/common/personalNav.ejs diff --git a/project/controller/homepageController.js b/project/controller/homepageController.js index 760c4a4..2c50373 100644 --- a/project/controller/homepageController.js +++ b/project/controller/homepageController.js @@ -318,6 +318,10 @@ designer_table.designer_name }) }) }); + }, + logOut (req, resp) { + req.session.username = null; + resp.redirect('/home') } }; diff --git a/project/routes/test.js b/project/routes/test.js index 97f0396..6f5f4cf 100644 --- a/project/routes/test.js +++ b/project/routes/test.js @@ -8,5 +8,6 @@ router.get('/mytest', function (req, resp) { }); router.get('/home',homepageController.getGoods); +router.get('/logOut',homepageController.logOut); -module.exports = router; \ No newline at end of file +module.exports = router; diff --git a/project/views/CH/Notpaying.ejs b/project/views/CH/Notpaying.ejs index 09cb1a8..3d3620d 100644 --- a/project/views/CH/Notpaying.ejs +++ b/project/views/CH/Notpaying.ejs @@ -173,27 +173,7 @@
- + <% include ../common/personalNav.ejs %>
diff --git a/project/views/CH/Order.ejs b/project/views/CH/Order.ejs index 1f228df..1cfb3cd 100644 --- a/project/views/CH/Order.ejs +++ b/project/views/CH/Order.ejs @@ -173,26 +173,7 @@
- + <% include ../common/personalNav.ejs %>
diff --git a/project/views/CH/Paymenthasbeen.ejs b/project/views/CH/Paymenthasbeen.ejs index 5f34513..3df5209 100644 --- a/project/views/CH/Paymenthasbeen.ejs +++ b/project/views/CH/Paymenthasbeen.ejs @@ -196,27 +196,7 @@
- + <% include ../common/personalNav.ejs %>
diff --git a/project/views/CH/completed.ejs b/project/views/CH/completed.ejs index abd14c3..64a4316 100644 --- a/project/views/CH/completed.ejs +++ b/project/views/CH/completed.ejs @@ -127,27 +127,7 @@
- + <% include ../common/personalNav.ejs %>
diff --git a/project/views/CH/showOders.ejs b/project/views/CH/showOders.ejs index d50f45b..45899d0 100644 --- a/project/views/CH/showOders.ejs +++ b/project/views/CH/showOders.ejs @@ -126,27 +126,7 @@
- + <% include ../common/personalNav.ejs %>
diff --git a/project/views/FYK/account.ejs b/project/views/FYK/account.ejs index 08082af..2509830 100644 --- a/project/views/FYK/account.ejs +++ b/project/views/FYK/account.ejs @@ -20,26 +20,7 @@
- + <% include ../common/personalNav.ejs%>
diff --git a/project/views/FYK/address.ejs b/project/views/FYK/address.ejs index cfafaa6..6ba98a4 100644 --- a/project/views/FYK/address.ejs +++ b/project/views/FYK/address.ejs @@ -20,26 +20,7 @@
- + <% include ../common/personalNav.ejs %>
diff --git a/project/views/FYK/collect.ejs b/project/views/FYK/collect.ejs index 823f405..17e4470 100644 --- a/project/views/FYK/collect.ejs +++ b/project/views/FYK/collect.ejs @@ -20,26 +20,7 @@
- + <% include ../common/personalNav.ejs %>
diff --git a/project/views/FYK/editinfo.ejs b/project/views/FYK/editinfo.ejs index cb3ac5f..2f94f86 100644 --- a/project/views/FYK/editinfo.ejs +++ b/project/views/FYK/editinfo.ejs @@ -20,26 +20,7 @@
- + <% include ../common/personalNav.ejs %>
diff --git a/project/views/FYK/me.ejs b/project/views/FYK/me.ejs index 65c064e..654136a 100644 --- a/project/views/FYK/me.ejs +++ b/project/views/FYK/me.ejs @@ -21,26 +21,7 @@
- + <% include ../common/personalNav.ejs %>
diff --git a/project/views/common/personalNav.ejs b/project/views/common/personalNav.ejs new file mode 100644 index 0000000..978012a --- /dev/null +++ b/project/views/common/personalNav.ejs @@ -0,0 +1,21 @@ + -- Gitee From 8164eefbbc7110d74591602f2089ba62fe3ffaa6 Mon Sep 17 00:00:00 2001 From: CccccHhhhh <845024850@qq.com> Date: Mon, 15 Jul 2019 21:12:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Merge=20branch=20'master'=20of=20https://gi?= =?UTF-8?q?tee.com/AC-0308/Interesting=5FPH3=20into=20=E9=99=88=E6=B5=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # project/public/pages/CH/vip.html --- project/views/CH/Notpaying.ejs | 4 ++-- project/views/CH/Order.ejs | 4 ++-- project/views/CH/Paymenthasbeen.ejs | 15 ++++++++++----- project/views/CH/completed.ejs | 2 +- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/project/views/CH/Notpaying.ejs b/project/views/CH/Notpaying.ejs index 09cb1a8..de385b2 100644 --- a/project/views/CH/Notpaying.ejs +++ b/project/views/CH/Notpaying.ejs @@ -27,7 +27,7 @@
- +
@@ -161,7 +161,7 @@
- +
diff --git a/project/views/CH/Order.ejs b/project/views/CH/Order.ejs index 1f228df..d30e5cf 100644 --- a/project/views/CH/Order.ejs +++ b/project/views/CH/Order.ejs @@ -26,7 +26,7 @@
- +
@@ -50,7 +50,7 @@
- +
diff --git a/project/views/CH/Paymenthasbeen.ejs b/project/views/CH/Paymenthasbeen.ejs index 5f34513..59e145b 100644 --- a/project/views/CH/Paymenthasbeen.ejs +++ b/project/views/CH/Paymenthasbeen.ejs @@ -26,8 +26,8 @@
- - + +
@@ -73,7 +73,7 @@
- +
@@ -183,8 +183,8 @@
- - + +
@@ -266,9 +266,14 @@ // function getOrder() { // // } + function delShop() { $('.ordersec2')[0].remove() } + function ADDShop() { + $('.ordersec2')[0].remove() + + } diff --git a/project/views/CH/completed.ejs b/project/views/CH/completed.ejs index abd14c3..feb8ccc 100644 --- a/project/views/CH/completed.ejs +++ b/project/views/CH/completed.ejs @@ -115,7 +115,7 @@
- +
-- Gitee From daab569a3b519ebcc0b19306cfb6291ddb5cebc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E5=8D=96=E6=8A=A5=E7=9A=84=E5=B0=8F?= =?UTF-8?q?=E8=A1=8C=E5=AE=B6?= Date: Mon, 15 Jul 2019 21:25:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=80=E8=88=AC=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/public/pages/ZYS/afflatus.html | 2 +- project/public/pages/ZYS/album.html | 2 +- project/public/pages/ZYS/trademark.html | 2 +- project/views/CH/completed.ejs | 12 ++++-------- project/views/TYH/show_comments.ejs | 2 +- project/views/ZYS/stylist.ejs | 10 +++++----- .../ZYS/stylist.html" | 2 +- 7 files changed, 14 insertions(+), 18 deletions(-) diff --git a/project/public/pages/ZYS/afflatus.html b/project/public/pages/ZYS/afflatus.html index 3913e4c..95ba10f 100644 --- a/project/public/pages/ZYS/afflatus.html +++ b/project/public/pages/ZYS/afflatus.html @@ -700,7 +700,7 @@
  • - + 设计师 20 diff --git a/project/public/pages/ZYS/album.html b/project/public/pages/ZYS/album.html index 0aca992..308dfc2 100644 --- a/project/public/pages/ZYS/album.html +++ b/project/public/pages/ZYS/album.html @@ -700,7 +700,7 @@
  • - + 设计师 20 diff --git a/project/public/pages/ZYS/trademark.html b/project/public/pages/ZYS/trademark.html index 113bdf8..2ffa91d 100644 --- a/project/public/pages/ZYS/trademark.html +++ b/project/public/pages/ZYS/trademark.html @@ -698,7 +698,7 @@
  • - + 设计师 20 diff --git a/project/views/CH/completed.ejs b/project/views/CH/completed.ejs index 64a4316..268e301 100644 --- a/project/views/CH/completed.ejs +++ b/project/views/CH/completed.ejs @@ -109,6 +109,9 @@ @@ -170,13 +173,6 @@ <% include ../common/footer.ejs%> <% include ../common/common_scripts.ejs%> + - diff --git a/project/views/TYH/show_comments.ejs b/project/views/TYH/show_comments.ejs index c4f7a6e..624da46 100644 --- a/project/views/TYH/show_comments.ejs +++ b/project/views/TYH/show_comments.ejs @@ -44,7 +44,7 @@
  • - + 设计师 20 diff --git a/project/views/ZYS/stylist.ejs b/project/views/ZYS/stylist.ejs index 6591f4d..23a7b2a 100644 --- a/project/views/ZYS/stylist.ejs +++ b/project/views/ZYS/stylist.ejs @@ -27,25 +27,25 @@
  • - + 灵感 6
  • - + 品牌 4
  • - + 专辑 2
  • - + 设计师 20 @@ -60,7 +60,7 @@ <%for(var i=0;i
    - + 设计师图片
    榆杨设计师｜<%=list[i].designer_hold_place%>｜<%=list[i].designer_name%>
     diff --git "a/\351\241\271\347\233\256\351\203\250\347\275\262/\345\206\227\344\275\231\351\235\231\346\200\201/ZYS/stylist.html" "b/\351\241\271\347\233\256\351\203\250\347\275\262/\345\206\227\344\275\231\351\235\231\346\200\201/ZYS/stylist.html" index cdd53c4..ccc3453 100644 --- "a/\351\241\271\347\233\256\351\203\250\347\275\262/\345\206\227\344\275\231\351\235\231\346\200\201/ZYS/stylist.html" +++ "b/\351\241\271\347\233\256\351\203\250\347\275\262/\345\206\227\344\275\231\351\235\231\346\200\201/ZYS/stylist.html" @@ -697,7 +697,7 @@
  • - + 设计师 20 -- Gitee