Merge remote-tracking branch 'origin/develop'

@@ -19,6 +19,8 @@ var tip = require('../../plugin/tip');
 
 var brandId = $('#brand-info').data('id');
 
+var jumpToApp = $('#jump-to-app').val();
+
 var mIntro, aIntro;
 
 var moreHammer, likeHammer;
@@ -71,6 +73,12 @@ likeHammer.on('tap', function(e) {
     var opt = 'ok',
         $this = $(e.target);
 
+
+    //jumpToApp = 1表示APP未登录的情况，此时不发送ajax请求而由a链接直接跳转APP
+    if (jumpToApp === '1') {
+        return;
+    }
+
     e.preventDefault();
 
     if ($this.hasClass('like')) {

@@ -31,11 +31,16 @@
         }
 
         .search {
-            float: right;
-            margin-top: 6px;
+            position: absolute;
+            top: 7px;
+            right:0;
             border: none;
             background: transparent;
             font-size: 16px;
+            width: 3rem;
+            height: 30px;
+            overflow: hidden;
+            line-height: 30px;
         }
     }
 

@@ -52,6 +52,8 @@
             </div>
         {{/if}}
 
+        <input id="jump-to-app" type="hidden" value={{jumpToApp}}>
+
         {{!-- wx-share --}}
         <input id="shareLink" type="hidden" value={{shareLink}}>
         <input id="shareImg" type="hidden" value={{shareImg}}>

@@ -238,14 +238,14 @@ class BackController extends AbstractAction
             $result = BackData::validateMobileCode($phoneNum, $code, $areaCode);
             if($result['code'] === 200)
             {
-                $result['data'] = '/passport/back/password?phoneNum='.$phoneNum.'&token='.$result['data']['token'].'&areaCode='.$areaCode;
+                $result['data'] = '/passport/back/backcode?phoneNum='.$phoneNum.'&token='.$result['data']['token'].'&areaCode='.$areaCode;
             }
 
             $this->echoJson($result);
         }
     }
 
-    public function passwordAction()
+    public function backcodeAction()
     {
         $phoneNum = $this->get('phoneNum', '');
         // 手机验证令牌