diff --git a/service/Application/Home/View/Default/Cart/Index.html b/service/Application/Home/View/Default/Cart/Index.html
index ce65a3341..6c1f2d090 100644
--- a/service/Application/Home/View/Default/Cart/Index.html
+++ b/service/Application/Home/View/Default/Cart/Index.html
@@ -47,13 +47,17 @@
                                 </div>
                             </div>
                             <div class="wap-base am-show-sm-only">
-                                <span class="original-price">￥{{$cart.original_price}}</span>
+                                <if condition="$cart['original_price'] gt 0">
+                                    <span class="original-price">￥{{$cart.original_price}}</span>
+                                </if>
                                 <strong class="total-price-content">￥{{$cart.price}}</strong>
                                 <span class="wap-number">x{{$cart.stock}}</span>
                             </div>
                         </td>
                         <td class="price am-hide-sm-only">
-                            <p class="original-price">￥{{$cart.original_price}}</p>
+                            <if condition="$cart['original_price'] gt 0">
+                                <p class="original-price">￥{{$cart.original_price}}</p>
+                            </if>
                             <p class="line-price">￥{{$cart.price}}</p>
                         </td>
                         <td class="number am-hide-sm-only">
diff --git a/service/Application/Home/View/Default/Index/Index.html b/service/Application/Home/View/Default/Index/Index.html
index 6997824fb..255e469fd 100755
--- a/service/Application/Home/View/Default/Index/Index.html
+++ b/service/Application/Home/View/Default/Index/Index.html
@@ -170,7 +170,9 @@
 				                <foreach name="floor.goods" item="goods">
 									<div class="goods-items <if condition="in_array($key, [0,1])">am-u-sm-7 am-u-md-4 text-two<else />am-u-sm-6 am-u-md-2 text-three</if>  <if condition="in_array($key, [0,3])">sug</if> <if condition="in_array($key, [2,5])">big</if> <if condition="$key eq 5">last</if>">
 										<div class="outer-con">
-											<div class="goods-title ellipsis">{{$goods.title}}</div>	
+											<div class="goods-title ellipsis">
+												<a href="{{$goods['goods_url']}}">{{$goods.title}}</a>
+											</div>
 											<div class="price">￥{{$goods.price}}</div>
 										</div>
 										<a href="{{$goods['goods_url']}}">
diff --git a/service/Application/Home/View/Default/Public/Nav.html b/service/Application/Home/View/Default/Public/Nav.html
index cb321641d..220235671 100755
--- a/service/Application/Home/View/Default/Public/Nav.html
+++ b/service/Application/Home/View/Default/Public/Nav.html
@@ -1,14 +1,14 @@
 <div class="navCir">
     <li class="active">
-        <a href="home.html"><i class="am-icon-home"></i>首页</a>
+        <a href="{{:__MY_URL__}}"><i class="am-icon-home"></i>首页</a>
     </li>
     <li>
-        <a href="sort.html"><i class="am-icon-list"></i>分类</a>
+        <a href="{{:U('Home/Category/Index')}}"><i class="am-icon-list"></i>分类</a>
     </li>
     <li>
-        <a href="shopcart.html"><i class="am-icon-shopping-basket"></i>购物车</a>
+        <a <if condition="empty($user)">href="javascript:;" class="login-event"<else /> href="{{:U('Home/Cart/Index')}}"</if>><i class="am-icon-shopping-basket"></i>购物车</a>
     </li>
     <li>
-        <a href="../person/index.html"><i class="am-icon-user"></i>我的</a>
+        <a <if condition="empty($user)">href="javascript:;" class="login-event"<else /> href="{{:U('Home/User/Index')}}"</if>><i class="am-icon-user"></i>我的</a>
     </li>
 </div>
\ No newline at end of file
diff --git a/service/Public/Home/Default/Css/Cart.css b/service/Public/Home/Default/Css/Cart.css
index 36a34b02a..4f653e781 100644
--- a/service/Public/Home/Default/Css/Cart.css
+++ b/service/Public/Home/Default/Css/Cart.css
@@ -25,7 +25,6 @@ strong.total-price-content, .selected-tips strong, .nav-total-price { color: #d2
 .cart-nav input[type="checkbox"] { vertical-align: inherit; }
 .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%; }
@@ -34,10 +33,11 @@ strong.total-price-content, .selected-tips strong, .nav-total-price { color: #d2
     .cart-content table tr .total-price { width: 20%; }
     .cart-content table tr .operation { width: 15%; }
     .cart-content { margin-top: 20px; }
+    .cart-nav .nav-total-price { margin-right: 5px; }
 }
 
 @media only screen and (max-width:640px)  {
-    .cart-content table tr .base { width: 80%; }
+    .cart-content table tr .base { width: 85%; }
     .selected-tips { display: none; }
     .am-footer { margin-top: 10px; }
 
@@ -45,5 +45,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% - 141px); height: 30px; -o-text-overflow: ellipsis; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
+    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; }
 }
\ 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 165bd6572..aa7a1661f 100755
--- a/service/Public/Home/Default/Css/Common.css
+++ b/service/Public/Home/Default/Css/Common.css
@@ -119,7 +119,6 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px ;}
 
 /* 顶部小导航 */
 .header-top { background-color: #fafafa; border-bottom: solid 1px #f0f0f0; }
-.header-top a, .header-top span { color: #333; }
 .header{ display:none; max-width:1000px; margin:0px auto; font-size:12px;}  
 
 .am-footer { border-top: 2px solid #d2364c; }
@@ -512,7 +511,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% - 200px); top: calc(50% - 175px); margin-left: 0; margin-top: 0; }
+    .common-login-modal { max-width: 400px; height: 372px; left: calc(50% - 200px); top: calc(50% - 186px); margin-left: 0; margin-top: 0; }
 }
 
 /**
diff --git a/service/Public/Home/Default/Css/Index.css b/service/Public/Home/Default/Css/Index.css
index 4e0d38ab0..a27c02565 100755
--- a/service/Public/Home/Default/Css/Index.css
+++ b/service/Public/Home/Default/Css/Index.css
@@ -138,7 +138,7 @@ text-align: center;float:none}
     /*第二套各类活动*/
     .row li{width: 25%;float: left;}
 }
-.word .outer:hover { background: #f9918f; color: #fff; border: 3px solid #fff; }
+.word .outer:hover { background: #f9918f; color: #fff !important; border: 3px solid #fff; }
 
 
 @media only screen and (min-width: 640px) {
@@ -351,8 +351,8 @@ text-align: center;float:none}
     .m-baseinfo{position: relative;margin-bottom: 10px;}
     .m-baseinfo img.user-avatar {display: block;width: 50px;height: 50px;border-radius: 50px;}
     .m-baseinfo em span {position: absolute;top:15px;left:60px;font-size: 12px;color: #3C3C3C;}
-    .member-login{height: 25px;overflow: hidden;display: block;}
     .member-login .btn{width:95px;margin-right:3px;height: 25px;display: inline-block;line-height: 25px;text-align: center;}
+    .member-login .btn:hover { color: #fff !important; text-decoration: none; }
     .member-login{overflow: hidden;height:25px;text-align: center;}
     .member-logout {  position: absolute; top: 33px; left: 60px; font-size: 12px; color: #f4546b; }
     .member-center { overflow: hidden; }
diff --git a/service/Public/Upload/express/images/20180917104528_logo.png b/service/Public/Upload/express/images/20180917104528_logo.png
new file mode 100644
index 000000000..fc59087f6
Binary files /dev/null and b/service/Public/Upload/express/images/20180917104528_logo.png differ
diff --git a/service/Public/Upload/express/images/20180917104538_logo.png b/service/Public/Upload/express/images/20180917104538_logo.png
new file mode 100644
index 000000000..46d3a1245
Binary files /dev/null and b/service/Public/Upload/express/images/20180917104538_logo.png differ
diff --git a/service/Public/Upload/express/images/20180917104550_logo.png b/service/Public/Upload/express/images/20180917104550_logo.png
new file mode 100644
index 000000000..a02b089ac
Binary files /dev/null and b/service/Public/Upload/express/images/20180917104550_logo.png differ
diff --git a/service/Public/Upload/express/images/20180917104559_logo.png b/service/Public/Upload/express/images/20180917104559_logo.png
new file mode 100644
index 000000000..e52ede01f
Binary files /dev/null and b/service/Public/Upload/express/images/20180917104559_logo.png differ
diff --git a/service/Public/Upload/express/images/20180917104616_logo.png b/service/Public/Upload/express/images/20180917104616_logo.png
new file mode 100644
index 000000000..894329259
Binary files /dev/null and b/service/Public/Upload/express/images/20180917104616_logo.png differ
diff --git a/service/Public/Upload/express/images/20180917104631_logo.png b/service/Public/Upload/express/images/20180917104631_logo.png
new file mode 100644
index 000000000..86bc1ef18
Binary files /dev/null and b/service/Public/Upload/express/images/20180917104631_logo.png differ
diff --git a/service/Public/Upload/express/images/20180917104650_logo.png b/service/Public/Upload/express/images/20180917104650_logo.png
new file mode 100644
index 000000000..0fe1ac951
Binary files /dev/null and b/service/Public/Upload/express/images/20180917104650_logo.png differ
diff --git a/service/Public/Upload/express/images/20180917104707_logo.png b/service/Public/Upload/express/images/20180917104707_logo.png
new file mode 100644
index 000000000..de9a13f61
Binary files /dev/null and b/service/Public/Upload/express/images/20180917104707_logo.png differ
diff --git a/service/Public/Upload/express/images/20180917104722_logo.png b/service/Public/Upload/express/images/20180917104722_logo.png
new file mode 100644
index 000000000..26f00f60b
Binary files /dev/null and b/service/Public/Upload/express/images/20180917104722_logo.png differ
diff --git a/service/Public/Upload/express/images/20180917104750_logo.png b/service/Public/Upload/express/images/20180917104750_logo.png
new file mode 100644
index 000000000..d24480b10
Binary files /dev/null and b/service/Public/Upload/express/images/20180917104750_logo.png differ
diff --git a/service/Public/Upload/express/images/20180917104757_logo.png b/service/Public/Upload/express/images/20180917104757_logo.png
new file mode 100644
index 000000000..db81bdc2f
Binary files /dev/null and b/service/Public/Upload/express/images/20180917104757_logo.png differ
diff --git a/service/Public/Upload/express/images/20180917104816_logo.png b/service/Public/Upload/express/images/20180917104816_logo.png
new file mode 100644
index 000000000..18b5ee6f1
Binary files /dev/null and b/service/Public/Upload/express/images/20180917104816_logo.png differ
diff --git a/service/Public/Upload/express/images/20180917104839_logo.png b/service/Public/Upload/express/images/20180917104839_logo.png
new file mode 100644
index 000000000..7be77aba0
Binary files /dev/null and b/service/Public/Upload/express/images/20180917104839_logo.png differ
diff --git a/service/Public/Upload/express/images/20180917104848_logo.png b/service/Public/Upload/express/images/20180917104848_logo.png
new file mode 100644
index 000000000..5b8c05f68
Binary files /dev/null and b/service/Public/Upload/express/images/20180917104848_logo.png differ