diff --git a/service/Application/Home/Lang/zh-cn.php b/service/Application/Home/Lang/zh-cn.php
index 6004cffdc..fc4eac7aa 100755
--- a/service/Application/Home/Lang/zh-cn.php
+++ b/service/Application/Home/Lang/zh-cn.php
@@ -62,7 +62,7 @@ return array(
'action' => 'Index',
'name' => '我的地址',
'is_show' => 1,
- 'icon' => 'am-icon-map-marker',
+ 'icon' => 'am-icon-street-view',
),
array(
'control' => 'Safety',
diff --git a/service/Application/Home/View/Default/User/Index.html b/service/Application/Home/View/Default/User/Index.html
index 45dfcec42..f54170db7 100755
--- a/service/Application/Home/View/Default/User/Index.html
+++ b/service/Application/Home/View/Default/User/Index.html
@@ -36,26 +36,26 @@
- -
+
-
0
订单总数
- -
+
-
0
商品收藏
- -
+
-
0
我的足迹
@@ -65,9 +65,45 @@
-
diff --git a/service/Public/Home/Default/Css/User.Index.css b/service/Public/Home/Default/Css/User.Index.css
index ae36e1110..ac5fc1abc 100644
--- a/service/Public/Home/Default/Css/User.Index.css
+++ b/service/Public/Home/Default/Css/User.Index.css
@@ -1,6 +1,9 @@
/**
* 用户中心
*/
+.user-base, ul.order-base {
+ overflow: hidden;
+}
.user-base {
-webkit-animation: changeBg 20s infinite;
-moz-animation: changeBg 20s infinite;
@@ -11,16 +14,12 @@
width: 100%;
position: relative;
padding: 20px 10px;
- overflow: hidden;
}
.user-base p, .user-base span, .user-base a {
color: #fff;
}
-.user-base a {
+.user-base a, .order-base a, .order-nav a {
text-decoration: none;
-}
-.user-base-left, .user-base-right {
-
}
.user-avatar {
text-align: center;
@@ -33,7 +32,7 @@
height: 80px;
border-radius: 100%;
}
-.user-avatar .user-name, .order-base {
+.user-avatar .user-name {
margin-top: 5px;
}
@@ -44,12 +43,75 @@
.user-base-right a:not(:last-child) {
margin-right: 15px;
}
-.user-base-icon {
+ul.user-base-icon {
background: rgba(0,0,0,0.1);
position: absolute;
}
+.order-nav {
+ padding: 10px 5px;
+ border-bottom: 1px solid #f1f1f1;
+}
+.order-nav i {
+ width: 20px;
+ height: 20px;
+ background-repeat: no-repeat;
+ background-position: 50% 50%;
+ background-size: 70%;
+ display: inline-block;
+ vertical-align: bottom;
+}
+.order-nav .nav-name i.order-icon {
+ background-image: url(../images/user-index-nav-order-icon.png);
+}
+.order-nav .icon-tips, .order-base a {
+ color: #888;
+}
+.order-nav .icon-tips i {
+padding-left: 5px;
+}
+
+ul.order-base {
+ margin-bottom: 10px;
+ border-bottom: 1px solid #f1f1f1;
+ padding: 13px 0 5px 0;
+}
+ul.order-base li {
+ float: left;
+ width: 25%;
+ text-align: center;
+ position: relative;
+}
+ul.order-base li i {
+ width: 20px;
+ height: 20px;
+ background-repeat: no-repeat;
+ display: inline-block;
+ vertical-align: bottom;
+ opacity: 0.5;
+ background-size: cover;
+ margin-bottom: 2px;
+}
+ul.order-base i.icon-1 {
+ background-image: url(../Images/user-index-nav-order-icon-1.png);
+}
+ul.order-base i.icon-2 {
+ background-image: url(../Images/user-index-nav-order-icon-2.png);
+}
+ul.order-base i.icon-3 {
+ background-image: url(../Images/user-index-nav-order-icon-3.png);
+}
+ul.order-base i.icon-100 {
+ background-image: url(../Images/user-index-nav-order-icon-100.png);
+}
+ul.order-base li span.am-badge {
+ position: absolute;
+ top: -7px;
+ left: 55%;
+}
+
+
/**
* PC
*/
@@ -67,16 +129,16 @@
display: block;
line-height: 28px;
}
- .user-base-icon {
+ ul.user-base-icon {
bottom: 20px;
right: 10px;
}
- .user-base-icon li {
+ ul.user-base-icon li {
float: left;
padding: 5px 20px;
text-align: center;
}
- .user-base-icon li p {
+ ul.user-base-icon li p {
font-weight: 500;
}
}
@@ -113,13 +175,13 @@
right: 10px;
top: 10px;
}
- .user-base-icon {
+ ul.user-base-icon {
left: 0;
bottom: 0;
width: 100%;
padding: 5px 0;
}
- .user-base-icon li {
+ ul.user-base-icon li {
float: left;
width: 33.33%;
}
diff --git a/service/Public/Home/Default/Images/user-index-nav-order-icon-1.png b/service/Public/Home/Default/Images/user-index-nav-order-icon-1.png
new file mode 100644
index 000000000..79b8f1382
Binary files /dev/null and b/service/Public/Home/Default/Images/user-index-nav-order-icon-1.png differ
diff --git a/service/Public/Home/Default/Images/user-index-nav-order-icon-100.png b/service/Public/Home/Default/Images/user-index-nav-order-icon-100.png
new file mode 100644
index 000000000..ecf88cdf8
Binary files /dev/null and b/service/Public/Home/Default/Images/user-index-nav-order-icon-100.png differ
diff --git a/service/Public/Home/Default/Images/user-index-nav-order-icon-2.png b/service/Public/Home/Default/Images/user-index-nav-order-icon-2.png
new file mode 100644
index 000000000..20ef8c7b0
Binary files /dev/null and b/service/Public/Home/Default/Images/user-index-nav-order-icon-2.png differ
diff --git a/service/Public/Home/Default/Images/user-index-nav-order-icon-3.png b/service/Public/Home/Default/Images/user-index-nav-order-icon-3.png
new file mode 100644
index 000000000..0dbacc3a4
Binary files /dev/null and b/service/Public/Home/Default/Images/user-index-nav-order-icon-3.png differ
diff --git a/service/Public/Home/Default/Images/user-index-nav-order-icon.png b/service/Public/Home/Default/Images/user-index-nav-order-icon.png
new file mode 100644
index 000000000..9ce0fee1a
Binary files /dev/null and b/service/Public/Home/Default/Images/user-index-nav-order-icon.png differ