diff --git a/service/Application/Home/Controller/CartController.class.php b/service/Application/Home/Controller/CartController.class.php
new file mode 100644
index 000000000..85c2f5635
--- /dev/null
+++ b/service/Application/Home/Controller/CartController.class.php
@@ -0,0 +1,42 @@
+display('Index');
+ }
+}
+?>
\ No newline at end of file
diff --git a/service/Application/Home/View/Default/Cart/Index.html b/service/Application/Home/View/Default/Cart/Index.html
new file mode 100644
index 000000000..5a0794518
--- /dev/null
+++ b/service/Application/Home/View/Default/Cart/Index.html
@@ -0,0 +1,174 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已选商品 0 件
+ 合计：
+ ￥2131234
+
+
+
+
- ¥{{$goods.price}}
- 库存{{$goods.inventory}}{{$goods.inventory_unit}}
+ ¥{{$goods.price}}
diff --git a/service/Application/Home/View/Default/Public/HeaderTopNav.html b/service/Application/Home/View/Default/Public/HeaderTopNav.html
index 60be330b4..57de50036 100755
--- a/service/Application/Home/View/Default/Public/HeaderTopNav.html
+++ b/service/Application/Home/View/Default/Public/HeaderTopNav.html
@@ -27,7 +27,7 @@
-
+
diff --git a/service/Public/Home/Default/Css/Cart.css b/service/Public/Home/Default/Css/Cart.css
new file mode 100644
index 000000000..c1728e4a1
--- /dev/null
+++ b/service/Public/Home/Default/Css/Cart.css
@@ -0,0 +1,41 @@
+.goods-detail img { width: 80px; height: 80px; }
+.goods-detail { position: relative; margin-left: 15px; }
+.goods-title { display: block; max-height: 36px; overflow: hidden; text-overflow: ellipsis; }
+.goods-title, .goods-attr li, .original-price, .operation a, .wap-number, .selected-tips, .cart-nav a, .total-price-tips, .cart-nav label { font-size: 12px; }
+.goods-title:hover { text-decoration: underline; }
+.goods-base { position: absolute; top: 0; left: 85px; }
+.goods-attr { margin-top: 5px; }
+.goods-attr li { color: #888; line-height: 16px; }
+.original-price, .line-price { font-family: Verdana,Tahoma,arial; }
+.original-price { color: #9c9c9c; text-decoration: line-through; }
+.line-price { color: #3c3c3c; }
+.line-price, strong.total-price-content, .nav-total-price { font-weight: 700; }
+.number-tag { width: 100px; }
+.number-tag .am-form-field { padding: 3px; height: 25px; text-align: center; font-size: 16px !important; }
+.number-tag .am-input-group-label { line-height: 23px; height: 25px; font-size: 14px !important; padding: 0 10px; }
+.number-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; }
+.operation a { display: block; }
+.am-table > tbody > tr > td { border-top: 1px solid #F5F5F5; }
+.cart-content table td.base input[type="checkbox"] { float: left; }
+
+.cart-nav { background: #eee; height: 50px; line-height: 50px; padding: 0 5px; }
+.cart-nav .separate-submit { height: 50px; width: 100px; font-size: 20px; }
+.selected-tips { margin-right: 15px; }
+.cart-nav label { font-weight: 100; }
+.cart-nav input[type="checkbox"] { vertical-align: inherit; }
+.cart-nav .delete-submit-all { margin-left: 10px; }
+
+@media only screen and (min-width:640px) {
+ .cart-content table tr .base { width: 30%; }
+ .cart-content table tr .price { width: 15%; }
+ .cart-content table tr .number { width: 20%; }
+ .cart-content table tr .total-price { width: 20%; }
+ .cart-content table tr .operation { width: 15%; }
+ .cart-content { margin-top: 20px; }
+}
+
+@media only screen and (max-width:640px) {
+ .cart-content table tr .base { width: 80%; }
+ .selected-tips { display: none; }
+}
\ 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 15a249b4d..fe2fe919a 100755
--- a/service/Public/Home/Default/Css/Goods.css
+++ b/service/Public/Home/Default/Css/Goods.css
@@ -31,7 +31,7 @@ input{font-size:12px;font-size:100%;outline:none;line-height:normal;color:#444;}
.theme-signin-right .img-info img{margin:5px 5px ;width:80px;height:80px ;}
.theme-signin-right .text-info{position:absolute;left:110px;top:20px ;}
.text-info .price-now{display:block;font-size:16px ;color:#C40000;}
-.text-info span#Stock{font-size:14px ;}
+.text-info span.stock-tips{font-size:12px ;}
/*可选规格*/
.iteminfo_parameter { margin-bottom: 10px; }
@@ -79,7 +79,7 @@ input{font-size:12px;font-size:100%;outline:none;line-height:normal;color:#444;}
/*商品信息*/
.theme-signin-right{display: none;}
.text-info .price-now{float: left;margin-right:10px ;}
- .text-info span#Stock {float:left;font-size: 12px;}
+ .text-info span.stock-tips {float:left;font-size: 12px;}
/*操作*/
.btn-op{overflow: hidden;padding:10px 20%; position: static;}
@@ -169,8 +169,9 @@ flex: 1 1 0%;line-height: 16px;cursor: pointer;}
/*数量*/
.iteminfo_parameter.munber,.iteminfo_parameter.freight{display:none ;}
.iteminfo_parameter.munber dd{margin-left:5px ;}
-#min, #add{ width: 35px; height: 25px; outline:none; }
-#text_box { width: 35px; height: 25px; text-align: center; }
+#min, #add{ width: 35px; height: 25px; outline:none; line-height: 23px; padding: 0; cursor: pointer; }
+#text_box { width: 50px; height: 25px; text-align: center; font-size: 16px !important; }
+.theme-popover .am-input-group { display: inline-flex; }
/*购物车*/
diff --git a/service/Public/Home/Default/Js/Goods.js b/service/Public/Home/Default/Js/Goods.js
index be53511fe..d02de486a 100755
--- a/service/Public/Home/Default/Js/Goods.js
+++ b/service/Public/Home/Default/Js/Goods.js
@@ -96,7 +96,7 @@ $(document).ready(function() {
//初始化数量为1,并失效减
$('#min').attr('disabled', true);
//数量增加操作
- $("#add").click(function() {
+ $("#add").on('click', function() {
t.val(parseInt(t.val()) + 1)
if (parseInt(t.val()) != 1) {
$('#min').attr('disabled', false);
@@ -104,7 +104,7 @@ $(document).ready(function() {
});
//数量减少操作
- $("#min").click(function() {
+ $("#min").on('click', function() {
t.val(parseInt(t.val()) - 1);
if (parseInt(t.val()) == 1) {
$('#min').attr('disabled', true);
+
+