From adf8d404b228bf62cbbcdd1dd7773d5a8c5e3a0e Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Thu, 11 Oct 2018 01:41:55 +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 --- .../Home/View/Default/Cart/Index.html | 4 + .../Home/View/Default/Category/Index.html | 4 + .../Home/View/Default/Index/Index.html | 156 +++++++++--------- .../Home/View/Default/Public/Common.html | 11 -- .../Home/View/Default/Public/Nav.html | 10 +- .../Home/View/Default/Public/NavBar.html | 1 - .../Home/View/Default/Public/UserNav.html | 25 --- .../Home/View/Default/User/Index.html | 4 + .../Application/Service/BuyService.class.php | 4 + service/Public/Home/Default/Css/Cart.css | 4 +- service/Public/Home/Default/Css/Category.css | 3 + service/Public/Home/Default/Css/Common.css | 15 +- service/Public/Home/Default/Css/Index.css | 2 +- .../Public/Home/Default/Css/User.Index.css | 3 + .../Images/home-mini-nav-cart-icon.png | Bin 0 -> 894 bytes .../Images/home-mini-nav-category-icon.png | Bin 0 -> 730 bytes .../Images/home-mini-nav-seconds-icon.png | Bin 0 -> 3391 bytes .../Images/home-mini-nav-user-icon.png | Bin 0 -> 879 bytes service/Public/Home/Default/Js/Cart.js | 5 +- 19 files changed, 119 insertions(+), 132 deletions(-) delete mode 100755 service/Application/Home/View/Default/Public/Common.html delete mode 100755 service/Application/Home/View/Default/Public/NavBar.html delete mode 100755 service/Application/Home/View/Default/Public/UserNav.html create mode 100644 service/Public/Home/Default/Css/User.Index.css create mode 100755 service/Public/Home/Default/Images/home-mini-nav-cart-icon.png create mode 100755 service/Public/Home/Default/Images/home-mini-nav-category-icon.png create mode 100755 service/Public/Home/Default/Images/home-mini-nav-seconds-icon.png create mode 100755 service/Public/Home/Default/Images/home-mini-nav-user-icon.png 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;"> -
-
- - - - - - {{:mb_substr($category['name'], 0, 4, 'utf-8')}} - - - - - -
- -
-
{{$floor.describe}}
-
- - - - -
-
- - - -
am-u-sm-7 am-u-md-4 text-twoam-u-sm-6 am-u-md-2 text-three sug big last"> -
-
- style="color:{{$goods.title_color}};">{{$goods.title}} -
-
￥{{$goods.price}}
-
- - - -
- - + + 更多 +
- - - -
-
+ +
style="background-color:{{$floor.bg_color}};"style="background-color:#eaeaea;"> +
+
+ + + + + + {{:mb_substr($category['name'], 0, 4, 'utf-8')}} + + + + + +
+ +
+
{{$floor.describe}}
+
+ + + + +
+
- - - + + +
am-u-sm-7 am-u-md-4 text-twoam-u-sm-6 am-u-md-2 text-three sug big last"> +
+
+ style="color:{{$goods.title_color}};">{{$goods.title}} +
+
￥{{$goods.price}}
+
+ + + +
+ + +
+
+ + + +
- \ 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')}}
-
- {{:L('common_operation_cancel')}} - {{:L('common_operation_confirm')}} -
-
-
- \ 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 @@ -
-
  • +
    +
  • class="active"> 首页
    • -
  • +
  • class="active"> 分类
    • -
  • +
  • class="active"> href="javascript:;" class="login-event" href="{{:U('Home/Cart/Index')}}">购物车
    • -
  • +
  • class="active"> href="javascript:;" class="login-event" href="{{:U('Home/User/Index')}}">我的
    • \ 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 0000000000000000000000000000000000000000..72bccfa6f0204a7e35a12f308815c5fbd1ae1503 GIT binary patch literal 894 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S903?%u>HW~mamUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIA=0X`wFKADC8NddnOcea4cFA4GsX1M!qw^FE}u}j*SRUI?SxANG9GcYh+ z^mK6yi8#D9vb(57fybm_&!NZv|8EoBu{x}^W5Vv8Gs{X`PvlM8pd;+8VBI3$wkFr6 zO_ojeKl|jx3x0A&_cu*b&oR$&Tk`n6$AucNZ3(m9XkJj{jXv9Ojq}!-hG{v?$25&6 z{W$#Nw1fJ&3wnHA#cb;rFL+#aX;tEdbj_y38xJR$JWu$zc;|rxZtgPfyvv&k|M2$z zGoMpzcbDn^Lf<%+wOcP`aW6a~7IZ>{+fh99(1+{)%ide^s{46Y#Pj{>J@N7T(*yVR z?5K|Adr}%#FQT>QnnmGvpF2SdKMU&xzqbw+jQFm8Z`JbohmYD{+QVzg`^&2OD@R70 zX41vAtKa>cH7n>txY45b9G{OLkCQxEe)?8%b!yA?W1(u%`!`7MTNN|cXwfURlSk_o zU*1r5)6n61%Hy?WZ;!n961&aFE1kPLc4>z0Iv>yF&=TDNt!$v)T4r1MtSE}9)@ znY-j(f{(W96At1uE+hegt`Aof5qbcQ~6AiM> zTQXyhR*9UN^oi@XWYyvsjnfw9tucG6{(Gj=(pN`rO+GPia+|Pwa(BDYYQrP)Zb6l- zhs`cL)=71KA}XDI)Bm&0vhc#(d!O^>$cdSHN-0NAe;7Dtl|+Axh27HJXVqW6G%9~N zy(RE`=9*cRchA2OaqyY_=7iHbD_ibK#ix5WEssB7b=jnPb7z~>T~(hK5qD&Ldk*Q@ zMoTlv-{P};H|bMwL|(`}x1CxUq6@BVv6$uLywdBXlJ@s>!&R5I+w3`XYg$`B$MiF% zER{tp8xQUM&oOoGLspY*dwXrw81Mbowop+z`l6e8%X$%m@{jIU-+W}&bn5NSbFcJW zxopSMj*_d7_Xlh_Q0;AVS4WOPcG@1cRYxywdF5DG*JNuH{rqzGsZHF!c`7GvyF2@j z-mmlrE9OmEHm8C&cEak-yds>n>f5zl_7CJQ={Drfyf)=KFx@kFy85}S Ib4q9e0Hln+B>(^b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0388491450174b303d89a6c8ff7cf205726110d2 GIT binary patch literal 730 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S913?xsr#TWu9g8-ipSD(zn|D=FlhdWz$VIGOkSQYjv*CsZ?7@7hy+Tof3UxM!uQ*aC+~tx zt&WIpdlThZv_*8f1nX7JKAlH7jcfUGJw$JLsdO!L4)YM=^z`J~Eih*?FP}?UQhD+1 zzq2cky?Ik*oZrvA#Xgzm-@Tsm-=9@S@YXI}qMf=>+t}6k^If2r}dW|ynk+PqFH0k*4M$ya+$&<9vNvc)tSy#EBLeU zPV!~n#m2IZ+srQb9}Zu#_t94WzLUMt3ej~@`nxlA4+?Bg*dX>sOS;4G49B`jY^U7n+OkBfo!6=BG zk15Liz4?NICPr3`7o5M`d{!Je^`$3lLD{c^z5eTNu77b-lkxvdySKNq6Zb9upxo?~ zeW&G;-7h2!W``sAd?o%{8VKPiiP^ykbDhfQ`HyZ%pJCls=9lf(ULjhFVD r3Kgqwx6Io2KknYwONY9?{$=$ld>^P2z4R+E!7+Hc`njxgN@xNAwH##X literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d6610ad0372e9b6989f4ffe55ade4c0927a4d1b5 GIT binary patch literal 3391 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 literal 0 HcmV?d00001 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%"}); }