'1'

app.wxss

@@ -24,7 +24,8 @@ text {
 }
 
 ::-webkit-scrollbar {
-  width: 0;
-  height: 0;
-  color: transparent;
+  display:none;
+  width:0;
+  height:0;
+  color:transparent;
 }

component/comment/comment.js

@@ -50,7 +50,7 @@ Component({
           temp.id = item.id;
           temp.replyCount = item.replyCount;
           temp.time = formatDate(item.gmtCreated, 3);
-          temp.likes = item.postsAttributeInfo.favors || 0;
+          temp.likes = item.likeCount || 0;
           temp.isLike = item.isLike;
           temp.replyList = item.replyVOList;
           temp.showControl = 0;
@@ -99,15 +99,18 @@ Component({
     likeComment: function (e) {
       console.log(e);
       let postId = e.currentTarget.dataset.id ? e.currentTarget.dataset.id : e.target.dataset.id;
-      let index = e.currentTarget.dataset.index || index === 0 ? e.currentTarget.dataset.index : e.target.dataset.index;
+      let index = e.currentTarget.dataset.index || e.currentTarget.dataset.index === 0 ? e.currentTarget.dataset.index : e.target.dataset.index;
       httpRequestApi.likeCommend(postId).success(res => {
-        console.log(res);
+        console.log('点赞点赞点赞',res.data);
         const str = `commentList[${index}].likes`;
         const strImg = `commentList[${index}].isLike`;
-        this.setData({
-          [str]: res.data.data.favors,
-          [strImg]: true
-        })
+        if(res.data.data){
+          this.setData({
+            [str]: res.data.data,
+            [strImg]: true
+          })
+        }
+        
       });
     },
     // 回复作品
@@ -127,7 +130,7 @@ Component({
     },
     catchComment: function catchComment(e) {
       let postId = e.currentTarget.dataset.id ? e.currentTarget.dataset.id : e.target.dataset.id;
-      let index = e.currentTarget.dataset.index || index === 0 ? e.currentTarget.dataset.index : e.target.dataset.index;
+      let index = e.currentTarget.dataset.index || e.currentTarget.dataset.index === 0 ? e.currentTarget.dataset.index : e.target.dataset.index;
       this.setData({
         postId: postId,
         replyType: 'comment',
@@ -158,12 +161,21 @@ Component({
       httpRequestApi.getReply(this.uid, columnId, 1, 10).success((res) => {
         const commentList = res.data.data.list;
         commentList.forEach((item, index) => {
+          console.log('回复列表',index)
+          console.log('回复列表',this.data.postIndex)
+          
           if (index === this.data.postIndex) {
             let replyList = item.replyVOList;
-            
-            let str = `commentList[${index}].replyVOList`;
+            console.log('回复列表',replyList)
+            let str = `commentList[${index}].replyList`;
+            let strShow = `commentList[${index}].showControl`;
+            let strReply = `commentList[${index}].replyCount`;
             this.setData({
-              [str]: replyList
+              [str]: replyList,
+              [strShow]: 10,
+              [strReply]: replyList.length
+            },()=>{
+              console.log('刷新后列表',this.data.commentList)
             })
             return;
           };

component/comment/comment.less

@@ -1,10 +1,10 @@
 .comment_container {
     position: fixed;
-    z-index: 99;
+    z-index: 9999;
     bottom: 0;
     width: 100%;
     // height: auto;
-    // min-height: 550rpx;
+    min-height: 450rpx;
     max-height: 900rpx;
     background: #ffffff;
     padding-bottom: 120rpx;
@@ -66,21 +66,23 @@
                 }
 
                 .comment_text {
-                    font-size: 28rpx;
-                    color: rgba(0, 0, 0, 0.6);
+                    font-size: 30rpx;
+                    color: rgba(0, 0, 0, 0.8);
                     margin-bottom: 23rpx;
                 }
 
                 .comment_reply_wrapper {
                     background: rgba(0, 0, 0, .03);
                     width: 100%;
-
+                    padding-left: 12rpx;
+                    padding-top: 10rpx;
+                    box-sizing: border-box;
                     .comment_reply_item {
                         font-size: 28rpx;
-                        color: rgba(0, 0, 0, .6);
+                        color: rgba(0, 0, 0, .8);
 
                         .reply_nickname {
-                            color: rgba(1, 67, 124, .6);
+                            color: rgba(1, 67, 124, .8);
                         }
 
                     }
@@ -93,6 +95,8 @@
                         font-size: 26rpx;
                         color: #698FAF;
                         padding-right: 20rpx;
+                        box-sizing: border-box;
+                        padding-bottom: 20rpx;
                     }
                 }
 
@@ -105,7 +109,7 @@
                     margin-top: 30rpx;
 
                     .time {
-                        color: rgba(0, 0, 0, .6);
+                        color: rgba(0, 0, 0, .8);
                         font-size: 28rpx;
 
                     }
@@ -133,7 +137,7 @@
 
                             text {
                                 font-size: 22.4rpx;
-                                color: rgba(0, 0, 0, .6);
+                                color: rgba(0, 0, 0, .8);
                             }
                         }
 
@@ -154,7 +158,7 @@
 
                             text {
                                 font-size: 22.4rpx;
-                                color: rgba(0, 0, 0, .6);
+                                color: rgba(0, 0, 0, .8);
                             }
                         }
                     }
@@ -174,11 +178,16 @@
         background: #eeeded;
         position: fixed;
         bottom: 0;
+        z-index: 99999;
 
         input {
             width: 100%;
             height: 100%;
             background: #eeeded;
+
+            ::placeholder{
+                text-indent: 10rpx;
+            }
         }
     }
 }

component/comment/comment.wxml

@@ -1,7 +1,7 @@
 <!-- component/comment.wxml -->
 <scroll-view class="comment_container" scroll-y="{{true}}">
     <view class="comment_number">评论 {{commentNum}}</view>
-    <view class="comment_item" wx:for="{{commentList}}" data-commentid="{{item.id}}" wx:key="*this">
+    <view class="comment_item" wx:for="{{commentList}}" data-commentid="{{item.id}}" wx:key="id">
         <view class="comment_box">
             <view class="avatar_box">
                 <image src="{{item.avatar}}" />
@@ -10,8 +10,8 @@
                 <text class="nickname">{{item.nickName}}</text>
                 <text class="comment_text" space="false">{{item.text}}</text>
                 <view class="comment_reply_wrapper" wx:if="{{item.replyCount > 0}}">
-                    <view class="comment_reply_item" wx:for="{{item.replyList}}" wx:for-item="inner" wx:if="{{index <= item.showControl}}" wx:key="inner">
-                        <text class="reply_nickname">{{index}}:{{item.showControl}}{{inner.user.nickName}}：</text>
+                    <view class="comment_reply_item" wx:for="{{item.replyList}}" wx:for-item="inner" wx:if="{{index <= item.showControl}}" wx:key="id">
+                        <text class="reply_nickname">{{inner.user.wechatName}}：</text>
                         <text class="reply_text">{{inner.content}}</text>
                     </view>
                     <view wx:if="{{item.replyCount > 1 && item.showControl == 0}}" catchtap="showMore" data-index="{{index}}" class="more_btn">更多></view>
@@ -20,11 +20,11 @@
                     <view class="time">{{item.time}}</view>
                     <view class="info">
                         <view class="like" bindtap="{{item.isLike? null:'likeComment'}}" data-index="{{index}}" data-likes="{{item.likes}}" data-id="{{item.id}}">
-                            <image src="{{item.isLike? '../../static/image/point.png' : '../../static/image/like.png'}}" />
+                            <image src="{{item.isLike? '../../static/index/like_reply.png' : '../../static/index/like_reply_grey.png'}}" />
                             <text>{{item.likes}}</text>
                         </view>
                         <view class="comment" bindtap="catchComment" data-index="{{index}}" data-id="{{item.id}}">
-                            <image src="../../static/index/comment.png" />
+                            <image src="../../static/index/reply_icon.png" />
                             <text>{{item.replyCount}}</text>
                         </view>
                     </view>
@@ -33,6 +33,6 @@
         </view>
     </view>
     <view class="comment_input">
-        <input confirm-type="hold" focus="{{ifGetFocus}}" value="{{inputValue}}" bindconfirm="sendReply" placeholder="给好评..." />
+        <input confirm-type="hold" focus="{{ifGetFocus}}" value="{{inputValue}}" bindconfirm="sendReply" placeholder="       给好评..." />
     </view>
 </scroll-view>

component/comment/comment.wxss

@@ -1,8 +1,9 @@
 .comment_container {
   position: fixed;
-  z-index: 99;
+  z-index: 9999;
   bottom: 0;
   width: 100%;
+  min-height: 450rpx;
   max-height: 900rpx;
   background: #ffffff;
   padding-bottom: 120rpx;
@@ -58,20 +59,23 @@
   color: rgba(0, 0, 0, 0.6);
 }
 .comment_container .comment_item .comment_box .comment_info .comment_text {
-  font-size: 28rpx;
-  color: rgba(0, 0, 0, 0.6);
+  font-size: 30rpx;
+  color: rgba(0, 0, 0, 0.8);
   margin-bottom: 23rpx;
 }
 .comment_container .comment_item .comment_box .comment_info .comment_reply_wrapper {
   background: rgba(0, 0, 0, 0.03);
   width: 100%;
+  padding-left: 12rpx;
+  padding-top: 10rpx;
+  box-sizing: border-box;
 }
 .comment_container .comment_item .comment_box .comment_info .comment_reply_wrapper .comment_reply_item {
   font-size: 28rpx;
-  color: rgba(0, 0, 0, 0.6);
+  color: rgba(0, 0, 0, 0.8);
 }
 .comment_container .comment_item .comment_box .comment_info .comment_reply_wrapper .comment_reply_item .reply_nickname {
-  color: rgba(1, 67, 124, 0.6);
+  color: rgba(1, 67, 124, 0.8);
 }
 .comment_container .comment_item .comment_box .comment_info .comment_reply_wrapper .more_btn {
   display: flex;
@@ -81,6 +85,8 @@
   font-size: 26rpx;
   color: #698FAF;
   padding-right: 20rpx;
+  box-sizing: border-box;
+  padding-bottom: 20rpx;
 }
 .comment_container .comment_item .comment_box .comment_info .time_info {
   width: 100%;
@@ -91,7 +97,7 @@
   margin-top: 30rpx;
 }
 .comment_container .comment_item .comment_box .comment_info .time_info .time {
-  color: rgba(0, 0, 0, 0.6);
+  color: rgba(0, 0, 0, 0.8);
   font-size: 28rpx;
 }
 .comment_container .comment_item .comment_box .comment_info .time_info .info {
@@ -116,7 +122,7 @@
 }
 .comment_container .comment_item .comment_box .comment_info .time_info .info .like text {
   font-size: 22.4rpx;
-  color: rgba(0, 0, 0, 0.6);
+  color: rgba(0, 0, 0, 0.8);
 }
 .comment_container .comment_item .comment_box .comment_info .time_info .info .comment {
   width: 80rpx;
@@ -134,7 +140,7 @@
 }
 .comment_container .comment_item .comment_box .comment_info .time_info .info .comment text {
   font-size: 22.4rpx;
-  color: rgba(0, 0, 0, 0.6);
+  color: rgba(0, 0, 0, 0.8);
 }
 .comment_container .comment_input {
   width: 100%;
@@ -142,9 +148,13 @@
   background: #eeeded;
   position: fixed;
   bottom: 0;
+  z-index: 99999;
 }
 .comment_container .comment_input input {
   width: 100%;
   height: 100%;
   background: #eeeded;
 }
+.comment_container .comment_input input ::placeholder {
+  text-indent: 10rpx;
+}

component/hot/hot.wxss

@@ -436,7 +436,7 @@ swiper {
     top:0;
     width:100%;
     height:100%;
-    background:rgba(0, 0, 0, .6);
+    background:rgba(0, 0, 0, .8);
     z-index:999999;
 }
 

component/my/my.wxml

@@ -14,9 +14,10 @@
             <view class='avatar-nickname'>年级：{{myData.userInfo.gradeText  }}</view>
             <image class="edit-img" src="../../static/image/edit_new.png" />
             <view class='mine-category'>
-              <view class='amount-text'>{{ myData.playAmount || 0 }} 播放</view>
+              <view class='amount-text'>播放{{ myData.playAmount || 0 }} </view>
               <!-- <view class='amount-text'>{{ myData.user.likeAmount || 0 }} 赞</view> -->
-              <view class='amount-text'>{{ myData.fansAmount || 0 }} 粉丝</view>
+              <view class='amount-text'>粉丝{{ myData.fansAmount || 0 }}</view>
+              <view class='amount-text'>作品{{ myData.readAmount || 0 }} </view>
             </view>
           </view>
         </view>

component/my/my.wxss

@@ -2,12 +2,13 @@
   width: 100%;
   /* height: 1136rpx; */
   position: relative;
-  background: #faf7fa;
+  /* background: #faf7fa; */
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: space-between;
   box-sizing: border-box;
+  margin-bottom: 15rpx;
 }
 
 page {
@@ -122,15 +123,15 @@ page {
   width: 471rpx;
   font-size: 24rpx;
   display: flex;
-  /* justify-content: space-between; */
-  color: #767676;
+  justify-content: space-between;
+  color: rgba(0,0,0,.8);
   margin-top: 37rpx;
   padding-right: 37rpx;
 }
 
 .amount-text {
   font-weight: 400;
-  margin-right:125rpx;
+  /* margin-right:125rpx; */
 }
 
 image {
@@ -308,8 +309,8 @@ margin-top: -7rpx;
 
 .flower-tips-text {
   float: right;
-  color: #848484;
-  font-size: 22rpx;
+  color: rgba(0,0,0,.6);
+  font-size: 26rpx;
 }
 
 .btn-section {

component/myModal/myModal.wxss

@@ -2,7 +2,7 @@
     width: 100%;
     height: 100%;
     overflow: hidden;
-    background: rgba(0, 0, 0, .6);
+    background: rgba(0, 0, 0, .8);
     position: absolute;
     top: 0;
     z-index: 9999;

component/myToast/myToast.wxss

@@ -1,7 +1,7 @@
 .myToast {
     width: 100%;
     height: 100%;
-    background: rgba(37, 37, 37, .6);
+    background: rgba(37, 37, 37, .8);
     position: absolute;
     top: 0;
     left: 0;

component/share/share.wxss

@@ -5,7 +5,7 @@
     top:0;
     width:100%;
     height:100%;
-    background:rgba(0, 0, 0, .6);
+    background:rgba(0, 0, 0, .8);
     z-index:999999;
     
 }

component/video-swiper/index.js

@@ -171,7 +171,7 @@ Component({
             console.log('lastVideoId', this.data.lastVideoId);
             if (this.data.lastVideoId && e.target.id !== this.data.lastVideoId) {
                 const lastVideo = wx.createVideoContext(this.data.lastVideoId, this)
-                lastVideo.pause();
+                lastVideo.stop();
                 this.setData({
                     lastVideoId: e.target.id
                 })
@@ -191,7 +191,8 @@ Component({
             // this.trigger(e, 'ended');
         },
         onError: function onError(e) {
-            this.trigger(e, 'error');
+            console.log('视频出错', e)
+            // this.trigger(e, 'error');
         },
         onTimeUpdate: function onTimeUpdate(e) {
             this.trigger(e, 'timeupdate');
@@ -212,6 +213,26 @@ Component({
             console.log(e)
             this.trigger(e, 'openComment')
         },
+        // 展示视频
+        showVideo: function showVideo(e) {
+            let index = e.target.dataset.index ? e.target.dataset.index : e.currentTarget.dataset.index;
+            console.log('showVideo')
+            const str = `videoList[${index}].videoShow`;
+            if (this.data.lastIndex || this.data.lastIndex === 0) {
+                const lastStr = `videoList[${this.data.lastIndex}].videoShow`;
+                this.setData({
+                    lastIndex: index,
+                    [lastStr]: false,
+                    [str]: true
+                })
+            } else {
+                this.setData({
+                    lastIndex: index,
+                    [str]: true
+                })
+            }
+
+        },
         // 点击头部
         headTap: function headTap(e) {
             if (!wx.getStorageSync('user').wechatName) {
@@ -308,13 +329,33 @@ Component({
         },
         delete: function (e) {
             console.log('删除', e)
-            let data = {
-                id: e.currentTarget.dataset.id,
-                status: 'DEL'
-            }
-            httpRequestApi.putWork(data).success(res => {
-                console.log('已删除', res)
-                this.triggerEvent('delHideMyWork');
+            wx.showModal({
+                title: '确认删除吗？',
+                content: '作品将被永久删除，无法找回。',
+                confirmText: '确认',
+                cancelText: '取消',
+                success:(res) => {
+                    if (res.confirm) {
+                        /* let data = {
+                            id: e.currentTarget.dataset.id,
+                            status: status === 'NORMAL' ? 'DISABLE' : 'NORMAL'
+                        }
+                        httpRequestApi.putWork(data).success(res => {
+                            console.log('已隐藏', res)
+                            this.triggerEvent('delHideMyWork');
+                        }) */
+                        let data = {
+                            id: e.currentTarget.dataset.id,
+                            status: 'DEL'
+                        }
+                        httpRequestApi.putWork(data).success(res => {
+                            console.log('已删除', res)
+                            this.triggerEvent('delHideMyWork');
+                        })
+                    } else if (res.cancel) {
+                        console.log('用户点击取消')
+                    }
+                }
             })
         },
         hide: function (e) {
@@ -327,8 +368,15 @@ Component({
             }
             httpRequestApi.putWork(data).success(res => {
                 console.log('已隐藏', res)
-                this.triggerEvent('delHideMyWork');
+                if (res.data.data.status === 'DISABLE') {
+                    wx.showToast({
+                        title: '该作品仅自己可见',
+                        icon: 'none',
+                        duration: 2000
+                    })
+                }
 
+                this.triggerEvent('delHideMyWork');
             })
         },
         openShare: function (e) {
@@ -353,7 +401,7 @@ Component({
                 })
                 this.shareDialog.share(data);
             }
-            this.triggerEvent('openShare',e)
+            this.triggerEvent('openShare', e)
         },
         trigger: function trigger(e, type) {
             if (!wx.getStorageSync('user').wechatName) {

component/video-swiper/index.less

@@ -2,7 +2,7 @@
     width: 100%;
     height: 100%;
     // padding-top: 20rpx;
-
+    background: #eee;
     .video-swiper {
         width: 100%;
         height: 100%;
@@ -15,10 +15,13 @@
 
     .swiper_item {
         width: 100%;
-        height: 100%;
-
+        // height: 100%;
+        background: #ffffff;
+        margin-bottom: 10rpx;
+        overflow: hidden;
         &.no_swiper {
-            height: 879rpx;
+            max-height: 879rpx;
+            min-height: 640rpx;
         }
 
         .head_box {
@@ -29,6 +32,7 @@
             padding-left: 20rpx;
             box-sizing: border-box;
             padding-right: 20rpx;
+            position: relative;
 
             .tag_icon{
                 width: 66rpx;
@@ -43,6 +47,7 @@
                 height: 100%;
                 display: flex;
                 align-items: center;
+                position: relative;
 
                 .avatar {
                     width: 80rpx;
@@ -51,6 +56,13 @@
                     border-radius: 50%;
 
                 }
+                .avatar_fans{
+                    width: 34rpx;
+                    height: 34rpx;
+                    position: absolute;
+                    bottom: 5rpx;
+    left: 26rpx;
+                }
 
                 .user_right {
                     margin-left: 16rpx;
@@ -58,7 +70,8 @@
                     align-items: center;
                     .nickname {
                         font-size: 30rpx;
-                        color: rgba(0, 0, 0, 0.60);
+                        color: rgba(0, 0, 0, 0.80);
+                        font-weight: 600;
                     }
 
                     .efun_tag{
@@ -73,8 +86,8 @@
             .time {
                 display: flex;
                 align-items: center;
-                font-size: 26rpx;
-                color: rgba(0, 0, 0, 0.60);
+                font-size: 30rpx;
+                color: rgba(0, 0, 0, 0.80);
             }
 
             .my_btn {
@@ -96,7 +109,7 @@
 
                     .delete_text {
                         font-size: 26rpx;
-                        color: rgba(0, 0, 0, 0.60);
+                        color: rgba(0, 0, 0, 0.80);
                     }
                 }
                 .hide {
@@ -108,13 +121,13 @@
                     box-sizing: border-box;
                     .hide_image {
                         width: 32rpx;
-                        height: 27rpx;
-                        margin-bottom: 5rpx;
+                        height: 33rpx;
+                        margin-bottom: 2rpx;
                     }
 
                     .hide_text {
                         font-size: 26rpx;
-                        color: rgba(0, 0, 0, 0.60);
+                        color: rgba(0, 0, 0, 0.80);
                     }
                 }
             }
@@ -124,20 +137,63 @@
             width: 100%;
             height: 422rpx;
         }
+        .video_place{
+            width: 100%;
+            height: 430rpx;
+            background: rgba(0,0,0,.3);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            position: relative;
+
+            .play_btn{
+                width: 100rpx;
+                height: 100rpx;
+                position: absolute;
+                top: 170rpx;
+                left: 0;
+                right: 0;
+                margin: 0 auto;
+            }
+
+            .place_img{
+                width: 100%;
+                height: 100%;
+
+            }
+        }
+
+        .video_item_dialog{
+            width: 100%;
+            height: 422rpx;
+            background: rgba(0,0,0,.3);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            position: absolute;
+            z-index: 1;
+
+            .video_item_dialog_img{
+                width: 215rpx;
+                height: 215rpx;
+
+            }
+        }
 
         .video_title {
             width: 100%;
-            height: 62rpx;
-            font-size: 30rpx;
+            height: 45rpx;
+            font-size: 34rpx;
             color: #373737;
             display: flex;
             align-items: center;
-            padding-left: 20rpx;
+            padding-left: 0rpx;
         }
 
         .foot_box {
             width: 100%;
-            height: 120rpx;
+            height: 65rpx;
+            margin-top: 31rpx;
             display: flex;
             justify-content: space-between;
             padding-left: 20rpx;
@@ -148,10 +204,10 @@
                 align-items: center;
             }
 
-            .btn {
+            .video_btn {
                 margin-right: 42rpx;
                 font-size: 28rpx;
-                color: rgba(0, 0, 0, 0.60);
+                color: rgba(0, 0, 0, 0.80);
                 display: flex;
                 flex-direction: row;
                 align-items: center;
@@ -159,26 +215,26 @@
                 .collect_btn_icon {
                     width: 48rpx;
                     height: 46rpx;
-                    margin-right: 14rpx;
+                    margin-right: 7rpx;
                 }
 
                 .share_btn_icon {
                     width: 46rpx;
                     height: 46rpx;
-                    margin-right: 14rpx;
+                    margin-right: 8rpx;
                 }
 
                 .flower_btn_icon {
                     width: 46rpx;
                     height: 46rpx;
-                    margin-right: 14rpx;
+                    margin-right: 10rpx;
                     border-radius: none;
                 }
 
                 .comment_btn_icon {
                     width: 49rpx;
                     height: 47rpx;
-                    margin-right: 14rpx;
+                    margin-right: 9rpx;
                     border-radius: 0;
                 }
             }
@@ -190,6 +246,8 @@
             display: flex;
             align-items: center;
             justify-content: center;
+            margin-top: 10rpx;
+            margin-bottom: 10rpx;
 
             .reading_btn {
                 width: 271rpx;
@@ -209,6 +267,7 @@
                 text {
                     color: #fff;
                     font-size: 30rpx;
+
                 }
             }
         }

component/video-swiper/index.wxml

@@ -11,11 +11,12 @@
     bindanimationfinish="animationfinish">
     <!-- curQueue 循环会导致video重新插入，objectFit 不可变更 -->
         
-    <swiper-item class="swiper_item" wx:for="{{curQueue}}"  data-id="{{item.id}}"  wx:key="*this">
+    <swiper-item class="swiper_item" wx:for="{{curQueue}}"  data-id="{{item.id}}"  wx:key="id">
       <view class="head_box">
         <image class="tag_icon" wx:if="{{item.hasTag}}" src="{{item.tagUrl}}" />
         <view class="user_box" catchtap="{{ifHeadTap ? 'headTap' : null}}" data-uid="{{item.uid}}">
           <image class="avatar" lazy-load="true" src="{{item.avatar}}" />
+          <image class="avatar_fans" src="../../static/index/add_follow.png" />
           <view class="user_right">
             <view class="nickname">{{item.nickName}}</view>
             <image class="efun_tag" src="../../static/index/efun_tag.png" wx:if="{{item.isEfun}}"></image>
@@ -31,7 +32,8 @@
               <text >删除</text>
             </view>
             <view catchtap="hide" data-status="{{item.status}}"  data-id="{{item.id}}">
-              <image src="{{item.status==='NORMAL'? '../../static/index/hide_icon.png': '../../static/index/show_icon.png'}}" />
+              <image src="{{item.status==='NORMAL'? '../../static/index/show_icon.png': '../../static/index/hide_icon.png'}}" />
+              
               <text >{{item.status==='NORMAL'? '隐藏': '展示'}}</text>
             </view>
           </view>
@@ -69,21 +71,21 @@
         
       <view class="foot_box"> 
         <view class="foot_left">
-          <view class="btn collect_btn" catchtap="collectTap" data-index="{{index}}" data-id="{{item.id}}" data-type="{{item.type}}">
+          <view class="video_btn collect_btn" catchtap="collectTap" data-index="{{index}}" data-id="{{item.id}}" data-type="{{item.type}}">
               <image class="collect_btn_icon" src="{{item.isFavorite ? '../../static/index/star_colored.png' : '../../static/index/star.png'}}" />
               <text>收藏</text>
           </view>
-          <view class="btn share_btn" bindtap="openShare" data-index="{{index}}" data-id="{{item.id}}" data-avatar="{{item.avatar}}" data-author="{{item.nickName}}" data-uid="{{item.uid}}" data-img="{{item.img}}" data-title="{{item.title}}" data-type="{{item.type}}">
+          <view class="video_btn share_btn" bindtap="openShare" data-index="{{index}}" data-id="{{item.id}}" data-avatar="{{item.avatar}}" data-author="{{item.nickName}}" data-uid="{{item.uid}}" data-img="{{item.img}}" data-title="{{item.title}}" data-type="{{item.type}}">
               <image class="share_btn_icon" src="../../static/index/share.png" lazy-load="true" />
               <text>分享</text>
           </view>
         </view>
         <view class="foot_right">
-          <view class="btn flower_btn" catchtap="{{item.isLike ?  null : 'likeTap'}}" data-index="{{index}}" data-id="{{item.id}}" data-islike="{{item.isLike}}">
+          <view class="video_btn flower_btn" catchtap="{{item.isLike ?  null : 'likeTap'}}" data-index="{{index}}" data-id="{{item.id}}" data-islike="{{item.isLike}}">
               <image class="flower_btn_icon" src="{{item.isLike ? '../../static/index/heart_colored.png' : '../../static/index/heart.png'}}" />
               <text>{{item.likes}}</text>
           </view>
-          <view class="btn comment_btn" catchtap="openComment" data-id="{{item.id}}">
+          <view class="video_btn comment_btn" catchtap="openComment" data-id="{{item.id}}">
               <image class="comment_btn_icon" src="../../static/index/comment.png" lazy-load="true" />
               <text>{{item.commentAmount}}</text>
           </view>
@@ -100,11 +102,13 @@
   </swiper>
 
   <!-- // 非swiper -->
-  <view wx:if="{{!isSwiper}}" class="swiper_item no_swiper" wx:for="{{videoList}}"  data-id="{{item.id}}"  wx:key="*this">
+  <view wx:if="{{!isSwiper}}" class="swiper_item no_swiper" wx:for="{{videoList}}"  data-id="{{item.id}}"  wx:key="id">
       <view class="head_box">
         <image class="tag_icon" wx:if="{{item.hasTag}}" src="{{item.tagUrl}}" />
         <view class="user_box" catchtap="{{ifHeadTap ? 'headTap' : null}}" data-uid="{{item.uid}}">
           <image class="avatar" lazy-load="true" src="{{item.avatar}}" />
+          <image class="avatar_fans" wx:if="{{!item.isFans}}" src="../../static/index/add_follow.png" />
+          
           <view class="user_right">
             <view class="nickname">{{item.nickName}}</view>
             <image class="efun_tag" src="../../static/index/efun_tag.png" wx:if="{{item.isEfun}}"></image>
@@ -114,31 +118,44 @@
           <view wx:if="{{!item.showMyBtn}}" class="time">
             <text>发布时间:{{item.time}}</text>
           </view>
-          <view wx:if="{{item.showMyBtn}}" class="my_btn">
+          <view wx:if="{{item.showMyBtn && !item.ifCheck}}" class="my_btn">
             <view class="delete" catchtap="delete" data-id="{{item.id}}">
               <image class="delete_image" src="../../static/index/delete.png" />
               <text class="delete_text" >删除</text>
             </view>
             <view class="hide" catchtap="hide" data-status="{{item.status}}" data-id="{{item.id}}">
-              <image class="hide_image" src="{{item.status==='NORMAL'? '../../static/index/hide_icon.png': '../../static/index/show_icon.png'}}" />
-              <text class="hide_text" >{{item.status==='NORMAL'? '隐藏': '展示'}}</text>
+              <!-- <image class="hide_image" src="{{item.status==='NORMAL'? '../../static/index/hide_icon.png': '../../static/index/show_icon.png'}}" /> -->
+              <image class="hide_image" src="{{item.status==='NORMAL'? '../../static/index/unlock.png': '../../static/index/lock.png'}}" />
+
+              <text class="hide_text" >{{item.status==='NORMAL'? '公开': '仅自己可见'}}</text>
             </view>
           </view>
       </view>
+      <view class="video_place" wx:if="{{!item.videoShow}}" catchtap="{{item.ifCheck ? null : 'showVideo'}}" data-index="{{index}}" >
+        <image class="place_img" src="{{item.coverImg}}" />
+        <image class="play_btn" src="../../static/image/play-btn.png" />
+        <view class="video_item_dialog" wx:if="{{item.ifCheck}}">
+        <image class="video_item_dialog_img" src="../../static/index/checking.png" mode="aspectFit|aspectFill|widthFix" />
+      </view>
+      </view>
       <video 
+        wx:if="{{item.videoShow}}"
         id="video_{{index}}" 
         class="video_item" 
         loop="{{loop}}" 
-        enable-play-gesture 
-        enable-progress-gesture 
-        show-center-play-btn="{{false}}"
-        controls="{{true}}"
-        src="{{item.url}}" 
+        show-center-play-btn="{{!item.ifCheck ? true : false}}"
+        controls="{{!item.ifCheck ? true : false}}"
+        src="{{item.url ? item.url : '' }}" 
+        autoplay="{{true}}"
         object-fit="contain"
         data-index="{{index}}"
         bindplay="onPlayList"
         bindended="onEndedList"
+        binderror="onError"
       >
+        <!-- show-center-play-btn="{{!item.ifCheck ? true : false}}" -->
+        <!-- show-center-play-btn="{{!item.ifCheck ? true : false}}" -->
+        <!-- show-center-play-btn="{{!item.ifCheck ? true : false}}" -->
       <!--   bindplay="onPlay"
         bindpause="onPause"
         bindended="onEnded"
@@ -148,37 +165,38 @@
         bindprogress="onProgress"
         bindloadedmetadata="onLoadedMetaData" -->
       </video>
+        
       <view class="video_title">
         <text>
-          {{item.title}}
+          《{{item.title}}》
         </text>
           
       </view>
         
-      <view class="foot_box"> 
+      <view class="foot_box" wx:if="{{!item.ifCheck}}"> 
         <view class="foot_left">
-          <view class="btn collect_btn" catchtap="collectTap" data-index="{{index}}" data-id="{{item.id}}" data-type="{{item.type}}">
+          <view class="video_btn collect_btn" catchtap="collectTap" data-index="{{index}}" data-id="{{item.id}}" data-type="{{item.type}}">
               <image class="collect_btn_icon" src="{{item.isFavorite ? '../../static/index/star_colored.png' : '../../static/index/star.png'}}" />
               <text>收藏</text>
           </view>
-          <view class="btn share_btn" bindtap="openShare" data-author="{{item.nickName}}" data-index="{{index}}" data-id="{{item.id}}" data-avatar="{{item.avatar}}" data-uid="{{item.uid}}" data-img="{{item.img}}" data-title="{{item.title}}" data-type="{{item.type}}">
+          <view class="video_btn share_btn" bindtap="openShare" data-author="{{item.nickName}}" data-index="{{index}}" data-id="{{item.id}}" data-avatar="{{item.avatar}}" data-uid="{{item.uid}}" data-img="{{item.img}}" data-title="{{item.title}}" data-type="{{item.type}}">
               <image class="share_btn_icon" src="../../static/index/share.png" />
               <text>分享</text>
           </view>
         </view>
           <view class="foot_right">
-          <view class="btn flower_btn" catchtap="{{item.isLike ?  null : 'likeTap'}}" data-index="{{index}}" data-id="{{item.id}}" data-islike="{{item.isLike}}">
+          <view class="video_btn flower_btn" catchtap="{{item.isLike ?  null : 'likeTap'}}" data-index="{{index}}" data-id="{{item.id}}" data-islike="{{item.isLike}}">
               <image class="flower_btn_icon" src="{{item.isLike ? '../../static/index/heart_colored.png' : '../../static/index/heart.png'}}" />
               <text>{{item.likes}}</text>
           </view>
-          <view class="btn comment_btn" catchtap="openComment" data-id="{{item.id}}">
+          <view class="video_btn comment_btn" catchtap="openComment" data-id="{{item.id}}">
               <image class="comment_btn_icon" src="../../static/index/comment.png" lazy-load="true" />
-              <text>{{item.commentAmount}}</text>
+              <text>{{item.commentAmount || 0}}</text>
           </view>
         </view>
             
       </view>
-      <view class="btn_wrapper" wx:if="{{!item.noReading}}" catchtap="goToReading" data-id="{{item.classId}}">
+      <view class="btn_wrapper" wx:if="{{!item.noReading && !item.ifCheck}}" catchtap="goToReading" data-id="{{item.classId}}">
         <view class="reading_btn">
           <image src="../../static/index/microphone.png" />
           <text>我要配音</text>

component/video-swiper/index.wxss

@@ -1,6 +1,7 @@
 .swiper_container {
   width: 100%;
   height: 100%;
+  background: #eee;
 }
 .swiper_container .video-swiper {
   width: 100%;
@@ -10,10 +11,13 @@
 }
 .swiper_container .swiper_item {
   width: 100%;
-  height: 100%;
+  background: #ffffff;
+  margin-bottom: 10rpx;
+  overflow: hidden;
 }
 .swiper_container .swiper_item.no_swiper {
-  height: 879rpx;
+  max-height: 879rpx;
+  min-height: 640rpx;
 }
 .swiper_container .swiper_item .head_box {
   width: 100%;
@@ -23,6 +27,7 @@
   padding-left: 20rpx;
   box-sizing: border-box;
   padding-right: 20rpx;
+  position: relative;
 }
 .swiper_container .swiper_item .head_box .tag_icon {
   width: 66rpx;
@@ -36,6 +41,7 @@
   height: 100%;
   display: flex;
   align-items: center;
+  position: relative;
 }
 .swiper_container .swiper_item .head_box .user_box .avatar {
   width: 80rpx;
@@ -43,6 +49,13 @@
   border: 2rpx solid green;
   border-radius: 50%;
 }
+.swiper_container .swiper_item .head_box .user_box .avatar_fans {
+  width: 34rpx;
+  height: 34rpx;
+  position: absolute;
+  bottom: 5rpx;
+  left: 26rpx;
+}
 .swiper_container .swiper_item .head_box .user_box .user_right {
   margin-left: 16rpx;
   display: flex;
@@ -50,7 +63,8 @@
 }
 .swiper_container .swiper_item .head_box .user_box .user_right .nickname {
   font-size: 30rpx;
-  color: rgba(0, 0, 0, 0.6);
+  color: rgba(0, 0, 0, 0.8);
+  font-weight: 600;
 }
 .swiper_container .swiper_item .head_box .user_box .user_right .efun_tag {
   width: 68rpx;
@@ -60,8 +74,8 @@
 .swiper_container .swiper_item .head_box .time {
   display: flex;
   align-items: center;
-  font-size: 26rpx;
-  color: rgba(0, 0, 0, 0.6);
+  font-size: 30rpx;
+  color: rgba(0, 0, 0, 0.8);
 }
 .swiper_container .swiper_item .head_box .my_btn {
   display: flex;
@@ -80,7 +94,7 @@
 }
 .swiper_container .swiper_item .head_box .my_btn .delete .delete_text {
   font-size: 26rpx;
-  color: rgba(0, 0, 0, 0.6);
+  color: rgba(0, 0, 0, 0.8);
 }
 .swiper_container .swiper_item .head_box .my_btn .hide {
   display: flex;
@@ -92,29 +106,66 @@
 }
 .swiper_container .swiper_item .head_box .my_btn .hide .hide_image {
   width: 32rpx;
-  height: 27rpx;
-  margin-bottom: 5rpx;
+  height: 33rpx;
+  margin-bottom: 2rpx;
 }
 .swiper_container .swiper_item .head_box .my_btn .hide .hide_text {
   font-size: 26rpx;
-  color: rgba(0, 0, 0, 0.6);
+  color: rgba(0, 0, 0, 0.8);
 }
 .swiper_container .swiper_item .video_item {
   width: 100%;
   height: 422rpx;
 }
+.swiper_container .swiper_item .video_place {
+  width: 100%;
+  height: 430rpx;
+  background: rgba(0, 0, 0, 0.3);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+}
+.swiper_container .swiper_item .video_place .play_btn {
+  width: 100rpx;
+  height: 100rpx;
+  position: absolute;
+  top: 170rpx;
+  left: 0;
+  right: 0;
+  margin: 0 auto;
+}
+.swiper_container .swiper_item .video_place .place_img {
+  width: 100%;
+  height: 100%;
+}
+.swiper_container .swiper_item .video_item_dialog {
+  width: 100%;
+  height: 422rpx;
+  background: rgba(0, 0, 0, 0.3);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: absolute;
+  z-index: 1;
+}
+.swiper_container .swiper_item .video_item_dialog .video_item_dialog_img {
+  width: 215rpx;
+  height: 215rpx;
+}
 .swiper_container .swiper_item .video_title {
   width: 100%;
-  height: 62rpx;
-  font-size: 30rpx;
+  height: 45rpx;
+  font-size: 34rpx;
   color: #373737;
   display: flex;
   align-items: center;
-  padding-left: 20rpx;
+  padding-left: 0rpx;
 }
 .swiper_container .swiper_item .foot_box {
   width: 100%;
-  height: 120rpx;
+  height: 65rpx;
+  margin-top: 31rpx;
   display: flex;
   justify-content: space-between;
   padding-left: 20rpx;
@@ -124,34 +175,34 @@
   display: flex;
   align-items: center;
 }
-.swiper_container .swiper_item .foot_box .btn {
+.swiper_container .swiper_item .foot_box .video_btn {
   margin-right: 42rpx;
   font-size: 28rpx;
-  color: rgba(0, 0, 0, 0.6);
+  color: rgba(0, 0, 0, 0.8);
   display: flex;
   flex-direction: row;
   align-items: center;
 }
-.swiper_container .swiper_item .foot_box .btn .collect_btn_icon {
+.swiper_container .swiper_item .foot_box .video_btn .collect_btn_icon {
   width: 48rpx;
   height: 46rpx;
-  margin-right: 14rpx;
+  margin-right: 7rpx;
 }
-.swiper_container .swiper_item .foot_box .btn .share_btn_icon {
+.swiper_container .swiper_item .foot_box .video_btn .share_btn_icon {
   width: 46rpx;
   height: 46rpx;
-  margin-right: 14rpx;
+  margin-right: 8rpx;
 }
-.swiper_container .swiper_item .foot_box .btn .flower_btn_icon {
+.swiper_container .swiper_item .foot_box .video_btn .flower_btn_icon {
   width: 46rpx;
   height: 46rpx;
-  margin-right: 14rpx;
+  margin-right: 10rpx;
   border-radius: none;
 }
-.swiper_container .swiper_item .foot_box .btn .comment_btn_icon {
+.swiper_container .swiper_item .foot_box .video_btn .comment_btn_icon {
   width: 49rpx;
   height: 47rpx;
-  margin-right: 14rpx;
+  margin-right: 9rpx;
   border-radius: 0;
 }
 .swiper_container .swiper_item .btn_wrapper {
@@ -160,6 +211,8 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  margin-top: 10rpx;
+  margin-bottom: 10rpx;
 }
 .swiper_container .swiper_item .btn_wrapper .reading_btn {
   width: 271rpx;

pages/index/index.js

@@ -72,7 +72,7 @@ Page({
     commentList: [],
     commentNum: 0,
     followPageNo: 1,
-    followPageSize: 3,
+    followPageSize: 6,
     coursePageNo: 1,
     coursesData: [],
     updateId: 0 // 刷新id
@@ -102,9 +102,9 @@ Page({
     // 获取推荐列表
     if (myIndex == 0) {
       this.setData({
-        recommendPageNo:1,
+        recommendPageNo: 1,
         videoList: [],
-        isSwiper: true
+        isSwiper: false
       }, () => {
         this.getHotRecommend(this.uid);
       })
@@ -125,7 +125,7 @@ Page({
     if (myIndex == 1) {
       this.setData({
         videoList: [],
-        isSwiper: true,
+        isSwiper: false,
         followPageNo: 1
       }, () => {
         this.getFollowData()
@@ -168,7 +168,7 @@ Page({
         workId: null,
         myIndex: 0,
         videoList: [],
-        isSwiper: true,
+        isSwiper: false,
         recommendTotalNo: 1
       })
       httpRequestApi.getClassDetail(id).success(res => {
@@ -177,7 +177,7 @@ Page({
         tempList.push(res.data.data);
         this.setData({
           videoList: [],
-          isSwiper: true,
+          isSwiper: false,
           recommendTotalNo: 1
         }, () => {
           this.formatWorksList(tempList, true);
@@ -335,6 +335,12 @@ Page({
         this.updateData(0)
       })
     }
+    if (this.data.fromReading) {
+      this.setData({
+        fromReading: false
+      })
+      this.updateData(3)
+    }
     // const userInfo = wx.getStorageSync('user')
     // console.log('userInfo',userInfo)
     // if (userInfo.wechatName) {
@@ -372,14 +378,14 @@ Page({
   },
   // 组装list
   formatWorksList(list, notSet) {
-    const tempList = [];
+    // const tempList = [];
     list.forEach((item, index) => {
-      if (index === list.length - 2 && list.length > 2) {
+      /* if (index === list.length - 2 && list.length > 2) {
         console.log('设置当前id', item.id)
         this.setData({
           updateId: item.userRead.id
         })
-      }
+      } */
       const temp = {};
       temp.title = item.userRead.title;
       temp.summary = item.userRead.summary;
@@ -397,17 +403,21 @@ Page({
       temp.type = item.userRead.type;
       temp.nickName = item.user.wechatName;
       temp.isLike = item.isLike;
+      temp.isFans = item.isFans ? true : item.user.uid === this.uid ? true : false;
       temp.isFavorite = item.isFavorites;
       temp.isEfun = item.user.profession === '官方' ? true : false;
       temp.hasTag = item.userRead.tag && item.userRead.tag !== 'EXAMPLE' ? true : false;
-      temp.tagUrl = item.userRead.tag ? item.userRead.tag === 'HOT' ? '../../static/index/hot_tag.png' :  '../../static/index/new_tag.png' : ''
+      temp.tagUrl = item.userRead.tag ? item.userRead.tag === 'HOT' ? '../../static/index/hot_tag.png' : '../../static/index/new_tag.png' : ''
+      temp.status = item.userRead.status;
+      temp.coverImg = item.userRead.coverImg;
+      temp.videoShow = false;
       this.data.videoList.push(temp);
-      tempList.push(temp);
+      // tempList.push(temp);
     });
     console.log('当前list', this.data.videoList)
     // if (!notSet) {
     this.setData({
-      videoList: tempList
+      videoList: this.data.videoList
     })
     // }
 
@@ -451,13 +461,13 @@ Page({
         userInfo.gradeText = '学前班'
         break;
       case 'PRIMARY_FIRST_GRADE':
-        userInfo.gradeText = '小学一年级'
+        userInfo.gradeText = '一年级'
         break;
       case 'PRIMARY_SECOND_GRADE':
-        userInfo.gradeText = '小学二年级'
+        userInfo.gradeText = '二年级'
         break;
       case 'PRIMARY_THREE_GRADE':
-        userInfo.gradeText = '小学三年级'
+        userInfo.gradeText = '三年级'
         break;
     }
     return userInfo;
@@ -493,6 +503,21 @@ Page({
         this.getCoursesList()
       })
     }
+    if (this.data.myIndex === 1) {
+      this.setData({
+        followPageNo: this.data.followPageNo + 1
+      }, () => {
+        this.getFollowData()
+      })
+    }
+    if (this.data.myIndex === 0) {
+      console.log('首页加载第二页')
+      this.setData({
+        recommendPageNo: this.data.recommendPageNo + 1
+      }, () => {
+        this.getHotRecommend()
+      })
+    }
 
     // // 当前在推荐页面 加载推荐
     // if (this.data.myIndex === 1) {
@@ -512,16 +537,13 @@ Page({
   },
   onPullDownRefresh: function () {
     //当前在团购页下拉加载
-    if (this.data.myIndex === 0) {
-      // groupInit(this);
-    }
-
+    this.updateData(this.data.myIndex)
     wx.showNavigationBarLoading() //在标题栏中显示加载
     //模拟加载
     setTimeout(function () {
       wx.hideNavigationBarLoading() //完成停止加载
       wx.stopPullDownRefresh() //停止下拉刷新
-    }, 1500);
+    }, 1000);
   },
   goToMessage: function () {
     wx.navigateTo({
@@ -619,13 +641,19 @@ Page({
         temp.isFavorite = item.isFavorites;
         temp.showMyBtn = true;
         temp.nickName = this.data.myData.userInfo.wechatName;
-        temp.status = item.userRead.status
+        temp.status = item.userRead.status;
+        temp.ifCheck = item.userRead.status === 'CHECK' ? true : false;
+        temp.coverImg = item.userRead.coverImg;
+        temp.isFans = true;
+        temp.videoShow = false;
         myWorks.push(temp);
       });
       console.log('myWorks', myWorks)
-      this.setData({
-        videoList: myWorks
-      })
+      if (this.data.myIndex === 3) {
+        this.setData({
+          videoList: myWorks
+        })
+      }
     })
   },
   // 评论区点击
@@ -716,7 +744,7 @@ Page({
       return {
         title: this.data.shareTitle,
         path: `/pages/index/index?readId=${this.data.shareId}`,
-        imageUrl: this.data.shareImg
+        imageUrl: '../../static/index/share_icon.png'
 
       }
     } else {

pages/index/index.json

@@ -8,7 +8,7 @@
         "StatusBar": "../../component/statusBar/statusBar",
         "shareDialog": "/component/share/share"
     },
-    "enablePullDownRefresh": false,
+    "enablePullDownRefresh": true,
     "window": {
         "onReachBottomDistance": 50
       }

pages/index/index.wxml

@@ -22,7 +22,7 @@
   <import src="/templates/courses/courses.wxml" />
   <!-- 顶部导航 -->
   <view class="top-tab" wx:if="{{!isGradeShow}}">
-    <block wx:for="{{tab}}" wx:key="{{index}}">
+    <block wx:for="{{tab}}" wx:key="index">
       <view class="tabbar {{index == myIndex ? 'select':' '}}" bindtap="switcher" data-index="{{index}}">
         <text>{{item.name}}</text>
       </view>
@@ -43,6 +43,12 @@
   <view class="comment_section" catchtouchmove="touchMove" catchtap="commentTap" data-type="blank" wx:if="{{commentShow}}">
     <Comment data-type="list" commentId="{{commentId}}" commentNum="{{commentNum}}" inputValue="{{inputValue}}" bindsendReply="sendReply" />
   </view>
+  <view class="no_follow" wx:if="{{myIndex === 1 && videoList.length <= 0}}">
+    <image class="no_follow_icon" src="../../static/index/no_follow.png" />
+    <text >这是关注页面！</text>
+    <text >赶快去关注优秀作者吧，</text>
+    <text >这里会发生微妙变化</text>
+  </view>
 </view>
 <!-- <MyToast /> -->
 <view hidden="{{hide}}">

pages/index/index.wxss

@@ -10,7 +10,8 @@
 @import "/templates/courses/courses.wxss";
 
 .container {
-  background: rgba(242, 242, 242, 1);
+  /* background: rgba(242, 242, 242, 1); */
+  background: #eee;
   height: 100%;
   /* overflow: hidden; */
 }
@@ -41,6 +42,22 @@
 
 }
 
+.no_follow {
+  display: flex;
+  width: 100%;
+  height: 98%;
+  align-items: center;
+  justify-content: center;
+  color: rgba(0, 0, 0, .4);
+  font-size: 34rpx;
+  flex-direction: column;
+}
+
+.no_follow_icon {
+  width: 274rpx;
+  height: 258rpx;
+}
+
 .tabbar {
   /* flex: 1; */
   display: flex;
@@ -50,7 +67,7 @@
   height: 58rpx;
   line-height: 60rpx;
   font-size: 40rpx;
-  opacity:0.7;
+  opacity: 0.7;
   font-weight: 800;
   /* border-radius: 30rpx; */
   /* background: #fff; */
@@ -65,7 +82,7 @@
   /* background: #61ca54; */
   font-size: 40rpx;
   border-bottom: 6rpx solid #fff;
-  opacity:1;
+  opacity: 1;
 }
 
 .bottom-tab image {
@@ -80,6 +97,7 @@
   top: 50%;
   transform: translate(-50%, -50%);
 }
+
 /* 部分公用css */
 .red-text {
   color: #ff3600;
@@ -179,8 +197,8 @@
   flex-direction: row-reverse;
   align-items: center;
   padding-right: 35rpx;
-margin-bottom:6rpx;
-margin-left: 4rpx;
+  margin-bottom: 6rpx;
+  margin-left: 4rpx;
 }
 
 .worksCard .topData .authorAvatar {
@@ -199,7 +217,7 @@ margin-left: 4rpx;
   border-radius: 15rpx;
   font-size: 22rpx;
   /* font-family: PingFangSC-Medium; */
-  font-weight: 800; 
+  font-weight: 800;
   color: rgba(255, 255, 255, 1);
   line-height: 30rpx;
   text-align: center;
@@ -212,7 +230,7 @@ margin-left: 4rpx;
 .topData .numberInfo {
   display: flex;
   flex-direction: column;
-  margin-top:-5rpx;
+  margin-top: -5rpx;
 
 }
 
@@ -241,7 +259,7 @@ margin-left: 4rpx;
   text-align: right;
   /* width:57%; */
   float: right;
-  line-height:37rpx;
+  line-height: 37rpx;
 
 }
 
@@ -264,28 +282,31 @@ margin-left: 4rpx;
   color: #848484;
   font-size: 24rpx;
 }
-.index-dialog{
+
+.index-dialog {
   width: 100%;
   height: 100%;
   position: fixed;
   top: 0;
   left: 0;
-  z-index:3;
-  background: rgba(0,0,0,.3)
+  z-index: 3;
+  background: rgba(0, 0, 0, .3)
 }
-.index-dialog-wrapper{
+
+.index-dialog-wrapper {
   width: 392rpx;
   height: 240rpx;
   background: #fff;
   border-radius: 30rpx;
-  box-shadow: 0 0 10 0 rgba(0,0,0, .5);
+  box-shadow: 0 0 10 0 rgba(0, 0, 0, .5);
   position: fixed;
   top: 281rpx;
   left: 0;
   right: 0;
   margin: 0 auto;
 }
-.index-dialog-text{
+
+.index-dialog-text {
   width: 100%;
   font-size: 29rpx;
   color: #535353;
@@ -294,7 +315,7 @@ margin-left: 4rpx;
   margin-top: 59rpx;
 }
 
-.index-dialog-btn{
+.index-dialog-btn {
   width: 160rpx;
   height: 50rpx;
   border: 3rpx solid #f75642;
@@ -307,28 +328,29 @@ margin-left: 4rpx;
   margin: 41rpx auto;
 }
 
-.index-dialog-btn-hide{
+.index-dialog-btn-hide {
   width: 100%;
   height: 100%;
   position: absolute;
-  background: rgba(0,0,0, 0);
+  background: rgba(0, 0, 0, 0);
   top: 0;
 }
 
-.comment_section{
-  position: absolute;
+.comment_section {
+  position: fixed;
   top: 0;
   left: 0;
   width: 100%;
   height: 98%;
-  background: rgba(0,0,0, .2);
+  z-index: 9999;
+  background: rgba(0, 0, 0, .3);
   overflow: hidden;
 }
 
-.change_grade{
+.change_grade {
   width: 100%;
   height: 100%;
-  background: rgba(0,0,0,.7);
+  background: rgba(0, 0, 0, .7);
   display: flex;
   justify-content: center;
   align-items: center;
@@ -338,17 +360,17 @@ margin-left: 4rpx;
   z-index: 9999;
 }
 
-.change_grade .change_brage_wrapper{
+.change_grade .change_brage_wrapper {
   width: 548rpx;
   height: 453rpx;
   background: #fff;
   border-radius: 20rpx;
 }
 
-.change_grade .change_brage_wrapper .title{
+.change_grade .change_brage_wrapper .title {
   width: 100%;
   text-align: center;
-  color: rgba(0,0,0,.6);
+  color: rgba(0, 0, 0, .6);
   font-size: 40rpx;
   margin-top: 33rpx;
   margin-bottom: 66rpx;
@@ -356,14 +378,14 @@ margin-left: 4rpx;
   justify-content: center;
 }
 
-.change_grade .change_brage_wrapper .change_row{
+.change_grade .change_brage_wrapper .change_row {
   width: 100%;
   display: flex;
   justify-content: space-around;
   margin-bottom: 65rpx;
 }
 
-.change_grade .change_brage_wrapper .change_row .change_item{
+.change_grade .change_brage_wrapper .change_row .change_item {
   width: 220rpx;
   height: 68rpx;
   background: #14c962;

pages/mycollection/mycollection.js

@@ -12,7 +12,7 @@ Page({
     line1: '您还没有收藏过哦',
     line2: '快去收藏自己喜欢的吧',
     videoList: [],
-    commentShow:false
+    commentShow: false
   },
 
   toClass: function (e) {
@@ -59,7 +59,10 @@ Page({
       temp.type = item.userRead.type;
       temp.nickName = item.user.wechatName;
       temp.isLike = item.isLike;
+      temp.isFans = true;
       temp.isFavorite = true;
+      temp.coverImg = item.userRead.coverImg;
+      temp.videoShow = false;
       this.data.videoList.push(temp);
     });
     this.setData({
@@ -85,8 +88,8 @@ Page({
       })
     }
   },
-   // 打开评论
-   openComment: function (e) {
+  // 打开评论
+  openComment: function (e) {
     // 
     console.log('id', e.detail.activeId)
     this.setData({
@@ -116,7 +119,9 @@ Page({
       })
     });
   },
-
+  commentTouchMove: function (e) {
+    return;
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -164,6 +169,13 @@ Page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function () {
+    if (res.from === 'button') {
+      return {
+        title: this.data.shareTitle,
+        path: `/pages/index/index`,
+        imageUrl: '../../static/index/share_icon.png'
 
+      }
+    }
   }
 })

pages/mycollection/mycollection.wxml

@@ -12,7 +12,7 @@
   </view> -->
   <VideoSwiper wx:if="{{videoList.length > 0}}" class="video-swiper" video-list="{{videoList}}" nextMargin="{{nextMargin}}" isSwiper="{{isSwiper}}" ifHeadTap="{{true}}" bindopenComment="openComment" bindheadTap="headTapHandler" bindgoToReading="goToReading" binddelHideMyWork="delHideMyWork" bindchange="videoChange" />
   <!-- <myPlacerholder line1="{{line1}}" line2="{{line2}}" wx:if="{{collection_data.length <= 0}}" /> -->
-  <view class="comment_section" catchtap="commentTap" data-type="blank" wx:if="{{commentShow}}">
+  <view class="comment_section" catchtouchmove="commentTouchMove" catchtap="commentTap" data-type="blank" wx:if="{{commentShow}}">
     <Comment data-type="list" commentId="{{commentId}}" commentNum="{{commentNum}}" inputValue="{{inputValue}}" bindsendReply="sendReply" />
   </view>
 </view>

pages/mycollection/mycollection.wxss

@@ -3,6 +3,7 @@
   min-height: 100%;
   background: rgba(240, 241, 245, 1);
   padding-top: 22rpx;
+  background: #eee;
   /* background: #F0F1F5; */
 }
 .video-swiper {
@@ -63,11 +64,12 @@
 }
 
 .comment_section{
-  position: absolute;
+  position: fixed;
   top: 0;
   left: 0;
   width: 100%;
   height: 98%;
-  background: rgba(0,0,0, .2);
+  z-index: 9999;
+  background: rgba(0, 0, 0, .3);
   overflow: hidden;
 }

pages/myconcern/myconcern.wxml

@@ -24,5 +24,5 @@
       </view>
     </view>
   </view>
-  <myPlacerholder class="placerholder" imageShow="{{imageShow}}" line1="{{line1}}" line2="{{line2}}" wx:if="{{fanList.length <= 1}}" />        
+  <!-- <myPlacerholder class="placerholder" imageShow="{{imageShow}}" line1="{{line1}}" line2="{{line2}}" wx:if="{{fanList.length <= 1}}" />         -->
 </view>

pages/myworks/myworks.js

@@ -17,6 +17,7 @@ Page({
     isFans: false,
     isMyself: false,
     commentId: '',
+    pageSize: 3
 
   },
   // 打开评论
@@ -101,8 +102,10 @@ Page({
 
   },
 
+
+
   getUserWorks(uid, pageNo, pageSize) {
-    APIClient.userWorks(uid, pageNo, pageSize).success(res => {
+    APIClient.userWorks(this.data.uid, this.data.pageNo, this.data.pageSize).success(res => {
       console.log(res)
       const recommendRes = res.data.data.list;
       if (recommendRes.length === 0) return;
@@ -126,12 +129,14 @@ Page({
         temp.nickName = item.user.wechatName;
         temp.isLike = item.isLike;
         temp.isFavorite = item.isFavorites;
+        temp.isFans = true;
         // recommendWorks.push(temp);
         this.data.videoList.push(temp);
 
       });
       this.setData({
-        videoList: this.data.videoList
+        videoList: this.data.videoList,
+        totalNo: res.data.data.totalNo
       })
       console.log('dangqian', this.data.videoList)
     })
@@ -140,7 +145,8 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    if (options.uid === wx.getStorageSync('uid') || options.uid === 'c7f0a8fdd3a549ea9109a7b7486775f2') {
+    // if (options.uid === wx.getStorageSync('uid') || options.uid === 'c7f0a8fdd3a549ea9109a7b7486775f2') {
+    if (options.uid === wx.getStorageSync('uid')) {
       this.setData({
         isMyself: true
       })
@@ -161,7 +167,7 @@ Page({
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
-
+    
   },
 
   /**
@@ -198,10 +204,11 @@ Page({
   onReachBottom: function () {
     this.setData({
       pageNo: this.data.pageNo + 1
+    },()=>{
+      if (this.data.pageNo <= this.data.totalNo) {
+        this.getUserWorks();
+      }
     })
-    if (this.data.pageNo <= this.data.totalNo) {
-      this.getResults();
-    }
   },
 
   /**

pages/myworks/myworks.wxml

@@ -8,8 +8,10 @@
         <text class="avatar-nickname">{{ wareCards.user.wechatName }}</text>
       </view>
       <view class="follow" wx:if="{{!isMyself}}" bindtap="follow">
-        <image src="{{isFans? '../../static/index/followed.png' : '../../static/index/follow.png'}}" />
-        <text class="followBtn">{{isFans ? '已' : ''}}关注</text>
+        <!-- <image src="{{isFans? '../../static/index/followed.png' : '../../static/index/follow.png'}}" /> -->
+        <!-- <text class="followBtn">{{isFans ? '已' : ''}}关注</text> -->
+        <image src="{{isFans? '../../static/index/followed_btn.png' : '../../static/index/follow_btn.png'}}" />
+
       </view>
     </view>
     <view class='mine-category'>

pages/myworks/myworks.wxss

@@ -5,12 +5,13 @@ page {
 }
 
 .comment_section{
-  position: absolute;
+  position: fixed;
   top: 0;
   left: 0;
   width: 100%;
   height: 98%;
-  background: rgba(0,0,0, .2);
+  z-index: 9999;
+  background: rgba(0, 0, 0, .3);
   overflow: hidden;
 }
 
@@ -56,15 +57,15 @@ page {
   font-size: 26rpx;
   color: #8a8a8a;
   position: absolute;
-  top: 36rpx;
+  top: 54rpx;
   right: 32rpx;
 }
 
 .follow image {
-  width: 48rpx;
-  height: 45rpx;
+  width: 160rpx;
+  height: 50rpx;
   /* margin-right: 15rpx; */
-  margin-bottom: 8rpx;
+  /* margin-bottom: 8rpx; */
 }
 
 .avatar-bg {
@@ -99,7 +100,7 @@ page {
   text-overflow: ellipsis;
   white-space: nowrap;
   font-size: 30rpx;
-  color: rgba(0, 0, 0, .6);
+  color: rgba(0, 0, 0, .8);
 }
 
 
@@ -153,10 +154,10 @@ page {
   width: 674rpx;
   /* padding-top: 30rpx; */
   border-top: 1rpx solid rgba(0,0,0,.2);
-  padding-top: 19rpx;
+  padding-top: 26rpx;
   font-size: 28rpx;
   /* font-weight: 600; */
-  color: rgba(0,0,0,.6);
+  color: rgba(0,0,0,.8);
   z-index: 900;
   display: flex;
   margin: 0 auto;

pages/reading/reading.js

@@ -24,6 +24,7 @@ Page({
         readingText: '',
         videoList: [],
         pageNo: 1,
+        totalSize: 0,
         nextMargin: getApp().globalData.nextMargin,
         lowerThresHold: 100,
         isVideoListShow: true,
@@ -57,7 +58,8 @@ Page({
                 readingText: res.data.data.userRead.lessonText,
                 grade: res.data.data.userRead.grade,
                 exampleId: res.data.data.userRead.exampleId,
-                summary: res.data.data.userRead.summary
+                summary: res.data.data.userRead.summary,
+                coverImg: res.data.data.userRead.coverImg,
             })
             this.getReadInfo(id)
             httpRequestApi.userIntoPage('pages/reading/reading', '朗读页面').success((res) => {
@@ -322,6 +324,9 @@ Page({
             videoUrl: this.data.videoUrl
         })
         if (this.data.audioPath) {
+            if (this.data.audioPlaying) {
+                this.ss.stopPlay();
+            }
             this.ss.startPlay(this.data.audioPath);
             this.videoCtx.stop();
             this.videoCtx.play();
@@ -383,7 +388,7 @@ Page({
             })
         }
         wx.showLoading({
-            title: '作品分享中',
+            title: '作品上传中',
             mask: true
         })
 
@@ -420,14 +425,15 @@ Page({
             "summary": this.data.summary,
             "productId": this.data.productId,
             "grade": this.data.grade,
-            "exampleId": this.data.exampleId
+            "exampleId": this.data.exampleId,
+            "coverImg": this.data.coverImg
         };
         httpRequestApi.postWork(data).success(res => {
             wx.hideLoading({
                 success: () => {
                     wx.showToast({
-                        title: '上传成功',
-                        icon: 'success',
+                        title: '作品已上传正在审核中',
+                        icon: 'none',
                         duration: 1000,
                         success: () => {
                             console.log('上传成功', res);
@@ -446,12 +452,10 @@ Page({
                             });
                             const pages = getCurrentPages();
                             const prevPage = pages[pages.length - 2];
-                            console.log('上一个页面', prevPage);
-                            console.log('上一个页面', res.data.data.id);
                             prevPage.setData({
-                                workId: res.data.data.id, // 有id就塞到第一位
+                                // workId: res.data.data.id, // 有id就塞到第一位
+                                fromReading: true
                             }, () => {
-                                console.log('上一个页面', prevPage);
                                 wx.navigateBack({
                                     delta: 1
                                 })
@@ -491,12 +495,16 @@ Page({
                 temp.nickName = item.user ? item.user.wechatName : '';
                 temp.id = item.userRead.id;
                 temp.noReading = true;
+                temp.isFans = item.isFans ? true : item.user.uid === this.uid ? true : false;
+                temp.coverImg = item.userRead.coverImg;
+                temp.videoShow = false;
                 // recommendWorks.push(temp);
                 // that.data.hotData.hotWorks.push(temp);
                 this.data.videoList.push(temp);
             });
             this.setData({
-                videoList: this.data.videoList
+                videoList: this.data.videoList,
+                totalSize: res.data.data.totalSize
             })
         });
     },
@@ -546,7 +554,7 @@ Page({
             return {
                 title: this.data.shareTitle,
                 path: `/pages/index/index${this.data.shareId}`,
-                imageUrl: this.data.shareImg
+                imageUrl: '../../static/index/share_icon.png'
 
             }
         } else {
@@ -567,6 +575,7 @@ Page({
     },
     onPlay: function (e) {
         // 下边视频列表onplay
+        console.log('视频播放视频播放')
         if (this.videoCtx) {
             this.videoCtx.stop();
         } else {

pages/reading/reading.wxml

@@ -35,29 +35,34 @@
         </view> -->
         <text class="textContent">{{readingText}}</text>
     </scroll-view>
+    <view class="read_num" wx:if="{{isVideoListShow && totalSize > 0}}">
+        <image class="read_num_icon" src='../../static/index/peoples.png' />
+        
+        <text >共有{{totalSize}}个作品</text>
+    </view>
     <view class="score_section" wx:if="{{ifScoreShow}}">
         <view class="title">测评报告</view>
         <view class="star_row">
-            <image class="star" wx:for="{{star}}" src="{{item? '../../static/index/star_colored.png': '../../static/index/star.png'}}" />
+            <image class="star" wx:for="{{star}}" src="{{item? '../../static/index/star_test_colored.png': '../../static/index/star_test.png'}}" />
         </view>
         <view class="score_item">
             <text class="score_square"></text>
-            <text >完成度：{{integrity}}/100</text>
+            <text>完成度：{{integrity}}/100</text>
         </view>
         <view class="score_item">
             <text class="score_square"></text>
-            <text >正确率：{{accuracy}}/100</text>
+            <text>正确率：{{accuracy}}/100</text>
         </view>
         <view class="score_item">
             <text class="score_square"></text>
-            <text >语速：{{fluency}}/100</text>
+            <text>语速：{{fluency}}/100</text>
         </view>
         <view class="score_item">
             <text class="score_square"></text>
-            <text >语音语调：{{tone}}/100</text>
+            <text>语音语调：{{tone}}/100</text>
         </view>
     </view>
-    <VideoSwiper bindopenShare="openShare" wx:if="{{videoList && videoList.length > 0 && isVideoListShow}}" class="video-swiper" video-list="{{videoList}}" nextMargin="{{nextMargin}}" isSwiper="{{false}}" bindopenComment="openComment" bindheadTap="headTapHandler" bindgoToReading="goToReading" bindplay="onPlay"></VideoSwiper>
+    <VideoSwiper bindopenShare="openShare" wx:if="{{videoList && videoList.length > 0 && isVideoListShow}}" class="video-swiper" video-list="{{videoList}}" nextMargin="{{nextMargin}}" isSwiper="{{false}}" bindopenComment="openComment" bindheadTap="headTapHandler" bindgoToReading="goToReading" bindonPlay="onPlay"></VideoSwiper>
 </scroll-view>
 <view class="comment_section" catchtap="commentTap" data-type="blank" wx:if="{{commentShow}}">
     <Comment data-type="list" commentId="{{commentId}}" />
@@ -66,23 +71,23 @@
     <view class="score_section">
         <view class="title">测评报告</view>
         <view class="star_row">
-            <image class="star" wx:for="{{star}}" src="{{item? '../../static/index/star_colored.png': '../../static/index/star.png'}}" />
+            <image class="star" wx:for="{{star}}" src="{{item? '../../static/index/star_test_colored.png': '../../static/index/star_test.png'}}" />
         </view>
         <view class="score_item">
             <text class="score_square"></text>
-            <text >完成度：{{integrity}}/100</text>
+            <text>完成度：{{integrity}}/100</text>
         </view>
         <view class="score_item">
             <text class="score_square"></text>
-            <text >正确率：{{accuracy}}/100</text>
+            <text>正确率：{{accuracy}}/100</text>
         </view>
         <view class="score_item">
             <text class="score_square"></text>
-            <text >语速：{{fluency}}/100</text>
+            <text>语速：{{fluency}}/100</text>
         </view>
         <view class="score_item">
             <text class="score_square"></text>
-            <text >语音语调：{{tone}}/100</text>
+            <text>语音语调：{{tone}}/100</text>
         </view>
     </view>
     <view class="close" bindtap="closeScoreDialog">

pages/reading/reading.wxss

@@ -1,6 +1,25 @@
 .readingPage {
     height: 100%;
     /* overflow: hidden; */
+    /* background: #eee; */
+}
+
+.read_num {
+    width: 100%;
+    height: 81rpx;
+    background: #eee;
+    display: flex;
+    align-items: center;
+    padding-left: 30rpx;
+    box-sizing: border-box;
+    color: rgba(0, 0, 0, .8);
+    font-size: 28rpx;
+}
+
+.read_num_icon {
+    width: 37rpx;
+    height: 37rpx;
+    margin-right: 17rpx;
 }
 
 .videoSection {
@@ -16,11 +35,23 @@ audio {
     bottom: 200rpx;
 }
 
+.comment_section {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 98%;
+    z-index: 9999;
+    background: rgba(0, 0, 0, .3);
+    overflow: hidden;
+}
+
 .textSection {
     width: 100%;
     height: 500rpx;
     /* padding-bottom: 200rpx; */
     overflow: visible;
+    background: #fff;
 }
 
 .btn_wrapper {
@@ -50,6 +81,7 @@ audio {
 .btn_wrapper .reading_btn text {
     color: #fff;
     font-size: 30rpx;
+    font-weight: 30rpx;
 }
 
 .textSection .textContent {
@@ -134,7 +166,7 @@ audio {
 .score_dialog {
     width: 100%;
     height: 100%;
-    background: rgba(0, 0, 0, .3);
+    background: rgba(0, 0, 0, .6);
     display: flex;
     flex-direction: column;
     justify-content: center;
@@ -160,16 +192,18 @@ audio {
 
 .score_dialog .score_section {
     width: 552rpx;
-    height: 611rpx;
+    height: 562rpx;
     background: #fffdf7;
     border-radius: 30rpx;
 }
+
 .readingPage .score_section {
-    margin: 28rpx auto 0;
-    width: 627rpx;
+    width: 100%;
+    padding: 0 110rpx;
+    box-sizing: border-box;
     height: 524rpx;
     background: #fffbf7;
-    border-radius: 30rpx;
+    border-top: 10rpx solid #eee;
 }
 
 .score_section .title {
@@ -188,14 +222,14 @@ audio {
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
-    padding: 0 55rpx;
+    padding: 0 100rpx;
     box-sizing: border-box;
     margin-bottom: 42rpx;
 }
 
 .score_section .star_row .star {
-    width: 75.8rpx;
-    height: 86.7rpx;
+    width: 55rpx;
+    height: 53rpx;
 }
 
 .score_section .score_item {

pages/social/insideMessage/insideMessage.wxml

@@ -1,9 +1,9 @@
 <view class="message-view">
-    <button open-type="contact" plain="true" hover-class="none" style="border: none;">
+    <!-- <button open-type="contact" plain="true" hover-class="none" style="border: none;">
         <view class="contact-btn">
             <image src="../../../static/image/contact_img.png"></image>
         </view>
-    </button>
+    </button> -->
     <view class="message-box" wx:for="{{messageList}}" wx:key="{{index}}">
         <view class="message-time">{{item.gmtCreated}}</view>
         <view class="message-text">

pages/user/myEdit/myEdit.js

@@ -14,19 +14,19 @@ Page({
     msg: '',
     nickname: '',
     gradeIndex:0,
-    gradeArray:['小学一年级','小学二年级','小学三年级','学前班'],
+    gradeArray:['一年级','二年级','三年级','学前班'],
     gradeCode:'',
     gradeObject: [{
         code: 'PRIMARY_FIRST_GRADE',
-        name: '小学一年级'
+        name: '一年级'
       },
       {
         code: 'PRIMARY_SECOND_GRADE',
-        name: '小学二年级'
+        name: '二年级'
       },
       {
         code: 'PRIMARY_THREE_GRADE',
-        name: '小学三年级'
+        name: '三年级'
       },
       {
         code: 'PRESCHOOL',

templates/courses/courses.less

@@ -1,13 +1,13 @@
 .courses_container {
     width: 100%;
     height: 100%;
-    background: #444;
+    background: #eee;
 
     .course_item {
         width: 100%;
         height: 400rpx;
         background: #fff;
-        margin-top: 10rpx;
+        margin-bottom: 10rpx;
         padding-top: 20rpx;
         box-sizing: border-box;
         // display: flex;
@@ -37,14 +37,21 @@
 
             }
 
-            .course_btn {
-                width: 270rpx;
+            .course_btn_wrapper{
+                width: 290rpx;
                 display: flex;
                 align-items: center;
                 justify-content: space-between;
+              }
+            .course_btn {
+                // width: 270rpx;
+                display: flex;
+                align-items: center;
+                // justify-content: space-between;
                 .btn_icon {
-                    width: 56rpx;
-                    height: 56rpx;
+                    width: 48rpx;
+                    height: 46rpx;
+                    margin-right: 7rpx;
                 }
 
                 .btn_text {

templates/courses/courses.wxml

@@ -4,11 +4,11 @@
         <view class="course_item" bindtap="goToReading" wx:for="{{coursesData}}" data-id="{{item.userRead.exampleId}}" wx:key="index">
             <image class="course_icon" src="{{item.userRead.iconImg}}" lazy-load="true" />
             <view class="course_info">
-                <text class="course_title">{{item.userRead.title}}</text>
+                <text class="course_title">《{{item.userRead.title}}》</text>
                 <view class="course_btn_wrapper">
                     <view class="collect course_btn" data-index="{{index}}" data-id="{{item.userRead.id}}" data-type="{{item.userRead.type}}" catchtap="courseCollectTap">
                         <image class="collect_icon btn_icon" src="{{item.isFavorites ?'../../static/index/star_colored.png' :'../../static/index/star.png' }}" />
-                        <text class="collect_text btn_text">{{item.isFavorites? '已收藏' : '收藏'}}</text>
+                        <text class="collect_text btn_text">{{item.isFavorites? '收藏' : '收藏'}}</text>
                     </view>
                     <view class="share course_btn" catchtap="coursesOpenShare" data-author="{{item.user.nickName}}" data-index="{{index}}" data-id="{{item.userRead.id}}" data-avatar="{{item.user.avatar}}" data-uid="{{item.user.uid}}" data-icon="{{item.userRead.iconImg}}" data-title="{{item.userRead.title}}" data-type="{{item.userRead.type}}">
                         <image class="share_icon btn_icon" src="../../static/index/share.png" />

templates/courses/courses.wxss

@@ -7,7 +7,7 @@
   width: 100%;
   height: 400rpx;
   background: #fff;
-  margin-top: 10rpx;
+  margin-bottom: 10rpx;
   padding-top: 20rpx;
   box-sizing: border-box;
 }
@@ -30,23 +30,20 @@
   color: #373737;
   font-size: 30rpx;
 }
-.course_btn_wrapper{
+.courses_container .course_item .course_info .course_btn_wrapper {
   width: 290rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
 .courses_container .course_item .course_info .course_btn {
-  /* width: 290rpx; */
   display: flex;
   align-items: center;
-
-  /* justify-content: space-between; */
 }
 .courses_container .course_item .course_info .course_btn .btn_icon {
-  width: 50rpx;
-  height: 50rpx;
-  margin-right: 11rpx;
+  width: 48rpx;
+  height: 46rpx;
+  margin-right: 7rpx;
 }
 .courses_container .course_item .course_info .course_btn .btn_text {
   font-size: 28rpx;