Merge branch 'master' into feature/students

 {
   "name": "yohobuy",
-  "version": "4.8.6",
+  "version": "4.8.7",
   "description": "yohobuy statics",
   "keywords": [],
   "homepage": "",

@@ -306,6 +306,7 @@
     .row:nth-child(2) {
         height: 45px;
         line-height: 45px;
+        width: 90%;
 
         > span {
             margin-right: 15px;

@@ -92,7 +92,7 @@ class CouponController extends AbstractAction
             } else {
                 $returnData['isApp'] = true;
                 $playUrlEncode = strtr($playUrl . '?code=' . $receiveData['code'] .'&app_version=' . $receiveData['app_version'], array('/' => '\\/'));
-                $returnData['url'] = $playUrl . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $playUrlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"Y"}}';
+                $returnData['url'] = $playUrl . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"http:' . $playUrlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}';
 //                $playUrlEncode = strtr($playUrl, array('/' => '\\/'));
 //                $returnData['url'] = $playUrl . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $playUrlEncode . '","param":{"from":"app","code":"' . $receiveData['code'] . '"}},"requesturl":{"url":"","param":{}},"priority":"N"}}';
             }

@@ -77,9 +77,9 @@ class HfController extends AbstractAction
                     break;
                 case '4.8.0':
                 case '4.8.1':
-                    $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/ios/4.8.1/main.js';
-                    $result['data']['patchv'] = '102';
-                    $result['data']['filecode'] = md5('124ea75e8fffa40ba2d610689ed8bc58' . 'yohopatch2016');
+                    $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/ios/4.8.1/main481.js';
+                    $result['data']['patchv'] = '103';
+                    $result['data']['filecode'] = md5('d4c22cda799ecf3d281b9923d55faf6d' . 'yohopatch2016');
                     $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
                     break;
                 default: // 默认

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "4.8.6"
+application.version = "4.8.7"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "4.8.6"
+application.version = "4.8.7"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "4.8.6"
+application.version = "4.8.7"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "4.8.6"
+application.version = "4.8.7"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"