Signed-off-by: yukangzhe <382985154@qq.com>

app.json

@@ -29,7 +29,8 @@
     "pages/evaluationDetail/evaluationDetail",
     "pages/classOrder/classOrder",
     "pages/quan/quan",
-    "pages/editMyself/editMyself"
+    "pages/editMyself/editMyself",
+    "pages/showVideoList/showVideoList"
   ],
   "window": {
     "backgroundTextStyle": "dark",

pages/index/index.js

@@ -96,6 +96,12 @@ Page({
     })
   },
 
+  getMoreShow:function(){
+    wx.navigateTo({
+      url: '/pages/showVideoList/showVideoList',
+    })
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */

pages/index/index.wxml

@@ -65,7 +65,7 @@
   <view class="show-view">
     <view class="title-view">
       <view class="title">学生秀</view>
-      <view class="more">更多</view>
+      <view class="more" bindtap="getMoreShow">更多</view>
     </view>
     <showView list="{{stuShowList}}" bind:callThumbsUp="doThumbsUp"></showView>
     <view class="reset-btn" bindtap="queryStudentShow">换一批</view>
@@ -76,7 +76,7 @@
    <view class="show-view">
     <view class="title-view">
       <view class="title">老师秀</view>
-      <view class="more">更多</view>
+      <view class="more" bindtap="getMoreShow">更多</view>
     </view>
     <showView list="{{teaShowList}}" bind:callThumbsUp="doThumbsUp"></showView>
     <view class="reset-btn" bindtap="queryTeacherShow">换一批</view>

pages/myself/myself.wxml

@@ -66,6 +66,13 @@
 				</view>
 				<image lazy-load mode="aspectFill" class="li-arrow" src="{{imageUrl? imageUrl+'arrow0603.png' : ''}}"></image>
 			</view>
+			<view class="list-item">
+				<view class="li-left">
+					<image lazy-load mode="aspectFill" class="li-icon" src="/images/my-live.png"></image>
+					<button class="live-btn" open-type="contact" bindcontact="handleContact">在线客服</button>
+				</view>
+				<image lazy-load mode="aspectFill" class="li-arrow" src="{{imageUrl? imageUrl+'arrow0603.png' : ''}}"></image>
+			</view>
 			<view class="list-item" catchtap="callPhone">
 				<view class="li-left">
 					<image lazy-load mode="aspectFill" class="li-icon" src="/images/my-about.png"></image>

pages/myself/myself.wxss

@@ -1,8 +1,9 @@
 /* pages/tabBar/myself/myself.wxss */
-page{
+page {
   background: #f5f5f5;
   /* padding-bottom: 160rpx; */
 }
+
 .top {
   width: 100%;
   height: 240rpx;
@@ -26,7 +27,7 @@ page{
   overflow: hidden;
 }
 
-.list-item{
+.list-item {
   width: 100%;
   height: 90rpx;
   display: flex;
@@ -38,25 +39,48 @@ page{
   border-bottom: 2rpx solid #f5f5f5;
   line-height: 48rpx;
 }
-.li-icon{
+
+.li-icon {
   margin-right: 30rpx;
   width: 48rpx;
   height: 48rpx;
 }
-.li-left{
+
+.li-left {
   display: flex;
   align-items: center;
 }
-.li-arrow{
+
+.li-arrow {
   width: 14rpx;
   height: 24rpx;
 }
-.line{
+
+.line {
   width: 100%;
   height: 10rpx;
 }
-.footer{
+
+.footer {
   width: 100%;
   position: fixed;
   bottom: 0;
 }
+
+
+button {
+  font-weight: 400 !important;
+  height: 90rpx !important;
+  line-height: 90rpx !important;
+  width: 580rpx !important;
+  background: #FFF;
+  padding: 0 !important;
+  margin: 0 !important;
+  text-align: left;
+  font-size: 32rpx;
+  
+}
+.button-hover{
+  background: none !important;
+  color: #000 !important;
+}

pages/showVideoList/showVideoList.js

@@ -0,0 +1,95 @@
+// pages/showVideoList/showVideoList.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    switchTitle:['热门','最新','我发布的','我点赞的'],
+    list:[
+      {},
+      {},
+      {},
+    ],
+    loading: '上拉加载',
+    flag: 0,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    if (this.data.flag == 0) {
+      this.setData({
+        loading: '加载中',
+        flag: 1
+      })
+      setTimeout(() => {
+        this.setData({
+          list: [{},
+            {},
+            {},
+            {},
+            {},
+            {},
+            {},
+            {},
+            {},
+            {},
+          ],
+          loading: '没有更多数据',
+          flag: 2
+        })
+      }, 2000);
+    }
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/showVideoList/showVideoList.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "全部视频",
+  "usingComponents": {
+    "switchTab":"/pages/Components/switchTab/switchTab",
+    "showList":"/pages/Components/showList/showList"
+  }
+}

pages/showVideoList/showVideoList.wxml

@@ -0,0 +1,15 @@
+<view class="container">
+
+<!-- 顶部切换标题 -->
+  <switchTab arr="{{switchTitle}}"></switchTab>
+  <!-- end -->
+
+  <!-- 视频列表 -->
+  <view class="show-view">
+    <showList list="{{list}}"></showList>
+  </view>
+  <!-- end -->
+
+  <view class="loading">{{loading}}</view>
+
+</view>

pages/showVideoList/showVideoList.wxss

@@ -0,0 +1,20 @@
+/* pages/showVideoList/showVideoList.wxss */
+.container{
+  padding: 0;
+  margin: 0;
+}
+page{
+  background: #f1f1f1;
+}
+.loading {
+  height: 200rpx;
+  line-height: 100rpx;
+  background: #f1f1f1;
+  color: #999;
+  text-align: center;
+}
+.show-view{
+  width: 700rpx;
+  background: #FFF;
+  padding: 25rpx;
+}

pages/student/student.wxss

@@ -77,7 +77,7 @@ image{
     width: 30rpx;
     position: absolute;
     background: #FA1E17;
-    top: 256rpx;
+    top: 250rpx;
     border-radius: 100%;
     left: 15rpx;
 }
@@ -86,7 +86,7 @@ image{
       width: 30rpx;
       position: absolute;
       background: #FA1E17;
-      top: 256rpx;
+      top: 250rpx;
       border-radius: 100%;
       right: 15rpx;
 }
@@ -94,6 +94,7 @@ image{
   display: flex;
   padding: 40rpx;
   height: 60rpx;
+  margin-bottom: 20rpx;
 }
 .total-view view{
   margin: 0 auto;