Merge branch 'release/usercenter'

@@ -134,7 +134,11 @@ const index = (params) => {
 
         if (result[2] && result[2].data) {
             Object.assign(finalResult, {
-                productFavoriteTotal: result[2].data.product_favorite_total
+                productFavoriteTotal: result[2].data.product_favorite_total || '0'
+            });
+        } else {
+            Object.assign(finalResult, {
+                productFavoriteTotal: '0'
             });
         }
 
@@ -146,8 +150,13 @@ const index = (params) => {
                 yohoCoinNum: result[3].data.yoho_coin_num,
                 inboxTotal: result[3].data.inbox_total,
                 couponNum: result[3].data.coupon_num,
-                brandFavoriteTotal: result[3].data.brand_favorite_total,
-                productBrowse: result[3].data.product_browse
+                brandFavoriteTotal: result[3].data.brand_favorite_total || '0',
+                productBrowse: result[3].data.product_browse || '0'
+            });
+        } else {
+            Object.assign(finalResult, {
+                brandFavoriteTotal: '0',
+                productBrowse: '0'
             });
         }
 

@@ -43,8 +43,6 @@ const _assignExpressInfo = (showLogistics, order, result) => {
 const _getOrderStatus = (order, showLogistics) => {
     let result = {};
 
-    // let order.status = 3;
-
     if (order.isCancel === 'Y') {
         return {
             canceled: true
@@ -54,7 +52,7 @@ const _getOrderStatus = (order, showLogistics) => {
     // 先判断订单付款方式，根据不同的付款方式计算订单状态。（注:货到付款没有待付款状态）
     // 支付方式为非货到付款时，计算订单状态。
     if (parseInt(order.paymentType, 10) !== 2) {
-        switch (order.status) {
+        switch (parseInt(order.status, 10)) {
             case 0:
 
                 /* 待付款 */

@@ -48,8 +48,10 @@
                 </a>
                 {{/notice}}
             </div>
+            <div class="my-order">
+        {{^}}
+            <div class="my-order my-order-top">
         {{/if}}
-        <div class="my-order">
             <a class="order-title"  href="/home/orders">
                 我的订单
                 <span class="iconfont">

@@ -54,7 +54,7 @@ $('#upload-img').upload({
         }));
     },
     onUploadComplete: function(file, data) {
-        data = saveImage(data);
+        data = saveImage.saveImage(data);
 
         $uploadImgList.html('');
         imgStr = data.imgList[0].imgRelUrl;

@@ -160,4 +160,14 @@
     &:actived {
         color: #000;
     }
+}
+
+.circle-rightbottom {
+    position: absolute;
+
+    width: 25PX;
+    height: 0PX;
+    border:0 solid #323232;
+    border-bottom:25PX solid #323232;
+    border-radius:0 0 25PX 0;
 }
\ No newline at end of file

@@ -130,7 +130,7 @@
                 content: "";
                 position: absolute;
                 right: 0;
-                top: 24px;
+                top: 12px;
                 width: 0;
                 height: 44px;
                 border-right: 4px solid #fff;
@@ -145,9 +145,15 @@
             padding: 0;
             height: 88px;
 
-            .link-item p {
-                font-size: 32px;
-                line-height: 88px;
+            .link-item {
+                p {
+                    font-size: 32px;
+                    line-height: 88px;
+                }
+
+                &:after {
+                    top: 24px;
+                }
             }
         }
     }
@@ -241,6 +247,10 @@
         }
     }
 
+    .my-order-top {
+        margin-top: 30px;
+    }
+
     .group-list {
         margin-bottom: 30px;
         border-top: 1px solid #e0e0e0;

@@ -271,7 +271,7 @@
                     height: 60px;
                     position: absolute;
                     left: 50%;
-                    top: 50%;
+                    top: 47%;
                     margin-top: -18px;
                     margin-left: -250px;
                     z-index: 8;

@@ -42,7 +42,7 @@
                     height: 60px;
                     position: absolute;
                     left: 50%;
-                    top: 50%;
+                    top: 47%;
                     margin-top: -18px;
                     margin-left: -250px;
                     z-index: 8;