fe / YOHOBUYWAP · Commits

Go to a project

Authored by hf
Commit a019858d9b3ce3cc53270a9628a460cc32750e38 1 parent 098424e2

code review by hf: merge zhangzhen code to fixes home floor bugs

Inline Side-by-side
Showing 19 changed files with 235 additions and 101 deletions
@@ -10,11 +10,23 @@ var $searchBox = $('.search-box'), @@ -10,11 +10,23 @@ var $searchBox = $('.search-box'),
10 $box = $('.box'), 10 $box = $('.box'),
11 $indexSearch = $('.index-search'), 11 $indexSearch = $('.index-search'),
12 $indexLogo = $('.index-logo'), 12 $indexLogo = $('.index-logo'),
13 - $channelLink = $('.index-channel a'); 13 + $channelLink = $('.index-channel a'),
  14 + $win = $(window),
  15 + $doc = $(document),
  16 + $appFloatLayer = $('#float-layer-app');
14 17
15 var $search = $searchBox.children('input[type="text"]'), 18 var $search = $searchBox.children('input[type="text"]'),
16 - $cancelSearch = $box.children('.no-search'),  
17 - $searchIcon = $searchBox.children('.search-icon'); 19 + $cancelSearch = $box.children('.no-search'),
  20 + $searchIcon = $searchBox.children('.search-icon');
  21 +
  22 +// variables for calculate the app download layer position
  23 +var layerInit = false,
  24 + windowViewHeight = 0,
  25 + layerContentHeight = $appFloatLayer.height(),
  26 + layerPaddingTop = parseInt($appFloatLayer.css('padding-top')),
  27 + layerPaddingBottom = parseInt($appFloatLayer.css('padding-bottom')),
  28 + layerHeight = layerContentHeight + layerPaddingTop + layerPaddingBottom,
  29 + layerNewPos;
18 30
19 require('../common'); 31 require('../common');
20 32
@@ -69,3 +81,40 @@ $channelLink.on('touchstart', function() { @@ -69,3 +81,40 @@ $channelLink.on('touchstart', function() {
69 borderColor: '#fff' 81 borderColor: '#fff'
70 }); 82 });
71 }); 83 });
  84 +
  85 +
  86 +function updateLayerPosition() {
  87 + var winHeight = window.innerHeight,
  88 + bodyHeight = $doc.height(),
  89 + scrollTopPosition = $win.scrollTop();
  90 +
  91 + if (layerInit) {
  92 +
  93 + //keyboard is shown
  94 + if (windowViewHeight - winHeight > 200) {
  95 + if (scrollTopPosition + windowViewHeight + layerHeight >= bodyHeight) {
  96 + layerNewPos = 0;
  97 + } else {
  98 + layerNewPos = bodyHeight - windowViewHeight - scrollTopPosition - layerHeight;
  99 + }
  100 + } else {
  101 + layerNewPos = bodyHeight - winHeight - scrollTopPosition;
  102 + }
  103 +
  104 + } else {
  105 + windowViewHeight = winHeight;
  106 + layerNewPos = bodyHeight - winHeight - scrollTopPosition + layerHeight;
  107 + layerInit = true;
  108 + }
  109 +
  110 + $appFloatLayer.css({
  111 + position: 'relative',
  112 + bottom: layerNewPos + 'px'
  113 + });
  114 +}
  115 +
  116 +$(window).scroll(function() {
  117 + window.requestAnimationFrame(updateLayerPosition);
  118 +});
  119 +
  120 +$doc.on('ready', updateLayerPosition);
@@ -20,7 +20,7 @@ function couponAJAX(statu, page) { @@ -20,7 +20,7 @@ function couponAJAX(statu, page) {
20 page: page 20 page: page
21 }, 21 },
22 success: function(data) { 22 success: function(data) {
23 - $('.employ').append(data); 23 + $('#employ').append(data);
24 window.rePosFooter(); 24 window.rePosFooter();
25 loading.hideLoadingMask(); 25 loading.hideLoadingMask();
26 } 26 }
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 display: inline-block; 23 display: inline-block;
24 max-width: pxToRem(380px); 24 max-width: pxToRem(380px);
25 overflow: hidden; 25 overflow: hidden;
26 - text-overflow: ellipsis; 26 + text-overflow: ellipsis;
27 white-space: nowrap; 27 white-space: nowrap;
28 } 28 }
29 29
@@ -37,10 +37,10 @@ @@ -37,10 +37,10 @@
37 } 37 }
38 38
39 .action { 39 .action {
40 - font-size: pxToRem(40px); 40 + font-size: pxToRem(32px);
41 line-height: pxToRem(60px); 41 line-height: pxToRem(60px);
42 text-align: right; 42 text-align: right;
43 - 43 +
44 .edit, 44 .edit,
45 .del { 45 .del {
46 display: inline-block; 46 display: inline-block;
@@ -48,6 +48,10 @@ @@ -48,6 +48,10 @@
48 width: pxToRem(60px); 48 width: pxToRem(60px);
49 height: pxToRem(60px); 49 height: pxToRem(60px);
50 color: #999; 50 color: #999;
  51 +
  52 + &:hover {
  53 + color: #666;
  54 + }
51 } 55 }
52 56
53 .edit { 57 .edit {
@@ -212,7 +216,7 @@ @@ -212,7 +216,7 @@
212 float: right; 216 float: right;
213 color: #d0d0d0; 217 color: #d0d0d0;
214 } 218 }
215 - 219 +
216 &.highlight { 220 &.highlight {
217 background: #eee; 221 background: #eee;
218 } 222 }
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 } 23 }
24 } 24 }
25 } 25 }
26 -.employ-list{ 26 +#employ{
27 width:100%; 27 width:100%;
28 height: auto; 28 height: auto;
29 overflow:hidden; 29 overflow:hidden;
@@ -32,7 +32,9 @@ @@ -32,7 +32,9 @@
32 height: 180rem / $pxConvertRem; 32 height: 180rem / $pxConvertRem;
33 overflow: hidden; 33 overflow: hidden;
34 margin: 20rem / $pxConvertRem auto; 34 margin: 20rem / $pxConvertRem auto;
35 - background: image-url('me/employ/employ.jpg') top center no-repeat; 35 + background-image: image-url('me/employ/employ.jpg');
  36 + background-position: top center;
  37 + background-repeat:no-repeat;
36 background-size: 100% 100%; 38 background-size: 100% 100%;
37 color: #fff; 39 color: #fff;
38 position: relative; 40 position: relative;
@@ -42,16 +44,21 @@ @@ -42,16 +44,21 @@
42 float: left; 44 float: left;
43 text-align: center; 45 text-align: center;
44 line-height: 180rem / $pxConvertRem; 46 line-height: 180rem / $pxConvertRem;
45 - font-size: 180em / $pxConvertRem; 47 + font-size: 50px;
46 } 48 }
47 p{ 49 p{
48 width: 55.517241%; 50 width: 55.517241%;
49 height: auto; 51 height: auto;
50 - padding: 0 5% 18em / $pxConvertRem;; 52 + padding: 0 5% 18em / $pxConvertRem;
51 float: left; 53 float: left;
52 &:first-of-type{ 54 &:first-of-type{
53 - padding-top:30em / $pxConvertRem;  
54 - font-size: 60em / $pxConvertRem; 55 + padding-top: 0.75rem;
  56 + font-size: 18px;
  57 + height: 76rem / $pxConvertRem;
  58 + display: -webkit-box;
  59 + -webkit-line-clamp: 2;
  60 + -webkit-box-orient: vertical;
  61 + overflow: hidden;
55 } 62 }
56 } 63 }
57 i{ 64 i{
@@ -126,6 +126,7 @@ @@ -126,6 +126,7 @@
126 126
127 .price-underline { 127 .price-underline {
128 text-decoration: line-through; 128 text-decoration: line-through;
  129 + margin-left: pxToRem(15px);
129 } 130 }
130 } 131 }
131 132
@@ -170,17 +171,14 @@ @@ -170,17 +171,14 @@
170 } 171 }
171 172
172 &.del-fav { 173 &.del-fav {
173 - $width: pxToRem(image_width(sprite-file($fav, fav-del)));  
174 - $height: pxToRem(image_height(sprite-file($fav, fav-del)));  
175 -  
176 - @include rem-sprite($fav, fav-del);  
177 - width: $width;  
178 - height: $height;  
179 - 174 + width: 2rem;
  175 + height: 1.5rem;
  176 + line-height: 1.5rem;
180 position: absolute; 177 position: absolute;
181 top: 50%; 178 top: 50%;
182 - right: pxToRem(30px);  
183 - margin-top: -$height / 2; 179 + margin-top: -0.75rem;
  180 + right: 0;
  181 + color: #666;
184 } 182 }
185 } 183 }
186 } 184 }
@@ -188,6 +186,24 @@ @@ -188,6 +186,24 @@
188 } 186 }
189 //品牌收藏 187 //品牌收藏
190 .fav-brand-swiper { 188 .fav-brand-swiper {
  189 + border-top: 1px solid #e0e0e0;
  190 + border-bottom: pxToRem(28px) solid #f0f0f0;
  191 + position: relative;
  192 +
  193 + &:nth-of-type(1) {
  194 + border-top: 0;
  195 + }
  196 +
  197 + &:after {
  198 + content: '';
  199 + position: absolute;
  200 + left: 0;
  201 + bottom: -2px;
  202 + border-top: 1px solid #e0e0e0;
  203 + display: block;
  204 + width: 100%;
  205 + height: 1px;
  206 + }
191 207
192 .swiper-header { 208 .swiper-header {
193 height: pxToRem(100px); 209 height: pxToRem(100px);
@@ -239,21 +255,30 @@ @@ -239,21 +255,30 @@
239 } 255 }
240 } 256 }
241 .fav-more { 257 .fav-more {
242 - $width: pxToRem(image_width(sprite-file($fav, fav-more)));  
243 - $height: pxToRem(image_height(sprite-file($fav, fav-more)));  
244 -  
245 - @include rem-sprite($fav, fav-more);  
246 - width: $width;  
247 - height: $height;  
248 - 258 + width: 2.5rem;
  259 + height: 2.5rem;
249 position: absolute; 260 position: absolute;
250 - top: 50%;  
251 - right: pxToRem(30px);  
252 - margin-top: -$height / 2; 261 + top: 0;
  262 + right: 0;
  263 +
  264 + &:after {
  265 + $width: pxToRem(image_width(sprite-file($fav, fav-more)));
  266 + $height: pxToRem(image_height(sprite-file($fav, fav-more)));
  267 +
  268 + @include rem-sprite($fav, fav-more);
  269 + width: $width;
  270 + height: $height;
  271 +
  272 + position: absolute;
  273 + top: 50%;
  274 + right: pxToRem(30px);
  275 + margin-top: -$height / 2;
  276 + content: '';
  277 + }
253 } 278 }
254 } 279 }
255 .swiper-container { 280 .swiper-container {
256 - height: pxToRem(300px); 281 + height: pxToRem(365px);
257 margin: 0 pxToRem(30px); 282 margin: 0 pxToRem(30px);
258 283
259 .swiper-slide { 284 .swiper-slide {
@@ -270,9 +295,28 @@ @@ -270,9 +295,28 @@
270 img { 295 img {
271 display: block; 296 display: block;
272 width: 100%; 297 width: 100%;
273 - height: 100%; 298 + height: pxToRem(300px);
274 overflow: hidden; 299 overflow: hidden;
275 } 300 }
  301 + .brand-product {
  302 + height: pxToRem(65px);
  303 + line-height: pxToRem(65px);
  304 + text-align: center;
  305 + font-size: pxToRem(22px);
  306 + color: #fff;
  307 +
  308 + .price-discount {
  309 + span {
  310 + color: #d1021c
  311 + }
  312 + b {
  313 + color: #b0b0b0;
  314 + text-decoration: line-through;
  315 + font-weight: normal;
  316 + margin-left: pxToRem(13px);
  317 + }
  318 + }
  319 + }
276 } 320 }
277 } 321 }
278 } 322 }
@@ -140,6 +140,7 @@ @@ -140,6 +140,7 @@
140 border-top: 1px solid #e0e0e0; 140 border-top: 1px solid #e0e0e0;
141 141
142 .type-item { 142 .type-item {
  143 + position: relative;
143 float: left; 144 float: left;
144 color: #444; 145 color: #444;
145 font-size: pxToRem(28px); 146 font-size: pxToRem(28px);
@@ -149,6 +150,20 @@ @@ -149,6 +150,20 @@
149 &.highlight { 150 &.highlight {
150 background: #eee; 151 background: #eee;
151 } 152 }
  153 +
  154 + .num {
  155 + position: absolute;
  156 + padding: 0 pxToRem(8px);
  157 + top: 0;
  158 + right: pxToRem(40px);
  159 + min-width: pxToRem(16px);
  160 + font-size: pxToRem(24px);
  161 + line-height: pxToRem(32px);
  162 + color: #fff;
  163 + background: #F03D35;
  164 + text-align: center;
  165 + border-radius: pxToRem(20px);
  166 + }
152 } 167 }
153 168
154 .iconfont { 169 .iconfont {
1 $vip: sprite-map("me/vip/*.png", $spacing: 10px); 1 $vip: sprite-map("me/vip/*.png", $spacing: 10px);
2 $fav: sprite-map("me/fav/*.png", $spacing: 5px); 2 $fav: sprite-map("me/fav/*.png", $spacing: 5px);
3 3
4 -@import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service", "my-guang", "ihelp", "logistic"; 4 +@import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service", "my-guang", "ihelp", "browse-record";
5 5
@@ -171,4 +171,4 @@ @@ -171,4 +171,4 @@
171 @extend %qa; 171 @extend %qa;
172 } 172 }
173 } 173 }
174 -}  
  174 +}
@@ -35,6 +35,9 @@ @@ -35,6 +35,9 @@
35 font-size: 48em / $pxConvertRem; 35 font-size: 48em / $pxConvertRem;
36 margin-right: 8%; 36 margin-right: 8%;
37 float: left; 37 float: left;
  38 + text-overflow:ellipsis;
  39 + white-space:nowrap;
  40 + overflow:hidden;
38 .head-portrait{ 41 .head-portrait{
39 width:90rem / $pxConvertRem; 42 width:90rem / $pxConvertRem;
40 height: 90rem / $pxConvertRem; 43 height: 90rem / $pxConvertRem;
@@ -31,18 +31,23 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -31,18 +31,23 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
31 31
32 //意见反馈主体 32 //意见反馈主体
33 .suggest-content { 33 .suggest-content {
34 - border-top: pxToRem(30px) solid #fff; 34 + border-top: 1px solid #e0e0e0;
35 35
36 .suggest-item { 36 .suggest-item {
37 width: 100%; 37 width: 100%;
38 color: #444; 38 color: #444;
39 border-top: 1px solid #e0e0e0; 39 border-top: 1px solid #e0e0e0;
40 border-bottom: pxToRem(30px) solid #f0f0f0; 40 border-bottom: pxToRem(30px) solid #f0f0f0;
  41 + overflow: hidden;
41 42
42 - > img {  
43 - display: block;  
44 - overflow: hidden; 43 + .suggest-item-img {
45 width: 100%; 44 width: 100%;
  45 + overflow: hidden;
  46 + > img {
  47 + margin: 0 auto;
  48 + display: block;
  49 + max-width: 100%;
  50 + }
46 } 51 }
47 52
48 > h2 { 53 > h2 {
@@ -71,6 +76,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -71,6 +76,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
71 &.suggest-active { 76 &.suggest-active {
72 > div { 77 > div {
73 width: 50%; 78 width: 50%;
  79 + height: 100%;
74 float: left; 80 float: left;
75 text-align: left; 81 text-align: left;
76 padding-left: pxToRem(128px); 82 padding-left: pxToRem(128px);
@@ -130,8 +136,29 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -130,8 +136,29 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
130 line-height: pxToRem(88px); 136 line-height: pxToRem(88px);
131 text-align: center; 137 text-align: center;
132 font-size: pxToRem(30px); 138 font-size: pxToRem(30px);
133 - border-top: 1px solid #e0e0e0;  
134 - border-bottom: 1px solid #e0e0e0; 139 + //border-top: 1px solid #e0e0e0;
  140 + //border-bottom: 1px solid #e0e0e0;
  141 + border-top: pxToRem(30px) solid #f0f0f0;
  142 + border-bottom: pxToRem(30px) solid #f0f0f0;
  143 + position: relative;
  144 + &:after {
  145 + content: '';
  146 + width: 100%;
  147 + height: 1px;
  148 + border-top: 1px solid #e0e0e0;
  149 + position: absolute;
  150 + left: 0;
  151 + top: 0;
  152 + }
  153 + &:before {
  154 + content: '';
  155 + width: 100%;
  156 + height: 1px;
  157 + border-bottom: 1px solid #e0e0e0;
  158 + position: absolute;
  159 + left: 0;
  160 + bottom: 0;
  161 + }
135 162
136 a { 163 a {
137 color: #444; 164 color: #444;
@@ -176,7 +203,8 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -176,7 +203,8 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
176 203
177 .img-form { 204 .img-form {
178 padding: 0 pxToRem(30px); 205 padding: 0 pxToRem(30px);
179 - float: left; 206 + padding-top: pxToRem(40px);
  207 + overflow: hidden;
180 208
181 .upload-img-list { 209 .upload-img-list {
182 float: left; 210 float: left;
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
16 16
17 .user-name { 17 .user-name {
18 font-size: 25rem / $pxConvertRem; 18 font-size: 25rem / $pxConvertRem;
  19 + margin-right: 0.5rem;
19 } 20 }
20 21
21 .vip-icon { 22 .vip-icon {
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="my-address-page yoho-page"> 2 <div class="my-address-page yoho-page">
3 <div class="my-edit-address-page page-wrap"> 3 <div class="my-edit-address-page page-wrap">
4 <form class="edit-address"> 4 <form class="edit-address">
5 - <input type="hidden" name="id" value="{{address.id}}"> 5 + <input type="hidden" name="id" value="{{address.address_id}}">
6 <label class="username"> 6 <label class="username">
7 收件人姓名 7 收件人姓名
8 <input type="text" name="consignee" maxlength="20" value="{{address.consignee}}"> 8 <input type="text" name="consignee" maxlength="20" value="{{address.consignee}}">
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <span class="iconfont">&#xe604;</span> 18 <span class="iconfont">&#xe604;</span>
19 </label> 19 </label>
20 <label class="address"> 20 <label class="address">
21 - 详细地址 21 + 详细地址
22 <textarea name="address" maxlength="255">{{address.address}}</textarea> 22 <textarea name="address" maxlength="255">{{address.address}}</textarea>
23 </label> 23 </label>
24 24
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
28 确认 28 确认
29 </div> 29 </div>
30 </div> 30 </div>
31 - {{> me/address/address-list}} 31 + <div class="my-address-list-page page-wrap hide">
  32 + </div>
32 </div> 33 </div>
33 -{{> layout/footer}}  
  34 +{{> layout/footer}}
1 {{> layout/header}} 1 {{> layout/header}}
2 -<div class="employ">  
3 - <span class="active">未使用</span>  
4 - <span>已使用</span>  
5 -</div>  
6 -{{# couponsUrl}}  
7 - <div class="employ-list">  
8 - {{# used}}  
9 - <div class="employ-main">  
10 - <span>{{ money}}</span>  
11 - <p>{{ coupon_name}}</p>  
12 - <p>{{ couponValidity}}</p>  
13 - </div>  
14 - {{/ used}}  
15 - {{^ used}}  
16 - <div class="null">  
17 - <i></i>  
18 - <p>您还没有优惠券!</p>  
19 - <a href="{{topURL}}">随便逛逛</a>  
20 - </div>  
21 - {{/ used}} 2 +<div class="yoho-page">
  3 + <div class="employ">
  4 + <span class="active">未使用</span>
  5 + <span>已使用</span>
22 </div> 6 </div>
23 -<div class="employ-list not none">  
24 - {{# unused}}  
25 - <div class="employ-main">  
26 - <span>{{ money}}</span>  
27 - <p>{{ coupon_name}}</p>  
28 - <p>{{ couponValidity}}</p>  
29 - <i></i>  
30 - </div>  
31 - {{/ unused}}  
32 - {{^ unused}}  
33 - <div class="null">  
34 - <i></i>  
35 - <p>您还没有使用的优惠券!</p>  
36 - <a href="{{topURL}}">随便逛逛</a>  
37 - </div>  
38 - {{/ unused}} 7 + <div id="employ"></div>
39 </div> 8 </div>
40 -{{/ couponsUrl}}  
41 {{> layout/footer}} 9 {{> layout/footer}}
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <div class="fav-load-more fav-load-background hide"></div> 17 <div class="fav-load-more fav-load-background hide"></div>
18 </div> 18 </div>
19 <div class="fav-type"> 19 <div class="fav-type">
20 - <div class="fav-brand-swiper"></div> 20 + <div class="fav-brand-swiper-wrapper"></div>
21 <div class="fav-content-loading"></div> 21 <div class="fav-content-loading"></div>
22 22
23 <div class="fav-null-box hide"> 23 <div class="fav-null-box hide">
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 {{#isLogin}}{{brand_favorite_total}}{{/isLogin}} 28 {{#isLogin}}{{brand_favorite_total}}{{/isLogin}}
29 <p>收藏的品牌</p> 29 <p>收藏的品牌</p>
30 </a> 30 </a>
31 - <a class="link-item" href="/home/"> 31 + <a class="link-item" href="/home/record">
32 {{#isLogin}}{{product_browse}}{{/isLogin}} 32 {{#isLogin}}{{product_browse}}{{/isLogin}}
33 <p>浏览记录</p> 33 <p>浏览记录</p>
34 </a> 34 </a>
@@ -44,14 +44,23 @@ @@ -44,14 +44,23 @@
44 <a class="type-item" href="/home/order?type=2"> 44 <a class="type-item" href="/home/order?type=2">
45 <span class="iconfont">&#xe634;</span> 45 <span class="iconfont">&#xe634;</span>
46 <br>待付款 46 <br>待付款
  47 + {{#if pendingPaymentCount}}
  48 + <span class="num">{{pendingPaymentCount}}</span>
  49 + {{/if}}
47 </a> 50 </a>
48 <a class="type-item" href="/home/order?type=3"> 51 <a class="type-item" href="/home/order?type=3">
49 <span class="iconfont">&#xe63b;</span> 52 <span class="iconfont">&#xe63b;</span>
50 <br>待发货 53 <br>待发货
  54 + {{#if dueOutGoodsCount}}
  55 + <span class="num">{{dueOutGoodsCount}}</span>
  56 + {{/if}}
51 </a> 57 </a>
52 <a class="type-item" href="/home/order?type=4"> 58 <a class="type-item" href="/home/order?type=4">
53 <span class="iconfont">&#xe633;</span> 59 <span class="iconfont">&#xe633;</span>
54 <br>待收货 60 <br>待收货
  61 + {{#if dueInGoodsCount}}
  62 + <span class="num">{{dueInGoodsCount}}</span>
  63 + {{/if}}
55 </a> 64 </a>
56 </div> 65 </div>
57 </div> 66 </div>
@@ -94,7 +103,7 @@ @@ -94,7 +103,7 @@
94 </a> 103 </a>
95 </div> 104 </div>
96 <div class="group-list"> 105 <div class="group-list">
97 - <a class="list-item" href="/home/IHelp"> 106 + <a class="list-item" href="/help.html">
98 <span class="iconfont icon">&#xe639;</span> 107 <span class="iconfont icon">&#xe639;</span>
99 帮助 108 帮助
100 <span class="iconfont num">&#xe604;</span> 109 <span class="iconfont num">&#xe604;</span>
@@ -106,4 +115,4 @@ @@ -106,4 +115,4 @@
106 </div> 115 </div>
107 116
108 {{> layout/download_app}} 117 {{> layout/download_app}}
109 -{{> layout/footer}}  
  118 +{{> layout/footer}}
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="logistic-page yoho-page"> 2 <div class="logistic-page yoho-page">
3 <div class="overview"> 3 <div class="overview">
4 <div class="left" > 4 <div class="left" >
5 - <a href="{{logisticUrl}}"><div class="icon" style='background-image:url("{{logisticImg}}")'></div></a> 5 + <div class="icon" style='background-image:url("{{logisticImg}}")'> </div>
6 </div> 6 </div>
7 7
8 <div class="right"> 8 <div class="right">
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <span class="timeline-node"></span> 28 <span class="timeline-node"></span>
29 <div class="timeline-info"> 29 <div class="timeline-info">
30 <div class="timeline-info-row"> 30 <div class="timeline-info-row">
31 - {{status}} 31 + {{ city}}&nbsp;&nbsp;&nbsp;{{ status}}
32 </div> 32 </div>
33 <div class="timeline-info-row"> 33 <div class="timeline-info-row">
34 {{date}} 34 {{date}}
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="online-service-detail-page yoho-page"> 2 <div class="online-service-detail-page yoho-page">
3 <div class="qa-list"> 3 <div class="qa-list">
  4 + {{# service}}
4 {{# list}} 5 {{# list}}
5 <div class="question-item"> 6 <div class="question-item">
6 <div class="question">Q：{{q}}</div> 7 <div class="question">Q：{{q}}</div>
7 <div class="answer">{{a}}</div> 8 <div class="answer">{{a}}</div>
8 </div> 9 </div>
9 - {{/ list}} 10 + {{/ list}}
  11 + {{/ service}}
10 </div> 12 </div>
11 </div> 13 </div>
12 -{{> layout/footer}}  
  14 +{{> layout/footer}}
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="personal-details"> 2 <div class="personal-details">
3 <ul> 3 <ul>
4 - <li><span>头像</span><span><i class="head-portrait"><img class="user-avatar" src="{{ head_ico }}"></i></span></li> 4 + <li><span>头像</span><span><i class="head-portrait user-avatar" data-avatar="{{head_ico}}"></i></span></li>
5 <li><span>昵称</span><span>{{ nickname }}</span></li> 5 <li><span>昵称</span><span>{{ nickname }}</span></li>
6 <li><span>性别</span><span>{{ gender }}</span></li> 6 <li><span>性别</span><span>{{ gender }}</span></li>
7 <li><span>生日</span><span>{{ birthday }}</span></li> 7 <li><span>生日</span><span>{{ birthday }}</span></li>
@@ -6,22 +6,30 @@ @@ -6,22 +6,30 @@
6 我们希望了解您的意见和建议 6 我们希望了解您的意见和建议
7 </h2> 7 </h2>
8 8
  9 + <div class="create-new-suggest">
  10 + <a href="./suggestSub">
  11 + 反馈问题<span>（功能意见，界面意见）</span>
  12 + </a>
  13 + </div>
  14 +
9 <div class="suggest-content" id="suggest-content"> 15 <div class="suggest-content" id="suggest-content">
10 {{# suggestContent}} 16 {{# suggestContent}}
11 <div class="suggest-item" data-id="{{suggest_id}}"> 17 <div class="suggest-item" data-id="{{suggest_id}}">
12 {{#if imgUrl}} 18 {{#if imgUrl}}
  19 + <div class="suggest-item-img">
13 <img class="lazy" data-original="{{imgUrl}}" alt=""/> 20 <img class="lazy" data-original="{{imgUrl}}" alt=""/>
  21 + </div>
14 {{/if}} 22 {{/if}}
15 <h2>{{title}}</h2> 23 <h2>{{title}}</h2>
16 <p>{{content}}</p> 24 <p>{{content}}</p>
17 25
18 - <div class="suggest-type suggest-good"> 26 + <div class="suggest-type suggest-good {{#good}}show{{/good}}">
19 <div class="active"> 27 <div class="active">
20 <span class="iconfont">&#xe601;</span> 28 <span class="iconfont">&#xe601;</span>
21 <span>靠谱，谢谢您的反馈</span> 29 <span>靠谱，谢谢您的反馈</span>
22 </div> 30 </div>
23 </div> 31 </div>
24 - <div class="suggest-type suggest-bad"> 32 + <div class="suggest-type suggest-bad {{# bad}}show{{/ bad}}">
25 <div class="active"> 33 <div class="active">
26 <span class="iconfont">&#xe601;</span> 34 <span class="iconfont">&#xe601;</span>
27 <span>不靠谱，谢谢您的反馈</span> 35 <span>不靠谱，谢谢您的反馈</span>
@@ -44,11 +52,6 @@ @@ -44,11 +52,6 @@
44 52
45 {{/ suggestContent}} 53 {{/ suggestContent}}
46 </div> 54 </div>
47 - <div class="create-new-suggest">  
48 - <a href="./suggestSub">  
49 - 反馈问题<span>（功能意见，界面意见）</span>  
50 - </a>  
51 - </div>  
52 {{/ suggest}} 55 {{/ suggest}}
53 </div> 56 </div>
54 {{> layout/footer}} 57 {{> layout/footer}}