Merge branch 'release/4.5' of http://git.yoho.cn/fe/YOHOBUYWAP into release/4.5

@@ -198,6 +198,7 @@ class PlusstarData
         $param = Yohobuy::param();
         $param['brand_id'] = $brandInfo['data']['brand_id'];
         $param['udid'] = $udid;
+        $param['uid'] = $uid;
         $param['limit'] = 3;
         $param['client_type'] = $clientType;
         $param['private_key'] = Yohobuy::$privateKeyList[$clientType];
@@ -205,7 +206,6 @@ class PlusstarData
 
         $article = Yohobuy::get(Yohobuy::SERVICE_URL.self::URI_BRANDINFO_ARTICLE.'getArticleByBrand', $param);
         $result['getArticleByBrand'] = empty($article['data']) ? array() : $article['data'];
-//        file_put_contents('../../../../../../Desktop/app/n/getArticleByBrand.txt', var_export($result['getArticleByBrand'], true));
 
         // 是否收藏店铺
         $param = Yohobuy::param();
@@ -221,12 +221,6 @@ class PlusstarData
         }else{
             $result['getUidBrandFav'] = false;
         }
-        // 相关资讯列表 (3篇)
-//        $result['getArticleByBrand'] = array();
-//        Yohobuy::yarConcurrentCall(Yohobuy::PRD_SERVICE_URL . self::URI_BRANDINFO_ARTICLE, 'getArticleByBrand', array($brandInfo['data']['brand_id'], 3, $udid), function($retval) use(&$result) {
-//            $result['getArticleByBrand'] = empty($retval) ? array() : $retval;
-//            file_put_contents('../../../../../../Desktop/app/o/getArticleByBrand.txt', var_export($retval, true));
-//        });
 
         // 新品到着列表 (6篇)
         $result['getNewProduct'] = array();

@@ -24,9 +24,6 @@ $('.address-item').on('touchend', function() {
         $confimMod.find('.content').text('收货地址仅且只能修改一次，请确认是否修改？');
         $confimMod.fadeIn();
     }
-}).on('touchend', '.edit', function() {
-    window.location.href = $(this).data('href');
-    return false;
 });
 
 $confimMod.on('touchend', '.cancel', function(e) {

@@ -15,6 +15,7 @@ require('./address');
 require('./suggest');
 require('./browse-record');
 require('./address-act');
+require('./address-modify');
 require('./logistic');
 require('./pay');
 require('./personal-details');

@@ -36,26 +36,27 @@ function downCount(options) {
             _minute = _second * 60,
             _hour = _minute * 60,
             _day = _hour * 24,
-            days,
             hours,
             minutes,
             seconds;
 
         // calculate dates
-        days = Math.floor(difference / _day),
         hours = Math.floor((difference % _day) / _hour),
         minutes = Math.floor((difference % _hour) / _minute),
         seconds = Math.floor((difference % _minute) / _second);
 
         // fix dates so that it will show two digets
-        days = (String(days).length >= 2) ? days : '0' + days;
         hours = (String(hours).length >= 2) ? hours : '0' + hours;
         minutes = (String(minutes).length >= 2) ? minutes : '0' + minutes;
         seconds = (String(seconds).length >= 2) ? seconds : '0' + seconds;
 
         // set to DOM
         $countdownContainer.removeClass('hide');
-        $countDownHours.text('剩余' + hours + ':' + minutes + ':' + seconds);
+        if (hours === 0) {
+            $countDownHours.text('剩余' + minutes + ':' + seconds);
+        } else {
+            $countDownHours.text('剩余' + hours + ':' + minutes + ':' + seconds);
+        }
 
         difference -= 1000;
 

@@ -6,10 +6,6 @@
             <span class="name">{{consignee}}</span>
             <span class="tel">{{mobile}}</span>
             <p class="address-info">{{area}} {{address}}</p>
-            <div class="action iconfont">
-                <span class="edit" data-href="/home/addressAct?id={{address_id}}&refer=modify">&#xe61e;</span>
-                <span class="del" data-id="{{address_id}}">&#xe621;</span>
-            </div>
         </div>
         {{/ address}}
 
@@ -17,22 +13,6 @@
            添加新地址
         </a>
 
-        <div class="confim-mask hide">
-            <div class="confim-box">
-                <div class="content">
-                    您确定要删除地址？
-                </div>
-                <div class="action">
-                    <span class="cancel">
-                        取消
-                    </span>
-                    <span class="confim buriedpoint" data-bp-id="addressModify_alert_confirm_0">
-                        确认
-                    </span>
-                </div>
-            </div>
-        </div>
-
         <div class="confim-modify-mask hide">
             <div class="confim-box">
                 <div class="content">

@@ -1089,8 +1089,8 @@ class HomeController extends AbstractAction
         $this->auditJumpLogin();
 
         // 设置网站标题
-        $this->setTitle('地址修改');
-        $this->setNavHeader('地址修改', Helpers::url('/home'), false);
+        $this->setTitle('选择地址');
+        $this->setNavHeader('选择地址');
 
         $uid = $this->_uid;
         $address = UserModel::getAddressData($uid);

@@ -200,6 +200,7 @@ class BrandModel
                     'brandDomain' => $val['brandDomain'],
                     'brandId' => $val['brandId'],
                     'name' => $val['searchTerms'],
+                    'searchTime' => $val['searchTime'],
                     'url' => isset($val['brandDomain']) ? Helpers::url('', '', $val['brandDomain']) : '',
                 );
             }

@@ -85,7 +85,7 @@ class BrandController extends AbstractAction
         $brandDomain = $this->get('brandDomain');
         $brandId = $this->get('brandId');
         do {
-            if (empty($brandId) || empty($uid) || empty($brandDomain) || empty($brandName)) {
+            if (empty($uid) || empty($brandName)) {
                 break;
             }
             $records = time().'_'.$brandName.'_'.$brandDomain.'_'.$brandId;

@@ -131,7 +131,7 @@ class IndexController extends AbstractAction
         $channel = $this->get('yh_channel');
 
         // 标识是不是APP客户端
-        $isApp = is_numeric($channel);
+        $isApp = $this->isApp();
         // APP访问时通过频道参数判断性别
         if ($isApp) {
             switch (intval($channel)) {
@@ -193,9 +193,9 @@ class IndexController extends AbstractAction
 //                $build[] = Helpers::formatArticle($article, true, $isApp, false, $uid);
 //            }
             foreach ($article['data']['list']['artList'] as $articlekey =>$article) {
-                $build[$key] = Helpers::formatArticle($article, true, $isApp, false, $uid);
+                $build[$articlekey] = Helpers::formatArticle($article, true, $isApp, false, $uid);
                 if($this->isApp()){
-                $build[$articlekey]['collect']['url'] = Helpers::url('/author/index', array('id' => $id), 'guang');
+                    $build[$articlekey]['collect']['url'] = Helpers::url('/author/index', array('id' => $id), 'guang');
                 }
             }
             $data['guang']['infos'] = $build;

@@ -31,7 +31,7 @@ class InfoController extends AbstractAction
         $data['guang']['id'] = $id;
 
         // 标识是不是APP访问的
-        $isApp = null !== $this->get('app_version', null);
+        $isApp = $this->isApp();
         // 标识是否是微信访问
         $isWeixin = stripos($this->server('HTTP_USER_AGENT', ''), 'MicroMessenger') !== false;
 

@@ -84,7 +84,7 @@ class PlusstarController extends AbstractAction
 
             $channel = $this->get('yh_channel');
             // 标识是不是APP客户端
-            $isApp = is_numeric($channel);
+            $isApp = $this->isApp();
             // 标识是否是微信访问
             $isWeixin = stripos($this->server('HTTP_USER_AGENT', ''), 'MicroMessenger') !== false;
             // APP访问时通过频道参数判断性别