Merge branch 'develop' into test

@@ -64,7 +64,7 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
         id = $this.closest('.shopping-cart-good').data('id'),
         id = $this.closest('.shopping-cart-good').data('id'),
         url;
         url;
 
 
-    if ($this.closest('.put-in-favorite')) {
+    if ($this.closest('.put-in-favorite').length > 0) {
 
 
         //移入收藏夹
         //移入收藏夹
         url = '/shoppingCart/col';
         url = '/shoppingCart/col';

@@ -14,7 +14,6 @@ use Index\UserModel as UserModel;
  * @package 
  * @package 
  * @copyright yoho.inc
  * @copyright yoho.inc
  * @version 1.0 (2015-10-28 16:28:32)
  * @version 1.0 (2015-10-28 16:28:32)
- * @author fei.hong <fei.hong@yoho.cn>
  */
  */
 class HomeController extends AbstractAction
 class HomeController extends AbstractAction
 {
 {

@@ -33,12 +33,12 @@ application.debug = False
 application.servers.config = APPLICATION_PATH "/configs/core"
 application.servers.config = APPLICATION_PATH "/configs/core"
 
 
 ;出错的时候是否抛出异常
 ;出错的时候是否抛出异常
-application.dispatcher.throwException = False
+application.dispatcher.throwException = True
 
 
 ;是否使用默认的异常 捕获Controller, 如果开启,  在有未捕获的异常的时候,
 ;是否使用默认的异常 捕获Controller, 如果开启,  在有未捕获的异常的时候,
 ;控制权会交给ErrorController的errorAction 方法,
 ;控制权会交给ErrorController的errorAction 方法,
 ;可以通过$request->getException()获得此异常对象
 ;可以通过$request->getException()获得此异常对象
-application.dispatcher.catchException = False
+application.dispatcher.catchException = True
 
 
 ;模板预编译目录,该目录需要有读写权限
 ;模板预编译目录,该目录需要有读写权限
 application.template.compile = ROOT_PATH "/compile/m.yohobuy.com"
 application.template.compile = ROOT_PATH "/compile/m.yohobuy.com"

@@ -126,10 +126,10 @@ routes.product.route.action = Index
 routes.product.map.1 = productId
 routes.product.map.1 = productId
 routes.product.map.2 = goodsId
 routes.product.map.2 = goodsId
 
 
-routes.buy.type = "regex"
-routes.buy.match = "#/product/intro_([0-9]+)/(.*).html#"
-routes.buy.route.module = Product
-routes.buy.route.controller = Detail
-routes.buy.route.action = Intro
-routes.buy.map.1 = productSkn
+routes.productintro.type = "regex"
+routes.productintro.match = "#/product/intro_([0-9]+)/(.*).html#"
+routes.productintro.route.module = Product
+routes.productintro.route.controller = Detail
+routes.productintro.route.action = Intro
+routes.productintro.map.1 = productSkn