Merge remote-tracking branch 'remotes/origin/develop/wap' into stable/wap

@@ -4,6 +4,7 @@ namespace Product;
 
 
 use LibModels\Wap\Product\DetailData;
 use LibModels\Wap\Product\DetailData;
 use Plugin\Helpers;
 use Plugin\Helpers;
+use Plugin\Images;
 
 
 /**
 /**
  * 商品详情页模板相关的数据模型
  * 商品详情页模板相关的数据模型
@@ -771,7 +772,7 @@ class DetailModel
             // 发售日期
             // 发售日期
             $result['releaseDate'] = $product['saleTime'] . '发售';
             $result['releaseDate'] = $product['saleTime'] . '发售';
             // baner
             // baner
-            $result['banner'] = $product['defaultUrl'];
+            $result['banner'] = Helpers::getImageUrl($product['defaultUrl'], 750, '');
             $result['description'] = $product['description'];
             $result['description'] = $product['description'];
 
 
             // 附件
             // 附件
@@ -799,7 +800,7 @@ class DetailModel
         switch(intval($attachment['attachType'])) {
         switch(intval($attachment['attachType'])) {
             case 1: // 大图文字
             case 1: // 大图文字
                 $result['img'] = array(
                 $result['img'] = array(
-                    'attachUrl' => Helpers::getImageUrl($attachment['attachUrl'], 290, 200),
+                    'attachUrl' => Helpers::getImageUrl($attachment['attachUrl'], 750, ''),
                     'attachName' => $attachment['attachName'],
                     'attachName' => $attachment['attachName'],
                     'intro' => $attachment['intro'],
                     'intro' => $attachment['intro'],
                     'orderBy' => $attachment['orderBy']
                     'orderBy' => $attachment['orderBy']
@@ -809,7 +810,7 @@ class DetailModel
                 $result['video'] = array(
                 $result['video'] = array(
                     'attachUrl' => $attachment['attachUrl'],
                     'attachUrl' => $attachment['attachUrl'],
                     'orderBy' => $attachment['orderBy'],
                     'orderBy' => $attachment['orderBy'],
-                    'img' => Helpers::getImageUrl($attachment['intro'], 290, 200)
+                    'img' => Helpers::getImageUrl($attachment['intro'], 750, '')
                 );
                 );
                 break;
                 break;
             case 3: // 文本类型
             case 3: // 文本类型
@@ -823,7 +824,7 @@ class DetailModel
         }
         }
 
 
         if(count($result) > 1) {
         if(count($result) > 1) {
-            Helpers::sortArrByField($result, 'orderBy');
+            Helpers::sortArrByField($result, 'orderBy', true);
         }
         }
 
 
         return $result;
         return $result;