From b64cd255986de6d5d8916bcc0d311570c6a5d221 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Mon, 8 Oct 2018 01:17:51 +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            |  6 +++---
 service/Public/Home/Default/Css/Cart.css         | 16 +++++++++++-----
 service/Public/Home/Default/Css/Goods.css        |  2 +-
 service/Public/Home/Default/Js/Cart.js           |  2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/service/Application/Home/View/Default/Cart/Index.html b/service/Application/Home/View/Default/Cart/Index.html
index 532180fec..ddc7adcc2 100755
--- a/service/Application/Home/View/Default/Cart/Index.html
+++ b/service/Application/Home/View/Default/Cart/Index.html
@@ -21,7 +21,7 @@
                 <tr>
                     <th>商品信息</th>
                     <th class="am-hide-sm-only">单价</th>
-                    <th class="am-hide-sm-only">数量</th>
+                    <th>数量</th>
                     <th class="am-hide-sm-only">金额</th>
                     <th>操作</th>
                 </tr>
@@ -60,10 +60,10 @@
                             </if>
                             <p class="line-price">￥{{$goods.price}}</p>
                         </td>
-                        <td class="number am-hide-sm-only">
+                        <td class="number">
                             <div class="am-input-group am-input-group-sm stock-tag" data-inventory="{{$goods.inventory}}" data-price="{{$goods.price}}" data-ajax-url="{{:U('Home/Cart/Stock')}}">
                                 <span class="am-input-group-label <if condition="$goods['is_shelves'] eq 1 and $goods['is_delete_time'] eq 0">stock-submit</if>" data-type="min">-</span>
-                                <input type="text" class="am-form-field" value="{{$goods.stock}}" <if condition="$goods['is_shelves'] neq 1 or $goods['is_delete_time'] neq 0">disabled</if> />
+                                <input type="number" class="am-form-field" value="{{$goods.stock}}" <if condition="$goods['is_shelves'] neq 1 or $goods['is_delete_time'] neq 0">disabled</if> />
                                 <span class="am-input-group-label <if condition="$goods['is_shelves'] eq 1 and $goods['is_delete_time'] eq 0">stock-submit</if>" data-type="add">+</span>
                             </div>
                             <if condition="$goods['is_shelves'] neq 1">
diff --git a/service/Public/Home/Default/Css/Cart.css b/service/Public/Home/Default/Css/Cart.css
index 4f653e781..edbe38191 100755
--- a/service/Public/Home/Default/Css/Cart.css
+++ b/service/Public/Home/Default/Css/Cart.css
@@ -1,8 +1,8 @@
-.goods-detail img { width: 80px; height: 80px; }
-.goods-detail { position: relative; margin-left: 20px; }
+.goods-detail img { width: 80px; height: 80px; position: absolute; }
+.goods-detail { position: relative; margin-left: 18px; min-height: 80px; }
 .goods-title { display: block; max-height: 36px; overflow: hidden; text-overflow: ellipsis; }
 .goods-title:hover { text-decoration: underline; }
-.goods-base { position: absolute; top: 0; left: 85px; }
+.goods-base { float: left; top: 0; margin-left: 85px; }
 .goods-attr { margin-top: 5px;  }
 .goods-attr li { color: #888; line-height: 16px; }
 .original-price, .line-price { font-family: Verdana,Tahoma,arial; }
@@ -13,7 +13,8 @@
 .stock-tag .am-form-field { padding: 3px; height: 25px; text-align: center; font-size: 16px !important; }
 .stock-tag .am-input-group-label { line-height: 23px; height: 25px; font-size: 14px !important; padding: 0 10px; }
 .stock-tag .am-input-group-label, .cart-nav label { cursor: pointer; }
-strong.total-price-content, .selected-tips strong, .nav-total-price { color: #d2364c; font-size: 16px; }
+.selected-tips strong, .nav-total-price { font-size: 16px; }
+strong.total-price-content, .selected-tips strong, .nav-total-price { color: #d2364c; }
 .am-table { margin-bottom: 10px; }
 .am-table > tbody > tr > td { border-top: 1px solid #F5F5F5; }
 .cart-content table td.base input[type="checkbox"] { float: left; }
@@ -37,7 +38,7 @@ strong.total-price-content, .selected-tips strong, .nav-total-price { color: #d2
 }
 
 @media only screen and (max-width:640px)  {
-    .cart-content table tr .base { width: 85%; }
+    .cart-content table tr .base { width: 55%; }
     .selected-tips { display: none; }
     .am-footer { margin-top: 10px; }
 
@@ -48,4 +49,9 @@ strong.total-price-content, .selected-tips strong, .nav-total-price { color: #d2
     width: calc(100% - 120px); 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; }
+
+    .goods-detail { min-height: 40px; }
+    .goods-detail img { width: 40px; height: 40px; }
+    .goods-base { margin-left: 45px; }
+    .stock-tag { width: 85px; }
 }
\ No newline at end of file
diff --git a/service/Public/Home/Default/Css/Goods.css b/service/Public/Home/Default/Css/Goods.css
index cf94de5f5..7894800a9 100755
--- a/service/Public/Home/Default/Css/Goods.css
+++ b/service/Public/Home/Default/Css/Goods.css
@@ -15,7 +15,7 @@ input{font-size:12px;font-size:100%;outline:none;line-height:normal;color:#444;}
 .theme-poptit{padding:12px;position:relative;overflow: hidden;background:#fff ;height:80px ;}
 .theme-poptit .close{float:right;color:#999;padding:5px;margin:-2px -5px -5px;font:bold 14px/14px simsun;text-shadow:0 1px 0 #ddd}
 .theme-poptit .close:hover{color:#444;}
-.theme-popover .confirm { background-color: #d2364c; border-color: #d2364c; color: #fff; }
+.theme-popover .confirm { background-color: #d2364c; border-color: #d2364c; color: #fff !important; }
 
 /* 轮播 */
 .scoll { margin-bottom: 10px; }
diff --git a/service/Public/Home/Default/Js/Cart.js b/service/Public/Home/Default/Js/Cart.js
index 9fc119276..c41bc1661 100755
--- a/service/Public/Home/Default/Js/Cart.js
+++ b/service/Public/Home/Default/Js/Cart.js
@@ -126,7 +126,7 @@ $(function()
         {
             $('.cart-nav').css({"position":"fixed", "bottom":0, "width":$('.cart-content').width()+"px", "z-index":1000});
         } else {
-            $('.cart-nav').css({"position":"relative", "bottom":0, "z-index":0});
+            $('.cart-nav').css({"position":"relative", "bottom":0, "z-index":0, "width":"100%"});
         }
     }
     cart_nav_pop();