diff --git a/application/index/view/default/public/nav.html b/application/index/view/default/public/nav.html index da6341f0c48e40cf2fc84e6d340ceea49454a0e7..f2838d8e96ebb29c007c5dcedb24e515d12f5686 100755 --- a/application/index/view/default/public/nav.html +++ b/application/index/view/default/public/nav.html @@ -1,17 +1,26 @@
  • - 首页 + + 首页 +

    首页

    +
  • - 分类 + + 分类 +

    分类

    +
  • - - {{if !empty($common_cart_total)}} - {{$common_cart_total}} - {{/if}} +
  • - +
  • \ No newline at end of file diff --git a/public/appmini/old/alipay/images/nav-icon-cart.png b/public/appmini/old/alipay/images/nav-icon-cart.png old mode 100755 new mode 100644 index 90cf0b2249d3a445b353e85c71a85c30d3c94577..15b0208f4c5e69151f1861c3cc0b72c32c0eb143 Binary files a/public/appmini/old/alipay/images/nav-icon-cart.png and b/public/appmini/old/alipay/images/nav-icon-cart.png differ diff --git a/public/appmini/old/weixin/images/nav-icon-cart.png b/public/appmini/old/weixin/images/nav-icon-cart.png old mode 100755 new mode 100644 index 90cf0b2249d3a445b353e85c71a85c30d3c94577..15b0208f4c5e69151f1861c3cc0b72c32c0eb143 Binary files a/public/appmini/old/weixin/images/nav-icon-cart.png and b/public/appmini/old/weixin/images/nav-icon-cart.png differ diff --git a/public/static/admin/default/css/order.css b/public/static/admin/default/css/order.css index 923c719b8130c672d6532b69777c5caef2777368..b96399a5ee42fe90c39a4fabd71379743f547ddb 100755 --- a/public/static/admin/default/css/order.css +++ b/public/static/admin/default/css/order.css @@ -40,7 +40,7 @@ form.am-form .am-form-group { padding-right: 5px; } .business-item ul li { border:1px solid transparent ;overflow: hidden; float: left; cursor: pointer; padding: 5px; border: 1px solid #eee; margin: 0 10px 10px 0; } .business-item ul li img { width: 36px; height: 36px; vertical-align: middle; } .business-item ul li.selected { border-color: #d2364c ; position: relative; } -.business-item ul li.selected i.icon-active { position: absolute; width: 10px; height: 10px; font-size: 0; line-height: 0; right: 0px; bottom: 0px; background: url(../images/sys_item_selected.gif) no-repeat right bottom; } +.business-item ul li.selected i.icon-active { position: absolute; width: 10px; height: 10px; font-size: 0; line-height: 0; right: 0px; bottom: 0px; background: url(../images/sys-item-selected.gif) no-repeat right bottom; } @media only screen and (min-width:640px) { .business-item ul li {width:calc(33% - 5px); } .business-item ul li:nth-child(3n) { margin-right: 0; } diff --git a/public/static/index/default/css/buy.css b/public/static/index/default/css/buy.css index a17eb744f68de4872dea76543ab82e7f954aa49e..ba42f4a91a73877d3af650fb66e2b9d6ab5f3a8e 100755 --- a/public/static/index/default/css/buy.css +++ b/public/static/index/default/css/buy.css @@ -23,7 +23,7 @@ ul.logistics-list li.selected i.icon-active, ul.payment-list li.selected i.icon- line-height: 0; right: 0px; bottom: 0px; - background: url(../images/sys_item_selected.gif) no-repeat right bottom; + background: url(../images/sys-item-selected.gif) no-repeat right bottom; } .business-item ul { padding: 10px 3px 5px 5px;} ul.logistics-list li img, ul.payment-list li img { width: 36px; height: 36px; vertical-align: middle; } @@ -147,7 +147,7 @@ ul.address-list, .business-item ul { overflow: hidden; } .address { margin-top: 10px; } .address, .buy-message { border-top: 1px solid #eee; } .address .control { display: none; } - .address-default {background: url(../images/peraddress.png) repeat-x; background-position: bottom; } + .address-default {background: url(../images/buy-peraddress.png) repeat-x; background-position: bottom; } ul.address-list li { padding: 5px; min-height: 60px; overflow: hidden; } .address-detail .phone { float: right; } ul.address-list .am-icon-angle-right { color: #888; } diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index 95f674fb9c76b91f9cdfb05dc9399fb48b3f134c..6a4887460ea758a085ef14df8765faf180dd8809 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -96,9 +96,9 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a .mobile-navigation{position: fixed;bottom:0px ;width: 100%;z-index: 999;background:#fff ;} .mobile-navigation li{width: 25%;padding:2px ;background:#fff ;border-top:1px solid #f5f5f5 ;float: left;text-align: center;font-size: 12px; position: relative; } -.mobile-navigation li a { text-decoration: none; } -.mobile-navigation li i{display: block;font-size: 16px; z-index: 1; } -.mobile-navigation li.active a{color:#d2364c ;} +.mobile-navigation li a { text-decoration: none; color: #666; } +.mobile-navigation li img { width: 30px; height: 30px; margin: 0 auto; } +.mobile-navigation li.active a{ color:#d2364c; } .hot-icon { position: absolute; top: 1%; left: 53%; z-index: 2; border: 1px solid #fff; } @media only screen and (min-width: 640px) { diff --git a/public/static/index/default/css/goods.css b/public/static/index/default/css/goods.css index f6df47cd885c1eb1f14fd496c11a6d64e15b8164..e02cc240bc21f986cb3926fce6e83fa15c437e10 100755 --- a/public/static/index/default/css/goods.css +++ b/public/static/index/default/css/goods.css @@ -98,7 +98,7 @@ input{font-size:12px;font-size:100%;outline:none;line-height:normal;color:#444;} /*选中样式*/ .sku-line{position: relative;} .theme-options li a:hover{ border:2px solid #e4393c; padding:0 5px; text-decoration:none;} - .theme-options li i{ position:absolute; width:10px; height:10px; font-size:0; line-height:0; right:0px; bottom:0px; background:url(../images/sys_item_selected.gif) no-repeat right bottom; z-index:99; display:none;} + .theme-options li i{ position:absolute; width:10px; height:10px; font-size:0; line-height:0; right:0px; bottom:0px; background:url(../images/sys-item-selected.gif) no-repeat right bottom; z-index:99; display:none;} .theme-options li.selected a{ border:2px solid #e4393c; padding:0 5px;} .theme-options li.selected i{ display:block;} @@ -190,7 +190,7 @@ fieldset legend{margin-left:15px;padding-left:3px;padding-right:3px;color:#333;} .goods-favor-count { color: #999; } .iteminfo_parameter a:hover{text-decoration: none;color:initial ;} .tm-indcon .tm-label,.tb-detail-price dt{ white-space:nowrap; color:#888;} -.tb-detail-price{ background: #fcf1e3 url(../images/goods_meta_bg.png); background-size: cover; -moz-background-size: cover; background-repeat: no-repeat; height:75px;padding:10px; } +.tb-detail-price{ background: #fcf1e3 url(../images/goods-meta-bg.png); background-size: cover; -moz-background-size: cover; background-repeat: no-repeat; height:75px;padding:10px; } .tb-detail-price .items {display: block;margin-left:0 !important;} .tb-detail-price .items dt { float:left; text-align: left;} .sys_item_price{font-size: 24px;font-weight: bold; line-height: 16px;} @@ -352,7 +352,7 @@ ul.detail-attr li {height: 26px;overflow: hidden;line-height: 26px;vertical-alig .tb-thumb li div { border:1px solid #eee; overflow: hidden;} div.zoomDiv { z-index:999; position:absolute; top:0px; left:0px; width:400px; height:400px; background:#ffffff; border:1px solid #CCCCCC; display:none; text-align:center; overflow:hidden; } div.zoomDiv img { min-width: 1000px; display: block; } - div.zoomMask { position:absolute; background:url(../images/mask.png)repeat scroll 0 0 rgba(33, 150, 243, 0.3); cursor:move; z-index:1; } + div.zoomMask { position:absolute; background:url(../images/goods-mask.png)repeat scroll 0 0 rgba(33, 150, 243, 0.3); cursor:move; z-index:1; } /*规格*/ .theme-popover {display: block;position: static;border:none ;box-shadow: none;width: 100%;} @@ -426,6 +426,7 @@ ul.detail-attr li {height: 26px;overflow: hidden;line-height: 26px;vertical-alig ul.tm-ind-panel li:first-child { text-align: left; } ul.tm-ind-panel li:last-child { text-align: right; } .tb-detail-price .items dt { margin-right: 10px; } + .tb-detail-hd h1 { font-size: 14px; } /* 推荐商品 */ .like li:not(:nth-of-type(2n)) { border-right: 1px solid #eee; } diff --git a/public/static/index/default/css/index.css b/public/static/index/default/css/index.css index 2721ba2870917d80e98bb1de5fe09ddee40ee12e..3d7e1adc8cffe4399d489e2940bad272ebd11c96 100755 --- a/public/static/index/default/css/index.css +++ b/public/static/index/default/css/index.css @@ -35,24 +35,6 @@ dt + dd {margin-top: 0;} text-align: center;float:none} .items-nav-title h3,.items-nav-title .today-brands,.items-nav-title .more{display: none;} - -/*第二套各类活动*/ -.row {padding: 10px 0px;overflow: hidden;} -.row li{width: 50%;float: left;} -/*秒杀*/ -.sale {background: #ffd800;padding: 0px 2px 4px 2px;} -.sale-item{padding: 0px 2px;} -.sale-item .s-img,.sale-item .s-info{background:#fff ;padding:10px 2px ;} -/*时间*/ -.sale-mt{overflow: hidden;background:#ffd800 ;margin-top:10px ;} -.sale-mt i {float: left;display: block;width:60px;height:46px;background: url(../../images/sale-t_clock.jpg);background-size:100% } -.sale-mt .sale-title{font-size: 18px;font-style:italic;line-height: 46px;color: #885621;margin-left:10px;} -.sale-mt .s-time {float:right;width:112px;height: 27px;position: relative;background: url(../../images/icon-sale.png);background-size:100% ;margin-top:10px ;margin-right: 10px;} -.sale-mt .s-time span { position: absolute;top: 0;display: block;width: 27px;height: 27px;line-height: 27px;font-size:18px;color: #ffeee0;text-align: center;overflow: hidden;} -.s-time .mm {left:43px;} -.s-time .ss {left:85px;} - -.s-buy{display:none;} /*楼层*/ .flood {background: #fff; position: relative; } .outer-con .price { color: #f33f00; font-weight: bold; } diff --git a/public/static/index/default/css/order.detail.css b/public/static/index/default/css/order.detail.css index a475d5554c44b1d65bf9ed0665baab4dc02deb95..b291bb51404c98f90a7ce1753fbd1eb707a23716 100755 --- a/public/static/index/default/css/order.detail.css +++ b/public/static/index/default/css/order.detail.css @@ -178,7 +178,7 @@ ul.progress li.current .title { .business-item ul li { border:1px solid transparent ;overflow: hidden; float: left; cursor: pointer; padding: 5px; border: 1px solid #eee; margin: 0 10px 10px 0; } .business-item ul li img { width: 36px; height: 36px; } .business-item ul li.selected { border-color: #d2364c ; position: relative; } -.business-item ul li.selected i.icon-active { position: absolute; width: 10px; height: 10px; font-size: 0; line-height: 0; right: 0px; bottom: 0px; background: url(../images/sys_item_selected.gif) no-repeat right bottom; } +.business-item ul li.selected i.icon-active { position: absolute; width: 10px; height: 10px; font-size: 0; line-height: 0; right: 0px; bottom: 0px; background: url(../images/sys-item-selected.gif) no-repeat right bottom; } @media only screen and (min-width:640px) { .business-item ul li {width:calc(33% - 5px); } .business-item ul li:nth-child(3n) { margin-right: 0; } diff --git a/public/static/index/default/css/search.css b/public/static/index/default/css/search.css index 5ac6be63609ca486a58868bbc6d0bd9e524677b1..826e7f6142c0f748ef9715615f0252025030d07e 100755 --- a/public/static/index/default/css/search.css +++ b/public/static/index/default/css/search.css @@ -23,7 +23,7 @@ li.select-result dl{padding: 25px 0 5px 0px;} li.select-result dt {left:-26px; top:0;font-weight:bold;width:50px;} .select-no{color:#999} -.select .select-result a{padding-right:20px;background: url("../images/close.png") right 9px no-repeat} +.select .select-result a{padding-right:20px;background: url("../images/search-close.png") right 9px no-repeat} .select .select-result a:hover{background-position:right -15px} .screening-remove-submit{display:none;line-height:21px;margin-top:4px;width:35px;float:right;color:#F00;cursor:pointer;} diff --git a/public/static/index/default/css/user.index.css b/public/static/index/default/css/user.index.css index 8b262a41b4025bc323317ff3d44f66921189fe0e..c571e5f83632bde8fe688930605d7fbbb326433c 100755 --- a/public/static/index/default/css/user.index.css +++ b/public/static/index/default/css/user.index.css @@ -2,7 +2,7 @@ * 用户中心 */ .user-base, ul.order-base{overflow: hidden;} -.user-base{-webkit-animation: changeBg 20s infinite; -moz-animation: changeBg 20s infinite; animation: changeBg 20s infinite; background-color: #ED5564; background-image: url(../images/member_top_bg.png); background-size: cover; width: 100%; position: relative; padding: 20px 10px;} +.user-base{-webkit-animation: changeBg 20s infinite; -moz-animation: changeBg 20s infinite; animation: changeBg 20s infinite; background-color: #ED5564; background-image: url(../images/user-member_top_bg.png); background-size: cover; width: 100%; position: relative; padding: 20px 10px;} .user-base p, .user-base span, .user-base a{color: #fff;} .user-base a, .order-base a, .order-nav a{text-decoration: none;} .user-avatar{text-align: center;} diff --git a/public/static/index/default/css/useraddress.css b/public/static/index/default/css/useraddress.css index acf79e9d4b179b904af99c00c74643857895ed57..4897667bc85a8c5e5b2a1e46e862a59a337a2a01 100755 --- a/public/static/index/default/css/useraddress.css +++ b/public/static/index/default/css/useraddress.css @@ -17,7 +17,7 @@ ul.address-list li .user-base { } ul.address-list li.address-default { - background-image: url(../images/peraddressbg.png); + background-image: url(../images/address-peraddressbg.png); } ul.address-list li { @@ -25,7 +25,7 @@ ul.address-list li .user-base { width: calc(50% - 5px); height: 130px; float: left; - background-image: url(../images/peraddbg.png); + background-image: url(../images/address-peraddbg.png); background-repeat: no-repeat; background-size: 100% 100%; margin: 0 10px 10px 0; diff --git a/public/static/index/default/images/addicon.png b/public/static/index/default/images/addicon.png deleted file mode 100755 index cfcd807fd63e4e9c37036174fc9174e1e296666b..0000000000000000000000000000000000000000 Binary files a/public/static/index/default/images/addicon.png and /dev/null differ diff --git a/public/static/index/default/images/peraddbg.png b/public/static/index/default/images/address-peraddbg.png similarity index 100% rename from public/static/index/default/images/peraddbg.png rename to public/static/index/default/images/address-peraddbg.png diff --git a/public/static/index/default/images/peraddressbg.png b/public/static/index/default/images/address-peraddressbg.png similarity index 100% rename from public/static/index/default/images/peraddressbg.png rename to public/static/index/default/images/address-peraddressbg.png diff --git a/public/static/index/default/images/peraddress.png b/public/static/index/default/images/buy-peraddress.png similarity index 100% rename from public/static/index/default/images/peraddress.png rename to public/static/index/default/images/buy-peraddress.png diff --git a/public/static/index/default/images/checkbox.gif b/public/static/index/default/images/checkbox.gif deleted file mode 100755 index a91b3866512ae0ea40000bd1bb4f920a5b73e458..0000000000000000000000000000000000000000 Binary files a/public/static/index/default/images/checkbox.gif and /dev/null differ diff --git a/public/static/index/default/images/default-user-avatar-s.jpg b/public/static/index/default/images/default-user-avatar-s.jpg deleted file mode 100755 index fce14d5f96a664d5c42116b398f4087204678ba3..0000000000000000000000000000000000000000 Binary files a/public/static/index/default/images/default-user-avatar-s.jpg and /dev/null differ diff --git a/public/static/index/default/images/mask.png b/public/static/index/default/images/goods-mask.png similarity index 100% rename from public/static/index/default/images/mask.png rename to public/static/index/default/images/goods-mask.png diff --git a/public/static/index/default/images/goods_meta_bg.png b/public/static/index/default/images/goods-meta-bg.png similarity index 100% rename from public/static/index/default/images/goods_meta_bg.png rename to public/static/index/default/images/goods-meta-bg.png diff --git a/public/static/index/default/images/home-mini-nav-cart-icon.png b/public/static/index/default/images/home-mini-nav-cart-icon.png deleted file mode 100755 index 72bccfa6f0204a7e35a12f308815c5fbd1ae1503..0000000000000000000000000000000000000000 Binary files a/public/static/index/default/images/home-mini-nav-cart-icon.png and /dev/null differ diff --git a/public/static/index/default/images/home-mini-nav-category-icon.png b/public/static/index/default/images/home-mini-nav-category-icon.png deleted file mode 100755 index 0388491450174b303d89a6c8ff7cf205726110d2..0000000000000000000000000000000000000000 Binary files a/public/static/index/default/images/home-mini-nav-category-icon.png and /dev/null differ diff --git a/public/static/index/default/images/home-mini-nav-order-icon.png b/public/static/index/default/images/home-mini-nav-order-icon.png deleted file mode 100755 index a3172aaf7c4f7c07ebdfd70db39c8827ea847cac..0000000000000000000000000000000000000000 Binary files a/public/static/index/default/images/home-mini-nav-order-icon.png and /dev/null differ diff --git a/public/static/index/default/images/home-mini-nav-seconds-icon.png b/public/static/index/default/images/home-mini-nav-seconds-icon.png deleted file mode 100755 index d6610ad0372e9b6989f4ffe55ade4c0927a4d1b5..0000000000000000000000000000000000000000 Binary files a/public/static/index/default/images/home-mini-nav-seconds-icon.png and /dev/null differ diff --git a/public/static/index/default/images/home-mini-nav-user-icon.png b/public/static/index/default/images/home-mini-nav-user-icon.png deleted file mode 100755 index 427e894881d3002effa6de8112af761499afd47c..0000000000000000000000000000000000000000 Binary files a/public/static/index/default/images/home-mini-nav-user-icon.png and /dev/null differ diff --git a/public/static/index/default/images/ibar_sprites.png b/public/static/index/default/images/ibar_sprites.png deleted file mode 100755 index 03741355e78a725ac5110b69bf1b1f05ec12396e..0000000000000000000000000000000000000000 Binary files a/public/static/index/default/images/ibar_sprites.png and /dev/null differ diff --git a/public/static/index/default/images/icon-sale.png b/public/static/index/default/images/icon-sale.png deleted file mode 100755 index eef3fd29f36227ea4fa8388fb40948be3100e2b8..0000000000000000000000000000000000000000 Binary files a/public/static/index/default/images/icon-sale.png and /dev/null differ diff --git a/public/static/index/default/images/nav-icon-cart-active.png b/public/static/index/default/images/nav-icon-cart-active.png new file mode 100755 index 0000000000000000000000000000000000000000..34b341f6d860d855a8bd530190ff25fd26e07b6b Binary files /dev/null and b/public/static/index/default/images/nav-icon-cart-active.png differ diff --git a/public/static/index/default/images/nav-icon-cart.png b/public/static/index/default/images/nav-icon-cart.png new file mode 100644 index 0000000000000000000000000000000000000000..15b0208f4c5e69151f1861c3cc0b72c32c0eb143 Binary files /dev/null and b/public/static/index/default/images/nav-icon-cart.png differ diff --git a/public/static/index/default/images/nav-icon-category-active.png b/public/static/index/default/images/nav-icon-category-active.png new file mode 100755 index 0000000000000000000000000000000000000000..8db743b75a12b0b42834db38f86cb9bf8e3f6a6e Binary files /dev/null and b/public/static/index/default/images/nav-icon-category-active.png differ diff --git a/public/static/index/default/images/nav-icon-category.png b/public/static/index/default/images/nav-icon-category.png new file mode 100755 index 0000000000000000000000000000000000000000..b0464d183378aa0d71b9ba2b0f4e1340084e8069 Binary files /dev/null and b/public/static/index/default/images/nav-icon-category.png differ diff --git a/public/static/index/default/images/nav-icon-home-active.png b/public/static/index/default/images/nav-icon-home-active.png new file mode 100755 index 0000000000000000000000000000000000000000..3d62e91145617aef694777a2608af2aedf039de1 Binary files /dev/null and b/public/static/index/default/images/nav-icon-home-active.png differ diff --git a/public/static/index/default/images/nav-icon-home.png b/public/static/index/default/images/nav-icon-home.png new file mode 100755 index 0000000000000000000000000000000000000000..b90a704e368293557df88f8557660ccb03c16a35 Binary files /dev/null and b/public/static/index/default/images/nav-icon-home.png differ diff --git a/public/static/index/default/images/nav-icon-user-active.png b/public/static/index/default/images/nav-icon-user-active.png new file mode 100755 index 0000000000000000000000000000000000000000..2ef2eaef090abd3343d5a78b73b9caddf914ceb1 Binary files /dev/null and b/public/static/index/default/images/nav-icon-user-active.png differ diff --git a/public/static/index/default/images/nav-icon-user.png b/public/static/index/default/images/nav-icon-user.png new file mode 100755 index 0000000000000000000000000000000000000000..e8531f430675863e5853baf30423f7098b5e1731 Binary files /dev/null and b/public/static/index/default/images/nav-icon-user.png differ diff --git a/public/static/index/default/images/sale-t.jpg b/public/static/index/default/images/sale-t.jpg deleted file mode 100755 index 3a9ce655b7f10fcd61bfe46e8252520d3dc5a266..0000000000000000000000000000000000000000 Binary files a/public/static/index/default/images/sale-t.jpg and /dev/null differ diff --git a/public/static/index/default/images/sale-t_clock.jpg b/public/static/index/default/images/sale-t_clock.jpg deleted file mode 100755 index 3968a588f3f17d589d10069a6a001ed23b336431..0000000000000000000000000000000000000000 Binary files a/public/static/index/default/images/sale-t_clock.jpg and /dev/null differ diff --git a/public/static/index/default/images/close.png b/public/static/index/default/images/search-close.png similarity index 100% rename from public/static/index/default/images/close.png rename to public/static/index/default/images/search-close.png diff --git a/public/static/index/default/images/sys_item_selected.gif b/public/static/index/default/images/sys-item-selected.gif similarity index 100% rename from public/static/index/default/images/sys_item_selected.gif rename to public/static/index/default/images/sys-item-selected.gif diff --git a/public/static/index/default/images/member_top_bg.png b/public/static/index/default/images/user-member_top_bg.png similarity index 100% rename from public/static/index/default/images/member_top_bg.png rename to public/static/index/default/images/user-member_top_bg.png