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

@@ -44,22 +44,22 @@
                 <a class="type-item" href="/home/order?type=2">
                     <span class="iconfont">&#xe634;</span>
                     <br>待付款
-                    {{#if pendingPaymentCount}}
-                    <span class="num">{{pendingPaymentCount}}</span>
+                    {{#if wait_pay_num}}
+                    <span class="num">{{wait_pay_num}}</span>
                     {{/if}}
                 </a>
                 <a class="type-item" href="/home/order?type=3">
                     <span class="iconfont">&#xe63b;</span>
                     <br>待发货
-                    {{#if dueOutGoodsCount}}
-                    <span class="num">{{dueOutGoodsCount}}</span>
+                    {{#if wait_cargo_num}}
+                    <span class="num">{{wait_cargo_num}}</span>
                     {{/if}}
                 </a>
                 <a class="type-item" href="/home/order?type=4">
                     <span class="iconfont">&#xe633;</span>
                     <br>待收货
-                    {{#if dueInGoodsCount}}
-                    <span class="num">{{dueInGoodsCount}}</span>
+                    {{#if send_cargo_num}}
+                    <span class="num">{{send_cargo_num}}</span>
                     {{/if}}
                 </a>
             </div>

@@ -62,10 +62,9 @@ class UserModel
                 'brand_favorite_total',
                 'product_favorite_total',
                 'product_browse',
-                'dueInGoodsCount',
-                'dueOutGoodsCount',
-                'pendingPaymentCount',
-                'refundGoodsCount'
+                'send_cargo_num',
+                'wait_cargo_num',
+                'wait_pay_num',
             );
             foreach ($infoNumData['data'] as $key => &$val) {