Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -55,7 +55,7 @@
         position: absolute;
         position: absolute;
         right: 0.75rem;
         right: 0.75rem;
         bottom: 0.25rem;
         bottom: 0.25rem;
-        color: #ccc;
+        color: #999;
     }
     }
 }
 }
 
 

@@ -181,7 +181,11 @@
                             top: 50%;
                             top: 50%;
                             margin-top: -0.75rem;
                             margin-top: -0.75rem;
                             right: 0;
                             right: 0;
-                            color: #666;
+                            color: #999;
+
+                            padding-right: 0.75rem;
+                            text-align: right;
+
                         }
                         }
                     }
                     }
                 }
                 }
@@ -343,5 +347,10 @@
         height: 2rem;
         height: 2rem;
         background: image_url('loading.gif') center center no-repeat;
         background: image_url('loading.gif') center center no-repeat;
         @include background-size(auto 40%);
         @include background-size(auto 40%);
+
+        position: absolute;
+        top: 50%;
+        left: 0;
+        margin-top: -1rem;
     }
     }
 }
 }

 $vip: sprite-map("me/vip/*.png", $spacing: 10px);
 $vip: sprite-map("me/vip/*.png", $spacing: 10px);
 $fav: sprite-map("me/fav/*.png", $spacing: 5px);
 $fav: sprite-map("me/fav/*.png", $spacing: 5px);
 
 
-@import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service", "my-guang", "ihelp", "browse-record", "pay";
+@import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service", "my-guang", "ihelp", "browse-record", "logistic", "pay";
 
 

@@ -181,8 +181,8 @@ $basicBtnC:#eb0313;
         min-height: pxToRem(83px);
         min-height: pxToRem(83px);
         font-size: pxToRem(28px);
         font-size: pxToRem(28px);
         color: #fff;
         color: #fff;
-        padding-left: pxToRem(25px);
-        padding-right: pxToRem(25px);
+        padding-left: pxToRem(28px);
+        padding-right: pxToRem(28px);
         line-height: pxToRem(36px);
         line-height: pxToRem(36px);
         background-color: #515150;
         background-color: #515150;
     }
     }

@@ -22,7 +22,7 @@
         {{/comments}}
         {{/comments}}
         
         
         {{#if loadmore}}
         {{#if loadmore}}
-        <input id="loadMoreUrl" type="hidden" value={{loadMoreUrl}}>
+        <input id="loadMoreUrl" type="hidden" value="{{loadMoreUrl}}">
         {{/if}}
         {{/if}}
 </div>
 </div>
 
 

@@ -28,7 +28,7 @@
         {{/ consults}}
         {{/ consults}}
 
 
         {{#if loadmore}}
         {{#if loadmore}}
-        <input id="loadMoreUrl" type="hidden" value={{loadMoreUrl}}>
+        <input id="loadMoreUrl" type="hidden" value="{{loadMoreUrl}}">
         {{/if}}
         {{/if}}
 </div>
 </div>
 {{> layout/footer}}
 {{> layout/footer}}

@@ -131,10 +131,10 @@
     </div>
     </div>
     {{/cartInfo}}
     {{/cartInfo}}
     {{#if introUrl}}
     {{#if introUrl}}
-    <input id="introUrl" type="hidden" value='{{introUrl}}'>
+    <input id="introUrl" type="hidden" value="{{introUrl}}">
     {{/if}}
     {{/if}}
     {{#if id}}
     {{#if id}}
-    <input id="productId" type="hidden" value='{{id}}'>
+    <input id="productId" type="hidden" value="{{id}}">
     {{/if}}
     {{/if}}
     
     
 </div>
 </div>

@@ -288,7 +288,9 @@
 </script>
 </script>
 {{/if}}
 {{/if}}
 {{#if logisticInfoPage}}
 {{#if logisticInfoPage}}
+<script>
     seajs.use('js/me/logistic');
     seajs.use('js/me/logistic');
+</script>
 {{/if}}
 {{/if}}
 {{#if payCenterPage}}
 {{#if payCenterPage}}
 <script>
 <script>