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

@@ -21,7 +21,7 @@ use LibModels\Wap\Product\SearchData;
 class PlusstarData
 {
 
-    const URI_BRANDLIST = 'guang/api/v1/plustar/getlist';
+    const URI_BRANDLIST = 'guang/api/v3/plustar/getlist';
     const URI_BRANDINFO_PLUSSTAR = 'guang/service/v3/plustar/'; // 'guang/service/v3/plustar/'
     const URI_BRANDINFO_FAVORITE = 'shops/service/v1/favorite/';
     const URI_BRANDINFO_ARTICLE = 'guang/service/v1/article/';
@@ -45,19 +45,20 @@ class PlusstarData
 
         // 公共的参数
         $param = Yohobuy::param();
-        $param['brand_type'] = '1';
         $param['gender'] = $gender;
         $param['yh_channel'] = $channel;
 
         // 构建推荐的品牌参数及调用接口的URL
         $build = $param;
-        $build['is_recommend'] = '1';
+        $build['brand_type'] = '4';
+        //$build['is_recommend'] = '1';
         $build['client_secret'] = Sign::getSign($build);
         $urlList['recom'] = Yohobuy::httpBuildQuery($url, $build);
 
         // 构建所有的品牌参数及调用接口的URL
         $build = $param;
-        $build['is_recommend'] = '0';
+        $build['brand_type'] = '1';
+        //$build['is_recommend'] = '0';
         $build['client_secret'] = Sign::getSign($build);
         $urlList['all'] = Yohobuy::httpBuildQuery($url, $build);
 

@@ -101,6 +101,9 @@ $addressForm.on('submit', function() {
 });
 
 $submit.on('touchend', function() {
+    if (security.hasDangerInput(false)) {
+        return false;
+    }
     $input.blur();
     $addressForm.submit();
     return false;

@@ -6,12 +6,9 @@
 
 var $ = require('jquery'),
     tip = require('../plugin/tip'),
-    security = require('../plugin/security'),
     loading = require('../plugin/loading');
 
 var $action = $('.action'),
-    $addressForm = $('.edit-address'),
-    $submit = $('.submit'),
     $addAddress = $('.add-address'),
     $footer = $('#yoho-footer'),
     $confim = $('.confim-mask'),
@@ -24,12 +21,13 @@ $pageWrap.first().css('min-height', function() {
 });
 window.rePosFooter();
 
-$confim.on('touchend', '.cancel', function() {
+$confim.on('touchend', '.cancel', function(e) {
     deleteId = null;
-    $confim.hide();
+    $confim.fadeOut();
+    return false;
 }).on('touchend', '.confim', function() {
     loading.showLoadingMask();
-    $confim.hide();
+    $confim.fadeOut();
     $.ajax({
         method: 'POST',
         url: '/home/delAddress',
@@ -52,6 +50,7 @@ $confim.on('touchend', '.cancel', function() {
     }).always(function() {
         deleteId = null;
     });
+    return false;
 });
 
 
@@ -69,17 +68,5 @@ $addAddress.on('touchend', function() {
 // 删除
 $action.on('touchend', '.del', function() {
     deleteId = $(this).data('id');
-    $confim.show();
-});
-
-$submit.on('touchend', function() {
-    if (security.hasDangerInput(false)) {
-        return false;
-    }
-    $addressForm.submit();
-    return false;
-}).on('touchstart', function() {
-    $(this).addClass('highlight');
-}).on('touchend touchcancel', function() {
-    $(this).removeClass('highlight');
+    $confim.fadeIn();
 });

@@ -114,11 +114,13 @@ $page.on('touchstart', '.del-icon', function() {
                         });
                     setTimeout(function() {
                         window.history.go(0);
-                    }, 2500);
+                    }, 1200);
                 }
             },
             complete: function() {
-                dialog.hideDialog(); //隐藏dialog
+                setTimeout(function() {
+                    dialog.hideDialog();
+                }, 1500);
             }
         });
     });

@@ -53,8 +53,8 @@
 					display: block;
 					position: relative;
 					i{
-						width:80rem / $pxConvertRem;
-						height: 30rem / $pxConvertRem;
+						width:72rem / $pxConvertRem;
+						height: 32rem / $pxConvertRem;
 						overflow: hidden;
 						display: block;
 						position: absolute;

@@ -13,21 +13,28 @@
     .basic-info {
         padding-top: 30rem / $pxConvertRem;
         padding-bottom: 25rem / $pxConvertRem;
+        p{
+            width: 100%;
+            height: auto;
+            overflow: hidden;
+            display: block;
+        }
+        span{
+            float: left;
+            overflow: hidden;
+        }
         .user-name {
             max-width: 240rem / $pxConvertRem;
             text-overflow:ellipsis; 
             white-space:nowrap; 
             font-size: 25rem / $pxConvertRem;
             margin-right: 0.5rem;
-            display: inline-block;
-            overflow: hidden;
         }
 
         .vip-icon {
-            display: inline-block;
             width: pxToRem(72px);
             height: pxToRem(32px);
-            vertical-align: sub;
+            line-height: 36rem / $pxConvertRem;
         }
 
         .vip-3 {

@@ -30,7 +30,7 @@ class HomeController extends AbstractAction
     {
         $uid = $this->getUid($useSession);
         if (!$uid) {
-            $this->go(Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', '/'))));
+            $this->go(Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', SITE_MAIN))));
         }
     }
 
@@ -785,7 +785,7 @@ class HomeController extends AbstractAction
         if (empty($orderCode)) {
             $this->error();
         }
-
+        
         $this->_view->display('pay', array(
             'payAppInfo' => array(
                 0 => array(
@@ -806,6 +806,7 @@ class HomeController extends AbstractAction
                 ),
             ),
             'orderCode' => $orderCode,
+            'hasWxShare' => strpos($this->_request->server('HTTP_USER_AGENT', ''), 'MicroMessenger') !== false
         ));
     }
 

@@ -51,7 +51,7 @@ class PlusstarModel
         }
 
         $result = array();
-        $brandList = PlusstarData::firstBrandList($gender, $channel);
+        $brandList = PlusstarData::firstBrandList($gender, $channel); 
         if (!empty($brandList['recom']['data']['list'][0]['data'])) {
             $result['ps']['star'] = self::formatData($brandList['recom']['data']['list'][0]['data'], $gender, true);
             //$result['ps']['sName'] = isset($brandList['recom']['data']['brand_type_name']) ? $brandList['recom']['data']['brand_type_name'] : '';
@@ -107,7 +107,7 @@ class PlusstarModel
         }
 
         $result = array();
-        $brandList = PlusstarData::brandList($gender, $channel);
+        $brandList = PlusstarData::brandList($gender, $channel); 
         if (!empty($brandList['star']['data']['list'][0]['data'])) {
             $result['ps']['star'] = self::formatData($brandList['star']['data']['list'][0]['data'], $gender, false);
             //$result['ps']['pName'] = isset($brandList['star']['data']['brand_type_name']) ? $brandList['star']['data']['brand_type_name'] : '';