From 41165e432609ed84df8780adb7575be462714436 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Sat, 13 Oct 2018 02:07:46 +0800
Subject: [PATCH] user index
---
service/Application/Home/Lang/zh-cn.php | 2 +-
.../Home/View/Default/User/Index.html | 48 ++++++++--
.../Public/Home/Default/Css/User.Index.css | 86 +++++++++++++++---
.../Images/user-index-nav-order-icon-1.png | Bin 0 -> 666 bytes
.../Images/user-index-nav-order-icon-100.png | Bin 0 -> 781 bytes
.../Images/user-index-nav-order-icon-2.png | Bin 0 -> 669 bytes
.../Images/user-index-nav-order-icon-3.png | Bin 0 -> 579 bytes
.../Images/user-index-nav-order-icon.png | Bin 0 -> 461 bytes
8 files changed, 117 insertions(+), 19 deletions(-)
create mode 100644 service/Public/Home/Default/Images/user-index-nav-order-icon-1.png
create mode 100644 service/Public/Home/Default/Images/user-index-nav-order-icon-100.png
create mode 100644 service/Public/Home/Default/Images/user-index-nav-order-icon-2.png
create mode 100644 service/Public/Home/Default/Images/user-index-nav-order-icon-3.png
create mode 100644 service/Public/Home/Default/Images/user-index-nav-order-icon.png
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 0000000000000000000000000000000000000000..79b8f138239bd4a09cc951198680a7a9eead4488
GIT binary patch
literal 666
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZRtNZmxcX!k0+~Ys?E50z2z01L
zNswPKgQeorkID<@et30*rTFbysm^6>pT(v#&RLK)>!f`*>*PznK5cp+lw8~V(DX=^
z)>otKyx1ba4!+h->Jr&q*bW-%#@p*}#wxw9JY72JPUhd|+q6I3Jy&)J(xGG+eTcZNGVzPFNM
zzm|V-Q>eWLv+jJ4+DTVi_yuGRtyq)A93rb#|u6{1-oD!M<
DUQXda
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..ecf88cdf8891e37771d73f12086201e82442d103
GIT binary patch
literal 781
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Z4g~mwxcX!k0+~Y>(l0VEQ_XB|7aB*Rst&!e4LXZCxeg#DA|t+PgaOiFlyjWv$64
z6c_zVNH*MdW|vLrEz_e-2Q3bKzNF5;z_{1b#WAEJuJ!WuNs9tRS|7Hq(2(qWmNPq8
z+Uo3@@Aa!cIz+QJovUXSkAE9m@alo9yYt&e_Po5G&cE6^)4<@o&VJ>Wxq6l(DuZr9oZnXZ82G602)8^)}J!~e$_YLws
zOs-ZBORqB6xl!)y9>?|3i)&aKWTiVSYD^Lj^l_hlQpaV{_-4Tz=WRZr%nh@-ayPM^
zi8wtg+2LxdNBrqe^X#nx>Kx9+o$)MUH{o;O^YoFN8pvPy#nCL<BBogE5B^vi*z=8rEl4mT2!XE`j_yQUWs+<9y6Yt+o%4*HsQ(wkEf)T-+QlaP{Qrf(ZQ;
xu|_vM*>=2@oUdA)|0DNm;1rLO={mWxi|Q9W_DQTvl3WN%(Vnh;F6*2UngHRg3bX(K
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..20ef8c7b030b89db3479211c97557950ec342822
GIT binary patch
literal 669
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZRtNZmxcX!k0+~Ys?E50z2z01L
zNswPKLlYB^*^i}$pT0SNF;Nu~kKz!qfBtt)>g&!AKUZAatlNK2Y2i73>*EI|%XsD_
z1X-@%by2T^vIy;`Uy?o!1l~!g7I^Nr^r1iQYZYJ=$4YKmU&p
z>k{A>^@zV!IXk6LsLbe#xuM7&RfE%NagL#pnp%gKo}S$*U$skb>LPC@vp>;Hzd|PR
zbHqrWbQ7Jm>cK1{nGmJND%JceE*;x<%V+W4pINf5|u>H5#)x~#(c6?dv
z6{wKer{d==9M$u%Gx9QDlI$+4qjTN;-f}*;&$Z;*;za9w?{C~DlV%6naJS^9E1NBn
zWawFbrGw|}r7ay&f%EEJ*NRQOWORSRmk)1MzgLGnx}CSZ$Is}R_KmQ_UwxnNs>=l;G?=4G0wSTW_O^Mtd)&(rPGE{n-ucri7D_q&XCMAy&W
zYco8rW=liH6bl9~TINQkbW!pUXO@
GgeCwT6W-zg
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..0dbacc3a4a8a6cabcdc6414da3d936d997b6258f
GIT binary patch
literal 579
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZS^|7RTzxVNfy{vg7cZpj2D(7I
zB*-tA;pdra7jAxfC&F{*x~RaUR@V9F-_E%#^qouYx5ToHhs-@kHCfg-Se4ss4wRDW
zX=GqvboO*{45^4)d--Nwvw=X{#e)upGnOzir=8vRt^WUaZGmR(Ko702F$*uYrz*Dn
z3oZ5{oOJ}=4o`b1o9Q+U)@8&AWx2d+r0oRPVzzfMY-d1;RF%rA>HR_-et*i`b%v;d$fG=`;`=R?v3z;*J^{)4{wJ?JX64Q_xSjMZ@6?-E-qjB!
z=TH22%*l5uL(Ic-0(uHsi>kX^U(Ss>x;SL>DR;;BKiR$~S-Yq=zOVtM15Z~!mvv4F
FO#n^=%oG3s
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..9ce0fee1ac46f2d2b564e2fad9176c60bd0a912d
GIT binary patch
literal 461
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKx3?xrnI^qbV3<7*YTzxVNt=HWm9*GO4EC%Z3
zFA4GsW_ahK)Umr<@Jwjh-I>O#0)hiJGcYjPdb&7F&f-LIXix%+tm6oo$D^tU;U1&{!&xfp{S(k)o
z**WZc`0dLd?;VW>DceOV)0WH;jFU{=dNJe9p}8-2tN-7>vvTq-xpliPbbc29`C)lE
zYr@TkG6($TJm1jsrXk7XTY~C2X`hn;?6-`jY1YKKoJ$BQd+y+UjJ-|f^gH$yCtt){
zi(W51wD?n^3xCF}8Rak;Z*=K`6u=jUwC
z-}v^x<5}%>+rl{qKh8T5I_1z0>+L0G>>5X1{@n|nHFM|Z>#j=|f7Xxkd#-nD&AB?!
zRJZic6-%yc`u{Pb@BG#;ZFVdQ&MBb@0P8x|6#xJL
literal 0
HcmV?d00001