Merge branch 'release/4.8'

@@ -531,10 +531,7 @@ class CartData
         $param['orderCode'] = $orderCode;
         $param['orderCode'] = $orderCode;
         $param['payment'] = $payment;
         $param['payment'] = $payment;
         $param['client_secret'] = Sign::getSign($param);
         $param['client_secret'] = Sign::getSign($param);
-<<<<<<< HEAD
-        return Yohobuy::get(Yohobuy::API_URL, $param);
-=======
+
         return Yohobuy::get(API_URL, $param);
         return Yohobuy::get(API_URL, $param);
->>>>>>> master
     }
     }
 }
 }

@@ -397,15 +397,9 @@ class ShopModel
                     Helpers::substrEllipsis($resource['enName'], 5) : Helpers::substrEllipsis($resource['enName'], 10),
                     Helpers::substrEllipsis($resource['enName'], 5) : Helpers::substrEllipsis($resource['enName'], 10),
                 'name' => Helpers::isChinese($resource['name']) ?
                 'name' => Helpers::isChinese($resource['name']) ?
                     Helpers::substrEllipsis($resource['name'], 5) : Helpers::substrEllipsis($resource['name'], 6),
                     Helpers::substrEllipsis($resource['name'], 5) : Helpers::substrEllipsis($resource['name'], 6),
-<<<<<<< HEAD
-                'img' => self::imageView2($resource['src'], 50, 50),
-                'title' => $resource['title'],
-                'url' => $resource['url'],
-=======
                 'img'=> self::imageView2($resource['src'], 50, 50),
                 'img'=> self::imageView2($resource['src'], 50, 50),
                 'title'=> $resource['title'],
                 'title'=> $resource['title'],
                 'url'=>  Helpers::getUrlSafe($resource['url']),
                 'url'=>  Helpers::getUrlSafe($resource['url']),
->>>>>>> master
             );
             );
         }
         }
         if (empty($result)) {
         if (empty($result)) {
@@ -459,13 +453,8 @@ class ShopModel
 
 
             foreach ($resource['data'] as $val) {
             foreach ($resource['data'] as $val) {
                 $result[] = array(
                 $result[] = array(
-<<<<<<< HEAD
-                    'img' => self::imageView2($val['src'], 160, 240),
-                    'url' => $val['url'],
-=======
                     'img'=> self::imageView2($val['src'], 160, 240),
                     'img'=> self::imageView2($val['src'], 160, 240),
                     'url'=>  Helpers::getUrlSafe($val['url']),
                     'url'=>  Helpers::getUrlSafe($val['url']),
->>>>>>> master
                 );
                 );
             }
             }
         }
         }