diff --git a/project/controller/homepageController.js b/project/controller/homepageController.js index 760c4a44411ae4191d5f42d8339fdf4c083ecfca..2c50373ff7bb4646f2977b82f976b3d1eaf6ba71 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/public/pages/ZYS/afflatus.html b/project/public/pages/ZYS/afflatus.html index e3a5bdcb5e9279a40db1b0a6fb67b1f2713e64f9..cc658ebcd73cff60720d28fc16d309a91dd0239c 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 9f5c236db50fef18ba31e0b3efd5a525a2a51aec..73db8e467e7a4419ad19df7a2120a306c5c48351 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 ea14962b210ce557acfabc90fb0ddcd12d2d07d2..4efdf53afa7c9297d3ed25e5d41a1c83389966e3 100644 --- a/project/public/pages/ZYS/trademark.html +++ b/project/public/pages/ZYS/trademark.html @@ -698,7 +698,7 @@
  • - + 设计师 20 diff --git a/project/routes/test.js b/project/routes/test.js index 97f0396769ec305f95dbf6068ae3ba06ccbef5e6..6f5f4cfbc911aa37b56c4231257a98551b21c436 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 09cb1a87960fd24e172b96c54c3b93e4a2bda8c3..7048818028a3a492cb8b9b0ac82878ab12569caa 100644 --- a/project/views/CH/Notpaying.ejs +++ b/project/views/CH/Notpaying.ejs @@ -27,7 +27,7 @@ @@ -161,7 +161,7 @@ @@ -173,27 +173,7 @@
    - + <% include ../common/personalNav.ejs %>
    diff --git a/project/views/CH/Order.ejs b/project/views/CH/Order.ejs index 1f228df7f048bcec8d839df067b8043ed925bb04..a4bfe97737ad28aa8394fdf66ffbbb7fd6f6b070 100644 --- a/project/views/CH/Order.ejs +++ b/project/views/CH/Order.ejs @@ -26,7 +26,7 @@
    @@ -50,7 +50,7 @@
    @@ -173,26 +173,7 @@
    - + <% include ../common/personalNav.ejs %>
    diff --git a/project/views/CH/Paymenthasbeen.ejs b/project/views/CH/Paymenthasbeen.ejs index 5f34513f85847d85c0abc1421588c276b0230f4b..4eabd109db49b783b4cde03a3d3456c58d9ad728 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 @@ @@ -196,27 +196,7 @@
    - + <% include ../common/personalNav.ejs %>
    @@ -266,9 +246,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 abd14c380e54d7e7614bad3a43306a6db6ac5702..442d72b1372b8ea3edb2579883d45ac0571099ef 100644 --- a/project/views/CH/completed.ejs +++ b/project/views/CH/completed.ejs @@ -109,13 +109,16 @@
    @@ -127,27 +130,7 @@
    - + <% include ../common/personalNav.ejs %>
    @@ -190,13 +173,6 @@ <% include ../common/footer.ejs%> <% include ../common/common_scripts.ejs%> + - diff --git a/project/views/CH/showOders.ejs b/project/views/CH/showOders.ejs index d50f45bf94cc05fd94f1fcdaafb012ea8ba23c54..45899d0e27b69c3a6408a38d37ce7b60a3f2b8cf 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 08082af72ce182a8b4f3d65c0178fc4e09ef0f1f..2509830e925fc1b04d73e628273df9e7ef43283d 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 cfafaa657e3292e85bba3f71d2ef2acff7d16cb4..6ba98a4937d290f097502b649a37de932fa86e83 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 823f4053b1ddef7d3a3a303d90310e49efa56cc8..17e4470722e7ed95670c89a372e13f60f073619d 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 cb3ac5fa0e0e7e78f2fb6a79ef1d61969ab4780d..2f94f8639dcd09be9b9273181dcde06bfcd02656 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 65c064e215d444dcd58844ab9db938b9bcc2db82..654136ad90404f800f76855fe539eb76020782e2 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/TYH/show_comments.ejs b/project/views/TYH/show_comments.ejs index c4f7a6eb2f80f1a0dbee36b8158b56381fb9e0e2..624da46850067fd790a4db1fc31fddc216ab29b1 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 48fede5a39d1f16f68d30e1da06d910b86c04c7d..4bf933b525ce96fce8e5d7662dc89fd98d92ed2f 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/project/views/common/personalNav.ejs b/project/views/common/personalNav.ejs new file mode 100644 index 0000000000000000000000000000000000000000..978012ae36be2e560eb0deb721ec2e3789fa95a8 --- /dev/null +++ b/project/views/common/personalNav.ejs @@ -0,0 +1,21 @@ + 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 cdd53c45a6bf806ebec42f41d09a270df0dbf67d..ccc345333fe3c3513f02afcdc7f7996f3a4024f5 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