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

@@ -139,7 +139,7 @@ class Yohobuy
         if (!empty($data)) {
         if (!empty($data)) {
             $url = self::httpBuildQuery($url, $data);
             $url = self::httpBuildQuery($url, $data);
         }
         }
-        var_dump($url);
+
         /* 开启缓存的情况 */
         /* 开启缓存的情况 */
         if ($cache && USE_CACHE) {
         if ($cache && USE_CACHE) {
             // 先尝试获取一级缓存(master), 有数据则直接返回.
             // 先尝试获取一级缓存(master), 有数据则直接返回.

@@ -555,7 +555,8 @@ class Helpers
      */
      */
     public static function syncUserSession($uid, $refer = '', $callback='call')
     public static function syncUserSession($uid, $refer = '', $callback='call')
     {
     {
-        return 'http://m1.yohobuy.com/Passport/session/index?callback=' . $callback . '&uid=' . $uid . '&go=' . $refer;
+        return 'http://m1.yohobuy.com/Passport/session/index?callback=' . $callback 
+                . '&sign=' . md5($uid . 'Js8Yn0!EwPM45-ws') . '&uid=' . $uid . '&go=' . $refer;
     }
     }
 
 
 }
 }

@@ -17,3 +17,4 @@ require('./browse-record');
 require('./address-act');
 require('./address-act');
 require('./logistic');
 require('./logistic');
 require('./pay');
 require('./pay');
+require('./personal-details');

@@ -9,4 +9,5 @@ require('./newsale/discount');
 require('./list');
 require('./list');
 require('./detail/detail');
 require('./detail/detail');
 require('./detail/loadmore');
 require('./detail/loadmore');
-require('./detail/consultform');
+require('./detail/consultform');
+require('./newsale/hot-rank');

@@ -13,10 +13,14 @@
     .basic-info {
     .basic-info {
         padding-top: 30rem / $pxConvertRem;
         padding-top: 30rem / $pxConvertRem;
         padding-bottom: 25rem / $pxConvertRem;
         padding-bottom: 25rem / $pxConvertRem;
-
         .user-name {
         .user-name {
+            max-width: 240rem / $pxConvertRem;
+            text-overflow:ellipsis; 
+            white-space:nowrap; 
             font-size: 25rem / $pxConvertRem;
             font-size: 25rem / $pxConvertRem;
             margin-right: 0.5rem;
             margin-right: 0.5rem;
+            display: inline-block;
+            overflow: hidden;
         }
         }
 
 
         .vip-icon {
         .vip-icon {

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

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

@@ -221,7 +221,7 @@ class LoginController extends AbstractAction
      */
      */
     public function sinacallbackAction()
     public function sinacallbackAction()
     {
     {
-        $sina = Factory::create('sina');
+        $sina = Factory::create('sinaweibo');
         $access = $sina->getAccessToken();
         $access = $sina->getAccessToken();
         /* 获取QQ腾讯用户的详细信息 */
         /* 获取QQ腾讯用户的详细信息 */
         $partnerInfo = $sina->getUserInfo($access);
         $partnerInfo = $sina->getUserInfo($access);