合并代码

component/follow/follow.wxml

@@ -1,28 +1,4 @@
 <template name="follow">
-  <!-- <view class="followWares" style="flex-direction:row;">
-    <view wx:for="{{followData}}" wx:key="{{index}}" class="followWareCard" bindtap="openWorks" data-readid="{{item.id}}" data-title="{{item.title}}">
-      <view class="userCard">
-        <image class="avatar" src="{{item.avatar}}" />
-        <view class="nameCross">
-          <text class="nickName">{{item.nickName}}</text>
-          <text class="time">{{item.time}}</text>
-        </view>
-      </view>
-      <image class="wareCardImg" src="{{item.img}}" />
-      <text class="wareCardTitle">{{item.title}}</text>
-      <view class="bottomData">
-        <text class="wareCardTip">{{item.summary}}</text>
-        <view class="wareCardPlays">
-            <image class="wareCardPlaysImg" src="../../static/image/hotPlays.png" />
-            <text>{{item.plays}}</text>
-        </view>
-        <view class="wareCardLikes">
-            <image class="wareCardLikesImg" src="../../static/image/like.png" />
-            <text>{{item.likes}}</text>
-        </view>
-    </view>
-    </view>
-  </view> -->
   <view class="followWares">
     <view wx:for="{{followData}}" wx:key="{{index}}" class="followWareCard" bindtap="openWorks" data-readid="{{item.id}}" data-title="{{item.title}}">
       <view class="topData">

component/hot/hot.wxss

@@ -106,20 +106,22 @@ swiper {
 }
 
 .hotSection .title .moreBtn {
-    display:flex;
-    flex-direction:row;
-    float:right;
-    width:100rpx;
-    height:38rpx;
-    font-size:28rpx;
-    color:#444;
-    align-items:center;
-    
-}
-.title .moreBtn image{
+    display: flex;
+    flex-direction: row;
+    float: right;
+    width: 100rpx;
+    height: 38rpx;
+    font-size: 28rpx;
+    color: #444;
+    align-items: center;
+
+}
+
+.title .moreBtn image {
     width: 21rpx;
     height: 25rpx;
 }
+
 .hotWares {
     display: flex;
     flex-wrap: wrap;
@@ -192,7 +194,7 @@ swiper {
     text-align: left;
     color: #444;
     font-size: 24rpx;
-    line-height:40rpx;
+    line-height: 40rpx;
 
 }
 
@@ -429,8 +431,8 @@ swiper {
 .worksLeft {
     display: flex;
     flex-direction: row;
-    flex:1;
-    margin-left:10rpx;
+    flex: 1;
+    margin-left: 10rpx;
 
 }
 
@@ -453,7 +455,7 @@ swiper {
     display: flex;
     flex-direction: row-reverse;
     align-items: center;
-    padding-right:35rpx;
+    padding-right: 35rpx;
 
 }
 
@@ -465,10 +467,12 @@ swiper {
 
     border-radius: 50%;
 }
-.topData .numberInfo{
+
+.topData .numberInfo {
     display: flex;
     flex-direction: column;
 }
+
 .worksCard .wareCardTip {
     width: 178rpx;
     height: 40rpx;
@@ -476,23 +480,23 @@ swiper {
     text-align: left;
     color: #444;
     font-size: 24rpx;
-    line-height:40rpx;
+    line-height: 40rpx;
 
 }
 
 .worksCard .wareCardPlays .wareCardPlaysImg {
-    width:26rpx;
-height:26rpx;
-margin-right: 6rpx;
-float: right;
+    width: 26rpx;
+    height: 26rpx;
+    margin-right: 6rpx;
+    float: right;
 }
 
 .worksCard .wareCardPlays text {
     margin-left: 4rpx;
     color: #5e5e5e;
     font-size: 22rpx;
-    text-align:right;
-/* width:57%; */
+    text-align: right;
+    /* width:57%; */
     float: right;
 }
 
@@ -505,9 +509,9 @@ float: right;
 }
 
 .worksCard .wareCardLikes .wareCardLikesImg {
-    width:26rpx;
-height:24rpx;
-margin-right: 6rpx;
+    width: 26rpx;
+    height: 24rpx;
+    margin-right: 6rpx;
 }
 
 .worksCard .wareCardLikes text {

component/my/my.wxml

@@ -1,54 +1,35 @@
-<wxs module="wxs">
-  function formatDate(time) {
-    var t = getDate(time); 
-    var tf = function(i){return (i < 10 ? '0' : '') + i};
-    var year = t.getFullYear();
-    var month = tf(t.getMonth() + 1);
-    var day = tf(t.getDate());
-    var hour = tf(t.getHours());
-    var minute = tf(t.getMinutes());
-    return month + '-' + day + ' ' + hour + ':' + minute;
-  }
-  function getBirthday(birthday){
-    var t = getDate(birthday); 
-    var tf = function(i){return (i < 10 ? '0' : '') + i};
-    var year = t.getFullYear();
-    var month = tf(t.getMonth() + 1);
-    var day = tf(t.getDate());
-    return year + '年' + month + '月' + day + '日';
-  }
-  module.exports.formatDate = formatDate;
-  module.exports.getBirthday = getBirthday;
-</wxs>
+<wxs src="../../pages/commonWxs/format.wxs" module="format"/>
 <template name="my">
   <view class='mine-container'>
     <view class='follow-details'>
       <view class='follow-info'>
-        <view class='avatar-bg'>
-          <view class='avatar-box'>
-            <image class='avatar-image' src='{{ myData.user.user.avatar }}'></image>
-          </view>
-          <view class='occupation-title'>{{ myData.user.user.profession }}</view>
-        </view>
-        <view class='avatar-msg'>
-          <view class='avatar-nickname'>
-            <text>{{ myData.user.user.wechatName }}</text>
-            <view class='flowers-box' wx:if='{{ myData.user.user.gender === 2 }}'>
-              <image src='../../static/image/flowers.png'></image>
+        <view class='set-msg'>
+          <view class='avatar-bg'>
+            <view class='avatar-box'>
+              <image class='avatar-image' src='{{ myData.user.user.avatar }}'></image>
             </view>
-            <view class='flowers-box' wx:elif='{{ myData.user.user.gender === 1 }}'>
-              <image src='../../static/image/boy.png'></image>
+            <view class='occupation-title'>{{ myData.user.user.profession }}</view>
+          </view>
+          <view class='avatar-msg'>
+            <view class='avatar-nickname'>
+              <text>{{ myData.user.user.wechatName }}</text>
+              <view class='flowers-box' wx:if='{{ myData.user.user.gender === 2 }}'>
+                <image src='../../static/image/flowers.png'></image>
+              </view>
+              <view class='flowers-box' wx:elif='{{ myData.user.user.gender === 1 }}'>
+                <image src='../../static/image/boy.png'></image>
+              </view>
+              <view wx:else class='gender-size'>未知</view>
             </view>
-            <view wx:else class='gender-size'>未知</view>
+            <view class='avatar-birthday'>{{ format.getBirthday(myData.user.user.birthday) }}</view>
+            <view class='avatar-address'>{{ myData.user.user.schoolName }}</view>
           </view>
-          <view class='avatar-birthday'>{{ wxs.getBirthday(myData.user.user.birthday) }}</view>
-          <view class='avatar-address'>{{ myData.user.user.schoolName }}</view>
-        </view>
-        <view class='mine-edit' bindtap='toMyEdit' data-title='{{ myData.title }}'>
-          <view class='edit-image'>
-            <image class='edit-img' src='../../static/image/reset.png'></image>
+          <view class='mine-edit' bindtap='toMyEdit' data-title='{{ myData.title }}'>
+            <view class='edit-image'>
+              <image class='edit-img' src='../../static/image/reset.png'></image>
+            </view>
+            <view class='edit-text'>修改</view>
           </view>
-          <view class='edit-text'>修改</view>
         </view>
       </view>
       <view class='mine-category'>
@@ -64,8 +45,8 @@
         <view class='follow-count'>
           <view class='color'>{{ myData.user.fansAmount || 0 }}</view>
           <view class='border-right'>
-            <view class='play-img'>
-              <image src='../../static/image/follow.png'></image>
+            <view class='red-heart'>
+              <image src='../../static/image/redheart.png'></image>
             </view>
             <text>关注</text>
           </view>
@@ -73,7 +54,7 @@
         <view class='point-count'>
           <view class='color'>{{ myData.user.likeAmount || 0 }}</view>
           <view class='border-right'>
-            <view class='play-img'>
+            <view class='point-img'>
               <image src='../../static/image/point.png'></image>
             </view>
             <text>赞</text>

component/my/my.wxss

@@ -1,7 +1,8 @@
 .mine-container{
   width: 750rpx;
-  background: #F0F1F5;
+  height: 1136rpx;
   position: relative;
+  background: #F0F1F5;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -9,6 +10,10 @@
   box-sizing: border-box;
 }
 
+page{
+  background: #F0F1F5;
+}
+
 .follow-details{
   width: 750rpx;
   box-sizing: border-box;
@@ -16,15 +21,22 @@
 }
 
 .follow-info{
-  /* border: 1rpx solid #3DBEF9; */
   margin-top: 20rpx;
   width: 100%;
-  height: 362rpx;
+  height: 382rpx;
   border-radius: 20rpx;
   background: #FFFFFF;
   display: flex;
 }
 
+.set-msg{
+  width: 100%;
+  height: 248rpx;
+  display: flex;
+  align-items: flex-start;
+  justify-content: center;
+}
+
 .avatar-bg{
   margin-left: 20rpx;
   margin-top: 50rpx;
@@ -40,9 +52,7 @@
   height: 138rpx;
   border-radius: 50%;
   z-index: 300;
-  position: absolute;
-  top: 7rpx;
-  left: 7rpx;
+  margin:8rpx auto;
 }
 
 .avatar-image{
@@ -89,15 +99,15 @@
   margin-left: 40rpx;
   margin-top: 50rpx;
   width: 500rpx;
-  height: 154rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  justify-content: center;
+  height: 150rpx;
   color: #444444;
   font-size: 32rpx;
 }
 
+.avatar-nickname,.avatar-birthday,.avatar-address{
+  line-height: 50rpx;
+}
+
 .gender-size{
   margin-left: 10rpx;
   font-size: 28rpx;
@@ -108,15 +118,15 @@
 .mine-category{
   box-sizing: border-box;
   width: 674rpx;
-  padding-top: 30rpx;
-  padding-bottom: 30rpx;
+  padding-top: 40rpx;
+  padding-bottom: 32rpx;
   border-top: 4rpx solid #F0F1F5;
   font-size: 28rpx;
   font-weight: 600;
   z-index: 900;
   display: flex;
   position: absolute;
-  top: 246rpx;
+  top: 268rpx;
   left: 38rpx;
 }
 
@@ -146,6 +156,20 @@
   margin-bottom: 6rpx;
 }
 
+.red-heart{
+  width: 26rpx;
+  height: 22rpx;
+  margin-right: 6rpx;
+  margin-bottom: 6rpx;
+}
+
+.point-img{
+  width: 28rpx;
+  height: 24rpx;
+  margin-right: 6rpx;
+  margin-bottom: 6rpx;
+}
+
 image{
   width: 100%;
   height: 100%;
@@ -160,7 +184,7 @@ image{
 }
 
 .follow-count{
-  color: #529BEF;
+  color: #FF0000;
 }
 
 .flower-count{
@@ -171,7 +195,7 @@ image{
 
 .mine-edit{
   position: absolute;
-  top: 75rpx;
+  top: 72rpx;
   right: 36rpx;
   width: 138rpx;
   height: 52rpx;
@@ -183,20 +207,20 @@ image{
 }
 
 .edit-image{
-  width: 22rpx;
-  height: 32rpx;
+  width: 24rpx;
+  height: 34rpx;
   margin-left: 24rpx;
   margin-right: 10rpx;
 }
 
 .edit-img{
-  width: 22rpx;
-  height: 32rpx;
+  width: 24rpx;
+  height: 34rpx;
 }
 
 .edit-text{
-  width: 144rpx;
-  height: 34rpx;
+  width: 150rpx;
+  height: 32rpx;
   color: #FFFFFF;
   font-size: 32rpx;
 }

pages/index/index.wxml

@@ -11,7 +11,7 @@
   <view class="top-tab">
     <block wx:for="{{tab}}" wx:key="{{index}}">
       <view class="tabbar {{index == myIndex ? 'select':' '}}" bindtap="switcher" data-index="{{index}}" wx:if="{{isIOS ? index === 0?  false : true : true}}">
-        <text >{{item.name}}</text>
+        <text>{{item.name}}</text>
       </view>
     </block>
   </view>

pages/index/index.wxss

@@ -2,34 +2,37 @@
 /*热门推荐*/
 @import "/component/hot/hot.wxss";
 /*热团*/
- @import "/component/group/group.wxss"; 
+@import "/component/group/group.wxss";
 /*关注*/
 @import "/component/follow/follow.wxss";
 /*我的*/
 @import "/component/my/my.wxss";
 
-.container{
-  background: rgba(240,241,245,1);
+.container {
+  background: rgba(240, 241, 245, 1);
 }
+
 .template {
   height: 100%;
 }
+
 .scroll-view {
   height: 100%;
 }
+
 .top-tab {
   position: fixed;
   top: 0;
   width: 100%;
   height: 80rpx;
-  background:#fff;
+  background: #fff;
   color: #383838;
   box-sizing: border-box;
   display: flex;
   justify-content: space-between;
   align-items: center;
   margin-bottom: 15rpx;
-  z-index:999;
+  z-index: 999;
   padding: 0 10rpx 0;
 }
 
@@ -63,5 +66,5 @@
   position: absolute;
   left: 50%;
   top: 50%;
-  transform: translate(-50%,-50%);
+  transform: translate(-50%, -50%);
 }

pages/social/replyDetail/replyDetail.wxml

@@ -9,7 +9,7 @@
       </view>
     </view>
 <view class='reply-all'>
-    全部回复({{ count }})
+    全部回复({{ count || 0 }})
   </view>
     <view class="{{classNormal}}" wx:for="{{comment}}" wx:key="{{index}}" wx:if="{{index !== 0}}">
       <image class="avatar" src="{{item.avatar}}" />

pages/social/replyDetail/replyDetail.wxss

@@ -11,7 +11,7 @@
   width: 100%;
   padding: 0 0 0 23rpx;
   height: 100%;
-  border-bottom: solid 2rpx #979797;
+  border-bottom: solid 2rpx #DEDEE2;
   display: flex;
   position: relative;
   background: #F0F1F5;

pages/social/works/works.wxml

@@ -43,6 +43,8 @@
             <view class="btnWrapper">
                 <image class="commentBtn" src="../../../static/image/comment.png" bindtap="goToDetail" data-id="{{item.id}}" data-index="{{index}}" />
                 <text class="commentText" bindtap="goToDetail" data-id="{{item.id}}" data-index="{{index}}">回复</text>
+                <!-- <image class="commentBtn" src="../../../static/image/comment.png" bindtap="goToDetail" data-count="{{item.replyCount}}" data-id="{{item.id}}" data-index="{{index}}" />
+                <text class="commentText" bindtap="goToDetail" data-id="{{item.id}}" data-count="{{item.replyCount}}" data-index="{{index}}">评论</text> -->
                 <image class="likeBtn" src="../../../static/image/like.png" data-index="{{index}}" data-likes="{{item.likes}}" data-id="{{item.id}}" bindtap="likeCommend" />
                 <text class="likeText" data-index="{{index}}" data-likes="{{item.likes}}" data-id="{{item.id}}" bindtap="likeCommend">{{item.likes}}</text>
             </view>

pages/user/mycollection/mycollection.js

@@ -29,10 +29,11 @@ Page({
         title: option.title
       });
     }
-
     httpRequestApi.myFavorites().success(res => {
       this.setData({
         collection_data: res.data.data.list
+      },() => {
+        console.log(this.data.collection_data);
       });
     });
   },

pages/user/mycollection/mycollection.wxml

@@ -8,6 +8,6 @@
     </view>
     <view class='content-detail'>
       <view class='left'>{{ item.summary }}</view>
-    </view>
+    </view> 
   </view>
-</view>
+</view>

pages/user/mycollection/mycollection.wxss

@@ -2,7 +2,6 @@
   width: 750rpx;
   background: #F0F1F5;
 }
-
 .collection-article{
   margin-bottom: 4rpx;
   box-sizing: border-box;
@@ -11,44 +10,8 @@
   background: #FFFFFF;
 }
 
-.collection-top{
-  width: 100%;
-  height: 120rpx;
-  display: flex;
-  align-items: center;
-}
-
-.top-img{
-  margin-right: 14rpx;
-  width: 96rpx;
-  height: 96rpx;
-  border-radius: 50%;
-}
-
-.top-img>image{
-  width: 100%;
-  height: 100%;
-  border-radius: 50%;
-}
-
-.collection-info{
-  width: 580rpx;
-  font-size: 32rpx;
-  margin-bottom: 10rpx;
-}
-
-.collection-info>.title{
-  color: #000000;
-  font-weight: 600;
-}
-
-.collection-info>.date{
-  color: #686868;
-  font-weight: lighter;
-}
-
 .video-preview{
-  margin-top: 10rpx;
+  padding-top: 16rpx;
   width: 100%;
   height: 290rpx;
   border-radius: 20rpx;
@@ -63,15 +26,15 @@
 .content-title{
   margin-top: 10rpx;
   width: 100%;
-  height: 55rpx;
+  height: 52rpx;
   font-size: 32rpx;
-  font-weight: 600;
+  font-weight: 500;
   color: #414141;
 }
 
 .content-detail{
   width: 100%;
-  height: 60rpx;
+  height: 50rpx;
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -81,33 +44,3 @@
 .left{
   width: 200rpx;
 }
-
-.right{
-  width: 220rpx;
-  height: 100%;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.right image{
-  width: 100%;
-  height: 100%;
-}
-
-.play-img{
-  width: 20rpx;
-  height: 20rpx;
-}
-
-.point-img{
-  width: 26rpx;
-  height: 24rpx;
-}
-
-.right-detail{
-  width: 100rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
-}

pages/user/myread/myread.js

@@ -5,80 +5,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-    wareCards: [
-      {
-        title: "古诗词诵读（一）江南",
-        grade: "一年级(上学期)",
-        avatarUrl: '../../../static/image/timg.jpg',
-        previewUrl: "../../../static/image/timg.jpg",
-        plays: "17230",
-        likes: "71230",
-        classId: "1",
-        avatar: '../../static/image/timg.jpg',
-        nickName: '喔喔',
-        time: '10-18 09:56'
-      },
-      {
-        title: "古诗词诵读（一）江南",
-        grade: "一年级(上学期)",
-        avatarUrl: '../../../static/image/timg.jpg',
-        previewUrl: "../../../static/image/timg.jpg",
-        plays: "17230",
-        likes: "71230",
-        classId: "1",
-        avatar: '../../static/image/timg.jpg',
-        nickName: '喔喔',
-        time: '10-18 09:56'
-      },
-      {
-        title: "古诗词诵读（一）江南",
-        grade: "一年级(上学期)",
-        avatarUrl: '../../../static/image/timg.jpg',
-        previewUrl: "../../../static/image/timg.jpg",
-        plays: "17230",
-        likes: "71230",
-        classId: "1",
-        avatar: '../../static/image/timg.jpg',
-        nickName: '喔喔',
-        time: '10-18 09:56'
-      },
-      {
-        title: "古诗词诵读（一）江南",
-        grade: "一年级(上学期)",
-        avatarUrl: '../../../static/image/timg.jpg',
-        previewUrl: "../../../static/image/timg.jpg",
-        plays: "17230",
-        likes: "71230",
-        classId: "1",
-        avatar: '../../static/image/timg.jpg',
-        nickName: '喔喔',
-        time: '10-18 09:56'
-      },
-      {
-        title: "古诗词诵读（一）江南",
-        grade: "一年级(上学期)",
-        avatarUrl: '../../../static/image/timg.jpg',
-        previewUrl: "../../../static/image/timg.jpg",
-        plays: "17230",
-        likes: "71230",
-        classId: "1",
-        avatar: '../../static/image/timg.jpg',
-        nickName: '喔喔',
-        time: '10-18 09:56'
-      },
-      {
-        title: "古诗词诵读（一）江南",
-        grade: "一年级(上学期)",
-        avatarUrl: '../../../static/image/timg.jpg',
-        previewUrl: "../../../static/image/timg.jpg",
-        plays: "17230",
-        likes: "71230",
-        classId: "1",
-        avatar: '../../static/image/timg.jpg',
-        nickName: '喔喔',
-        time: '10-18 09:56'
-      }
-    ]
+    wareCards: [],
+    user: {}
   },
 
   toWork: function (e) {
@@ -103,7 +31,17 @@ Page({
       });
     }
     APIClient.myRead().success(res => {
-      console.log(res.data.data.list);
+      console.log(res.data.data.list,'我的朗读');
+      APIClient.getUserWorksInfo().success(res => {
+        let user = res.data.data;
+        this.setData({
+          user: user,
+        }, () => {
+          console.log(this.data.user);
+        });
+      }).fail(error => {
+        console.log(error);
+      });
       this.setData({
         wareCards: res.data.data.list
       });

pages/user/myread/myread.wxml

@@ -1,5 +1,15 @@
+<wxs src="../../commonWxs/format.wxs" module="format" />
 <view class='my-read'>
   <view class='read-article' wx:for="{{ wareCards }}" wx:key="{{ index }}" bindtap='toWork' data-lessonId='{{ item.id }}' data-title='{{ item.title }}'>
+    <view class='user-info'>
+      <view class='avatar-box'>
+        <image class='avatar-image' src="{{ user.user.avatar }}" />
+      </view>
+      <view class="avatar-name">
+        <view>{{ user.user.wechatName }}</view>
+        <view>{{ format.formatDate(item.gmtCreated) }}</view>
+      </view>
+    </view>
     <view class='video-preview'>
       <image src='{{ item.iconImg }}'></image>
     </view>
@@ -13,15 +23,15 @@
           <view class='play-img'>
             <image src='../../../static/image/hotPlays.png'></image>
           </view>
-          <text>{{ item.playAmount }}</text>
+          <view class='count-add'>{{ item.playAmount || 0 }}</view>
         </view>
-        <view class='right-detail'>
+        <view class='right-details'>
           <view class='point-img'>
             <image src='../../../static/image/like.png'></image>
           </view>
-          <text>{{ item.likeAmount }}</text>
+          <view class='count-add'>{{ item.likeAmount || 0 }}</view>
         </view>
       </view>
-    </view>
+    </view> 
   </view>
 </view>

pages/user/myread/myread.wxss

@@ -3,6 +3,57 @@
   background: #F0F1F5;
 }
 
+.user-info{
+  width: 100%;
+  height: 132rpx;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.avatar-image{
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+}
+
+.avatar-box{
+  width: 96rpx;
+  height: 96rpx;
+  border-radius: 50%;
+}
+
+.avatar-name{
+  width: 420rpx;
+  height: 80rpx;
+  font-size: 32rpx;
+  color: #444444;
+  margin-left: 14rpx;
+  margin-bottom: 16rpx;
+}
+
+.avatar-follow{
+  margin-left:30rpx;
+  display:flex;
+  flex-direction:column;
+  align-items:center;
+  width:100rpx;
+
+}
+
+.avatar-img{
+  width: 46rpx;
+  height: 40rpx;
+}
+
+.avatar-images{
+  width: 100%;
+  height: 100%;
+}
+
+
+
+
 .read-article{
   margin-bottom: 4rpx;
   box-sizing: border-box;
@@ -39,7 +90,7 @@
 
 .read-info>.title{
   color: #000000;
-  font-weight: 600;
+  font-weight: 500;
 }
 
 .read-info>.date{
@@ -48,7 +99,7 @@
 }
 
 .video-preview{
-  margin-top: 10rpx;
+  /* margin-top: 16rpx; */
   width: 100%;
   height: 290rpx;
   border-radius: 20rpx;
@@ -65,13 +116,13 @@
   width: 100%;
   height: 50rpx;
   font-size: 32rpx;
-  font-weight: 600;
+  font-weight: 500;
   color: #414141;
 }
 
 .content-detail{
   width: 100%;
-  height: 60rpx;
+  height: 35rpx;
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -80,10 +131,11 @@
 
 .left{
   width: 200rpx;
+  margin-left:10rpx;
+
 }
 
 .right{
-  width: 220rpx;
   height: 100%;
   display: flex;
   justify-content: space-between;
@@ -97,7 +149,7 @@
 
 .play-img{
   width: 20rpx;
-  height: 20rpx;
+  height: 22rpx;
 }
 
 .point-img{
@@ -105,9 +157,17 @@
   height: 24rpx;
 }
 
-.right-detail{
-  width: 100rpx;
+.count-add{
+  width: 36rpx;
+  text-align: center;
+}
+
+.right-detail,.right-details{
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-end;
   align-items: flex-start;
+}
+
+.right-details{
+  margin-left: 20rpx;
 }

pages/user/myworks/myworks.wxml

@@ -3,25 +3,27 @@
 <view class='user-works'>
   <view class='follow-details'>
     <view class='follow-info'>
-      <view class='avatar-bg'>
-        <view class='avatar-box'>
-          <image class='avatar-image' src='{{ wareCards.user.avatar }}'></image>
-        </view>
-        <view class='occupation-title'>{{ wareCards.user.profession }}</view>
-      </view>
-      <view class='avatar-msg'>
-        <view class='avatar-nickname'>
-          <text>{{ wareCards.user.wechatName }}</text>
-          <view class='flowers-box' wx:if='{{ wareCards.user.gender === 2 }}'>
-            <image src='../../../static/image/flowers.png'></image>
+      <view class='set-msg'>
+        <view class='avatar-bg'>
+          <view class='avatar-box'>
+            <image class='avatar-image' src='{{ wareCards.user.avatar }}'></image>
           </view>
-          <view class='flowers-box' wx:elif='{{ wareCards.user.gender === 1 }}'>
-            <image src='../../../static/image/boy.png'></image>
+          <view class='occupation-title'>{{ wareCards.user.profession }}</view>
+        </view>
+        <view class='avatar-msg'>
+          <view class='avatar-nickname'>
+            <text>{{ wareCards.user.wechatName }}</text>
+            <view class='flowers-box' wx:if='{{ wareCards.user.gender === 2 }}'>
+              <image src='../../../static/image/flowers.png'></image>
+            </view>
+            <view class='flowers-box' wx:elif='{{ wareCards.user.gender === 1 }}'>
+              <image src='../../../static/image/boy.png'></image>
+            </view>
+            <view wx:else class='gender-size'>未知</view>
           </view>
-          <view wx:else class='gender-size'>未知</view>
+          <view class='avatar-birthday'>{{ format.getBirthday(wareCards.user.birthday) }}</view>
+          <view class='avatar-address'>{{ wareCards.user.schoolName }}</view>
         </view>
-        <view class='avatar-birthday'>{{ format.getBirthday(wareCards.user.birthday) }}</view>
-        <view class='avatar-address'>{{ wareCards.user.schoolName }}</view>
       </view>
     </view>
     <view class='mine-category'>

pages/user/myworks/myworks.wxss

@@ -7,7 +7,7 @@ page{
 .user-works{
   width: 750rpx;
   box-sizing: border-box;
-  padding: 0 16rpx;
+  padding: 0 15rpx;
   background: #F0F1F5;
   display: flex;
   flex-direction: column;
@@ -17,7 +17,7 @@ page{
 
 .follow-details{
   width: 100%;
-  height: 362rpx;
+  height: 382rpx;
   border-radius: 20rpx;
   background: #FFFFFF;
   margin-top: 30rpx;
@@ -94,11 +94,7 @@ page{
   margin-left: 40rpx;
   margin-top: 50rpx;
   width: 500rpx;
-  height: 154rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  justify-content: center;
+  height: 150rpx;
   color: #444444;
   font-size: 32rpx;
 }
@@ -109,11 +105,23 @@ page{
   align-self: center;
 }
 
+.set-msg{
+  width: 100%;
+  height: 248rpx;
+  display: flex;
+  align-items: flex-start;
+  justify-content: center;
+}
+
+.avatar-nickname,.avatar-birthday,.avatar-address{
+  line-height: 50rpx;
+}
+
 .mine-category{
   box-sizing: border-box;
   width: 674rpx;
-  padding-top: 30rpx;
-  padding-bottom: 30rpx;
+  padding-top: 40rpx;
+  padding-bottom: 32rpx;
   border-top: 4rpx solid #F0F1F5;
   font-size: 28rpx;
   font-weight: 600;

utils/APIClient.js

@@ -223,7 +223,7 @@ module.exports = {
   },
   // 收藏课程
   collectClass(uid, data) {
-    let url = getProductUrl(`wx/favorites`);
+    let url = getProductUrl(`wx/favorites`); 
     return request.getInstance().header({
       uid
     }).url(url).data(data).method('POST').send();