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

@@ -143,7 +143,6 @@ class Yohobuy
         if (!empty($data)) {
             $url = self::httpBuildQuery($url, $data);
         }
-        echo $url;
 
         /* 开启缓存的情况 */
         if ($cache && USE_CACHE) {

@@ -576,7 +576,7 @@ class Helpers
             $oneGoods['id'] = $value['product_sku'];
             $oneGoods['skn'] = $value['product_skn'];
             $oneGoods['name'] = $value['product_name'];
-            $oneGoods['thumb'] = !empty($value['goods_images']) ? Images::getImageUrl($value['goods_images'], 90, 100) : '';
+            $oneGoods['thumb'] = !empty($value['goods_images']) ? Images::getImageUrl($value['goods_images'], 120, 160) : '';
             $oneGoods['color'] = $value['color_name'];
             $oneGoods['size'] = $value['size_name'];
             $oneGoods['checked'] = $value['selected'] === 'Y';

@@ -15,8 +15,8 @@ $('.address-item').on('touchend', function() {
 }).on('touchend', '.edit', function() {
     window.location.href = $(this).data('href');
     return false;
-}).on('touchend', '.del', function() {
-    deleteId = $(this).data('address-id');
+}).on('touchstart', '.del', function() {
+    deleteId = $(this).data('id');
 });
 
 $confim.on('touchend', '.confim', function() {

@@ -41,6 +41,7 @@
     .thumb {
         float: left;
         width: 100rem / $pxConvertRem;
+        margin-right: 20rem / $pxConvertRem;
     }
 
     .text-info {
@@ -48,7 +49,7 @@
         .name {
             font-size: 28rem / $pxConvertRem;
             height: 74rem / $pxConvertRem;
-            overflow: hidden;  
+            overflow: hidden;
             display: -webkit-box;
             -webkit-line-clamp: 2;
             -webkit-box-orient: vertical;

@@ -58,13 +58,7 @@
 {{/if}}
 
 <div class="price-compute">
-    <p>
-        <span>总价（¥{{price}}）<i>-</i></span>
-        <span>活动价(¥{{activityPrice}})</span>
-    </p>
-    <p>
-        <span><i>=</i>商品总计金额 （¥{{sumPrice}}）</span>
-    </p>
+    <p>{{formulaPrice}}</p>
 </div>
 
 <div class="balance">

@@ -788,8 +788,9 @@ class CartModel
             }
 
             // 结算数据
-            $result['price'] = Helpers::transPrice($data['shopping_cart_data']['order_amount']);
-            $result['activityPrice'] = Helpers::transPrice($data['shopping_cart_data']['discount_amount']);
+            $result['formulaPrice'] = $data['shopping_cart_data']['promotion_formula'];
+            /*$result['price'] = Helpers::transPrice($data['shopping_cart_data']['order_amount']);
+            $result['activityPrice'] = Helpers::transPrice($data['shopping_cart_data']['discount_amount']);*/
             $result['count'] = $data['shopping_cart_data']['selected_goods_count'];
             $result['isAllSelected'] = ($data['shopping_cart_data']['goods_count'] === $data['shopping_cart_data']['selected_goods_count']) && ($data['shopping_cart_data']['selected_goods_count'] >0);
             $result['sumPrice'] = Helpers::transPrice($data['shopping_cart_data']['last_order_amount']);