文章

app/Http/Controllers/WeChat/ApiController.php

@@ -154,18 +154,19 @@ class ApiController extends Controller
         return response()->json(['status' => 'success', 'width' => $image->width(), 'height' => $image->height(), 'shareImage' => $image_url, 'shareText' => $text, 'shareTextPosX' => $pos[0], 'shareTextPosY' => $pos[1]]);
     }
 
-    public function getMoreVideos(Request $request)
+    public function getMoreVideosAndArticles(Request $request)
     {
         $offset = $request->input('offset', 0);
-        $list = Content::where('type', 3)->orderBy('sort')->offset($offset)->limit(15)->get();
+        $list = Content::whereIn('type', [3, 4])->orderBy('sort')->offset($offset)->limit(15)->get();
         foreach($list as $item) {
-            if(empty($item->pic_url)) {
-                $item->pic_url = 'https://u5.9026.com/addons/swdz_mall/core/web/uploads/image/f0/f0734ad93d46497483344846864596a4.jpg';
-            } else {
-                $item->pic_url = url($item->pic_url);
+            if($item->type == 3) {
+                if(empty($item->pic_url)) {
+                    $item->pic_url = 'https://u5.9026.com/addons/swdz_mall/core/web/uploads/image/f0/f0734ad93d46497483344846864596a4.jpg';
+                } else {
+                    $item->pic_url = url($item->pic_url);
+                }
+                $item->url = url($item->content);
             }
-
-            $item->url = url($item->content);
         }
         return response()->json(['status' => 'success', 'list' => $list]);
     }

routes/wechat.php

@@ -6,7 +6,7 @@ Route::get('checkPosition', 'ApiController@checkPosition');
 Route::get('startCheckCard', 'ApiController@startCheckCard');
 Route::get('endCheckCard', 'ApiController@endCheckCard');
 Route::get('getShareInfo', 'ApiController@getShareInfo');
-Route::get('getMoreVideos', 'ApiController@getMoreVideos');
+Route::get('getMoreVideosAndArticles', 'ApiController@getMoreVideosAndArticles');
 Route::get('getCourseInfo', 'ApiController@getCourseInfo');
 Route::get('getMyLearnInfo', 'ApiController@getMyLearnInfo');
 Route::get('applyLeave', 'ApiController@applyLeave');

wechat/pages/article/article.js

@@ -59,7 +59,7 @@ Page({
       //   },
       //       ];
       wx.request({
-        url: api.getMoreVideosUrl,
+        url: api.getMoreVideosAndArticlesUrl,
         method: 'GET',
         data: {
           'offset': o.data.video_list.length
@@ -123,5 +123,8 @@ Page({
         video_list: i,
         animationData: this.animation.export()
       });
+  },
+  redirectToArticle: function(e) {
+    console.log(e);
   }
 });

wechat/pages/article/article.json

@@ -4,5 +4,5 @@
   "usingComponents": {
     "zan-card": "../../bower_components/zanui-weapp/dist/card/index"
   },
-  "navigationBarTitleText": "视频专区"
+  "navigationBarTitleText": "视频和文章"
 }

wechat/pages/article/article.wxml

@@ -2,7 +2,7 @@
     <view class="info">
         <view class="info-list">
             <view class="info-content" wx:for="{{video_list}}">
-                <view class="info-bg">
+                <view class="info-bg" wx:if="{{ item.type == 3 }}">
                     <view class="info-video">
                         <image bindtap="play" class="bg {{show_video==index?hide:''}}" data-index="{{index}}" src="{{item.pic_url}}"></image>
                         <image bindtap="play" class="play {{show_video==index?hide:''}}" data-index="{{index}}" src="/images/video-play.png"></image>
@@ -18,6 +18,9 @@
                         </view>
                     </view> -->
                 </view>
+                <view wx:if="{{ item.type == 4 }}" class='info-bg' catchtap='redirectToArticle' data-id='{{ item.id }}'>
+                  <view class="info-label">{{ item.title||'未命名' }}</view>
+                </view>
             </view>
         </view>
     </view>

wechat/utils/api.js

@@ -8,7 +8,7 @@ module.exports = {
   startCheckCardUrl: headUrl + 'startCheckCard',
   endCheckCardUrl: headUrl + 'endCheckCard',
   getShareInfoUrl: headUrl + 'getShareInfo',
-  getMoreVideosUrl: headUrl + 'getMoreVideos',
+  getMoreVideosAndArticlesUrl: headUrl + 'getMoreVideosAndArticles',
   getCourseInfoUrl: headUrl + 'getCourseInfo',
   getMyLearnInfoUrl: headUrl + 'getMyLearnInfo',
   getRemarkTitlesUrl: headUrl + 'getRemarkTitles',