Merge branch 'develop/wap' into beta/wap

@@ -251,16 +251,19 @@ $('.add-intimacy').on('touchstart', function(event) {
 
 
 // 关闭日历弹出窗事件
 // 关闭日历弹出窗事件
 $('.pop-intimacy .pop-close, .classroom-mask').on('click', function() {
 $('.pop-intimacy .pop-close, .classroom-mask').on('click', function() {
-    $('.pop-intimacy').css({
-        zIndex: '-1'
-    }).hide();
-    $('.classroom-mask').css({
-        zIndex: '-1'
-    }).hide();
 
 
-    $('body').css({
-        overflow: 'visible'
-    });
+    // $('.pop-intimacy').css({
+    //     zIndex: '-1'
+    // }).hide();
+    // $('.classroom-mask').css({
+    //     zIndex: '-1'
+    // }).hide();
+
+    // $('body').css({
+    //     overflow: 'visible'
+    // });
+
+    location.reload();
 });
 });
 
 
 function setAvatar() {
 function setAvatar() {

@@ -165,7 +165,7 @@ class StarClassModel
             foreach ($data['data']['list']['artList'] as $key => $value) {
             foreach ($data['data']['list']['artList'] as $key => $value) {
                 //获得原尺寸图片
                 //获得原尺寸图片
                 $collocationList[$key]['img'] = Helpers::getOriginalImg($value['src']);
                 $collocationList[$key]['img'] = Helpers::getOriginalImg($value['src']);
-                $collocationList[$key]['url'] = $value['url'];
+                $collocationList[$key]['url'] = $isApp ? $value['url'] : Helpers::getFilterUrl($value['url']);
                 $collocationList[$key]['title'] = $value['title'];
                 $collocationList[$key]['title'] = $value['title'];
                 $collocationList[$key]['content'] = $value['intro'];
                 $collocationList[$key]['content'] = $value['intro'];
                 $collocationList[$key]['time'] = $value['publish_time'];
                 $collocationList[$key]['time'] = $value['publish_time'];