'1'

component/comment/comment.less

@@ -4,10 +4,11 @@
     bottom: 0;
     width: 100%;
     // height: auto;
-    min-height: 450rpx;
-    max-height: 900rpx;
+    // min-height: 450rpx;
+    // max-height: 900rpx;
+    height: 850rpx;
     background: #ffffff;
-    padding-bottom: 120rpx;
+    padding-bottom: 200rpx;
     box-sizing: border-box;
 
 
@@ -174,11 +175,11 @@
 
     .comment_input {
         width: 100%;
-        height: 120rpx;
+        height: 180rpx;
         background: #eeeded;
         position: fixed;
         bottom: 0;
-        z-index: 99999;
+        z-index: 9999;
 
         input {
             width: 100%;
@@ -187,6 +188,7 @@
 
             ::placeholder{
                 text-indent: 10rpx;
+                color: #000;
             }
         }
     }

component/comment/comment.wxss

@@ -3,10 +3,9 @@
   z-index: 9999;
   bottom: 0;
   width: 100%;
-  min-height: 450rpx;
-  max-height: 900rpx;
+  height: 850rpx;
   background: #ffffff;
-  padding-bottom: 120rpx;
+  padding-bottom: 200rpx;
   box-sizing: border-box;
 }
 .comment_container .comment_number {
@@ -144,11 +143,11 @@
 }
 .comment_container .comment_input {
   width: 100%;
-  height: 120rpx;
+  height: 180rpx;
   background: #eeeded;
   position: fixed;
   bottom: 0;
-  z-index: 99999;
+  z-index: 9999;
 }
 .comment_container .comment_input input {
   width: 100%;
@@ -157,4 +156,5 @@
 }
 .comment_container .comment_input input ::placeholder {
   text-indent: 10rpx;
+  color: #000;
 }

component/my/my.wxml

@@ -4,15 +4,15 @@
     <view class='follow-details'>
       <view class='follow-info'>
         <view class="info-placerholder"></view>
-        <view class='set-msg' wx:if="{{myData.userInfo.wechatName }}">
+        <view class='set-msg' wx:if="{{myData.userInfo.wechatName }}" bindtap="toMyEdit">
           <view class='avatar-box'>
             <image class='avatar-image' src='{{ myData.userInfo.avatar  }}'></image>
             <!-- <view class='occupation-title' wx:if="{{myData.user.user.profession}}">{{ myData.user.user.profession }}</view> -->
           </view>
-          <view class='avatar-msg' bindtap="toMyEdit">
+          <view class='avatar-msg' >
             <view class='avatar-nickname'>微信昵称：{{ myData.userInfo.wechatName  }}</view>
             <view class='avatar-nickname'>年级：{{myData.userInfo.gradeText  }}</view>
-            <image class="edit-img" src="../../static/image/edit_new.png" />
+            <image class="edit-img" src="../../static/index/edit.png" />
             <view class='mine-category'>
               <view class='amount-text'>播放{{ myData.playAmount || 0 }} </view>
               <!-- <view class='amount-text'>{{ myData.user.likeAmount || 0 }} 赞</view> -->

component/my/my.wxss

@@ -160,12 +160,12 @@ image {
 } */
 
 .edit-img {
-  width: 24rpx;
+  width: 26rpx;
   height: 30rpx;
   display: block;
   position: absolute;
-  right: 43rpx;
-  bottom: 73rpx;
+  right: 51rpx;
+  bottom: 98rpx;
 
 }
 

component/share/share.js

@@ -341,10 +341,12 @@ Component({
     if (res.from === 'button') {
       // 来自页面内转发按钮
       console.log(res.target)
+    }else{
+      return {
+        title: '课文朗读，从未如此有趣',
+        path: '/pages/index/index'
+      }
     }
-    return {
-      title: this.data.title,
-      path: this.data.path
-    }
+    
   },
 })

component/share/share.wxss

@@ -81,7 +81,7 @@
     /* top: 30rpx; */
     width: 510rpx;
     height: 893rpx;
-    margin: 63rpx auto;
+    margin: 196rpx auto;
     /* width: 375rpx; */
     /* height: 667rpx; */
 }

component/statusBar/statusBar.js

@@ -6,46 +6,49 @@ Component({
     receiveData: {
       type: null,
       observer: function (newVal, oldVal) {
-        let gradeText = '一年级'
-        switch (newVal.grade) {
-          case '0':
-            gradeText = '学前班';
-            break;
-          case '1':
-            gradeText = '一年级';
-            break;
-          case '2':
-            gradeText = '二年级';
-            break;
-          case '3':
-            gradeText = '三年级';
-            break;
-        }
+        // let gradeText = '一年级'
+        // switch (newVal.grade) {
+        //   case 'PRESCHOOL':
+        //     gradeText = '学前班';
+        //     break;
+        //   case 'PRIMARY_FIRST_GRADE':
+        //     gradeText = '一年级';
+        //     break;
+        //   case 'PRIMARY_SECOND_GRADE':
+        //     gradeText = '二年级';
+        //     break;
+        //   case 'PRIMARY_THREE_GRADE':
+        //     gradeText = '三年级';
+        //     break;
+        // }
         this.setData({
           isshowbtn: newVal.isshowbtn, //是否显示按钮
           title: newVal.title, //标题
-          grade: gradeText
+          // grade: gradeText
         })
       }
     },
     grade: {
       type: 'String',
       observer: function (newVal) {
-        console.log('年级',newVal)
+        console.log('年级', newVal)
         let gradeText = '一年级'
         switch (newVal) {
-          case '0':
+          case 'PRESCHOOL':
             gradeText = '学前班';
             break;
-          case '1':
+          case 'PRIMARY_FIRST_GRADE':
             gradeText = '一年级';
             break;
-          case '2':
+          case 'PRIMARY_SECOND_GRADE':
             gradeText = '二年级';
             break;
-          case '3':
+          case 'PRIMARY_THREE_GRADE':
             gradeText = '三年级';
             break;
+          case 'PRIMARY_SENIOR_GRADE':
+            gradeText = '四年级';
+            break;
         }
         this.setData({
           gradeText: gradeText
@@ -69,8 +72,9 @@ Component({
     gradeTap: function () {
       console.log("点击年级");
       this.triggerEvent('gradeTap', 'false');
+      console.log('状态栏高度', this.data.statusBarHeight)
     },
-    prePageTap: function(){
+    prePageTap: function () {
       console.log('点击返回')
       wx.navigateBack({
         delta: 1

component/statusBar/statusBar.wxml

@@ -1,7 +1,7 @@
 <!-- 没有按钮的情况 -->
 <view class="custom flex_center" style="padding-top:{{statusBarHeight}}px" wx:if="{{!isshowbtn}}">
     <view class='custom iconv' bindtap="prePageTap">
-        <image class="back" src="../../static/image/reset.png"  />
+        <image class="back" src="../../static/index/back_my.png"  />
     </view>
     <view class='custom title'>{{title}}</view>
 </view>

component/statusBar/statusBar.wxss

@@ -4,7 +4,7 @@
     width: 100%;
     top: 0;
     left: 0;
-    height: 90rpx;
+    height: 91rpx;
     background: #12C962;
     z-index: 999;
     display: flex;
@@ -70,6 +70,7 @@
 }
 
 .empty_custom {
-    height: 45px;
+    height: 46px;
     width: 100%;
+    background: #12C962;
 }

component/video-swiper/index.less

@@ -252,7 +252,7 @@
             .reading_btn {
                 width: 271rpx;
                 height: 80rpx;
-                background: #14c962;
+                background: #3FACFF;
                 border-radius: 100rpx;
                 display: flex;
                 align-items: center;

component/video-swiper/index.wxss

@@ -217,7 +217,7 @@
 .swiper_container .swiper_item .btn_wrapper .reading_btn {
   width: 271rpx;
   height: 80rpx;
-  background: #14c962;
+  background: #3FACFF;
   border-radius: 100rpx;
   display: flex;
   align-items: center;

pages/index/index.js

@@ -49,6 +49,7 @@ Page({
       }
     ],
     winH: 568,
+    statusBarHeight: getApp().globalData.statusBarHeight,
     myIndex: 0,
     followData: [],
     recommendPageNo: 1,
@@ -75,7 +76,12 @@ Page({
     followPageSize: 6,
     coursePageNo: 1,
     coursesData: [],
-    updateId: 0 // 刷新id
+    updateId: 0, // 刷新id
+    statusbarobj: {
+      isshowbtn: true, //是否显示按钮
+      title: "小学语文朗读配音", //标题
+    },
+    grade: wx.getStorageSync('grade')
 
   },
   jurisdiction: function () {
@@ -469,6 +475,9 @@ Page({
       case 'PRIMARY_THREE_GRADE':
         userInfo.gradeText = '三年级'
         break;
+      case 'PRIMARY_SENIOR_GRADE':
+        userInfo.gradeText = '四年级';
+        break;
     }
     return userInfo;
   },
@@ -742,18 +751,17 @@ Page({
     console.log('点击分享按钮', this.data.shareImg)
     if (res.from === 'button') {
       return {
-        title: this.data.shareTitle,
+        title: '请欣赏我的课文朗读作品，点赞+评论。',
         path: `/pages/index/index?readId=${this.data.shareId}`,
         imageUrl: '../../static/index/share_icon.png'
 
       }
     } else {
       return {
-        title: '快来听我的朗读作品吧',
-        path: '/pages/index/index'
+        title: '课文朗读，从未如此有趣',
+        path: '/pages/index/index',
       }
     }
-
   },
   openShare: function (e) {
     console.log('用户点击分享按钮', e)
@@ -770,6 +778,7 @@ Page({
     wx.setStorageSync('grade', grade)
     this.setData({
       isGradeShow: false,
+      grade
     })
     if (this.data.oldUser) {
       let data = {
@@ -778,6 +787,7 @@ Page({
       httpRequestApi.settingUserInfo(data).success(res => {
 
       })
+      return;
     };
     getOpenidNoLogin((res) => {
       console.log('getOpenidNoLogin', res)
@@ -805,11 +815,18 @@ Page({
     httpRequestApi.getFollowWorks(this.data.followPageNo, this.data.followPageSize).success(res => {
       if (res.data.data.totalSize === 0) {
         this.setData({
-          videoList: []
+          videoList: [],
+          noFollow: true
         })
         console.log('没有关注人或关注的人没有发过作品')
         return
+      } else {
+        this.setData({
+          noFollow: false
+
+        })
       }
+
       console.log('关注列表', res)
       const followData = res.data.data.list;
       // const videoList = [];

pages/index/index.wxml

@@ -9,6 +9,9 @@
     </view>
     <view class="change_row">
       <view class="change_item" bindtap="changeGrade" data-code="PRIMARY_THREE_GRADE">三年级</view>
+      <view class="change_item" bindtap="changeGrade" data-code="PRIMARY_SENIOR_GRADE">四年级</view>
+    </view>
+    <view class="change_row">
       <view class="change_item" bindtap="changeGrade" data-code="PRESCHOOL">学前班</view>
     </view>
   </view>
@@ -21,7 +24,7 @@
   <import src="/component/my/my.wxml" />
   <import src="/templates/courses/courses.wxml" />
   <!-- 顶部导航 -->
-  <view class="top-tab" wx:if="{{!isGradeShow}}">
+  <view class="top-tab" wx:if="{{!isGradeShow}}" >
     <block wx:for="{{tab}}" wx:key="index">
       <view class="tabbar {{index == myIndex ? 'select':' '}}" bindtap="switcher" data-index="{{index}}">
         <text>{{item.name}}</text>
@@ -43,7 +46,7 @@
   <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}}">
+  <view class="no_follow" wx:if="{{myIndex === 1 && videoList.length <= 0 && noFollow}}">
     <image class="no_follow_icon" src="../../static/index/no_follow.png" />
     <text >这是关注页面！</text>
     <text >赶快去关注优秀作者吧，</text>

pages/mycollection/mycollection.js

@@ -12,7 +12,11 @@ Page({
     line1: '您还没有收藏过哦',
     line2: '快去收藏自己喜欢的吧',
     videoList: [],
-    commentShow: false
+    commentShow: false,
+    statusbarobj: {
+      isshowbtn: false, //是否显示按钮
+      title: "小学语文朗读配音", //标题
+  },
   },
 
   toClass: function (e) {
@@ -171,11 +175,16 @@ Page({
   onShareAppMessage: function () {
     if (res.from === 'button') {
       return {
-        title: this.data.shareTitle,
-        path: `/pages/index/index`,
+        title: '请欣赏我的课文朗读作品，点赞+评论。',
+        path: `/pages/index/index?readId=${this.data.shareId}`,
         imageUrl: '../../static/index/share_icon.png'
 
       }
+    } else {
+      return {
+        title: '课文朗读，从未如此有趣',
+        path: '/pages/index/index',
+      }
     }
   }
 })

pages/mycollection/mycollection.json

@@ -2,7 +2,9 @@
     "usingComponents": {
         "myPlacerholder": "/component/myPlacerholder/myPlacerholder",
         "VideoSwiper": "/component/video-swiper/index",
-        "Comment": "/component/comment/comment"
+        "Comment": "/component/comment/comment",
+        "StatusBar": "../../../../component/statusBar/statusBar"
+
     },
     "enablePullDownRefresh": false
 }

pages/mycollection/mycollection.wxml

@@ -1,3 +1,4 @@
+<!-- <StatusBar receiveData="{{statusbarobj}}" grade="{{grade}}" bindgradeTap="gradeTap" /> -->
 <view class='my-collection'>
   <!-- <view class='collection-article' wx:for="{{ collection_data }}" wx:key="{{ index }}" bindtap='toClass' data-targetCode="{{item.targetCode}}" data-title='{{ item.userRead.title }}'>
     <view class='video-preview'>

pages/mycollection/mycollection.wxss

@@ -2,7 +2,7 @@
   width: 750rpx;
   min-height: 100%;
   background: rgba(240, 241, 245, 1);
-  padding-top: 22rpx;
+  padding-top: 10rpx;
   background: #eee;
   /* background: #F0F1F5; */
 }

pages/myconcern/myconcern.js

@@ -10,7 +10,11 @@ Page({
       fanList:[],
       imageShow: false,
       line1: '您暂时没有关注过其他人哦',
-      line2: '快去关注其他人吧'
+      line2: '快去关注其他人吧',
+      statusbarobj: {
+        isshowbtn: false, //是否显示按钮
+        title: "小学语文朗读配音", //标题
+      },
   },
   toUserDetails: function(e){
     let uid = e.currentTarget.dataset.uid;
@@ -87,6 +91,18 @@ Page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function () {
+    if (res.from === 'button') {
+      return {
+        title: '请欣赏我的课文朗读作品，点赞+评论。',
+        path: `/pages/index/index?readId=${this.data.shareId}`,
+        imageUrl: '../../static/index/share_icon.png'
 
+      }
+    } else {
+      return {
+        title: '课文朗读，从未如此有趣',
+        path: '/pages/index/index',
+      }
+    }
   }
 })

pages/myconcern/myconcern.json

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

pages/myconcern/myconcern.wxml

@@ -1,4 +1,5 @@
 <!-- <wxs src="../../commonWxs/format.wxs" module="format" /> -->
+<!-- <StatusBar receiveData="{{statusbarobj}}" grade="{{grade}}" bindgradeTap="gradeTap" /> -->
 <view class='my-concern'>
   <view class="concern-center">
     <view class='concern-info' wx:for="{{ fanList }}" wx:key="{{ index }}" bindtap='toUserDetails' data-uid='{{ item.user.uid }}' data-fanId='{{ item.fans.fanId }}'>

pages/myconcern/myconcern.wxss

@@ -5,7 +5,7 @@ page {
 
 .concern-center {
   width: 716rpx;
-  margin: 20rpx auto;
+  margin: 10rpx auto;
 }
 
 .concern-info {

pages/myworks/myworks.js

@@ -17,7 +17,11 @@ Page({
     isFans: false,
     isMyself: false,
     commentId: '',
-    pageSize: 3
+    pageSize: 3,
+    statusbarobj: {
+      isshowbtn: false, //是否显示按钮
+      title: "小学语文朗读配音", //标题
+    },
 
   },
   // 打开评论
@@ -130,6 +134,9 @@ Page({
         temp.isLike = item.isLike;
         temp.isFavorite = item.isFavorites;
         temp.isFans = true;
+        temp.videoShow = false;
+        temp.coverImg = item.userRead.coverImg;
+
         // recommendWorks.push(temp);
         this.data.videoList.push(temp);
 
@@ -214,7 +221,23 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+  onShareAppMessage: function (res) {
+    console.log('点击分享按钮', res)
+    console.log('点击分享按钮', this.data.shareTitle)
+    console.log('点击分享按钮', this.data.shareId)
+    console.log('点击分享按钮', this.data.shareImg)
+    if (res.from === 'button') {
+      return {
+        title: '请欣赏我的课文朗读作品，点赞+评论。',
+        path: `/pages/index/index?readId=${this.data.shareId}`,
+        imageUrl: '../../static/index/share_icon.png'
 
-  }
+      }
+    } else {
+      return {
+        title: '课文朗读，从未如此有趣',
+        path: '/pages/index/index',
+      }
+    }
+  },
 })

pages/myworks/myworks.json

@@ -1,6 +1,7 @@
 {
     "usingComponents": {
         "VideoSwiper": "../../../component/video-swiper/index",
-        "Comment": "../../../component/comment/comment"
+        "Comment": "../../../component/comment/comment",
+        "StatusBar": "/component/statusBar/statusBar"
     }
 }

pages/myworks/myworks.wxml

@@ -1,5 +1,6 @@
 <!-- pages/user/myworks/myworks.wxml -->
 <!-- <wxs src="../../commonWxs/format.wxs" module="format" /> -->
+<!-- <StatusBar receiveData="{{statusbarobj}}" grade="{{grade}}" bindgradeTap="gradeTap" /> -->
 <scroll-view class='user-works'>
   <view class='follow-details'>
     <view class='follow-info'>

pages/reading/reading.js

@@ -36,7 +36,11 @@ Page({
         star: [0, 0, 0, 0, 0],
         ifTextShow: true,
         ifScoreDialogShow: false,
-        ifScoreShow: false
+        ifScoreShow: false,
+        statusbarobj: {
+            isshowbtn: false, //是否显示按钮
+            title: "小学语文朗读配音", //标题
+        },
     },
     onLoad: function (option) {
         console.log(option);
@@ -94,12 +98,6 @@ Page({
         this.ss.destroyEngine();
     },
     onShow: function () {
-        this.setData({
-            statusbarobj: {
-                isshowbtn: false, //是否显示按钮
-                title: "小学语文课文朗读", //标题
-            },
-        })
         this.videoCtx = wx.createVideoContext('myVideo', this);
         let data = requirePlugin("myPlugin");
         const obj = {
@@ -334,7 +332,7 @@ Page({
         } else {
             const recordSource = this.data.recordSource
             wx.uploadFile({
-                url: 'https://reader-test.efunbox.cn/readerBase/file/upload',
+                url: 'https://reader-api.ai160.com/file/upload',
                 filePath: recordSource,
                 name: '朗读录音',
                 header: {
@@ -397,7 +395,7 @@ Page({
         } else {
             const recordSource = this.data.recordSource;
             wx.uploadFile({
-                url: 'https://reader-test.efunbox.cn/readerBase/file/upload',
+                url: 'https://reader-api.ai160.com/file/upload',
                 filePath: recordSource,
                 name: '朗读录音',
                 header: {
@@ -464,7 +462,17 @@ Page({
                     })
                 }
             });
-        });
+        }).fail(res=>{
+            wx.hideLoading({
+                success: () => {
+                    wx.showToast({
+                        title: '上传超时',
+                        icon: 'fail',
+                        duration: 1000
+                    })
+                }
+            });
+        })
 
     },
 
@@ -552,19 +560,22 @@ Page({
         console.log('点击分享按钮', this.data.shareImg)
         if (res.from === 'button') {
             return {
-                title: this.data.shareTitle,
-                path: `/pages/index/index${this.data.shareId}`,
-                imageUrl: '../../static/index/share_icon.png'
-
+              title: '请欣赏我的课文朗读作品，点赞+评论。',
+              path: `/pages/index/index?readId=${this.data.shareId}`,
+              imageUrl: '../../static/index/share_icon.png'
+      
             }
-        } else {
+          } else {
             return {
-                title: '快来听我的朗读作品吧',
-                path: '/pages/index/index'
+              title: '课文朗读，从未如此有趣',
+              path: '/pages/index/index',
             }
-        }
+          }
 
     },
+    touchMove: function(){
+        return
+    },
     openShare: function (e) {
         console.log('用户点击分享按钮', e)
         this.setData({

pages/reading/reading.wxml

@@ -1,3 +1,4 @@
+<!-- <StatusBar receiveData="{{statusbarobj}}" grade="{{grade}}" bindgradeTap="gradeTap" /> -->
 <scroll-view class="readingPage" lower-threshold="{{}}" scroll-y="true" bindscrolltolower="scrollToLower" bindscrolltoupper="scrollToUpper">
     <!-- <view class="videoSection" wx:if="{{!isIOS}}">
         <image wx:if="{{!videoLoad}}" class="videoIcon" src="{{iconImg}}" />
@@ -37,8 +38,7 @@
     </scroll-view>
     <view class="read_num" wx:if="{{isVideoListShow && totalSize > 0}}">
         <image class="read_num_icon" src='../../static/index/peoples.png' />
-        
-        <text >共有{{totalSize}}个作品</text>
+        <text>共有{{totalSize}}个作品</text>
     </view>
     <view class="score_section" wx:if="{{ifScoreShow}}">
         <view class="title">测评报告</view>
@@ -46,25 +46,37 @@
             <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>
+            <view class="score_item_left">
+                <text class="score_square"></text>
+                <text>完成度：</text>
+            </view>
+            <text>{{integrity}}/100</text>
         </view>
         <view class="score_item">
-            <text class="score_square"></text>
-            <text>正确率：{{accuracy}}/100</text>
+            <view class="score_item_left">
+                <text class="score_square"></text>
+                <text>正确率：</text>
+            </view>
+            <text>{{accuracy}}/100</text>
         </view>
         <view class="score_item">
-            <text class="score_square"></text>
-            <text>语速：{{fluency}}/100</text>
+            <view class="score_item_left">
+                <text class="score_square"></text>
+                <text>语速：</text>
+            </view>
+            <text>{{fluency}}/100</text>
         </view>
         <view class="score_item">
-            <text class="score_square"></text>
-            <text>语音语调：{{tone}}/100</text>
+            <view class="score_item_left">
+                <text class="score_square"></text>
+                <text>语调：</text>
+            </view>
+            <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" bindonPlay="onPlay"></VideoSwiper>
 </scroll-view>
-<view class="comment_section" catchtap="commentTap" data-type="blank" wx:if="{{commentShow}}">
+<view class="comment_section" catchtouchmove="touchMove" catchtap="commentTap" data-type="blank" wx:if="{{commentShow}}">
     <Comment data-type="list" commentId="{{commentId}}" />
 </view>
 <view class="score_dialog" wx:if="{{ifScoreDialogShow}}">
@@ -74,20 +86,32 @@
             <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>
+            <view class="score_item_left">
+                <text class="score_square"></text>
+                <text>完成度：</text>
+            </view>
+            <text>{{integrity}}/100</text>
         </view>
         <view class="score_item">
-            <text class="score_square"></text>
-            <text>正确率：{{accuracy}}/100</text>
+            <view class="score_item_left">
+                <text class="score_square"></text>
+                <text>正确率：</text>
+            </view>
+            <text>{{accuracy}}/100</text>
         </view>
         <view class="score_item">
-            <text class="score_square"></text>
-            <text>语速：{{fluency}}/100</text>
+            <view class="score_item_left">
+                <text class="score_square"></text>
+                <text>语速：</text>
+            </view>
+            <text>{{fluency}}/100</text>
         </view>
         <view class="score_item">
-            <text class="score_square"></text>
-            <text>语音语调：{{tone}}/100</text>
+            <view class="score_item_left">
+                <text class="score_square"></text>
+                <text>语调：</text>
+            </view>
+            <text>{{tone}}/100</text>
         </view>
     </view>
     <view class="close" bindtap="closeScoreDialog">

pages/reading/reading.wxss

@@ -65,7 +65,7 @@ audio {
 .btn_wrapper .reading_btn {
     width: 271rpx;
     height: 80rpx;
-    background: #14c962;
+    background: #3FACFF;
     border-radius: 100rpx;
     display: flex;
     align-items: center;
@@ -242,9 +242,14 @@ audio {
     padding-left: 110rpx;
     box-sizing: border-box;
     margin-bottom: 10rpx;
+    justify-content: space-between;
+    padding-right: 100rpx;
 }
 
-.score_section .score_item .score_square {
+.score_item_left{
+    display: flex;align-items: center;
+}
+.score_section .score_item .score_item_left .score_square {
     width: 17.6rpx;
     height: 17.6rpx;
     background: #cda069;

pages/social/insideMessage/insideMessage.js

@@ -7,7 +7,11 @@ Page({
         messageList: [],
         totalNo: 1,
         totalSize: 0,
-        index: 1
+        index: 1,
+        statusbarobj: {
+            isshowbtn: false, //是否显示按钮
+            title: "小学语文朗读配音", //标题
+        },
     },
     onLoad: function (options) {
         wx.setNavigationBarTitle({
@@ -22,7 +26,7 @@ Page({
             return;
         }
         httpRequestApi.getMessageList(this.data.index, 10).success((res) => {
-            
+
             res.data.data.list.forEach(item => {
                 item.gmtCreated = formatDate(item.gmtCreated, 1)
                 this.data.messageList.push(item);

pages/social/insideMessage/insideMessage.json

@@ -1,5 +1,7 @@
 {
-  "usingComponents": {},
+  "usingComponents": {
+    "StatusBar": "../../../../component/statusBar/statusBar"
+  },
   "window": {
     "onReachBottomDistance": 50
   }

pages/social/insideMessage/insideMessage.wxml

@@ -1,3 +1,4 @@
+<!-- <StatusBar receiveData="{{statusbarobj}}" grade="{{grade}}" bindgradeTap="gradeTap" /> -->
 <view class="message-view">
     <!-- <button open-type="contact" plain="true" hover-class="none" style="border: none;">
         <view class="contact-btn">

pages/social/littleFlower/littleFlower.js

@@ -7,7 +7,11 @@ Page({
     data: {
         misssionList: [],
         continuousDay: 0,
-        isIOS: false
+        isIOS: false,
+        statusbarobj: {
+            isshowbtn: false, //是否显示按钮
+            title: "小学语文朗读配音", //标题
+        },
     },
     onLoad: function (options) {
         wx.setNavigationBarTitle({

pages/social/littleFlower/littleFlower.json

@@ -1,4 +1,6 @@
 {
-  "usingComponents": {},
+  "usingComponents": {
+    "StatusBar": "../../../../component/statusBar/statusBar"
+  },
   "enablePullDownRefresh": false
 }

pages/social/littleFlower/littleFlower.wxml

@@ -1,3 +1,4 @@
+<!-- <StatusBar receiveData="{{statusbarobj}}" grade="{{grade}}" bindgradeTap="gradeTap" /> -->
 <view class="little-flower-box">
     <view class="green-placerholder"></view>
     <view class="sign-in-title">已连续签到{{continuousDay}}天</view>
@@ -10,11 +11,12 @@
             </view>
             <view class="cross-red-line" wx:if="{{index !== 6}}"></view>
         </view> -->
-
-         <view wx:for="{{dateList}}" wx:key="{{index}}" class="date-item">
+        <view wx:for="{{dateList}}" wx:key="{{index}}" class="date-item">
             <image wx:if="{{item.isSign}}" class="date-complete" src="../../../static/image/sign_in_icon.png" />
             <view class="date-left">
-                <view class="date-circle" style="background: {{item.isSign ? '#f75642' : '#fff'}}; color: {{item.isSign ? '#fff' : '#f75642'}} ">{{item.count}}</view>
+                <view class="date-circle" style="background: {{item.isSign ? '#f75642' : '#fff'}}; color: {{item.isSign ? '#fff' : '#f75642'}} ">
+                    {{item.count}}
+                </view>
                 <view class="date-time">{{item.date}}</view>
             </view>
             <view class="cross-red-line" wx:if="{{index !== 6}}"></view>
@@ -32,9 +34,18 @@
                 </view>
             </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 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>

pages/user/myEdit/myEdit.js

@@ -13,9 +13,13 @@ Page({
     date: '',
     msg: '',
     nickname: '',
-    gradeIndex:0,
-    gradeArray:['一年级','二年级','三年级','学前班'],
-    gradeCode:'',
+    gradeIndex: 0,
+    gradeArray: ['一年级', '二年级', '三年级','四年级', '学前班'],
+    gradeCode: '',
+    statusbarobj: {
+      isshowbtn: false, //是否显示按钮
+      title: "小学语文朗读配音", //标题
+    },
     gradeObject: [{
         code: 'PRIMARY_FIRST_GRADE',
         name: '一年级'
@@ -29,6 +33,10 @@ Page({
         name: '三年级'
       },
       {
+        code: 'PRIMARY_SENIOR_GRADE',
+        name: '四年级'
+      },
+      {
         code: 'PRESCHOOL',
         name: '学前班'
       }
@@ -71,7 +79,7 @@ Page({
         // tempFilePath可以作为img标签的src属性显示图片
         const localImage = res.tempFilePaths[0];
         wx.uploadFile({
-          url: 'https://reader-test.efunbox.cn/readerBase/file/upload',
+          url: 'https://reader-api.ai160.com/file/upload',
           filePath: localImage,
           name: '头像',
           header: {
@@ -116,12 +124,12 @@ Page({
       })
     });
   },
-  bindGradeChange: function(e){
-    console.log('年级选择',e)
+  bindGradeChange: function (e) {
+    console.log('年级选择', e)
     this.setData({
       gradeIndex: e.detail.value,
       gradeCode: this.data.gradeObject[e.detail.value].code
-    },()=>{
+    }, () => {
       console.log(this.data.gradeCode)
     })
   },
@@ -135,44 +143,44 @@ Page({
     httpRequestApi.getUserInfo().success(res => {
       const user = res.data.data;
       let gradeIndex = 0;
-      this.data.gradeObject.forEach((item,index)=>{
-        console.log('年级index',item)
-        console.log('年级index',item)
-        if(item.code === user.grade){
-          console.log('年级index',index)
+      this.data.gradeObject.forEach((item, index) => {
+        console.log('年级index', item)
+        console.log('年级index', item)
+        if (item.code === user.grade) {
+          console.log('年级index', index)
           gradeIndex = index
         }
-      console.log(user)
-      const birthday = user.birthday ? formatDate(user.birthday, 2) : '2018-01-01';
-      console.log(birthday)
-      this.setData({
-        user: user,
-        date: birthday,
-        sexs: [{
-            value: 2,
-            checked: user.gender === 2 ? true : false,
-            sex: '女'
-          },
-          {
-            value: 1,
-            checked: user.gender === 1 ? true : false,
-            sex: '男'
-          }
-        ],
-        occupations: [{
-            value: '家长',
-            checked: user.profession === '家长' ? true : false
-          },
-          {
-            value: '老师',
-            checked: user.profession === '老师' ? true : false
-          },
-          {
-            value: '学生',
-            checked: user.profession === '学生' ? true : false
-          }
-        ],
-        gradeIndex
+        console.log(user)
+        const birthday = user.birthday ? formatDate(user.birthday, 2) : '2018-01-01';
+        console.log(birthday)
+        this.setData({
+          user: user,
+          date: birthday,
+          sexs: [{
+              value: 2,
+              checked: user.gender === 2 ? true : false,
+              sex: '女'
+            },
+            {
+              value: 1,
+              checked: user.gender === 1 ? true : false,
+              sex: '男'
+            }
+          ],
+          occupations: [{
+              value: '家长',
+              checked: user.profession === '家长' ? true : false
+            },
+            {
+              value: '老师',
+              checked: user.profession === '老师' ? true : false
+            },
+            {
+              value: '学生',
+              checked: user.profession === '学生' ? true : false
+            }
+          ],
+          gradeIndex
         })
       })
       console.log(this.data.date)

pages/user/myEdit/myEdit.json

@@ -1,3 +1,6 @@
 {
-    "enablePullDownRefresh": false
+    "enablePullDownRefresh": false,
+    "usingComponents": {
+        "StatusBar": "../../../../component/statusBar/statusBar"
+    }
 }

pages/user/myEdit/myEdit.wxml

@@ -1,3 +1,5 @@
+<!-- <StatusBar receiveData="{{statusbarobj}}" grade="{{grade}}" bindgradeTap="gradeTap" /> -->
+
 <view style="background:#f7f7f7;margin-top:-30rpx;">
   <view class="avatarBox" name="avatar" value="user.avatar">
     <image src="{{user.avatar}}" bindtap="changeAvatar" class="avatarImage" />

project.config.json

@@ -26,9 +26,11 @@
     "useIsolateContext": true,
     "useCompilerModule": true,
     "userConfirmedUseCompilerModuleSwitch": false,
+    "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true
+    "minifyWXSS": true,
+    "bundle": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.14.0",

utils/const.js

@@ -5,5 +5,5 @@ module.exports = {
   productApi:  'https://reader-test.efunbox.cn/readerProduct/',
   // baseApi: 'https://reader.lingjiao.cn/readerBase/'
   // baseApi: 'https://readertest.lingjiao.cn:442/readerBase/'
-  baseApi: 'https://reader-test.efunbox.cn/readerBase/'
+  baseApi: 'https://reader-api.ai160.com/'
 }