diff --git a/service/Application/Home/View/Default/Cart/Index.html b/service/Application/Home/View/Default/Cart/Index.html
index 6735c63c8..ce65a3341 100644
--- a/service/Application/Home/View/Default/Cart/Index.html
+++ b/service/Application/Home/View/Default/Cart/Index.html
@@ -82,17 +82,17 @@
 
         <!-- 导航 -->
         <div class="cart-nav">
-            <div class="am-fl">
+            <div class="am-fl nav-left">
                 <label>
                     <input type="checkbox" value="3" class="select-all-event" />
                     <span>全选</span>
                 </label>
                 <a href="javascript:;" class="submit-ajax" data-url="{{:U('Home/Cart/Delete')}}" data-id="{{$base.ids}}" data-view="reload" data-msg="清空后不可恢复、确认操作吗？">清空</a>
             </div>
-            <div class="am-fr">
-                <span class="selected-tips">已选商品 <strong>0</strong> 件</span>
-                <span class="total-price-tips">合计：</span>
-                <strong class="nav-total-price">￥0.00</strong>
+            <div class="am-fr nav-right">
+                <span class="selected-tips am-fl">已选商品 <strong>0</strong> 件</span>
+                <span class="total-price-tips am-fl">合计：</span>
+                <strong class="nav-total-price am-fl">￥0.00</strong>
                 <button type="button" class="am-btn am-btn-primary separate-submit">结算</button>
             </div>
         </div>
diff --git a/service/Application/Home/View/Default/User/ModalLoginInfo.html b/service/Application/Home/View/Default/User/ModalLoginInfo.html
index 5f9d01a16..ca6db5e44 100644
--- a/service/Application/Home/View/Default/User/ModalLoginInfo.html
+++ b/service/Application/Home/View/Default/User/ModalLoginInfo.html
@@ -41,7 +41,12 @@
     {
         if(e.code == 0)
         {
-            parent.location.reload();
+            $.AMUI.progress.done();
+            Prompt(e.msg, 'success');
+            setTimeout(function()
+            {
+                parent.location.reload();
+            }, 1500);
         } else {
             $('form.form-validation').find('button[type="submit"]').button('reset');
             $.AMUI.progress.done();
diff --git a/service/Public/Common/Css/Common.css b/service/Public/Common/Css/Common.css
index 5adffac71..ac959c0fc 100755
--- a/service/Public/Common/Css/Common.css
+++ b/service/Public/Common/Css/Common.css
@@ -31,10 +31,11 @@
 /**
  * 公共提示信息
  */
-#common-prompt {position:fixed;top:0;left:0;right:0;text-align:center;padding:5px;font-size:14px;z-index:10000;margin-top: 0px;box-shadow: 0 2px 4px rgba(0,0,0,.12), 0 0 6px rgba(0,0,0,.04);border-radius: 2px;}
-@media only screen and (min-width: 641px){
-    #common-prompt { max-width: 280px;margin: 0 auto; }
-}
+#common-prompt {position:fixed;top:0;left:0;right:0;text-align:center;padding:5px;font-size:14px;z-index:10000; border-radius: 2px; width: 260px; margin: 0 auto;}
+#common-prompt.am-alert-danger { background-color: #fef0f0; border-color: #fde2e2; color: #f56c6c; box-shadow: 0 2px 4px #fef1f1, 0 0 6px rgba(0, 0, 0, 0); }
+#common-prompt.am-alert-success { background-color: #f0f9eb; border-color: #e1f3d8; color: #67c23a; box-shadow: 0 2px 4px #efffe5, 0 0 6px rgba(0, 0, 0, 0); }
+#common-prompt p { text-align: left; font-size: 12px; }
+#common-prompt .am-close { line-height: 20px; }
 
 /**
  * iframe
diff --git a/service/Public/Home/Default/Css/Cart.css b/service/Public/Home/Default/Css/Cart.css
index 12c4f99db..36a34b02a 100644
--- a/service/Public/Home/Default/Css/Cart.css
+++ b/service/Public/Home/Default/Css/Cart.css
@@ -23,8 +23,9 @@ strong.total-price-content, .selected-tips strong, .nav-total-price { color: #d2
 .selected-tips { margin-right: 15px; }
 .cart-nav label { font-weight: 500; margin: 0;  }
 .cart-nav input[type="checkbox"] { vertical-align: inherit; }
-.cart-nav .am-fl { margin-left: 5px; }
-.cart-nav .am-fl a { margin-left: 10px; }
+.cart-nav .nav-left { margin-left: 5px; }
+.cart-nav .nav-left a { margin-left: 10px; }
+.cart-nav .nav-total-price { margin-right: 5px; }
 
 @media only screen and (min-width:640px)  {
     .cart-content table tr .base { width: 30%; }
@@ -39,4 +40,10 @@ strong.total-price-content, .selected-tips strong, .nav-total-price { color: #d2
     .cart-content table tr .base { width: 80%; }
     .selected-tips { display: none; }
     .am-footer { margin-top: 10px; }
+
+    .nav-left { width: calc(30% - 5px); }
+    .nav-right { width: 70%; }
+    .cart-nav, .nav-left, .nav-right { overflow: hidden; }
+    .nav-right .nav-total-price { display: block;
+    width: calc(100% - 141px); height: 30px; -o-text-overflow: ellipsis; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
 }
\ 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 9ff17eb77..d37ad2f38 100755
--- a/service/Public/Home/Default/Css/Common.css
+++ b/service/Public/Home/Default/Css/Common.css
@@ -512,7 +512,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
     /**
      * 公共登录窗口
      */
-    .common-login-modal { max-width: 400px; max-height: 350px; left: calc(50% + 100px); top: calc(50% + 100px); }
+    .common-login-modal { max-width: 400px; max-height: 350px; left: calc(50% - 200px); top: calc(50% - 175px); margin-left: 0; margin-top: 0; }
 }
 
 /**
@@ -530,7 +530,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
  * 框架覆盖
  */
 .am-btn-secondary {
-    color: #fff;
+    color: #fff !important;
     background-color: #f07c8c;
     border-color: #f07c8c;
 }
@@ -538,7 +538,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
     background-color: #e86175;
 }
 .am-btn-secondary:hover, .am-btn-secondary:focus, .am-btn-secondary:active, .am-btn-secondary.am-active, .am-dropdown.am-active .am-btn-secondary.am-dropdown-toggle {
-    color: #fff;
+    color: #fff !important;
     border-color: #e86175;
 }
 .am-btn-secondary.am-disabled, .am-btn-secondary[disabled], fieldset[disabled] .am-btn-secondary, .am-btn-secondary.am-disabled:hover, .am-btn-secondary[disabled]:hover, fieldset[disabled] .am-btn-secondary:hover, .am-btn-secondary.am-disabled:focus, .am-btn-secondary[disabled]:focus, fieldset[disabled] .am-btn-secondary:focus, .am-btn-secondary.am-disabled:active, .am-btn-secondary[disabled]:active, fieldset[disabled] .am-btn-secondary:active, .am-btn-secondary.am-disabled.am-active, .am-btn-secondary[disabled].am-active, fieldset[disabled] .am-btn-secondary.am-active {
@@ -551,7 +551,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
 }
 
 .am-btn-primary {
-    color: #fff;
+    color: #fff !important;
     background-color: #d2364c;
     border-color: #d2364c;
 }
@@ -559,7 +559,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
     background-color: #d31e37;
 }
 .am-btn-primary:hover, .am-btn-primary:focus, .am-btn-primary:active, .am-btn-primary.am-active, .am-dropdown.am-active .am-btn-primary.am-dropdown-toggle {
-    color: #fff;
+    color: #fff !important;
     border-color: #d31e37;
 }
 .am-btn-primary.am-disabled, .am-btn-primary[disabled], fieldset[disabled] .am-btn-primary, .am-btn-primary.am-disabled:hover, .am-btn-primary[disabled]:hover, fieldset[disabled] .am-btn-primary:hover, .am-btn-primary.am-disabled:focus, .am-btn-primary[disabled]:focus, fieldset[disabled] .am-btn-primary:focus, .am-btn-primary.am-disabled:active, .am-btn-primary[disabled]:active, fieldset[disabled] .am-btn-primary:active, .am-btn-primary.am-disabled.am-active, .am-btn-primary[disabled].am-active, fieldset[disabled] .am-btn-primary.am-active {