直播修改

taiyuan
1 parent 581a42d0
Showing 5 changed files with 267 additions and 118 deletions
packageA/pages/liveStream/liveStream.js
packageA/pages/liveStream/liveStream.json
packageA/pages/liveStream/liveStream.wxml
packageA/pages/liveStream/liveStream.wxss
packageA/pages/liveStreamDetails/liveStreamDetails.wxss
@@ -10,17 +10,25 @@ var t = require(&quot;../../../utils/util&quot;),
   o = s.globalData.setting,
   os = o;
 var regeneratorRuntime = require('../../../utils/runtime.js');
-1
+
+const app = getApp();
+let self = null;
+
+
 Page({
   /**
    * 页面的初始数据
    */
   data: {
     curPage: 1,
-    pageNum: 1,
-    liveing: [],
-    livetoBegin: [],
-    liveOver: []
+    living: {},
+    livetoBegin: {},
+    liveOver: {},
+		list: null,
+		isLoading: false, // 检测是否已经发送请求,防止重复发送请求
+		noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
+		pageNum: 1, // 当前页数
+		
   },
   // list: [],
   // live: {
@@ -60,8 +68,10 @@ Page({
           storeId: o.stoid
         },
         success: function (res) {
-          console.log('我发起了PUT请求,请求结果：', res.data);
-          resolve();
+          // console.log('我发起了PUT请求,请求结果：', res.data);
+					if(res.data.code == 0) {
+						resolve();
+					};
         }
       });
     });
@@ -136,99 +146,144 @@ Page({
     })
   },
-  pageTotal: function (rowCount, pageSize) {
-    if (rowCount == null || rowCount == "") {
-      return 0;
-    } else {
-      if (pageSize != 0 && rowCount % pageSize == 0) {
-        return parseInt(rowCount / pageSize)
-      };
-      if (pageSize != 0 && rowCount % pageSize != 0) {
-        return parseInt(rowCount / pageSize) + 1;
-      };
-    }
-  },
-
-  getData: function (liveStatus) {
-    var that = this;
-    var curPage = this.data.curPage
-    getApp().request.promiseGet("/api/weshop/wx/livelist/page", {
-      data: {
-        storedId: o.stoid,
-        page: curPage,
-        live_status: liveStatus
-      }
-    }).then(res => {
-      if (res.data.code == 0) {
-        if (liveStatus == 101) {
-          that.setData({
-            liveing: res.data.data.pageData
-          });
-        } else if (liveStatus == 102) {
-          that.setData({
-            livetoBegin: res.data.data.pageData
-          });
-        } else if (liveStatus == 103) {
-          that.setData({
-            liveOver: res.data.data.pageData
-          });
-
-          var total = res.data.data.total;
-          console.log("total", total);
-          var pageSize = res.data.data.pageSize;
-          console.log("pageSize", pageSize);
-          var pageNum = that.pageTotal(total, pageSize);
-          console.log("pageNum", pageNum);
-          that.setData({
-            pageNum
-          });
-
-        }
-      }
-
-      curPage++;
-      that.setData({
-        curPage
-      });
+  // pageTotal: function (rowCount, pageSize) {
+  //   if (rowCount == null || rowCount == "") {
+  //     return 0;
+  //   } else {
+  //     if (pageSize != 0 && rowCount % pageSize == 0) {
+  //       return parseInt(rowCount / pageSize)
+  //     };
+  //     if (pageSize != 0 && rowCount % pageSize != 0) {
+  //       return parseInt(rowCount / pageSize) + 1;
+  //     };
+  //   }
+  // },
-    });
-  },
+  // getData: function (liveStatus) {
+  //   var that = this;
+  //   var curPage = this.data.curPage
+  //   getApp().request.promiseGet("/api/weshop/wx/livelist/page", {
+  //     data: {
+  //       storedId: o.stoid,
+  //       page: curPage,
+  //       live_status: liveStatus
+  //     }
+  //   }).then(res => {
+  //     if (res.data.code == 0) {
+  //       if (liveStatus == 101) {
+  //         that.setData({
+  //           liveing: res.data.data.pageData
+  //         });
+  //       } else if (liveStatus == 102) {
+  //         that.setData({
+  //           livetoBegin: res.data.data.pageData
+  //         });
+  //       } else if (liveStatus == 103) {
+  //         that.setData({
+  //           liveOver: res.data.data.pageData
+  //         });
+
+  //         var total = res.data.data.total;
+  //         console.log("total", total);
+  //         var pageSize = res.data.data.pageSize;
+  //         console.log("pageSize", pageSize);
+  //         var pageNum = that.pageTotal(total, pageSize);
+  //         console.log("pageNum", pageNum);
+  //         that.setData({
+  //           pageNum
+  //         });
+
+  //       }
+  //     }
+
+  //     curPage++;
+  //     that.setData({
+  //       curPage
+  //     });
+
+  //   });
+  // },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    console.log('ppppp',this.pageTotal(4, 10));
-    // var self = this;
-    // this.updateLiveList().then(() => {
-    //   self.getData(101);
-    //   self.getData(102);
-    //   self.getData(103);
-    // });
+		self = this;
+    // console.log('ppppp',this.pageTotal(4, 10));
+		
+		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
+			self.setData({
+				userInfo: data,
+			});
+		});
   },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
-    // var self = this;
-    // this.updateLiveList().then(() => {
-    //   self.loadLiveList(1);
-    // });
-
-    var self = this;
-    this.updateLiveList().then(() => {
-      self.getData(101);
-      self.getData(102);
-      self.getData(103);
-    });
+    
   },
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+		if(app.globalData.userInfo) {
+			if(!this.data.isLogin) {
+				this.setData({
+					userInfo: app.globalData.userInfo,
+					imghost: app.globalData.setting.imghost,
+					isLogin: true,
+				});
+		
+				this.updateLiveList().then(() => {
+					
+				  self.getData(true, '/api/weshop/wx/livelist/page', { //请求直播中列表
+						storedId: o.stoid,
+						live_status: 101,
+						pageSize: 100,
+					}).then((res) => {
+						self.setData({
+							living: self.data.list,
+						});
+						
+						//直播中列表请求完后，请求即将开始列表
+						self.getData(true, '/api/weshop/wx/livelist/page', {
+							storedId: o.stoid,
+							live_status: 102,
+							pageSize: 100,
+						}).then((res) => {
+							self.setData({
+								livetoBegin: self.data.list,
+							});
+							
+							//即将开始列表请求完后，请求结束列表
+							self.getData(true, '/api/weshop/wx/livelist/page', {
+								storedId: o.stoid,
+								live_status: 103,
+							}).then((res) => {
+								self.setData({
+									liveOver: self.data.list,
+								});
+							});
+							
+							
+						});
+						
+						
+					});
+					
+					
+					
+					
+					
+				});
+				
+				
+
+			};
+		};
   },
   /**
@@ -262,26 +317,32 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-    var self = this;
-    var curPage = this.data.curPage;
-    console.log('now curPage',curPage);
-    var pageNum = this.data.pageNum;
-    console.log('now pageNum',pageNum);
-
-    if (curPage <= pageNum) {
-      wx.showLoading({
-        title: '加载中...',
-      })
-      setTimeout(function () {
-        self.loadLiveList(curPage);
-        wx.hideLoading();
-      }, 500);
-    } else {
-      wx.showToast({
-        title: '已经到底啦~',
-        duration: 1000
-      })
-    }
+    // var self = this;
+    // var curPage = this.data.curPage;
+    // console.log('now curPage',curPage);
+    // var pageNum = this.data.pageNum;
+    // console.log('now pageNum',pageNum);
+
+    // if (curPage <= pageNum) {
+    //   wx.showLoading({
+    //     title: '加载中...',
+    //   })
+    //   setTimeout(function () {
+    //     self.loadLiveList(curPage);
+    //     wx.hideLoading();
+    //   }, 500);
+    // } else {
+    //   wx.showToast({
+    //     title: '已经到底啦~',
+    //     duration: 1000
+    //   })
+    // }
+		
+		console.log('触底啦');
+		this.scrollToLower('/api/weshop/wx/livelist/page', {
+			storedId: o.stoid,
+			live_status: 103
+		});
   },
   /**
@@ -308,5 +369,80 @@ Page({
       // path: '/page/user?id=123'
     }
   },
+	
+	
+	
+	
+	
+	
+	/**
+	 * 请求数据
+	 */
+	getData: function(isInit, url, data) {
+		let p = app.request.promiseGet(url, {
+			data: data,
+			isShowLoading: true,
+		})
+		.then(function(res) {
+			if(res.data.code == 0) {
+				
+				self.setData({
+					isLoading: false
+				});
+				
+				if(isInit) {// 第一次加载
+					self.setData({
+						list: res.data.data
+					});
+				} else {
+					self.setData({
+						'list.pageData': self.data.list.pageData.concat(res.data.data.pageData)
+					});
+				};
+				
+				if((res.data.data.pageData.length == 0) || (res.data.data.pageSize * res.data.data.page >= res.data.data.total)) {
+					self.setData({
+						noMore: true
+					});
+				};
+				
+			} else {
+				self.setData({
+					'list.pageData': []
+				});
+			};
+			
+		});
+	
+		return p;
+	},
+	
+	
+	/**
+	 * 上拉加载
+	 */
+	scrollToLower(url, requestData) {
+		// 数据总量
+		let total = this.data.list.total;
+		// 单页最大数据量
+		let pageSize = this.data.list.pageSize;
+		// 如果数据总量不为0且小于或等于单页最大数据量，说明数据已全部加载，显示‘没有更多了’
+		if((total != 0)&&(total <= pageSize)) {
+			this.setData({
+				noMore: true
+			});
+		};
+		
+		if(!this.data.isLoading && !this.data.noMore) {
+			this.setData({
+				isLoading: true,
+				pageNum: this.data.pageNum + 1
+			});
+			requestData.page = this.data.pageNum;
+			this.getData(false, url, requestData);
+		};
+	},
+	
+	
 })
 \ No newline at end of file
 {
   "usingComponents": {
-      "subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe"
+     "nodata": "/components/nodata/nodata",
+		 "subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe"
   },
   "navigationBarTitleText": "直播",
-  "onReachBottomDistance": 300
+	"enablePullDownRefresh": false
 }
 \ No newline at end of file
 <!--pages/liveStream/liveStream.wxml-->
 <wxs src="../../../utils/filter.wxs" module="filter"></wxs>
 <view>
-	<block wx:if="{{live === '{}'}}">当前暂无直播</block>
 	<!-- 即将开始 -->
-	<block wx:if="{{livetoBegin.length > 0}}">
+	<block wx:if="{{livetoBegin.pageData.length > 0}}">
 		<view class="title">即将开始</view>
 		<view class="list">
-			<block wx:for="{{livetoBegin}}" wx:key="item">
+			<block wx:for="{{livetoBegin.pageData}}" wx:key="item">
 				<view class="list-item" data-id="{{item.id}}" data-live="toBegin" catchtap="clickItem">
 					<view class="list-item-left">
-						<image src="{{item.share_img}}" class="item-pic" mode="aspectFill"></image>
+						<image src="{{item.share_img}}" class="item-pic" mode="aspectFit"></image>
 					</view>
 					<view class="list-item-right">
 						<view>
@@ -27,13 +26,13 @@
 	<!-- 直播中 -->
-	<block wx:if="{{liveing.length > 0}}">
+	<block wx:if="{{living.pageData.length > 0}}">
 		<view class="title">直播中</view>
 		<view class="list">
-			<block wx:for="{{liveing}}"  wx:key="item">
+			<block wx:for="{{liveing.pageData}}"  wx:key="item">
 				<view class="list-item" catchtap="clickItem" data-id="{{item.id}}" data-live="ing">
 					<view class="list-item-left">
-						<image src="{{item.share_img}}" class="item-pic" mode="aspectFill"></image>
+						<image src="{{item.share_img}}" class="item-pic" mode="aspectFit"></image>
 					</view>
 					<view class="list-item-right">
 						<view>
@@ -50,13 +49,13 @@
 	<!-- 精彩回放 -->
-	<block wx:if="{{liveOver.length > 0}}">
+	<block wx:if="{{liveOver.pageData.length > 0}}">
 		<view class="title">精彩回放</view>
 		<view class="list">
-			<block wx:for="{{liveOver}}"  wx:key="item">
+			<block wx:for="{{liveOver.pageData}}"  wx:key="item">
 				<view class="list-item" bindtap="clickItem" data-id="{{item.id}}"  data-live="over">
 					<view class="list-item-left">
-						<image src="{{item.share_img}}" class="item-pic" mode="aspectFill"></image>
+						<image src="{{item.share_img}}" class="item-pic" mode="aspectFit"></image>
 					</view>
 					<view class="list-item-right">
 						<view>
@@ -70,4 +69,10 @@
 			</block>
 		</view>
 	</block>
+	
+	
+	<nodata nodataContainer="t-c" wx:if="{{livetoBegin.pageData.length == 0 && liveing.pageData.length == 0 && liveOver.pageData.length == 0}}"></nodata>
+	<view class="no-more" hidden="{{!noMore}}" wx:if="{{living.pageData.length != 0 && livetoBegin.pageData.length == 0 && liveO.pageData.length == 0}}">- 没有更多了 -</view>
+	<view class="no-more" hidden="{{!noMore}}" wx:if="{{living.pageData.length == 0 && livetoBegin.pageData.length != 0 && liveO.pageData.length == 0}}">- 没有更多了 -</view>
+	<view class="no-more" hidden="{{!noMore}}" wx:if="{{living.pageData.length == 0 && livetoBegin.pageData.length == 0 && liveO.pageData.length != 0}}">- 没有更多了 -</view>
 </view>
 \ No newline at end of file
@@ -60,12 +60,12 @@
 }
 .item-time {
   color: #999;
-  font-size: 22rpx;
+  font-size: 24rpx;
   padding-top: 10rpx;
 }
 .item-anchor {
   color: #999;
-  font-size: 22rpx;
+  font-size: 24rpx;
 }
 .item-btn {
@@ -74,7 +74,7 @@
   line-height: 56rpx;
   background-color: #f23030;
   color: #fff;
-  font-size: 28rpx;
+  font-size: 24rpx;
   text-align: center;
 }
 subscribe {
@@ -101,4 +101,11 @@ subscribe {
 }
 .subscribe--live-player-hasSubscribe {
   background-color: #666 !important;
+}
+
+.no-more {
+	font-size: 24rpx;
+	line-height: 3;
+	color: #909090;
+	text-align: center;
 }
 \ No newline at end of file
@@ -128,7 +128,7 @@
 .btn {
   color: #fff;
   background-color: #f23030;
-  font-size: 36rpx;
+  font-size: 30rpx;
   line-height: 92rpx;
   text-align: center;
   /* width: 618rpx;