From 7bfd2e9ec7c695f9fc95ca50154df27e464ab651 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 10 Oct 2018 18:18:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Lang/zh-cn/navigation.php | 5 +- .../Admin/View/Default/Navigation/Index.html | 17 ++-- .../Application/Common/Common/function.php | 6 +- service/Application/Common/Lang/zh-cn.php | 11 ++- .../Controller/CommonController.class.php | 28 +----- .../Home/Controller/IndexController.class.php | 5 + .../Home/Controller/OrderController.class.php | 3 + .../Home/View/Default/Cart/Index.html | 22 ++++- .../Home/View/Default/CustomView/Index.html | 2 +- .../Home/View/Default/Index/Index.html | 11 ++- .../Home/View/Default/Order/Detail.html | 2 +- .../Home/View/Default/Order/Index.html | 11 +++ .../Home/View/Default/Public/HeaderNav.html | 10 +- .../View/Default/Public/HeaderTopNav.html | 40 +++++--- .../Home/View/Default/Public/UserMenu.html | 2 +- .../Temp/38432eb7369925b9a826f2b9f64e2262.php | 2 +- .../Application/Service/BuyService.class.php | 33 ++++++- .../Service/OrderService.class.php | 92 ++++++++++++++++++ service/Public/Common/Js/Common.js | 7 +- service/Public/Home/Default/Css/Common.css | 13 ++- service/Public/Home/Default/Css/Goods.css | 5 +- service/Public/Home/Default/Css/Search.css | 6 +- .../Images/-0-saturn_solar.jpg_220x220.jpg | Bin 16342 -> 0 bytes .../Default/Images/0-item_pic.jpg_220x220.jpg | Bin 40029 -> 0 bytes service/Public/Home/Default/Images/01.jpg | Bin 177321 -> 0 bytes service/Public/Home/Default/Images/01_mid.jpg | Bin 103279 -> 0 bytes .../Public/Home/Default/Images/01_small.jpg | Bin 2586 -> 0 bytes service/Public/Home/Default/Images/02.jpg | Bin 131235 -> 0 bytes service/Public/Home/Default/Images/02_mid.jpg | Bin 86945 -> 0 bytes .../Public/Home/Default/Images/02_small.jpg | Bin 2339 -> 0 bytes service/Public/Home/Default/Images/03.jpg | Bin 66480 -> 0 bytes service/Public/Home/Default/Images/03_mid.jpg | Bin 57312 -> 0 bytes .../Public/Home/Default/Images/03_small.jpg | Bin 1788 -> 0 bytes .../Default/Images/1-item_pic.jpg_220x220.jpg | Bin 18329 -> 0 bytes service/Public/Home/Default/Images/1.jpg | Bin 5628 -> 0 bytes service/Public/Home/Default/Images/10.jpg | Bin 8090 -> 0 bytes service/Public/Home/Default/Images/11.jpg | Bin 28758 -> 0 bytes .../Public/Home/Default/Images/1_160x160.jpg | Bin 16805 -> 0 bytes service/Public/Home/Default/Images/2.jpg | Bin 6445 -> 0 bytes service/Public/Home/Default/Images/2016.png | Bin 392103 -> 0 bytes service/Public/Home/Default/Images/3.jpg | Bin 14568 -> 0 bytes .../Public/Home/Default/Images/3CoOkxrFOP.png | Bin 37141 -> 0 bytes service/Public/Home/Default/Images/4.jpg | Bin 10841 -> 0 bytes service/Public/Home/Default/Images/5.jpg | Bin 8868 -> 0 bytes service/Public/Home/Default/Images/556.png | Bin 106855 -> 0 bytes service/Public/Home/Default/Images/557.png | Bin 106414 -> 0 bytes service/Public/Home/Default/Images/559.png | Bin 117139 -> 0 bytes service/Public/Home/Default/Images/566.png | Bin 152012 -> 0 bytes .../Home/Default/Images/566fda5cN4b8a1675.gif | Bin 3860 -> 0 bytes service/Public/Home/Default/Images/6.jpg | Bin 11449 -> 0 bytes .../Home/Default/Images/62988.jpg_80x80.jpg | Bin 4938 -> 0 bytes .../Home/Default/Images/65.jpg_120x120xz.jpg | Bin 11560 -> 0 bytes service/Public/Home/Default/Images/7.jpg | Bin 17208 -> 0 bytes service/Public/Home/Default/Images/72h.png | Bin 1556 -> 0 bytes service/Public/Home/Default/Images/8.jpg | Bin 7515 -> 0 bytes .../Home/Default/Images/88.jpg_120x120xz.jpg | Bin 8388 -> 0 bytes service/Public/Home/Default/Images/9.jpg | Bin 9743 -> 0 bytes .../Images/T13iv.XiFdXXa94Hfd-32-32.png | Bin 1396 -> 0 bytes service/Public/Home/Default/Images/TB102.jpg | Bin 107411 -> 0 bytes .../TB1SSK7JpXXXXXCXXXXXXXXXXXX-800-600.png | Bin 8028 -> 0 bytes .../Default/Images/TB1_pic.jpg_200x200.jpg | Bin 40657 -> 0 bytes service/Public/Home/Default/Images/TJ.jpg | Bin 130126 -> 0 bytes service/Public/Home/Default/Images/TJ2.jpg | Bin 96102 -> 0 bytes .../Public/Home/Default/Images/YXARdXxj5.png | Bin 3759 -> 0 bytes service/Public/Home/Default/Images/act1.png | Bin 79524 -> 0 bytes service/Public/Home/Default/Images/act2.png | Bin 104280 -> 0 bytes service/Public/Home/Default/Images/act3.png | Bin 31403 -> 0 bytes .../Public/Home/Default/Images/activity.jpg | Bin 67064 -> 0 bytes .../Public/Home/Default/Images/activity1.jpg | Bin 87376 -> 0 bytes .../Public/Home/Default/Images/activity2.jpg | Bin 72185 -> 0 bytes .../Public/Home/Default/Images/activity3.jpg | Bin 67164 -> 0 bytes service/Public/Home/Default/Images/ad1.jpg | Bin 208440 -> 0 bytes service/Public/Home/Default/Images/ad2.jpg | Bin 360689 -> 0 bytes service/Public/Home/Default/Images/ad3.jpg | Bin 365242 -> 0 bytes service/Public/Home/Default/Images/ad4.jpg | Bin 301108 -> 0 bytes service/Public/Home/Default/Images/ad5.jpg | Bin 150425 -> 0 bytes service/Public/Home/Default/Images/ad6.jpg | Bin 148289 -> 0 bytes service/Public/Home/Default/Images/ad7.jpg | Bin 138570 -> 0 bytes service/Public/Home/Default/Images/ad8.jpg | Bin 279322 -> 0 bytes service/Public/Home/Default/Images/addbg.png | Bin 2558 -> 0 bytes .../Public/Home/Default/Images/addicon1.png | Bin 1105 -> 0 bytes .../Public/Home/Default/Images/addicon2.png | Bin 956 -> 0 bytes service/Public/Home/Default/Images/advTip.jpg | Bin 36048 -> 0 bytes service/Public/Home/Default/Images/bamboo.jpg | Bin 19954 -> 0 bytes service/Public/Home/Default/Images/bamboo.png | Bin 5461 -> 0 bytes service/Public/Home/Default/Images/big.jpg | Bin 59558 -> 0 bytes service/Public/Home/Default/Images/blog01.jpg | Bin 26309 -> 0 bytes service/Public/Home/Default/Images/blog02.jpg | Bin 50662 -> 0 bytes service/Public/Home/Default/Images/blog03.jpg | Bin 78516 -> 0 bytes service/Public/Home/Default/Images/blog04.jpg | Bin 40302 -> 0 bytes service/Public/Home/Default/Images/blog05.jpg | Bin 28107 -> 0 bytes service/Public/Home/Default/Images/blog06.jpg | Bin 21341 -> 0 bytes service/Public/Home/Default/Images/blog07.jpg | Bin 47831 -> 0 bytes service/Public/Home/Default/Images/blog08.jpg | Bin 23481 -> 0 bytes service/Public/Home/Default/Images/blog09.jpg | Bin 45589 -> 0 bytes service/Public/Home/Default/Images/bonus.png | Bin 8737 -> 0 bytes .../Public/Home/Default/Images/browse1.jpg | Bin 29932 -> 0 bytes service/Public/Home/Default/Images/cake.jpg | Bin 19963 -> 0 bytes service/Public/Home/Default/Images/cake.png | Bin 5245 -> 0 bytes service/Public/Home/Default/Images/candy.jpg | Bin 20193 -> 0 bytes service/Public/Home/Default/Images/candy.png | Bin 4794 -> 0 bytes service/Public/Home/Default/Images/cardbg.jpg | Bin 17820 -> 0 bytes .../Public/Home/Default/Images/chocolate.jpg | Bin 20947 -> 0 bytes .../Public/Home/Default/Images/chocolate.png | Bin 4983 -> 0 bytes .../Public/Home/Default/Images/chongzhi.png | Bin 1133 -> 0 bytes .../Public/Home/Default/Images/clockbg.png | Bin 3655 -> 0 bytes service/Public/Home/Default/Images/close.png | Bin 2910 -> 0 bytes service/Public/Home/Default/Images/combo.png | Bin 1181 -> 0 bytes .../Default/Images/comment.jpg_400x400.jpg | Bin 78235 -> 0 bytes .../Public/Home/Default/Images/comment.png | Bin 1112 -> 0 bytes .../Public/Home/Default/Images/cookies.jpg | Bin 20654 -> 0 bytes .../Public/Home/Default/Images/cookies.png | Bin 7756 -> 0 bytes service/Public/Home/Default/Images/coupon.png | Bin 3683 -> 0 bytes .../Public/Home/Default/Images/coupon2015.png | Bin 15780 -> 0 bytes .../Home/Default/Images/coupon20150805.png | Bin 34390 -> 0 bytes .../Public/Home/Default/Images/couponli.png | Bin 3884 -> 0 bytes service/Public/Home/Default/Images/cp.jpg | Bin 49561 -> 0 bytes service/Public/Home/Default/Images/cp2.jpg | Bin 57961 -> 0 bytes service/Public/Home/Default/Images/day-to.png | Bin 924 -> 0 bytes service/Public/Home/Default/Images/extra.png | Bin 202 -> 0 bytes service/Public/Home/Default/Images/fish.jpg | Bin 20411 -> 0 bytes service/Public/Home/Default/Images/fish.png | Bin 5131 -> 0 bytes .../Home/Default/Images/gift_intro_bg.png | Bin 2204 -> 0 bytes .../Home/Default/Images/gift_stamp_1.png | Bin 7048 -> 0 bytes .../Home/Default/Images/gift_stamp_2.png | Bin 9517 -> 0 bytes .../Home/Default/Images/gift_stamp_21.png | Bin 12762 -> 0 bytes .../Home/Default/Images/gift_stamp_3.png | Bin 9565 -> 0 bytes .../Home/Default/Images/gift_stamp_31.png | Bin 12175 -> 0 bytes .../Home/Default/Images/goods_meta_bg.png | Bin 0 -> 36124 bytes .../Public/Home/Default/Images/header-bg.png | Bin 39342 -> 0 bytes .../Public/Home/Default/Images/header-bg1.jpg | Bin 8459 -> 0 bytes .../Images/home-mini-nav-cart-icon.png | Bin 894 -> 0 bytes .../Images/home-mini-nav-category-icon.png | Bin 730 -> 0 bytes .../Images/home-mini-nav-seconds-icon.png | Bin 3391 -> 0 bytes .../Images/home-mini-nav-user-icon.png | Bin 879 -> 0 bytes .../Public/Home/Default/Images/huismall.jpg | Bin 21790 -> 0 bytes .../Public/Home/Default/Images/hwbn40x40.jpg | Bin 2468 -> 0 bytes .../Public/Home/Default/Images/iconbig.png | Bin 28304 -> 0 bytes .../Home/Default/Images/iconfont-bad.png | Bin 41854 -> 0 bytes .../Home/Default/Images/iconfont-badon.png | Bin 18392 -> 0 bytes .../Home/Default/Images/iconfont-evaluate.png | Bin 38044 -> 0 bytes .../Home/Default/Images/iconfont-good.png | Bin 17543 -> 0 bytes .../Home/Default/Images/iconfont-middle.png | Bin 17367 -> 0 bytes .../Public/Home/Default/Images/iconsmall.png | Bin 2941 -> 0 bytes .../Public/Home/Default/Images/iconsmall0.png | Bin 8433 -> 0 bytes .../Public/Home/Default/Images/iconsmall1.png | Bin 11454 -> 0 bytes .../Public/Home/Default/Images/iconsmall2.png | Bin 11235 -> 0 bytes .../Public/Home/Default/Images/iconsmall3.png | Bin 9448 -> 0 bytes service/Public/Home/Default/Images/image.jpg | Bin 7881 -> 0 bytes .../Public/Home/Default/Images/imgsearch1.jpg | Bin 49785 -> 0 bytes .../Home/Default/Images/index_ico_png32.png | Bin 10589 -> 0 bytes .../Public/Home/Default/Images/item-pic.jpg | Bin 4621 -> 0 bytes .../Home/Default/Images/kouhong.jpg_80x80.jpg | Bin 6986 -> 0 bytes service/Public/Home/Default/Images/kuaidi.png | Bin 16473 -> 0 bytes service/Public/Home/Default/Images/list1.jpg | Bin 44725 -> 0 bytes .../Public/Home/Default/Images/listsmall1.jpg | Bin 63845 -> 0 bytes .../Public/Home/Default/Images/loading.gif | Bin 6150 -> 0 bytes service/Public/Home/Default/Images/logo.png | Bin 12912 -> 0 bytes service/Public/Home/Default/Images/logo1.png | Bin 4544 -> 0 bytes .../Public/Home/Default/Images/logobig.png | Bin 21915 -> 0 bytes .../Public/Home/Default/Images/logobig1.png | Bin 22393 -> 0 bytes .../Public/Home/Default/Images/logobig2.png | Bin 6667 -> 0 bytes .../Public/Home/Default/Images/mansmall.jpg | Bin 22142 -> 0 bytes service/Public/Home/Default/Images/meat.jpg | Bin 19818 -> 0 bytes service/Public/Home/Default/Images/meat.png | Bin 5264 -> 0 bytes .../Public/Home/Default/Images/moneysmall.jpg | Bin 23500 -> 0 bytes .../Public/Home/Default/Images/mygift_bg.png | Bin 861 -> 0 bytes service/Public/Home/Default/Images/navce.png | Bin 30392 -> 0 bytes .../Public/Home/Default/Images/navsmall.jpg | Bin 20638 -> 0 bytes .../Home/Default/Images/no-img_mid_.jpg | Bin 5073 -> 0 bytes service/Public/Home/Default/Images/nut.jpg | Bin 20612 -> 0 bytes service/Public/Home/Default/Images/nut.png | Bin 5918 -> 0 bytes .../Public/Home/Default/Images/package.jpg | Bin 20498 -> 0 bytes .../Public/Home/Default/Images/package.png | Bin 5631 -> 0 bytes service/Public/Home/Default/Images/pay.png | Bin 1216 -> 0 bytes .../Public/Home/Default/Images/receive.png | Bin 1750 -> 0 bytes service/Public/Home/Default/Images/refund.png | Bin 2483 -> 0 bytes .../Home/Default/Images/return-process-cd.jpg | Bin 20486 -> 0 bytes service/Public/Home/Default/Images/row1.jpg | Bin 17024 -> 0 bytes service/Public/Home/Default/Images/row2.jpg | Bin 10188 -> 0 bytes service/Public/Home/Default/Images/row3.jpg | Bin 24016 -> 0 bytes service/Public/Home/Default/Images/row4.jpg | Bin 34888 -> 0 bytes service/Public/Home/Default/Images/sale1.jpg | Bin 13026 -> 0 bytes service/Public/Home/Default/Images/sale2.jpg | Bin 10463 -> 0 bytes service/Public/Home/Default/Images/sale3.jpg | Bin 6184 -> 0 bytes service/Public/Home/Default/Images/scoll1.png | Bin 108211 -> 0 bytes service/Public/Home/Default/Images/scoll2.png | Bin 120530 -> 0 bytes service/Public/Home/Default/Images/send.png | Bin 1141 -> 0 bytes service/Public/Home/Default/Images/side.png | Bin 1152 -> 0 bytes service/Public/Home/Default/Images/songzi.jpg | Bin 23767 -> 0 bytes service/Public/Home/Default/Images/sprite.png | Bin 10139 -> 0 bytes service/Public/Home/Default/Images/tea.jpg | Bin 20506 -> 0 bytes service/Public/Home/Default/Images/tea.png | Bin 4719 -> 0 bytes service/Public/Home/Default/Images/tj.png | Bin 83501 -> 0 bytes service/Public/Home/Default/Images/tj1.png | Bin 58518 -> 0 bytes service/Public/Home/Default/Images/tj2.png | Bin 59449 -> 0 bytes service/Public/Home/Default/Images/tw1.jpg | Bin 167974 -> 0 bytes service/Public/Home/Default/Images/tw2.jpg | Bin 84096 -> 0 bytes service/Public/Home/Default/Images/tw3.jpg | Bin 289707 -> 0 bytes service/Public/Home/Default/Images/tw4.jpg | Bin 107034 -> 0 bytes service/Public/Home/Default/Images/tw5.jpg | Bin 107053 -> 0 bytes service/Public/Home/Default/Images/tw6.jpg | Bin 157840 -> 0 bytes service/Public/Home/Default/Images/tw7.jpg | Bin 169900 -> 0 bytes service/Public/Home/Default/Images/wallet.png | Bin 6626 -> 0 bytes .../Public/Home/Default/Images/wangyin.jpg | Bin 42544 -> 0 bytes service/Public/Home/Default/Images/wdsc.png | Bin 1311 -> 0 bytes .../Home/Default/Images/weixin_code_145.png | Bin 861 -> 0 bytes .../Public/Home/Default/Images/weizhifu.jpg | Bin 37248 -> 0 bytes .../Public/Home/Default/Images/zhifubao.jpg | Bin 53304 -> 0 bytes service/Public/Home/Default/Images/图标.png | Bin 10001 -> 0 bytes service/Public/Home/Default/Js/Goods.js | 1 + 211 files changed, 252 insertions(+), 82 deletions(-) delete mode 100755 service/Public/Home/Default/Images/-0-saturn_solar.jpg_220x220.jpg delete mode 100755 service/Public/Home/Default/Images/0-item_pic.jpg_220x220.jpg delete mode 100755 service/Public/Home/Default/Images/01.jpg delete mode 100755 service/Public/Home/Default/Images/01_mid.jpg delete mode 100755 service/Public/Home/Default/Images/01_small.jpg delete mode 100755 service/Public/Home/Default/Images/02.jpg delete mode 100755 service/Public/Home/Default/Images/02_mid.jpg delete mode 100755 service/Public/Home/Default/Images/02_small.jpg delete mode 100755 service/Public/Home/Default/Images/03.jpg delete mode 100755 service/Public/Home/Default/Images/03_mid.jpg delete mode 100755 service/Public/Home/Default/Images/03_small.jpg delete mode 100755 service/Public/Home/Default/Images/1-item_pic.jpg_220x220.jpg delete mode 100755 service/Public/Home/Default/Images/1.jpg delete mode 100755 service/Public/Home/Default/Images/10.jpg delete mode 100755 service/Public/Home/Default/Images/11.jpg delete mode 100755 service/Public/Home/Default/Images/1_160x160.jpg delete mode 100755 service/Public/Home/Default/Images/2.jpg delete mode 100755 service/Public/Home/Default/Images/2016.png delete mode 100755 service/Public/Home/Default/Images/3.jpg delete mode 100755 service/Public/Home/Default/Images/3CoOkxrFOP.png delete mode 100755 service/Public/Home/Default/Images/4.jpg delete mode 100755 service/Public/Home/Default/Images/5.jpg delete mode 100755 service/Public/Home/Default/Images/556.png delete mode 100755 service/Public/Home/Default/Images/557.png delete mode 100755 service/Public/Home/Default/Images/559.png delete mode 100755 service/Public/Home/Default/Images/566.png delete mode 100755 service/Public/Home/Default/Images/566fda5cN4b8a1675.gif delete mode 100755 service/Public/Home/Default/Images/6.jpg delete mode 100755 service/Public/Home/Default/Images/62988.jpg_80x80.jpg delete mode 100755 service/Public/Home/Default/Images/65.jpg_120x120xz.jpg delete mode 100755 service/Public/Home/Default/Images/7.jpg delete mode 100755 service/Public/Home/Default/Images/72h.png delete mode 100755 service/Public/Home/Default/Images/8.jpg delete mode 100755 service/Public/Home/Default/Images/88.jpg_120x120xz.jpg delete mode 100755 service/Public/Home/Default/Images/9.jpg delete mode 100755 service/Public/Home/Default/Images/T13iv.XiFdXXa94Hfd-32-32.png delete mode 100755 service/Public/Home/Default/Images/TB102.jpg delete mode 100755 service/Public/Home/Default/Images/TB1SSK7JpXXXXXCXXXXXXXXXXXX-800-600.png delete mode 100755 service/Public/Home/Default/Images/TB1_pic.jpg_200x200.jpg delete mode 100755 service/Public/Home/Default/Images/TJ.jpg delete mode 100755 service/Public/Home/Default/Images/TJ2.jpg delete mode 100755 service/Public/Home/Default/Images/YXARdXxj5.png delete mode 100755 service/Public/Home/Default/Images/act1.png delete mode 100755 service/Public/Home/Default/Images/act2.png delete mode 100755 service/Public/Home/Default/Images/act3.png delete mode 100755 service/Public/Home/Default/Images/activity.jpg delete mode 100755 service/Public/Home/Default/Images/activity1.jpg delete mode 100755 service/Public/Home/Default/Images/activity2.jpg delete mode 100755 service/Public/Home/Default/Images/activity3.jpg delete mode 100755 service/Public/Home/Default/Images/ad1.jpg delete mode 100755 service/Public/Home/Default/Images/ad2.jpg delete mode 100755 service/Public/Home/Default/Images/ad3.jpg delete mode 100755 service/Public/Home/Default/Images/ad4.jpg delete mode 100755 service/Public/Home/Default/Images/ad5.jpg delete mode 100755 service/Public/Home/Default/Images/ad6.jpg delete mode 100755 service/Public/Home/Default/Images/ad7.jpg delete mode 100755 service/Public/Home/Default/Images/ad8.jpg delete mode 100755 service/Public/Home/Default/Images/addbg.png delete mode 100755 service/Public/Home/Default/Images/addicon1.png delete mode 100755 service/Public/Home/Default/Images/addicon2.png delete mode 100755 service/Public/Home/Default/Images/advTip.jpg delete mode 100755 service/Public/Home/Default/Images/bamboo.jpg delete mode 100755 service/Public/Home/Default/Images/bamboo.png delete mode 100755 service/Public/Home/Default/Images/big.jpg delete mode 100755 service/Public/Home/Default/Images/blog01.jpg delete mode 100755 service/Public/Home/Default/Images/blog02.jpg delete mode 100755 service/Public/Home/Default/Images/blog03.jpg delete mode 100755 service/Public/Home/Default/Images/blog04.jpg delete mode 100755 service/Public/Home/Default/Images/blog05.jpg delete mode 100755 service/Public/Home/Default/Images/blog06.jpg delete mode 100755 service/Public/Home/Default/Images/blog07.jpg delete mode 100755 service/Public/Home/Default/Images/blog08.jpg delete mode 100755 service/Public/Home/Default/Images/blog09.jpg delete mode 100755 service/Public/Home/Default/Images/bonus.png delete mode 100755 service/Public/Home/Default/Images/browse1.jpg delete mode 100755 service/Public/Home/Default/Images/cake.jpg delete mode 100755 service/Public/Home/Default/Images/cake.png delete mode 100755 service/Public/Home/Default/Images/candy.jpg delete mode 100755 service/Public/Home/Default/Images/candy.png delete mode 100755 service/Public/Home/Default/Images/cardbg.jpg delete mode 100755 service/Public/Home/Default/Images/chocolate.jpg delete mode 100755 service/Public/Home/Default/Images/chocolate.png delete mode 100755 service/Public/Home/Default/Images/chongzhi.png delete mode 100755 service/Public/Home/Default/Images/clockbg.png delete mode 100755 service/Public/Home/Default/Images/close.png delete mode 100755 service/Public/Home/Default/Images/combo.png delete mode 100755 service/Public/Home/Default/Images/comment.jpg_400x400.jpg delete mode 100755 service/Public/Home/Default/Images/comment.png delete mode 100755 service/Public/Home/Default/Images/cookies.jpg delete mode 100755 service/Public/Home/Default/Images/cookies.png delete mode 100755 service/Public/Home/Default/Images/coupon.png delete mode 100755 service/Public/Home/Default/Images/coupon2015.png delete mode 100755 service/Public/Home/Default/Images/coupon20150805.png delete mode 100755 service/Public/Home/Default/Images/couponli.png delete mode 100755 service/Public/Home/Default/Images/cp.jpg delete mode 100755 service/Public/Home/Default/Images/cp2.jpg delete mode 100755 service/Public/Home/Default/Images/day-to.png delete mode 100755 service/Public/Home/Default/Images/extra.png delete mode 100755 service/Public/Home/Default/Images/fish.jpg delete mode 100755 service/Public/Home/Default/Images/fish.png delete mode 100755 service/Public/Home/Default/Images/gift_intro_bg.png delete mode 100755 service/Public/Home/Default/Images/gift_stamp_1.png delete mode 100755 service/Public/Home/Default/Images/gift_stamp_2.png delete mode 100755 service/Public/Home/Default/Images/gift_stamp_21.png delete mode 100755 service/Public/Home/Default/Images/gift_stamp_3.png delete mode 100755 service/Public/Home/Default/Images/gift_stamp_31.png create mode 100644 service/Public/Home/Default/Images/goods_meta_bg.png delete mode 100755 service/Public/Home/Default/Images/header-bg.png delete mode 100755 service/Public/Home/Default/Images/header-bg1.jpg delete mode 100755 service/Public/Home/Default/Images/home-mini-nav-cart-icon.png delete mode 100755 service/Public/Home/Default/Images/home-mini-nav-category-icon.png delete mode 100755 service/Public/Home/Default/Images/home-mini-nav-seconds-icon.png delete mode 100755 service/Public/Home/Default/Images/home-mini-nav-user-icon.png delete mode 100755 service/Public/Home/Default/Images/huismall.jpg delete mode 100755 service/Public/Home/Default/Images/hwbn40x40.jpg delete mode 100755 service/Public/Home/Default/Images/iconbig.png delete mode 100755 service/Public/Home/Default/Images/iconfont-bad.png delete mode 100755 service/Public/Home/Default/Images/iconfont-badon.png delete mode 100755 service/Public/Home/Default/Images/iconfont-evaluate.png delete mode 100755 service/Public/Home/Default/Images/iconfont-good.png delete mode 100755 service/Public/Home/Default/Images/iconfont-middle.png delete mode 100755 service/Public/Home/Default/Images/iconsmall.png delete mode 100755 service/Public/Home/Default/Images/iconsmall0.png delete mode 100755 service/Public/Home/Default/Images/iconsmall1.png delete mode 100755 service/Public/Home/Default/Images/iconsmall2.png delete mode 100755 service/Public/Home/Default/Images/iconsmall3.png delete mode 100755 service/Public/Home/Default/Images/image.jpg delete mode 100755 service/Public/Home/Default/Images/imgsearch1.jpg delete mode 100755 service/Public/Home/Default/Images/index_ico_png32.png delete mode 100755 service/Public/Home/Default/Images/item-pic.jpg delete mode 100755 service/Public/Home/Default/Images/kouhong.jpg_80x80.jpg delete mode 100755 service/Public/Home/Default/Images/kuaidi.png delete mode 100755 service/Public/Home/Default/Images/list1.jpg delete mode 100755 service/Public/Home/Default/Images/listsmall1.jpg delete mode 100755 service/Public/Home/Default/Images/loading.gif delete mode 100755 service/Public/Home/Default/Images/logo.png delete mode 100755 service/Public/Home/Default/Images/logo1.png delete mode 100755 service/Public/Home/Default/Images/logobig.png delete mode 100755 service/Public/Home/Default/Images/logobig1.png delete mode 100755 service/Public/Home/Default/Images/logobig2.png delete mode 100755 service/Public/Home/Default/Images/mansmall.jpg delete mode 100755 service/Public/Home/Default/Images/meat.jpg delete mode 100755 service/Public/Home/Default/Images/meat.png delete mode 100755 service/Public/Home/Default/Images/moneysmall.jpg delete mode 100755 service/Public/Home/Default/Images/mygift_bg.png delete mode 100755 service/Public/Home/Default/Images/navce.png delete mode 100755 service/Public/Home/Default/Images/navsmall.jpg delete mode 100755 service/Public/Home/Default/Images/no-img_mid_.jpg delete mode 100755 service/Public/Home/Default/Images/nut.jpg delete mode 100755 service/Public/Home/Default/Images/nut.png delete mode 100755 service/Public/Home/Default/Images/package.jpg delete mode 100755 service/Public/Home/Default/Images/package.png delete mode 100755 service/Public/Home/Default/Images/pay.png delete mode 100755 service/Public/Home/Default/Images/receive.png delete mode 100755 service/Public/Home/Default/Images/refund.png delete mode 100755 service/Public/Home/Default/Images/return-process-cd.jpg delete mode 100755 service/Public/Home/Default/Images/row1.jpg delete mode 100755 service/Public/Home/Default/Images/row2.jpg delete mode 100755 service/Public/Home/Default/Images/row3.jpg delete mode 100755 service/Public/Home/Default/Images/row4.jpg delete mode 100755 service/Public/Home/Default/Images/sale1.jpg delete mode 100755 service/Public/Home/Default/Images/sale2.jpg delete mode 100755 service/Public/Home/Default/Images/sale3.jpg delete mode 100755 service/Public/Home/Default/Images/scoll1.png delete mode 100755 service/Public/Home/Default/Images/scoll2.png delete mode 100755 service/Public/Home/Default/Images/send.png delete mode 100755 service/Public/Home/Default/Images/side.png delete mode 100755 service/Public/Home/Default/Images/songzi.jpg delete mode 100755 service/Public/Home/Default/Images/sprite.png delete mode 100755 service/Public/Home/Default/Images/tea.jpg delete mode 100755 service/Public/Home/Default/Images/tea.png delete mode 100755 service/Public/Home/Default/Images/tj.png delete mode 100755 service/Public/Home/Default/Images/tj1.png delete mode 100755 service/Public/Home/Default/Images/tj2.png delete mode 100755 service/Public/Home/Default/Images/tw1.jpg delete mode 100755 service/Public/Home/Default/Images/tw2.jpg delete mode 100755 service/Public/Home/Default/Images/tw3.jpg delete mode 100755 service/Public/Home/Default/Images/tw4.jpg delete mode 100755 service/Public/Home/Default/Images/tw5.jpg delete mode 100755 service/Public/Home/Default/Images/tw6.jpg delete mode 100755 service/Public/Home/Default/Images/tw7.jpg delete mode 100755 service/Public/Home/Default/Images/wallet.png delete mode 100755 service/Public/Home/Default/Images/wangyin.jpg delete mode 100755 service/Public/Home/Default/Images/wdsc.png delete mode 100755 service/Public/Home/Default/Images/weixin_code_145.png delete mode 100755 service/Public/Home/Default/Images/weizhifu.jpg delete mode 100755 service/Public/Home/Default/Images/zhifubao.jpg delete mode 100755 service/Public/Home/Default/Images/图标.png diff --git a/service/Application/Admin/Lang/zh-cn/navigation.php b/service/Application/Admin/Lang/zh-cn/navigation.php index fd32ea1c9..859d075de 100755 --- a/service/Application/Admin/Lang/zh-cn/navigation.php +++ b/service/Application/Admin/Lang/zh-cn/navigation.php @@ -44,7 +44,8 @@ return array( 'navigation_nav_header_name' => '中间导航', 'navigation_nav_footer_name' => '底部导航', - 'goods_category_level_two' => '二级', - 'goods_category_level_three' => '三级', + 'navigation_category_level_one' => '一级', + 'navigation_category_level_two' => '二级', + 'navigation_category_level_three' => '三级', ); ?> \ No newline at end of file diff --git a/service/Application/Admin/View/Default/Navigation/Index.html b/service/Application/Admin/View/Default/Navigation/Index.html index 180f05495..7fa798a86 100755 --- a/service/Application/Admin/View/Default/Navigation/Index.html +++ b/service/Application/Admin/View/Default/Navigation/Index.html @@ -189,16 +189,15 @@ diff --git a/service/Application/Common/Common/function.php b/service/Application/Common/Common/function.php index a9b870449..da3ae6b8d 100755 --- a/service/Application/Common/Common/function.php +++ b/service/Application/Common/Common/function.php @@ -392,17 +392,17 @@ function NavDataDealWith($data) { // 文章分类 case 'article_category': - $v['url'] = HomeUrl('Channel', 'Index', ['id'=>$v['value'], 'viewid'=>$v['id']]); + $v['url'] = HomeUrl('Channel', 'Index', ['id'=>$v['value']]); break; // 自定义页面 case 'customview': - $v['url'] = HomeUrl('CustomView', 'Index', ['id'=>$v['value'], 'viewid'=>$v['id']]); + $v['url'] = HomeUrl('CustomView', 'Index', ['id'=>$v['value']]); break; // 商品分类 case 'goods_category': - $v['url'] = HomeUrl('Goods', 'Index', ['id'=>$v['value'], 'viewid'=>$v['id']]); + $v['url'] = HomeUrl('Search', 'Index', ['category_id'=>$v['value']]); break; } $data[$k] = $v; diff --git a/service/Application/Common/Lang/zh-cn.php b/service/Application/Common/Lang/zh-cn.php index 64b015221..a6ae4a667 100755 --- a/service/Application/Common/Lang/zh-cn.php +++ b/service/Application/Common/Lang/zh-cn.php @@ -362,8 +362,8 @@ return array( // 用户端 - 订单管理 'common_order_user_status' => array( 0 => array('id' => 0, 'name' => '待确认', 'checked' => true), - 1 => array('id' => 1, 'name' => '待支付'), - 2 => array('id' => 2, 'name' => '已支付'), + 1 => array('id' => 1, 'name' => '待付款'), + 2 => array('id' => 2, 'name' => '待发货'), 3 => array('id' => 3, 'name' => '待收货'), 4 => array('id' => 4, 'name' => '已完成'), 5 => array('id' => 5, 'name' => '已取消'), @@ -503,6 +503,13 @@ return array( 'app' => array('value' => 'app', 'name' => 'APP手机端'), ), + // 是否已评价 + 'common_comments_status_list' => array( + 0 => array('value' => 0, 'name' => '待评价'), + 1 => array('value' => 1, 'name' => '已评价'), + ), + + // 色彩值 'common_color_list' => array( diff --git a/service/Application/Home/Controller/CommonController.class.php b/service/Application/Home/Controller/CommonController.class.php index 7d221a29f..25e8217ee 100755 --- a/service/Application/Home/Controller/CommonController.class.php +++ b/service/Application/Home/Controller/CommonController.class.php @@ -5,6 +5,7 @@ namespace Home\Controller; use Think\Controller; use Service\GoodsService; use Service\NavigationService; +use Service\BuyService; /** * 前台 @@ -139,30 +140,6 @@ class CommonController extends Controller $this->assign('is_header', 1); $this->assign('is_footer', 1); - // 当前页面选择导航状态 - $nav_pid = 0; - $nav_id = 0; - foreach($this->nav_header as $v) - { - if(I('viewid') == $v['id']) - { - $nav_id = $v['id']; - } - if(!empty($v['item'])) - { - foreach($v['item'] as $vs) - { - if(I('viewid') == $vs['id']) - { - $nav_pid = $v['id']; - $nav_id = $vs['id']; - } - } - } - } - $this->assign('nav_pid', $nav_pid); - $this->assign('nav_id', $nav_id); - // 图片host地址 $this->assign('image_host', C('IMAGE_HOST')); @@ -183,6 +160,9 @@ class CommonController extends Controller // 商品大分类 $this->assign('goods_category_list', GoodsService::GoodsCategory()); + // 购物车商品总数 + $this->assign('common_cart_total', BuyService::CartTotal(['user'=>$this->user])); + // 当前控制器名称 $this->assign('controller_name', CONTROLLER_NAME); } diff --git a/service/Application/Home/Controller/IndexController.class.php b/service/Application/Home/Controller/IndexController.class.php index 5a658f528..c7c249488 100755 --- a/service/Application/Home/Controller/IndexController.class.php +++ b/service/Application/Home/Controller/IndexController.class.php @@ -5,6 +5,7 @@ namespace Home\Controller; use Service\BannerService; use Service\GoodsService; use Service\ArticleService; +use Service\OrderService; /** * 首页 @@ -52,6 +53,10 @@ class IndexController extends CommonController ]; $this->assign('article_list', ArticleService::ArticleList($params)); + // 用户订单状态 + $user_order_status = OrderService::OrderStatusStepTotal(['user_type'=>'user', 'user'=>$this->user, 'is_comments'=>1]); + $this->assign('user_order_status', $user_order_status['data']); + $this->display('Index'); } } diff --git a/service/Application/Home/Controller/OrderController.class.php b/service/Application/Home/Controller/OrderController.class.php index 8ffc370f7..a9183c646 100755 --- a/service/Application/Home/Controller/OrderController.class.php +++ b/service/Application/Home/Controller/OrderController.class.php @@ -84,6 +84,9 @@ class OrderController extends CommonController // 支付状态 $this->assign('common_order_pay_status', L('common_order_pay_status')); + // 评价状态 + $this->assign('common_comments_status_list', L('common_comments_status_list')); + // 参数 $this->assign('params', $params); $this->display('Index'); diff --git a/service/Application/Home/View/Default/Cart/Index.html b/service/Application/Home/View/Default/Cart/Index.html index ddc7adcc2..af34d6f5c 100755 --- a/service/Application/Home/View/Default/Cart/Index.html +++ b/service/Application/Home/View/Default/Cart/Index.html @@ -77,7 +77,7 @@ ¥{{$goods.total_price}} - 删除 + 删除 @@ -126,4 +126,22 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/service/Application/Home/View/Default/CustomView/Index.html b/service/Application/Home/View/Default/CustomView/Index.html index 229bac746..88d389bff 100755 --- a/service/Application/Home/View/Default/CustomView/Index.html +++ b/service/Application/Home/View/Default/CustomView/Index.html @@ -17,7 +17,7 @@ -
style="{{$max_width_style}}">{{$data.content}}
+
class="am-container">{{$data.content}}
diff --git a/service/Application/Home/View/Default/Index/Index.html b/service/Application/Home/View/Default/Index/Index.html index dbad29b2a..9dc06103b 100755 --- a/service/Application/Home/View/Default/Index/Index.html +++ b/service/Application/Home/View/Default/Index/Index.html @@ -84,10 +84,13 @@ diff --git a/service/Application/Home/View/Default/Order/Detail.html b/service/Application/Home/View/Default/Order/Detail.html index 6c2cb207d..545494dd8 100755 --- a/service/Application/Home/View/Default/Order/Detail.html +++ b/service/Application/Home/View/Default/Order/Detail.html @@ -173,7 +173,7 @@ 评价 - +
diff --git a/service/Application/Home/View/Default/Order/Index.html b/service/Application/Home/View/Default/Order/Index.html index b52b208fe..6e73f3f1a 100755 --- a/service/Application/Home/View/Default/Order/Index.html +++ b/service/Application/Home/View/Default/Order/Index.html @@ -96,6 +96,17 @@ + + 评价: + + diff --git a/service/Application/Home/View/Default/Public/HeaderNav.html b/service/Application/Home/View/Default/Public/HeaderNav.html index 3ea3424a5..676d0fe27 100755 --- a/service/Application/Home/View/Default/Public/HeaderNav.html +++ b/service/Application/Home/View/Default/Public/HeaderNav.html @@ -11,9 +11,13 @@ -
diff --git a/service/Application/Home/View/Default/Public/HeaderTopNav.html b/service/Application/Home/View/Default/Public/HeaderTopNav.html index fc9856209..dbede74fb 100755 --- a/service/Application/Home/View/Default/Public/HeaderTopNav.html +++ b/service/Application/Home/View/Default/Public/HeaderTopNav.html @@ -20,29 +20,32 @@ diff --git a/service/Application/Home/View/Default/Public/UserMenu.html b/service/Application/Home/View/Default/Public/UserMenu.html index 7f8168275..928dce7c5 100755 --- a/service/Application/Home/View/Default/Public/UserMenu.html +++ b/service/Application/Home/View/Default/Public/UserMenu.html @@ -13,7 +13,7 @@