Merge branch 'develop' into test

@@ -93,7 +93,7 @@ $addressForm.on('submit', function() {
             loading.hideLoadingMask();
             loading.hideLoadingMask();
         } else {
         } else {
             if (queryString.refer === 'shopping') {
             if (queryString.refer === 'shopping') {
-                window.location.href = '/shoppingCart/selectAddress';
+                window.location.href = '/cart/index/selectAddress';
             } else {
             } else {
                 window.location.href = '/home/address';
                 window.location.href = '/home/address';
             }
             }

@@ -43,6 +43,7 @@ optHammer.on('tap', function(e) {
                 $('#dialog-wrapper').hide();
                 $('#dialog-wrapper').hide();
                 if (!res) {
                 if (!res) {
                     tip.show('网络错误');
                     tip.show('网络错误');
+                    return;
                 }
                 }
                 if (res.code === 200) {
                 if (res.code === 200) {
                     tip.show('删除成功');
                     tip.show('删除成功');
@@ -74,6 +75,7 @@ optHammer.on('tap', function(e) {
                 $('#dialog-wrapper').hide();
                 $('#dialog-wrapper').hide();
                 if (!res) {
                 if (!res) {
                     tip.show('网络错误');
                     tip.show('网络错误');
+                    return;
                 }
                 }
                 if (res.code === 200) {
                 if (res.code === 200) {
                     tip.show('取消成功');
                     tip.show('取消成功');

@@ -18,4 +18,10 @@ require('./back/mobile');
 require('./back/code');
 require('./back/code');
 require('./back/email');
 require('./back/email');
 require('./back/email-success');
 require('./back/email-success');
-require('./back/new-password');
+require('./back/new-password');
+
+//绑定手机
+require('./bind/bind');
+require('./bind/code');
+require('./bind/password');
+

@@ -831,7 +831,7 @@ class HomeController extends AbstractAction
     /**
     /**
      * 订单详情页
      * 订单详情页
      */
      */
-    public function orderDetailAction()
+    public function orderdetailAction()
     {
     {
         // 审判跳转登录页
         // 审判跳转登录页
         $this->auditJumpLogin();
         $this->auditJumpLogin();

@@ -80,7 +80,7 @@ class OrderModel
                 $result[$key]['sumCost'] = $vo['amount'];
                 $result[$key]['sumCost'] = $vo['amount'];
                 //类内调用格式化订单商品数据方法
                 //类内调用格式化订单商品数据方法
                 $result[$key]['goods'] = Helpers::formatOrderGoods($vo['order_goods'], $count);
                 $result[$key]['goods'] = Helpers::formatOrderGoods($vo['order_goods'], $count);
-                $result[$key]['detailUrl'] = Helpers::url('/home/orderDetail', array('order_code' => $vo['order_code']));
+                $result[$key]['detailUrl'] = Helpers::url('/home/orderdetail', array('order_code' => $vo['order_code']));
                 $result[$key]['count'] = $count;
                 $result[$key]['count'] = $count;
             }
             }
         }
         }

@@ -33,12 +33,6 @@ class DetailModel
             // 调用服务
             // 调用服务
             $baseInfo = DetailData::baseInfo($productId, $uid);
             $baseInfo = DetailData::baseInfo($productId, $uid);
 
 
-//            // 因ＰＣ目前是不判断的，先保持一致，以后有需要，可以去掉
-//            // 判断商品是否在架
-//            if (empty($baseInfo['status'])) {
-//                return $result;
-//            }
-
             // 商品名称
             // 商品名称
             if (isset($baseInfo['productName'])) {
             if (isset($baseInfo['productName'])) {
                 $result['goodsName'] = $baseInfo['productName'];
                 $result['goodsName'] = $baseInfo['productName'];
@@ -241,7 +235,7 @@ class DetailModel
                 'numInCart' => 0,
                 'numInCart' => 0,
                 'goodsInstore' => $baseInfo['storage'], // 库存量
                 'goodsInstore' => $baseInfo['storage'], // 库存量
             );
             );
-            $soldOut = ($baseInfo['storage'] == 0) || ($totalStorageNum === 0);
+            $soldOut = ($baseInfo['storage'] == 0) || ($baseInfo['status'] == 0);
             $notForSale = $baseInfo['attribute'] == 2;
             $notForSale = $baseInfo['attribute'] == 2;
             // 显示加入购物车链接
             // 显示加入购物车链接
             if (!$soldOut && !$notForSale) {
             if (!$soldOut && !$notForSale) {

@@ -108,7 +108,7 @@ routes.girls.type = "rewrite"
 routes.girls.match = "/girl$"
 routes.girls.match = "/girl$"
 routes.girls.route.module = Index
 routes.girls.route.module = Index
 routes.girls.route.controller = Girls
 routes.girls.route.controller = Girls
-routes.girls.route.action = index
+routes.girls.route.action = Index
 
 
 ; 商品筛选
 ; 商品筛选
 routes.goodsfilter.type = "rewrite"
 routes.goodsfilter.type = "rewrite"
@@ -147,3 +147,9 @@ routes.productintro.route.controller = Detail
 routes.productintro.route.action = Intro
 routes.productintro.route.action = Intro
 routes.productintro.map.1 = productSkn
 routes.productintro.map.1 = productSkn
 
 
+; 订单相关
+routes.cart.type = "rewrite"
+routes.cart.match = "/home/order/detail$"
+routes.cart.route.module = Index
+routes.cart.route.controller = Home
+routes.cart.route.action = Ｈomedetail