Merge branch 'release_v1'

@@ -398,8 +398,8 @@ class SearchModel
             }
             }
             $product['url'] = Helpers::getUrlBySkc($productVal['product_id'], $product['default_goods'], $productVal['cn_alphabet']);
             $product['url'] = Helpers::getUrlBySkc($productVal['product_id'], $product['default_goods'], $productVal['cn_alphabet']);
             $product['pic_url'] = Images::getImageUrl($product['default_image'], 150, 200);
             $product['pic_url'] = Images::getImageUrl($product['default_image'], 150, 200);
-            $product['market_price'] = $productVal['market_price'] != $productVal['sales_price'] ? $productVal['market_price'] : '';
-            $product['price'] = $productVal['sales_price'];
+            $product['market_price'] = $productVal['market_price'] != $productVal['sales_price'] ? '¥'.$productVal['market_price'] : '';
+            $product['price'] = '¥'.$productVal['sales_price'];
             $product['product_name'] = $productVal['product_name'];
             $product['product_name'] = $productVal['product_name'];
             unset($product['default_goods']);
             unset($product['default_goods']);
             unset($product['default_image']);
             unset($product['default_image']);
@@ -408,6 +408,7 @@ class SearchModel
             }
             }
         }
         }
         ksort($result);
         ksort($result);
+        $result = array_values($result);
         return $result;
         return $result;
     }
     }
 
 

@@ -279,6 +279,9 @@ class CartModel
             if ($remove && isset($remove['code'])) {
             if ($remove && isset($remove['code'])) {
                 $result['code'] = $remove['code'];
                 $result['code'] = $remove['code'];
                 $result['message'] = $remove['message'];
                 $result['message'] = $remove['message'];
+                if (isset($remove['data']['goods_count'])) {
+                    $result['total_goods_num'] = $remove['data']['goods_count'];
+                }
             }
             }
         } while (false);
         } while (false);