diff --git a/service/Application/Home/View/Default/Cart/Index.html b/service/Application/Home/View/Default/Cart/Index.html index 5ecfba293..ddc24b3d9 100755 --- a/service/Application/Home/View/Default/Cart/Index.html +++ b/service/Application/Home/View/Default/Cart/Index.html @@ -124,6 +124,10 @@ + + + + diff --git a/service/Application/Home/View/Default/Category/Index.html b/service/Application/Home/View/Default/Category/Index.html index 75d9ea9c6..8462fed6f 100755 --- a/service/Application/Home/View/Default/Category/Index.html +++ b/service/Application/Home/View/Default/Category/Index.html @@ -49,6 +49,10 @@ + + + + \ No newline at end of file diff --git a/service/Application/Home/View/Default/Index/Index.html b/service/Application/Home/View/Default/Index/Index.html index 9dc06103b..3904e7201 100755 --- a/service/Application/Home/View/Default/Index/Index.html +++ b/service/Application/Home/View/Default/Index/Index.html @@ -113,89 +113,87 @@ -
-
- - - - -
-
-
-

{{$floor.name}}

-

{{$floor.vice_name}}

-
- - - - - - {{$categorys.name}} - - - - - -
- - 更多 - +
+ + + + +
+
+
+

{{$floor.name}}

+

{{$floor.vice_name}}

+
+ + + + + + {{$categorys.name}} + + + + +
-
- -
style="background-color:{{$floor.bg_color}};"style="background-color:#eaeaea;"> - - - - -
am-u-sm-7 am-u-md-4 text-twoam-u-sm-6 am-u-md-2 text-three sug big last"> - - - - -
-
-
+ + 更多 +
- - - -
-
+ +
style="background-color:{{$floor.bg_color}};"style="background-color:#eaeaea;"> + - - - + + +
am-u-sm-7 am-u-md-4 text-twoam-u-sm-6 am-u-md-2 text-three sug big last"> + + + + +
+
+
+
+
+ + + +
- \ No newline at end of file + + + + + \ No newline at end of file diff --git a/service/Application/Home/View/Default/Public/Common.html b/service/Application/Home/View/Default/Public/Common.html deleted file mode 100755 index ad26c4e05..000000000 --- a/service/Application/Home/View/Default/Public/Common.html +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-
{{:L('common_delete_tips')}}
- -
-
- \ No newline at end of file diff --git a/service/Application/Home/View/Default/Public/Nav.html b/service/Application/Home/View/Default/Public/Nav.html index 220235671..88075a85f 100755 --- a/service/Application/Home/View/Default/Public/Nav.html +++ b/service/Application/Home/View/Default/Public/Nav.html @@ -1,14 +1,14 @@ - \ No newline at end of file diff --git a/service/Application/Home/View/Default/Public/NavBar.html b/service/Application/Home/View/Default/Public/NavBar.html deleted file mode 100755 index 5f836517a..000000000 --- a/service/Application/Home/View/Default/Public/NavBar.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/service/Application/Home/View/Default/Public/UserNav.html b/service/Application/Home/View/Default/Public/UserNav.html deleted file mode 100755 index 59a09947d..000000000 --- a/service/Application/Home/View/Default/Public/UserNav.html +++ /dev/null @@ -1,25 +0,0 @@ -
- - - {{:L('common_login_text')}} - - - {{:L('common_reg_text')}} - - {{:L('common_reg_text')}} - - -
- - -
-
-
\ No newline at end of file diff --git a/service/Application/Home/View/Default/User/Index.html b/service/Application/Home/View/Default/User/Index.html index 7709b0a61..3ecf61717 100755 --- a/service/Application/Home/View/Default/User/Index.html +++ b/service/Application/Home/View/Default/User/Index.html @@ -28,6 +28,10 @@
+ + + + \ No newline at end of file diff --git a/service/Application/Service/BuyService.class.php b/service/Application/Service/BuyService.class.php index 22591f7b3..909e55030 100755 --- a/service/Application/Service/BuyService.class.php +++ b/service/Application/Service/BuyService.class.php @@ -86,6 +86,10 @@ class BuyService } else { $data['upd_time'] = time(); $data['stock'] += $temp['stock']; + if($data['stock'] > $goods['inventory']) + { + $data['stock'] = $goods['inventory']; + } if($m->where($where)->save($data)) { return DataReturn(L('common_join_success'), 0, self::CartTotal($params)); diff --git a/service/Public/Home/Default/Css/Cart.css b/service/Public/Home/Default/Css/Cart.css index edbe38191..453b02d2f 100755 --- a/service/Public/Home/Default/Css/Cart.css +++ b/service/Public/Home/Default/Css/Cart.css @@ -46,7 +46,7 @@ strong.total-price-content, .selected-tips strong, .nav-total-price { color: #d2 .nav-right { width: 70%; } .cart-nav, .nav-left, .nav-right { overflow: hidden; } .nav-right .nav-total-price { display: block; - width: calc(100% - 120px); height: 30px; -o-text-overflow: ellipsis; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; } + width: calc(100% - 122px); height: 30px; -o-text-overflow: ellipsis; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; } .cart-nav .separate-submit { float: right; width: 80px; } .wap-base { padding-left: 20px; } @@ -54,4 +54,6 @@ strong.total-price-content, .selected-tips strong, .nav-total-price { color: #d2 .goods-detail img { width: 40px; height: 40px; } .goods-base { margin-left: 45px; } .stock-tag { width: 85px; } + + .am-footer { padding-bottom: 55px; } } \ No newline at end of file diff --git a/service/Public/Home/Default/Css/Category.css b/service/Public/Home/Default/Css/Category.css index 9fec0f835..a5cba1517 100755 --- a/service/Public/Home/Default/Css/Category.css +++ b/service/Public/Home/Default/Css/Category.css @@ -10,4 +10,7 @@ } @media only screen and (max-width:1025px) { .am-accordion-gapped { margin: 0 5px; } +} +@media only screen and (max-width:640px) { + .am-footer { padding-bottom: 55px; } } \ No newline at end of file diff --git a/service/Public/Home/Default/Css/Common.css b/service/Public/Home/Default/Css/Common.css index 54cdbc208..752fbd29d 100755 --- a/service/Public/Home/Default/Css/Common.css +++ b/service/Public/Home/Default/Css/Common.css @@ -107,10 +107,11 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px ;} .tip{ display:none} -.navCir{position: fixed;bottom:0px ;width: 100%;z-index: 999;background:#fff ;} -.navCir li{width: 25%;padding:5px ;background:#fff ;border-top:1px solid #f5f5f5 ;float: left;text-align: center;font-size: 14px;} -.navCir li i{display: block;font-size: 18px;} -.navCir li.active a{color:#d2364c ;} +.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;} +.mobile-navigation li a { text-decoration: none; } +.mobile-navigation li i{display: block;font-size: 16px;} +.mobile-navigation li.active a{color:#d2364c ;} @media only screen and (max-width: 640px) { @@ -135,7 +136,7 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px ;} #ai-topsearch {height: 36px;} .search-bar input {width: 80%;height:36px;} .classified{display:none;} - .navCir{display:none;} + .mobile-navigation{display:none;} .nav-search{ position:relative;top:0px;z-index:0;margin-bottom: 5px;margin-top: 5px;} #ai-topsearch{ font-size:18px;height: 36px;} /*底部*/ @@ -179,7 +180,7 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px ;} .nav-cont li a {font-size: 16px;color: #333;line-height: 36px;margin-left: -1px;padding: 0 25px;text-decoration: none;font-weight: 700;display: inline-block;vertical-align: middle;} .nav-cont li a:hover { color:#d2364c; } - .nav-cont .nav-extra{position: absolute;right:0px ;top:6px;font-size: 16px;line-height:33px;height:33px ;width:120px;text-align:center;background: #e1363f;cursor: pointer;} + .nav-cont .nav-extra{position: absolute;right:0px ;top:6px;font-size: 14px;line-height:33px;height:33px ;width:110px;text-align:center;background: #e1363f;cursor: pointer;} .nav-cont .nav-extra .nav-user{background:#e0313b; width: 33px;height: 33px;border-radius: 33px;position: absolute;left:-28px;z-index: 2;padding: 1px;overflow: hidden;} .nav-cont .nav-extra b{display:block;position: absolute;width: 40px;height: 40px;border-radius:45px;z-index: 1;left: -31px;top: -4px;background: #fff;} .nav-cont .nav-extra .am-icon-angle-right { margin-left: 5px; } @@ -651,7 +652,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23 /** * 用户中心布局样式 */ -.user-menu {position:fixed;z-index:10;bottom:30px;right:20px;} +.user-menu {position:fixed;z-index:10;bottom:70px;right:10px;} .user-sidebar {width:145px;min-height:100%;float:left;} .user-sidebar .am-active {z-index:1600;} .user-sidebar .am-active a, .user-sidebar-list li a:hover {background:#fff1f5; text-decoration: none; color: #d2364c; } diff --git a/service/Public/Home/Default/Css/Index.css b/service/Public/Home/Default/Css/Index.css index 44d6f6d7b..a1822677a 100755 --- a/service/Public/Home/Default/Css/Index.css +++ b/service/Public/Home/Default/Css/Index.css @@ -146,7 +146,7 @@ text-align: center;float:none} .items-nav-title{background: #fff;} .hmtop{background: #fff;} .am-container {padding-left:0px;padding-right:0px ;} - .shopMainbg{width:100%;background:#fff;overflow:visible;} + .home-floor{width:100%;background:#fff;overflow:visible;} /*主题布局*/ .pro-title{ font-size:14px;} diff --git a/service/Public/Home/Default/Css/User.Index.css b/service/Public/Home/Default/Css/User.Index.css new file mode 100644 index 000000000..f36c3bcb1 --- /dev/null +++ b/service/Public/Home/Default/Css/User.Index.css @@ -0,0 +1,3 @@ +@media only screen and (max-width:640px) { + .am-footer { padding-bottom: 55px; } +} \ No newline at end of file diff --git a/service/Public/Home/Default/Images/home-mini-nav-cart-icon.png b/service/Public/Home/Default/Images/home-mini-nav-cart-icon.png new file mode 100755 index 000000000..72bccfa6f Binary files /dev/null and b/service/Public/Home/Default/Images/home-mini-nav-cart-icon.png differ diff --git a/service/Public/Home/Default/Images/home-mini-nav-category-icon.png b/service/Public/Home/Default/Images/home-mini-nav-category-icon.png new file mode 100755 index 000000000..038849145 Binary files /dev/null and b/service/Public/Home/Default/Images/home-mini-nav-category-icon.png differ diff --git a/service/Public/Home/Default/Images/home-mini-nav-seconds-icon.png b/service/Public/Home/Default/Images/home-mini-nav-seconds-icon.png new file mode 100755 index 000000000..d6610ad03 Binary files /dev/null and b/service/Public/Home/Default/Images/home-mini-nav-seconds-icon.png differ diff --git a/service/Public/Home/Default/Images/home-mini-nav-user-icon.png b/service/Public/Home/Default/Images/home-mini-nav-user-icon.png new file mode 100755 index 000000000..427e89488 Binary files /dev/null and b/service/Public/Home/Default/Images/home-mini-nav-user-icon.png differ diff --git a/service/Public/Home/Default/Js/Cart.js b/service/Public/Home/Default/Js/Cart.js index c41bc1661..386cf668f 100755 --- a/service/Public/Home/Default/Js/Cart.js +++ b/service/Public/Home/Default/Js/Cart.js @@ -121,10 +121,11 @@ $(function() function cart_nav_pop() { var scroll = $(document).scrollTop(); - var location = scroll+$(window).height(); + var location = scroll+$(window).height()-65; + var bottom = ($(window).width() < 640) ? '49px' : '0'; if(location < nav_top) { - $('.cart-nav').css({"position":"fixed", "bottom":0, "width":$('.cart-content').width()+"px", "z-index":1000}); + $('.cart-nav').css({"position":"fixed", "bottom":bottom, "width":$('.cart-content').width()+"px", "z-index":1000}); } else { $('.cart-nav').css({"position":"relative", "bottom":0, "z-index":0, "width":"100%"}); }