test

app/Http/Controllers/WeChat/ApiController.php

@@ -172,7 +172,7 @@ class ApiController extends Controller
                 $item->url = url($item->content);
             }
             $article_list = Content::where('type', 4)->orderBy('sort')->offset($article_offset)->limit(15)->get();
-            return response()->json(['status' => 'success', 'video_list' => $video_list, 'article_list' => $article_list]);
+            return response()->json(['status' => 'success', 'video_list' => $video_list, 'article_list' => $article_list, 'type' => $request->input('type')]);
         } else if($request->input('type') == 'video') {
             $list = Content::where('type', 3)->orderBy('sort')->offset($video_offset)->limit(15)->get();
             foreach($list as $item) {
@@ -187,7 +187,7 @@ class ApiController extends Controller
             $list = Content::where('type', 4)->orderBy('sort')->offset($article_offset)->limit(15)->get();
         }
 
-        return response()->json(['status' => 'success', 'list' => $list]);
+        return response()->json(['status' => 'success', 'list' => $list, 'type' => $request->input('type')]);
     }
 
     public function getAnnounces(Request $request)

wechat/pages/article/article.js

@@ -23,7 +23,7 @@ Page({
   },
   onLoad: function(a) {
     // app.pageOnLoad(this);
-    this.loadMoreGoodsList();
+    this.loadMoreGoodsList('both');
   },
   swiperTab: function (e) {
     var that = this;
@@ -50,7 +50,8 @@ Page({
   onHide: function() {},
   onUnload: function() {},
   onPullDownRefresh: function() {},
-  loadMoreGoodsList: function() {
+  loadMoreGoodsList: function(tab) {
+    var tab = tab || this.data.selectedTab;
     var o = this;
     // if (!is_loading_more) {
     //   o.setData({
@@ -90,15 +91,37 @@ Page({
       url: api.getMoreVideosAndArticlesUrl,
       method: 'GET',
       data: {
-        'offset': o.data.video_list.length
+        'video_offset': o.data.video_list.length,
+        'article_offset': o.data.article_list.length,
+        'type': tab
       },
       success: res => {
         if (res.data.list.length > 0) {
-          var t = o.data.video_list.concat(res.data.list);
-          o.setData({
-            video_list: t,
-            page: i + 1
-          });
+          if(res.data.type == 'video') {
+            var t = o.data.video_list.concat(res.data.list);
+            o.setData({
+              video_list: t,
+              page: i + 1
+            });
+          } else if (res.data.type == 'article') {
+            var t = o.data.article_list.concat(res.data.list);
+            o.setData({
+              article_list: t,
+              page: i + 1
+            });
+          } else if (res.data.type == 'both') {
+            var t = o.data.video_list.concat(res.data.video_list);
+            o.setData({
+              video_list: t,
+              page: i + 1
+            });
+            var t = o.data.article_list.concat(res.data.article_list);
+            o.setData({
+              article_list: t,
+              page: i + 1
+            });
+          }
+          
         } else {
           wx.showToast({
             title: '到底了',

wechat/pages/article/article.wxml

@@ -3,9 +3,42 @@
 </view>
 <swiper current="{{ selectedTab }}" duration="300" bindchange="swiperTab">
   <swiper-item item-id="video">
-    <view>视频</view>
+    <view class="after-navber">
+      <view class="info">
+        <view class="info-list">
+          <view class="info-content" wx:for="{{ video_list }}">
+            <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>
+                <video autoplay="true" class="{{show_video==index?'':hide}}" controls="controls" id="video_{{index}}" src="{{item.url}}" wx:if="{{show_video==index}}"></video>
+              </view>
+              <view class="info-label">{{item.title||'未命名'}}</view>
+              <!-- <view class="content {{item.show!=-1?'':'more'}}">{{item.content||'暂无信息'}}</view>   -->
+              <!-- <view class="flex-y-center flex-x-center" style="position:relative;height:80rpx;font-size:9pt;color:#afafaf">
+                        <text class="flex-y-center left">{{item.time}}</text>
+                        <view capture-bind:tap="more" class="right flex-y-center" data-index="{{index}}">
+                            <image animation="{{animationData}}" src="{{item.show!=-1?'/images/icon-up.png':'/images/icon-down.png'}}"></image>
+                            <text data-index="{{index}}">展开</text>
+                        </view>
+                    </view> -->
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
   </swiper-item>
   <swiper-item item-id="article">
-    <view>文章</view>
+    <view class="after-navber">
+      <view class="info">
+        <view class="info-list">
+          <view class="info-content" wx:for="{{ article_list }}">
+            <view class='info-bg' catchtap='redirectToArticle' data-id='{{ item.id }}'>
+              <view class="info-label">{{ item.title||'未命名' }}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
   </swiper-item>
-</swiper>
+</swiper>