Merge branch 'develop/wap' into beta/wap

@@ -63,6 +63,15 @@
 
 
     .goodDesc {
     .goodDesc {
         margin-top: 1rem;
         margin-top: 1rem;
+
+        p {
+            font-size: 0.6rem;
+            line-height: 1rem;
+        }
+
+        img {
+            margin: 0.3rem 0;
+        }
     }
     }
 
 
     .bottom {
     .bottom {

@@ -63,6 +63,18 @@
 
 
     .goodDesc {
     .goodDesc {
         margin-top: 1rem;
         margin-top: 1rem;
+        padding: 0.5rem;
+        border-top: 1px solid #e6e6e6;
+        background-color: #fff;
+
+        p {
+            font-size: 0.6rem;
+            line-height: 1rem;
+        }
+
+        img {
+            margin: 0.3rem 0;
+        }
     }
     }
 
 
     .bottom {
     .bottom {

@@ -17,8 +17,9 @@
         </div>
         </div>
     </div>
     </div>
 
 
-    {{# attaches}}
+    {{#if attaches}}
     <div class="goodDesc">
     <div class="goodDesc">
+        {{# attaches}}
             {{#img}}
             {{#img}}
                 <img src="{{attachUrl}}" alt="{{attachName}}">
                 <img src="{{attachUrl}}" alt="{{attachName}}">
             {{/img}}
             {{/img}}
@@ -33,8 +34,9 @@
                     <source src="{{attachUrl}}"/>
                     <source src="{{attachUrl}}"/>
                 </video>
                 </video>
             {{/video}}
             {{/video}}
-    </div>
         {{/attaches}}
         {{/attaches}}
+    </div>
+    {{/if}}
 
 
     <div class="bottom">
     <div class="bottom">
         <div class="logo"></div>
         <div class="logo"></div>

@@ -800,7 +800,7 @@ class DetailModel
         switch(intval($attachment['attachType'])) {
         switch(intval($attachment['attachType'])) {
             case 1: // 大图文字
             case 1: // 大图文字
                 $result['img'] = array(
                 $result['img'] = array(
-                    'attachUrl' => $attachment['attachUrl'],
+                    'attachUrl' => Helpers::getImageUrl($attachment['attachUrl'], 290, 200),
                     'attachName' => $attachment['attachName'],
                     'attachName' => $attachment['attachName'],
                     'intro' => $attachment['intro'],
                     'intro' => $attachment['intro'],
                     'orderBy' => $attachment['orderBy']
                     'orderBy' => $attachment['orderBy']
@@ -809,7 +809,8 @@ class DetailModel
             case 2: // 视频
             case 2: // 视频
                 $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)
                 );
                 );
                 break;
                 break;
             case 3: // 文本类型
             case 3: // 文本类型