1

app.json

@@ -5,6 +5,7 @@
     "pages/social/insideMessage/insideMessage",
     "pages/social/replyDetail/replyDetail",
     "pages/social/littleFlower/littleFlower",
+    "pages/social/prize/prize",
     "pages/main/class/class",
     "pages/main/books/books",
     "pages/main/week/week",

component/share/share.js

@@ -269,6 +269,7 @@ Component({
           this.triggerEvent('ShareDialogClose', {})
         }, 200)
       })
+      wx.hideLoading()
     },
     nothing: function (e) {
       return

pages/groupPage/collage-details/collage-details.wxml

@@ -33,14 +33,14 @@
             </view>
             <!-- 安卓推广团团长看到 -->
             <view class="group-regular-text" wx:if="{{groupOsType === 'ANDROID' && organizerUid === hosterUid && colonelName}}">
-                即可获得{{rewardMoney}}元奖学金和300朵小红花
+                即可获得{{rewardMoney}}元奖学金和100朵小红花
             </view>
             <view class="group-regular-text" wx:if="{{groupOsType === 'IOS' && organizerUid === hosterUid && colonelName}}">
-                即可获得300朵小红花
+                即可获得10朵小红花
             </view>
             <!-- 团员看到的分享助力团 -->
             <view class="group-regular-text" wx:if="{{groupOsType === 'IOS' && organizerUid !== hosterUid && colonelName}}">
-                即可助力团长<text class="red-text">{{organizer.wechatName}}</text>获得300朵小红花
+                即可助力团长<text class="red-text">{{organizer.wechatName}}</text>获得10朵小红花
             </view>
             <!-- 其他人浏览 -->
             <view class="group-organizer group-regular-text" wx:if="{{organizerUid !== hosterUid}}">
@@ -86,7 +86,7 @@
             <!-- 团购成功并且是团长看到并且是推广团 -->
             <view class="help-success" wx:if="{{groupOsType === 'ANDROID' && organizerUid === hosterUid && colonelName}}">
                 <view class="group-regular-text">拼团成功</view>
-                <view class="group-regular-text">你获得了{{rewardMoney}}元奖学金和300朵小红花</view>
+                <view class="group-regular-text">你获得了{{rewardMoney}}元奖学金和100朵小红花</view>
             </view>
         </view>
         <!-- 头像 -->
@@ -116,14 +116,14 @@
             <view class="explain-title">拼团规则</view>
             <view class="explain-gut">转发给自己的朋友们，分享好课，追随您一起学习进步</view>
             <view class="explain-gut">您的魅力不是吹的</view>
-            <view class="explain-gut">在限定时间内成功拼团，团长将得到{{rewardMoney}}元的奖励金</view>
+            <view class="explain-gut">在限定时间内成功拼团，团长将得到{{rewardMoney}}元的奖励金和100朵小红花</view>
             <view class="explain-gut">如果拼团失败</view>
             <view>您预付的课程费将在48小时内退回您的账户</view>
         </view>
         <view class="explain" wx:if="{{groupOsType === 'IOS' ? true : false}}">
             <view class="explain-title">助力规则</view>
             <view class="explain-gut">在限定时间内成功助力，团长将获得本课程3年试用权</view>
-            <view class="explain-gut">继续发起，将获得300朵小红花</view>
+            <view class="explain-gut">继续发起，将获得10朵小红花</view>
             <view class="explain-gut">助力者将获得7天的试用权</view>
             <view class="explain-gut">据我们统计：分享到3个群，成功率高达98.2%</view>
         </view>

pages/index/index.wxml

@@ -39,7 +39,7 @@
 </view>
 <view class="index-dialog" wx:if="{{indexMissionDialog}}">
   <view class="index-dialog-wrapper" bindtap="missionBtn" >
-    <view class="index-dialog-text">还有奖励任务没有完成哦</view>
+    <view class="index-dialog-text">还有<text class="red-text">{{unfinishedCount}}</text>个奖励任务没有完成哦</view>
     <view class="index-dialog-btn" >查看任务</view>
   </view>
 </view>

pages/index/index.wxss

@@ -43,7 +43,7 @@
   justify-content: center;
   align-items: center;
   width: 100rpx;
-  height: 71rpx;
+  height: 58rpx;
   line-height: 60rpx;
   font-size: 40rpx;
   opacity:0.7;
@@ -270,7 +270,7 @@ margin-left: 4rpx;
   background: rgba(0,0,0,.3)
 }
 .index-dialog-wrapper{
-  width: 370rpx;
+  width: 392rpx;
   height: 240rpx;
   background: #fff;
   border-radius: 30rpx;
@@ -283,7 +283,7 @@ margin-left: 4rpx;
 }
 .index-dialog-text{
   width: 100%;
-  font-size: 30rpx;
+  font-size: 29rpx;
   color: #535353;
   font-weight: 800;
   text-align: center;

pages/main/class/class.js

@@ -239,7 +239,7 @@ Page({
       readInfo.forEach(item => {
         const temp = {};
         temp.nickName = item.user.wechatName;
-        temp.time = formatDate(item.userRead.gmtModified, 3);
+        temp.time = formatDate(item.userRead.gmtCreated, 3);
         temp.avatar = item.user.avatar;
         temp.likes = item.userRead.playAmount ? item.userRead.playAmount : 0;
         temp.uid = item.userRead.uid;

pages/main/reading/reading.js

@@ -276,7 +276,7 @@ Page({
         })
         const recordSource = this.data.recordSource;
         wx.uploadFile({
-            url: 'https://reader.lingjiao.cn/readerBase/file/upload',
+            url: 'https://readertest.lingjiao.cn/readerBase/file/upload',
             filePath: recordSource,
             name: '朗读录音',
             header: {

pages/social/littleFlower/littleFlower.js

@@ -2,10 +2,12 @@ import httpRequestApi from '../../../utils/APIClient';
 import {
     formatDate
 } from '../../../utils/util';
+const app = getApp();
 Page({
     data: {
         misssionList: [],
-        continuousDay: 0
+        continuousDay: 0,
+        isIOS: false
     },
     onLoad: function (options) {
         wx.setNavigationBarTitle({
@@ -16,14 +18,20 @@ Page({
             res.data.data.forEach(item => {
                 const temp = {}
                 temp.title = item.task.title;
-                temp.type = item.task.type;
-                temp.type = item.task.type;
+                temp.type = item.task.targetType;
                 temp.bonus = item.task.award;
                 temp.finished = item.finished;
+                temp.taskAmount = item.task.joinAmount; 
+                if(item.userTask){
+                    temp.finishedAmount = item.userTask.completeAmount
+                } else {
+                    temp.finishedAmount = 0;
+                }
                 this.data.misssionList.push(temp)
             });
             this.setData({
-                misssionList: this.data.misssionList
+                misssionList: this.data.misssionList,
+                isIOS: app.globalData.isIOS
             })
             this.getSignInData();
         });
@@ -62,132 +70,132 @@ Page({
                     case 1:
                         if (pointNum >= 0 && pointNum <= 5) {
                             item.style = 'red';
-                            item.mark = '3';
+                            item.mark = '5';
                         } else if (pointNum < 0 && pointNum >= -3) {
                             item.style = 'white';
-                            item.mark = '3';
+                            item.mark = '5';
                         } else {
                             item.style = 'white';
-                            item.mark = '5';
+                            item.mark = '10';
                         }
                         break;
                     case 2:
                         if (pointNum >= 0 && pointNum <= 2) {
                             item.style = 'red';
-                            item.mark = '3';
+                            item.mark = '5';
                             // 超过今天五个圈圈
                         } else if (pointNum < 0 && pointNum >= -2) {
                             item.style = 'white';
-                            item.mark = '3';
+                            item.mark = '5';
                         } else {
                             item.style = 'white';
-                            item.mark = '5';
+                            item.mark = '10';
                         }
                         break;
                     case 3:
                         if (pointNum >= 0 && pointNum <= 3) {
                             item.style = 'red';
-                            item.mark = '3';
+                            item.mark = '5';
                             // 超过今天五个圈圈
                         } else if (pointNum === -1) {
                             item.style = 'white';
-                            item.mark = '3';
+                            item.mark = '5';
                         } else {
                             item.style = 'white';
-                            item.mark = '5';
+                            item.mark = '10';
                         }
                         break;
                     case 4:
                         if (pointNum >= 0 && pointNum <= 4) {
                             item.style = 'red';
-                            item.mark = '3';
+                            item.mark = '5';
                             // 超过今天五个圈圈
                         } else {
                             item.style = 'white';
-                            item.mark = '5';
+                            item.mark = '10';
                         }
                         break;
                     case 5:
                         if (pointNum > 0 && pointNum <= 4) {
                             item.style = 'red';
-                            item.mark = '3';
+                            item.mark = '5';
                         } else if(pointNum === 0){
                             item.style = 'red';
-                            item.mark = '5';
+                            item.mark = '10';
                         } else {
                             item.style = 'white';
-                            item.mark = '5';
+                            item.mark = '10';
                         }
                         break;
                     case 6:
                         if (pointNum > 1) {
                             item.style = 'red';
-                            item.mark = '3';
+                            item.mark = '5';
                             // 超过今天五个圈圈
                         } else if (pointNum <= 1 && pointNum >= 0) {
                             item.style = 'red';
-                            item.mark = '5';
+                            item.mark = '10';
                         } else {
                             item.style = 'white';
-                            item.mark = '5';
+                            item.mark = '10';
                         }
                         break;
                     case 7:
                         if (pointNum > 2) {
                             item.style = 'red';
-                            item.mark = '3';
+                            item.mark = '5';
                             // 超过今天五个圈圈
                         } else if (pointNum <= 2 && pointNum >= 0) {
                             item.style = 'red';
-                            item.mark = '5';
+                            item.mark = '10';
                         } else {
                             item.style = 'white';
-                            item.mark = '5';
+                            item.mark = '10';
                         }
                         break;
                     case 8:
                         if (pointNum > 3) {
                             item.style = 'red';
-                            item.mark = '3';
+                            item.mark = '5';
                             // 超过今天五个圈圈
                         } else if (pointNum <= 3 && pointNum >= 0) {
                             item.style = 'red';
-                            item.mark = '5';
+                            item.mark = '10';
                         }
                         break;
                     case 9:
                         if (pointNum > 4) {
                             item.style = 'red';
-                            item.mark = '3';
+                            item.mark = '5';
                             // 超过今天五个圈圈
                         } else if (pointNum <= 4 && pointNum >= 0) {
                             item.style = 'red';
-                            item.mark = '5';
+                            item.mark = '10';
                         }
                         break;
                     case 10:
                         if (pointNum > 5) {
                             item.style = 'red';
-                            item.mark = '3';
+                            item.mark = '5';
                             // 超过今天五个圈圈
                         } else if (pointNum <= 5 && pointNum >= 0) {
                             item.style = 'red';
-                            item.mark = '5';
+                            item.mark = '10';
                         }
                         break;
                     case 11:
                         if (pointNum > 6) {
                             item.style = 'red';
-                            item.mark = '3';
+                            item.mark = '5';
                             // 超过今天五个圈圈
                         } else if (pointNum <= 6 && pointNum >= 0) {
                             item.style = 'red';
-                            item.mark = '5';
+                            item.mark = '10';
                         }
                         break;
                     default:
                         item.style = 'red';
-                        item.mark = '5';
+                        item.mark = '10';
                         break;
                 }
                 // 生成日期
@@ -209,5 +217,10 @@ Page({
     },
     countTheDay: function (item) {
 
+    },
+    goToPrize: function(){
+        wx.navigateTo({
+            url: '../prize/prize'
+        })
     }
 })

pages/social/littleFlower/littleFlower.json

@@ -1,3 +1,4 @@
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "enablePullDownRefresh": false
 }

pages/social/littleFlower/littleFlower.wxml

@@ -3,10 +3,9 @@
     <view class="sign-in-title">已连续签到{{continuousDay}}天</view>
     <view class="sign-in-box">
         <view wx:for="{{dateList}}" wx:key="{{index}}" class="date-item">
+            <image wx:if="{{item.style === 'red'}}" class="date-complete" src="../../../static/image/sign_in_icon.png" />
             <view class="date-left">
-                <view class="date-circle" style="background: {{item.style === 'red' ? '#f75642' : '#fff'}}; color: {{item.style === 'red' ? '#fff' : '#f75642'}} ">
-                    +{{item.mark}}
-                </view>
+                <view class="date-circle" style="background: {{item.style === 'red' ? '#f75642' : '#fff'}}; color: {{item.style === 'red' ? '#fff' : '#f75642'}} ">{{item.mark}}</view>
                 <view class="date-time">{{item.time}}</view>
             </view>
             <view class="cross-red-line" wx:if="{{index !== 6}}"></view>
@@ -19,17 +18,25 @@
                 <view>{{item.title}}</view>
                 <view class="mission-bonus">
                     <image class="bonus-icon" src="../../../static/image/flower_small.png" />
-                    {{item.bonus}}
+                    <text wx:if="{{item.type !== 'GROUP'}}">{{item.bonus}}</text>
+                    <text wx:if="{{item.type === 'GROUP'}}">{{isIOS ? '10' : '100'}}</text>
                 </view>
             </view>
-            <view class="mission-status" wx:if="{{!item.finished}}">未完成</view>
+            <view class="mission-status" wx:if="{{!item.finished}}">
+                <view class="mission-status" wx:if="{{item.type !== 'GROUP' && item.type !== 'READ_SHARE'}}" >{{item.finishedAmount}}/{{item.taskAmount}}</view>
+                <view class="mission-status mission-group" wx:if="{{item.type === 'READ_SHARE' }}" >已获得{{item.finishedAmount * item.bonus}}<image class=".mission-group-icon" src="../../../static/image/flower_small.png" /></view>
+                <view class="mission-status mission-share" wx:if="{{item.type === 'GROUP'}}" >已完成<text class="red-text">{{item.finishedAmount}}</text>个</view>
+            </view>
             <view class="mission-status mission-complete" wx:if="{{item.finished}}">已完成</view>
         </view>
     </scroll-view>
-    <view class="explain">
+    <view class="lego-section" bindtap="goToPrize">
+        <image class="lego" src="../../../static/image/lego_icon.png" />
+    </view>
+    <!-- <view class="explain">
         <view class="explain-gut">小红花有什么用？</view>
         <view class="explain-gut">我们会启动很多好玩的活动，</view>
         <view class="explain-gut">到时候你将会有大大的惊喜哦！</view>
         <view class="explain-gut">请继续积攒小红花吧！</view>
-    </view>
+    </view> -->
 </view>

pages/social/littleFlower/littleFlower.wxss

@@ -1,7 +1,7 @@
 .little-flower-box {
     background: #edf0f3;
     height: 100%;
-    overflow: hidden;
+    /* overflow: hidden; */
 }
 
 .green-placerholder {
@@ -47,6 +47,14 @@
     align-items: center;
 }
 
+.date-complete {
+    width: 20rpx;
+    height: 20rpx;
+    position: absolute;
+    left: 35rpx;
+    top: -26rpx;
+}
+
 .date-left {
     display: flex;
     flex-direction: column;
@@ -57,7 +65,7 @@
     color: #717171;
     font-size: 22rpx;
     font-weight: 800;
-    margin-top:10rpx;
+    margin-top: 10rpx;
     width: 52rpx;
     text-align: center;
 }
@@ -70,7 +78,7 @@
     color: #fff;
     font-size: 22rpx;
     line-height: 50rpx;
-    text-indent:10rpx;
+    text-align: center;
 
 }
 
@@ -78,8 +86,8 @@
     width: 40rpx;
     height: 3rpx;
     border-top: 2rpx solid #f75642;
-    margin-top:-39rpx;
-margin-left:7rpx;
+    margin-top: -39rpx;
+    margin-left: 7rpx;
 
 }
 
@@ -125,7 +133,7 @@ margin-left:7rpx;
 
 .mission-item view {
     color: #535353;
-    font-size: 30rpx;
+    font-size: 28rpx;
     font-weight: 800;
     display: flex;
     align-items: center;
@@ -138,7 +146,7 @@ margin-left:7rpx;
     align-items: stretch;
 }
 
-.mission-bonus .bonus-icon {
+.bonus-icon {
     width: 28rpx;
     height: 33.2rpx;
     margin-right: 8rpx;
@@ -149,6 +157,39 @@ margin-left:7rpx;
     color: #f75642;
     text-align: right;
 }
-.mission-item .mission-complete{
+
+.mission-item .mission-complete {
     color: #919191;
+}
+
+.mission-item .mission-group {
+    color: #535353;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+.mission-group-icon {
+    width: 28rpx;
+    height: 33.2rpx;
+    margin-left: 8rpx;
+}
+
+.mission-item .mission-share {
+    color: #535353;
+}
+
+.red-text {
+    color: #F75642;
+}
+
+.lego-section{
+    width: 704rpx;
+    height: 206rpx;
+    border-radius: 12rpx;
+    margin: 0 auto;
+}
+.lego {
+    width: 100%;
+    height: 100%;
 }

pages/social/prize/prize.js

@@ -0,0 +1,13 @@
+import httpRequestApi from '../../../utils/APIClient';
+import {
+    formatDate
+} from '../../../utils/util';
+Page({
+    data: {
+    },
+    onLoad: function (options) {
+        // wx.setNavigationBarTitle({
+        //     title: '消息列表'
+        // })
+    }
+})

pages/social/prize/prize.wxml

@@ -0,0 +1,3 @@
+<view class="prize-page">
+    <image class="prize-icon" />
+</view>

pages/social/prize/prize.wxss

@@ -0,0 +1,9 @@
+.prize-page{
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+}
+.prize-icon{
+    width: 750rpx;
+    height: 1334rpx;
+}

pages/social/works/works.js

@@ -61,10 +61,13 @@ Page({
         if (option.flowerCount > 0) {
             this.setData({
                 flowerNum: option.flowerCount
-            }, () => {
-                this.flowerAnimationHandler();
             })
-
+        }
+        if (option.flowerCount) {
+            this.flowerAnimationHandler();
+            setTimeout(() => {
+                this.openShare();
+            }, 300)
         }
         getOpenidSessionKey((res) => {
             let id = option.id ? option.id : option.scene.replace('QR', '')
@@ -129,7 +132,7 @@ Page({
         // videoCtx.stop();
     },
     getWorks: function (uid, id) {
-        httpRequestApi.getWorksDetail(uid, id).success((res) => {
+        httpRequestApi.getWorksDetail(uid, id, this.data.goBackHome ? 'READ_SHARE' : '').success((res) => {
             const others = res.data.data.otherRead;
             const author = res.data.data.user;
             const works = res.data.data.userRead;
@@ -686,7 +689,7 @@ Page({
     },
     goToClass: function () {
 
-        if (!this.data.isIOS && this.videoCtx   ) {
+        if (!this.data.isIOS && this.videoCtx) {
             this.innerAudioContext.stop();
             this.innerAudioContext.destroy();
             this.videoCtx.stop();

pages/social/works/works.wxml

@@ -12,18 +12,13 @@
         <text class="nickName" bindtap="goToUsers" data-uid="{{authorUid}}">{{author}}</text>
         
         <view class="follow" wx:if="{{authorUid !== myUid && authorUid !== 'c7f0a8fdd3a549ea9109a7b7486775f2'}}" bindtap="follow">
-            <image src="{{isFans? '../../../static/image/fully_heart.png' : '../../../static/image/empty_heart.png'}}" />
-            <text class="followBtn">{{isFans ? '已' : ''}}关注</text>
-        </view>
-        <view class="like" bindtap="likeWorks" wx:if="{{authorUid !== myUid}}" style="{{authorUid === 'c7f0a8fdd3a549ea9109a7b7486775f2'? 'margin-left:160rpx' : null}}">
-            <text class="animation-flower {{addComeOut}}">+1</text>
-            <image src="../../../static/image/flower_circle.png" />
-            <!-- <text class="likeBtn">{{isLike ? '已' : ''}}点赞</text> -->
+            <image src="{{isFans? '../../../static/image/have_followed_btn.png' : '../../../static/image/follow_btn.png'}}" />
+            <!-- <text class="followBtn">{{isFans ? '已' : '+ '}}关注</text> -->
         </view>
     </view>
+    <!-- 重新调整html费时间 用定位实现 -->
     <view class="userSection">
         <view class="peopleNum">
-            <image class="peoplesIcon" src="../../../static/image/peoples.png" />
             <view class="title">共有{{totalRead}}个录音作品</view>
         </view>
         <scroll-view scroll-x class="scrollWrapper" scroll-with-animation="true">
@@ -36,6 +31,10 @@
     </view>
     <view class="commentSection">
         <view class="title">评论（{{total || 0}}）</view>
+        <view class="like" bindtap="likeWorks" wx:if="{{authorUid !== myUid}}" style="{{authorUid === 'c7f0a8fdd3a549ea9109a7b7486775f2'? 'margin-left:160rpx' : null}}">
+            <text class="animation-flower {{addComeOut}}">+1</text>
+            <image src="../../../static/image/like_btn.png" />
+        </view>
         <input class="commentInput" bindconfirm="sendHandler" value="{{inputValue}}" confirm-type="send" placeholder="听了这么多，说点什么吧" bindinput="inputValue"></input>
     </view>
     <view class="commentArea">

pages/social/works/works.wxss

@@ -4,10 +4,11 @@
     overflow: hidden;
 }
 
-.works-page{
+.works-page {
     width: 100%;
     overflow-x: hidden;
 }
+
 .videoSection {
     width: 750rpx;
     height: 421.9rpx;
@@ -54,20 +55,19 @@
 }
 
 .readAuthorSection .profession {
-    width: 68rpx;
-    height: 24rpx;
+    width: 60rpx;
+    height: 30rpx;
     background: rgba(97, 202, 84, 1);
-    border-radius: 166rpx;
-    border: 2rpx solid rgba(255, 255, 255, 1);
-    font-size: 16rpx;
-    /* font-family: PingFangSC-Medium; */
-    /* font-weight: 500; */
+    border-radius: 15rpx;
+    font-size: 22rpx;
     color: rgba(255, 255, 255, 1);
-    line-height: 24rpx;
+    line-height: 30rpx;
     text-align: center;
     position: absolute;
     bottom: 26rpx;
-    left: 44rpx;
+    left: 51rpx;
+    font-weight: 800;
+
 }
 
 .readAuthorSection .nickName {
@@ -79,17 +79,29 @@
     text-overflow: ellipsis;
     overflow: hidden;
     white-space: nowrap;
+    margin-top: -44rpx;
+
 }
 
-.readAuthorSection .like {
+.like {
+    display: inline-block;
     margin-left: 20rpx;
-    width: 62rpx;
-    height: 62rpx;
+    width: 34rpx;
+    height: 39rpx;
     font-size: 28rpx;
     border-radius: 30rpx;
     text-align: center;
     color: #FF0000;
     position: relative;
+    float: right;
+    margin-right: 51rpx;
+    margin-top: 12rpx;
+}
+
+.like image {
+    width: 34rpx;
+    height: 39rpx;
+
 }
 
 @keyframes numberMove {
@@ -111,24 +123,18 @@
     width: 23rpx;
     height: 23rpx;
     position: absolute;
-    left: 13rpx;
-    bottom: 28rpx;
+    left: 0;
+    bottom: 20rpx;
     opacity: 1;
-    
 }
 
-.add-one-come-out{
+.add-one-come-out {
     animation: numberMove 1.3s ease;
     -webkit-animation: numberMove 1.3s ease;
 }
 
 
 
-.readAuthorSection .like image {
-    width: 100%;
-    height: 100%;
-
-}
 
 
 
@@ -137,33 +143,44 @@
     align-items: center;
     justify-content: center;
     margin-left: 90rpx;
-    width: 160rpx;
-    height: 60rpx;
-    border: 2rpx solid #ff0000;
-    font-size: 28rpx;
+    width: 122rpx;
+    height: 56rpx;
+    /* border: 3rpx solid #12c962; */
+    /* font-size: 30rpx; */
     border-radius: 30rpx;
-    text-align: center;
-    line-height: 60rpx;
-    color: #ff0000;
+    /* text-align: center; */
+    /* line-height: 56rpx; */
+    color: #12c962;
+    position: absolute;
+    left: 60rpx;
+    top: 91rpx;
+
 }
 
 .readAuthorSection .follow image {
-    width: 36rpx;
-    height: 32rpx;
-    margin-right: 15rpx;
+    /* width: 36rpx; */
+    /* height: 32rpx; */
+    /* margin-right: 15rpx; */
+    width: 100%;
+    height: 100%;
 
 }
 
 .userSection {
-    width: 100%;
-    height: 166rpx;
-    border-bottom: solid 2rpx #f0f1f5;
+    width: 300rpx;
+    height: 158rpx;
+    position: absolute;
+    top: 453rpx;
+    right: 22rpx;
 }
 
 .userSection .peopleNum {
     display: flex;
     align-items: center;
-    margin: 10rpx 0 0 24rpx;
+    float: right;
+    margin-bottom: 13rpx;
+    margin-right: 12rpx;
+
 }
 
 .peopleNum .peoplesIcon {
@@ -174,14 +191,14 @@
 
 .peopleNum .title {
     font-size: 24rpx;
-    color: #5d5d5d;
+    color: #282828;
     height: 24rpx;
     line-height: 24rpx;
 }
 
 .userSection .scrollWrapper {
     display: flex;
-    margin-top: 16rpx;
+    /* margin-top: 16rpx; */
 }
 
 ::-webkit-scrollbar {
@@ -196,17 +213,19 @@
 }
 
 .userSection .avatarRow .userItem {
-    display: felx;
+    display: flex;
     justify-items: center;
     width: 100rpx;
     height: 100rpx;
-    margin-left: 24rpx;
+    margin-left: 12rpx;
 }
 
 .avatarRow .userItem image {
     width: 86rpx;
     height: 86rpx;
     border-radius: 50%;
+    border: 3rpx solid #12c962;
+
 }
 
 .commentSection {
@@ -219,8 +238,11 @@
     font-size: 32rpx;
     line-height: 44rpx;
     margin-left: 20rpx;
-    margin-bottom: 10rpx;
+    margin-top: 10rpx;
+    margin-bottom: 17rpx;
     color: #444;
+    display: inline-block;
+
 }
 
 .commentSection .commentInput {
@@ -271,20 +293,19 @@
 }
 
 .avatar-wrapper .profession {
-    width: 68rpx;
-    height: 24rpx;
+    width: 60rpx;
+    height: 30rpx;
     background: rgba(97, 202, 84, 1);
-    border-radius: 166rpx;
-    border: 2rpx solid rgba(255, 255, 255, 1);
-    font-size: 16rpx;
-    /* font-family: PingFangSC-Medium; */
-    /* font-weight: 500; */
+    border-radius: 15rpx;
+    font-size: 22rpx;
     color: rgba(255, 255, 255, 1);
-    line-height: 24rpx;
+    line-height: 30rpx;
     text-align: center;
     position: absolute;
-    bottom: -37rpx;
-    left: 17rpx;
+    bottom: -29rpx;
+    left: 22rpx;
+    font-weight: 800;
+
 }
 
 .commentItem .nickName {

pages/user/myEdit/myEdit.json

@@ -1 +1,3 @@
-{}
+{
+    "enablePullDownRefresh": false
+}

pages/user/mycollection/mycollection.json

@@ -1,5 +1,6 @@
 {
     "usingComponents": {
         "myPlacerholder": "/component/myPlacerholder/myPlacerholder"
-    }
+    },
+    "enablePullDownRefresh": false
 }

pages/user/myconcern/myconcern.json

@@ -1,4 +1,5 @@
 {
+    "enablePullDownRefresh": false,
     "usingComponents": {
         "myPlacerholder": "/component/myPlacerholder/myPlacerholder"
     }

pages/user/mycourse/mycourse.json

@@ -1,4 +1,5 @@
 {
+    "enablePullDownRefresh": false,
     "usingComponents": {
         "myPlacerholder": "/component/myPlacerholder/myPlacerholder"
     }

pages/user/myworks/myworks.wxss

@@ -89,6 +89,13 @@ page {
 
 }
 
+.avatar-nickname text {
+  max-width: 290rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .avatar-address {
   width: 500rpx;
 }

project.config.json

@@ -12,7 +12,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.3.2",
-	"appid": "wxdfa8a4f1623d28db",
+	"appid": "wx8961a3e5512f307c",
 	"projectname": "%E5%B0%8F%E5%AD%A6%E8%AF%BE%E6%96%87%E6%9C%97%E8%AF%BB%E9%85%8D%E9%9F%B3",
 	"debugOptions": {
 		"hidedInDevtools": []
@@ -36,7 +36,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 4,
+			"current": 1,
 			"list": [
 				{
 					"id": -1,
@@ -45,23 +45,10 @@
 					"query": ""
 				},
 				{
-					"id": -1,
+					"id": 1,
 					"name": "作品",
 					"pathName": "pages/social/works/works",
-					"query": "id=1544868253444507&title=【课文1】秋天",
-					"scene": "1012"
-				},
-				{
-					"id": -1,
-					"name": "自己发团",
-					"pathName": "pages/groupPage/collage-details/collage-details",
-					"query": "orderId=1547518873633105"
-				},
-				{
-					"id": 3,
-					"name": "123",
-					"pathName": "pages/loginPage/loginPage",
-					"query": "",
+					"query": "id=1548160250807513&title=【识字1】春夏秋冬",
 					"scene": "1012"
 				},
 				{

utils/APIClient.js

@@ -37,8 +37,8 @@ module.exports = {
     }).url(url).send();
   },
   // 获取用户朗读详细信息
-  getWorksDetail(uid, readId) {
-    let url = getBaseUrl(`wx/userRead/info/${readId}`);
+  getWorksDetail(uid, readId, shareFlag) {
+    let url = getBaseUrl(`wx/userRead/info/${readId}?join=${shareFlag}`);
     return request.getInstance().header({
       uid
     }).url(url).send();

utils/const.js

@@ -1,7 +1,7 @@
 // 常量列表
 module.exports = {
-	productApi: 'https://reader.lingjiao.cn/readerProduct/',
-	// productApi: 'https://readertest.lingjiao.cn/readerProduct/',
-	baseApi: 'https://reader.lingjiao.cn/readerBase/'
-	// baseApi: 'https://readertest.lingjiao.cn/readerBase/'
+	// productApi: 'https://reader.lingjiao.cn/readerProduct/',
+	productApi: 'https://readertest.lingjiao.cn/readerProduct/',
+	// baseApi: 'https://reader.lingjiao.cn/readerBase/'
+	baseApi: 'https://readertest.lingjiao.cn/readerBase/'
 }