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

Rock Zhang
Commit 91a99e3adb2589f47285c2989b8533ea554fb50d 2 parents d8715bd2 00f696a8
Showing 11 changed files with 60 additions and 13 deletions
docs/api-example.md
script/nginx/conf/vhosts/nginx.test.yohobuy.conf
static/img/me/no-order.png
static/img/me/vip-se5df70ae85.png
static/js/me/order.js
static/js/product/detail/detail.js
static/sass/me/_home.scss
static/sass/me/_index.scss
static/sass/me/_order.scss
static/sass/me/_vip-grade.scss
template/m.yohobuy.com/partials/me/order/orders.phtml
--- a/docs/api-example.md
View file @91a99e3
+++ b/docs/api-example.md
View file @91a99e3
@@ -21,3 +21,23 @@ DATA:
 ---------------
 {"code":200,"message":"Last Search List.","data":{"product_list":[{"brand_id":144,"market_price":590,"vip_price":0,"sales_price":590,"vip_discount_type":1,"product_id":"150783","max_sort_id":3,"storage_num":38,"product_name":"VANS M JT CARGO\t ","cn_alphabet":"VANSMJTCARGOVN02NJCMA","product_skn":51088175,"brand_name":"VANS","is_new":"Y","is_discount":"N","is_advance":"N","is_soon_sold_out":"N","is_limited":"N","is_yohood":"N","sales_phrase":"","goods_list":[{"goods_id":"207531","color_name":"\u7eff\u8272","color_id":"6","color_code":"#47ba17","color_value":"","images_url":"http:\/\/img13.static.yhbimg.com\/goodsimg\/2015\/09\/25\/10\/02b2ed1aad22f35ed07f7d98a9de5d6ebf.jpg?imageMogr2\/thumbnail\/{width}x{height}\/extent\/{width}x{height}\/background\/d2hpdGU=\/position\/center\/quality\/90","product_skc":"202881","is_default":"N"}],"tags":[],"default_images":"http:\/\/img13.static.yhbimg.com\/goodsimg\/2015\/09\/25\/10\/02b2ed1aad22f35ed07f7d98a9de5d6ebf.jpg?imageMogr2\/thumbnail\/{width}x{height}\/extent\/{width}x{height}\/background\/d2hpdGU=\/position\/center\/quality\/90"},{"brand_id":144,"market_price":490,"vip_price":0,"sales_price":490,"vip_discount_type":1,"product_id":"150781","max_sort_id":3,"storage_num":3,"product_name":"VANS M WARRICK\t ","cn_alphabet":"VANSMWARRICKVN02NIBHH","product_skn":51088174,"brand_name":"VANS","is_new":"Y","is_discount":"N","is_advance":"N","is_soon_sold_out":"N","is_limited":"N","is_yohood":"N","sales_phrase":"","goods_list":[{"goods_id":"207529","color_name":"\u9ed1\u8272","color_id":"2","color_code":"#333333","color_value":"","images_url":"http:\/\/img13.static.yhbimg.com\/goodsimg\/2015\/09\/25\/10\/02f401305cc7af370a894d7a094bd6f64c.jpg?imageMogr2\/thumbnail\/{width}x{height}\/extent\/{width}x{height}\/background\/d2hpdGU=\/position\/center\/quality\/90","product_skc":"202880","is_default":"N"}],"tags":[],"default_images":"http:\/\/img13.static.yhbimg.com\/goodsimg\/2015\/09\/25\/10\/02f401305cc7af370a894d7a094bd6f64c.jpg?imageMogr2\/thumbnail\/{width}x{height}\/extent\/{width}x{height}\/background\/d2hpdGU=\/position\/center\/quality\/90"}],"page_total":2,"total":52,"page":1,"content_code":""},"md5":"b66258633f505562a520e0fccf0b8803"}
+
+
+## 检测是否嵌入APP, APP里直接使用浏览器打开HTML5页面
+
+URL:
+---------------
+正式: http://m.yohobuy.com/appembed
+测试: http://buy.test.yoho.cn/appembed
+
+DATA:
+---------------
+{
+    "open": "Y",
+    "url": "http://m.yohobuy.com"
+}
+或
+{
+    "open": "N",
+    "url": "http://m.yohobuy.com"
+}
--- a/script/nginx/conf/vhosts/nginx.test.yohobuy.conf
View file @91a99e3
+++ b/script/nginx/conf/vhosts/nginx.test.yohobuy.conf
View file @91a99e3
@@ -17,6 +17,12 @@ server
     allow 172.16.0.0/16;
     deny all;
+    #检测是否嵌入APP
+    location = /appembed {
+        default_type application/json;
+        return 200 '{"open":"Y","url":"http://m.yohobuy.com"}';
+    }
+
     #账号相关
     location = /reg.html {
         root  /Data/code/git/yohobuy/assets;
--- a/static/img/me/no-order.png 0 → 100644
View file @91a99e3
+++ b/static/img/me/no-order.png 0 → 100644
View file @91a99e3
--- a/static/img/me/vip-se5df70ae85.png deleted 100644 → 0
View file @d8715bd
+++ b/static/img/me/vip-se5df70ae85.png deleted 100644 → 0
View file @d8715bd
--- a/static/js/me/order.js
View file @91a99e3
+++ b/static/js/me/order.js
View file @91a99e3
@@ -37,7 +37,7 @@ function getOrders() {
     }
     inAjax = true;
-    loading.show();
+    loading.showLoadingMask();
     $.ajax({
         type: 'GET',
@@ -62,7 +62,7 @@ function getOrders() {
             }
             inAjax = false;
-            loading.hide();
+            loading.hideLoadingMask();
         }
     });
 }
--- a/static/js/product/detail/detail.js
View file @91a99e3
+++ b/static/js/product/detail/detail.js
View file @91a99e3
@@ -20,7 +20,7 @@ goodsSwiper = new Swiper('.banner-swiper', {
     lazyLoadingInPrevNext: true,
     loop: true,
     paginationClickable: true,
-    pagination: '.swiper-pagination',
+    pagination: '.banner-top .pagination-inner',
     nextButton: '.swiper-button-next',
     prevButton: '.swiper-button-prev'
 });
--- a/static/sass/me/_home.scss
View file @91a99e3
+++ b/static/sass/me/_home.scss
View file @91a99e3
-$vip: sprite-map("me/vip/*.png");
 .my-page {
     background: #f0f0f0;
@@ -27,8 +26,8 @@ $vip: sprite-map("me/vip/*.png");
         .vip-icon {
             display: inline-block;
-            width: pxToRem(70px);
-            height: pxToRem(30px);
+            width: pxToRem(72px);
+            height: pxToRem(32px);
             vertical-align: middle;
         }
--- a/static/sass/me/_index.scss
View file @91a99e3
+++ b/static/sass/me/_index.scss
View file @91a99e3
+$vip: sprite-map("me/vip/*.png", $spacing: 10px);
+
 @import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service";
--- a/static/sass/me/_order.scss
View file @91a99e3
+++ b/static/sass/me/_order.scss
View file @91a99e3
@@ -2,6 +2,7 @@
     background: #f0f0f0;
     .order {
+        position: relative;
         display: block;
         background: #fff;
         margin: 30rem / $pxConvertRem 0;
@@ -64,17 +65,38 @@
     }
     .no-order {
+        position: absolute;
+        background: #fff;
         text-align: center;
-        color: #f0f0f0;
+        top: 50%;
+        margin-top: -220rem / $pxConvertRem;
+        width: 100%;
+
+        .icon {
+            width: 153rem / $pxConvertRem;
+            height: 196rem / $pxConvertRem;
+            background: image-url('me/no-order.png') no-repeat;
+            background-size: 100%;
+            margin: 0 auto;
+        }
-        .iconfont {
-            font-size: 50px;
+        span {
+            display: block;
+            color: #b0b0b0;
+            font-size: 24rem / $pxConvertRem;
+            margin: 30rem / $pxConvertRem 0 110rem / $pxConvertRem;
         }
         .walk-way {
             display: block;
+            height: 80rem / pxConvertRem;
+            line-height: 80rem / $pxConvertRem;
+            width: 70%;
+            margin: 0 auto;
+            text-align: center;
+            font-size: 30rem / $pxConvertRem;
             color: #fff;
-            background: #fff;
+            background: #444;
             @include border-radius(5px);
         }
     }
--- a/static/sass/me/_vip-grade.scss
View file @91a99e3
+++ b/static/sass/me/_vip-grade.scss
View file @91a99e3
-$vip: sprite-map("me/vip/*.png", $spacing: 10px);
-
 .vip-grade-page {
     background: #f0f0f0;
     padding-bottom: 30rem / $pxConvertRem;
--- a/template/m.yohobuy.com/partials/me/order/orders.phtml
View file @91a99e3
+++ b/template/m.yohobuy.com/partials/me/order/orders.phtml
View file @91a99e3
 {{#if walkwayUrl}}
     <div class="no-order">
-        <span class="iconfont">&#xe632;</span>
+        <div class="icon"></div>
         <span>你还没有订单</span>
         <a class="walk-way" href="{{walkwayUrl}}">随便逛逛</a>
     </div>