Merge remote-tracking branch 'origin/stable/wap'

@@ -10218,7 +10218,7 @@ $('.address-item').on('touchend', function() {
     orderInfo('address', address);
     orderInfo('address', address);
 
 
     window.location.href = $this.data('href');
     window.location.href = $this.data('href');
-}).on('touchstart', '.edit', function() {
+}).on('touchend', '.edit', function() {
     window.location.href = $(this).data('href');
     window.location.href = $(this).data('href');
     return false;
     return false;
 }).on('touchstart', '.del', function() {
 }).on('touchstart', '.del', function() {

@@ -27,7 +27,7 @@ $('.address-item').on('touchend', function() {
     orderInfo('address', address);
     orderInfo('address', address);
 
 
     window.location.href = $this.data('href');
     window.location.href = $this.data('href');
-}).on('touchstart', '.edit', function() {
+}).on('touchend', '.edit', function() {
     window.location.href = $(this).data('href');
     window.location.href = $(this).data('href');
     return false;
     return false;
 }).on('touchstart', '.del', function() {
 }).on('touchstart', '.del', function() {

@@ -5,6 +5,10 @@
     visibility: hidden;
     visibility: hidden;
   }
   }
 
 
+  .box.bytouch {
+    background-color:#eee;
+  }
+
   .box {
   .box {
     border: 1px solid #eee;
     border: 1px solid #eee;
     border-radius: 10rem / $pxConvertRem;
     border-radius: 10rem / $pxConvertRem;

@@ -708,11 +708,9 @@ class CartModel
                 }
                 }
 
 
                 // 缩略图
                 // 缩略图
-                foreach ($val['images_list'] as $image) {
-                    $thumbImageList[] = array(
-                        'img' => Helpers::getImageUrl($image['image_url'], 60, 60)
-                    );
-                }
+                $thumbImageList[] = array(
+                    'img' => Helpers::getImageUrl($val['color_image'], 60, 60)
+                );
 
 
                 // 商品库存总数
                 // 商品库存总数
                 $totalStorageNum += $colorNum;
                 $totalStorageNum += $colorNum;