Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/xieweiguang

@@ -81,4 +81,4 @@ exports.showDialog = function(data, callback) {
 
 
 exports.hideDialog = function() {
 exports.hideDialog = function() {
     $dialogWrapper.fadeOut();
     $dialogWrapper.fadeOut();
-};
+};

@@ -127,10 +127,22 @@ orderHammer.on('tap', function(e) {
                 },
                 },
                 success: function(data) {
                 success: function(data) {
                     if (data.code === 200) {
                     if (data.code === 200) {
+                        dialog.showDialog({
+                            dialogText: '删除订单成功',
+                            autoHide: true,
+                            fast: true
+                        });
 
 
                         //删除订单页面刷新
                         //删除订单页面刷新
                         history.go(0);
                         history.go(0);
                     }
                     }
+                },
+                error: function() {
+                    dialog.showDialog({
+                        dialogText: '删除订单失败',
+                        autoHide: true,
+                        fast: true
+                    });
                 }
                 }
             });
             });
         });
         });
@@ -152,10 +164,22 @@ orderHammer.on('tap', function(e) {
                 },
                 },
                 success: function(data) {
                 success: function(data) {
                     if (data.code === 200) {
                     if (data.code === 200) {
+                        dialog.showDialog({
+                            dialogText: '取消订单成功',
+                            autoHide: true,
+                            fast: true
+                        });
 
 
                         //取消订单页面刷新
                         //取消订单页面刷新
                         history.go(0);
                         history.go(0);
                     }
                     }
+                },
+                error: function() {
+                    dialog.showDialog({
+                        dialogText: '取消订单失败',
+                        autoHide: true,
+                        fast: true
+                    });
                 }
                 }
             });
             });
         });
         });
@@ -184,4 +208,4 @@ $(window).scroll(function() {
 });
 });
 
 
 //初始化请求第一页数据
 //初始化请求第一页数据
-getOrders();
+getOrders();

@@ -82,6 +82,9 @@ headerNavHammer.on('tap', function(e) {
                     autoHide: true,
                     autoHide: true,
                     dialogText: '提交成功'
                     dialogText: '提交成功'
                 });
                 });
+                setTimeout(function() {
+                    location.pathname = 'home/suggest';
+                }, 2000);
             }
             }
         }).fail(function() {
         }).fail(function() {
 
 

@@ -104,7 +104,7 @@ class SideModel
                         'textCn' => '查看全部',
                         'textCn' => '查看全部',
                         'textEn' => '',
                         'textEn' => '',
                         'back' => false,
                         'back' => false,
-                        'isSelect' => ($guangChoosed === 'all') ? true : false,
+                        'isSelect' => ($guangChoosed === 'lifestyle' || $guangChoosed === 'kids') ? true : false,
                         'url' => Helpers::url('', array('gender' => '1,2,3'), 'guang')
                         'url' => Helpers::url('', array('gender' => '1,2,3'), 'guang')
                     ),
                     ),
                     2 => array(
                     2 => array(

@@ -239,8 +239,8 @@ class UserModel
                     $product = array();
                     $product = array();
 	                $product['link'] = isset($val['goodsId']) ? Helpers::url('/product/pro_' . $val['product_skn'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : '';
 	                $product['link'] = isset($val['goodsId']) ? Helpers::url('/product/pro_' . $val['product_skn'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : '';
                     $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : '';
                     $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : '';
-                    $product['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] . '.00' : 0;
-                    $product['discount'] = !empty($one['sales_price']) ? '¥' . $one['sales_price'] . '.00' : 0;
+                    $product['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] : 0;
+                    $product['discount'] = !empty($one['sales_price']) ? '¥' . $one['sales_price'] : 0;
 
 
                     $brand['productList'][] = $product;
                     $brand['productList'][] = $product;
                 }
                 }