Merge branch 'develop/wap' into beta/wap

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

@@ -63,6 +63,18 @@
 
     .goodDesc {
         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 {

@@ -17,24 +17,26 @@
         </div>
     </div>
 
-    {{# attaches}}
+    {{#if attaches}}
     <div class="goodDesc">
-        {{#img}}
-            <img src="{{attachUrl}}" alt="{{attachName}}">
-        {{/img}}
+        {{# attaches}}
+            {{#img}}
+                <img src="{{attachUrl}}" alt="{{attachName}}">
+            {{/img}}
 
-        {{#text}}
-            <p class="desc">{{intro}}</p>
-        {{/text}}
+            {{#text}}
+                <p class="desc">{{intro}}</p>
+            {{/text}}
 
-        {{#video}}
-            <video poster="{{img}}"  controls="controls" controls="controls" preload="metadata" loop="loop" width="100%" name="media">
-                <source src="{{attachUrl}}" type="video/ogg;codecs=" theora,vorbis"" media="screen" />
-                <source src="{{attachUrl}}"/>
-            </video>
-        {{/video}}
+            {{#video}}
+                <video poster="{{img}}"  controls="controls" controls="controls" preload="metadata" loop="loop" width="100%" name="media">
+                    <source src="{{attachUrl}}" type="video/ogg;codecs=" theora,vorbis"" media="screen" />
+                    <source src="{{attachUrl}}"/>
+                </video>
+            {{/video}}
+        {{/attaches}}
     </div>
-    {{/attaches}}
+    {{/if}}
 
     <div class="bottom">
         <div class="logo"></div>

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