优化

mixins/share.js

@@ -46,77 +46,78 @@ module.exports = Behavior({
             pic.src = video.userReadExtend && video.userReadExtend.resourcesType == 1 ? video.userReadExtend.backgroundVirtualImg : video.userRead.coverImg;
             pic.onload = () => {
               ctx.drawImage(pic, 0, 0, 375, 211);
-              if (video.userReadExtend.resourcesType == 1) {
-                let aBg = canvas.createImage();
-                aBg.src = '/static/shareAudioBg.png';
-                aBg.onload = () => {
-                  ctx.drawImage(aBg, 127.5, 38, 120, 120);
-                  let rate = 0.5
-                  ctx.arc(
-                    Math.floor(375 * rate),
-                    98,
-                    Math.floor(100 * rate),
-                    0,
-                    2 * Math.PI
-                  );
-                  ctx.clip() //裁剪
-                  let coverImg = canvas.createImage();
-                  coverImg.src = video.userRead.coverImg;
-                  coverImg.onload = () => {
-                    ctx.drawImage( //定位在圆圈范围内便会出现
-                      coverImg, //图片暂存路径
-                      129, 42,
-                      110, 110,
-                    );
-                    ctx.restore()
-                  }
-                }
-              }
-            }
-            let peiyin = canvas.createImage();
-            peiyin.src = '/static/peiyin.jpg';
-            peiyin.onload = () => {
-              ctx.drawImage(peiyin, 0, 211, 375, 89);
-              //分享
-              let fx = canvas.createImage();
-              fx.src = '/static/share.png'
-              fx.onload = () => {
-                ctx.drawImage(fx, 12, 220, 20, 20)
-                ctx.fillText('分享', 36, 238)
-                // 收藏，一个一个渲染
-                let sc = canvas.createImage();
-                sc.src = '/static/no_collect.png'
-                sc.onload = () => {
-                  ctx.drawImage(sc, 110, 220, 19, 19)
-                  ctx.fillText('收藏', 134, 238)
-                  // 评论
-                  let pl = canvas.createImage();
-                  pl.src = '/static/comment.png'
-                  pl.onload = () => {
-                    ctx.drawImage(pl, 228, 222, 22, 22)
-                    ctx.fillText(video.userRead.commentAmount || 0, 340, 238)
-                    //点赞
-                    let dz = canvas.createImage();
-                    dz.src = video.isLike ? '/static/heart_colored.png' : '/static/heart.png'
-                    dz.onload = () => {
-                      ctx.drawImage(dz, 318, 222, 22, 22)
-                      ctx.fillText(video.userRead.likeAmount || 0, 254, 238)
-                      setTimeout(() => {
-                        wx.canvasToTempFilePath({
-                          canvas: canvas,
-                          success(res) {
-                            let title = wx.getStorageSync('uid') == video.user.uid ? '我的新作品发布啦，快来捧场点赞！' : video.userRead.type == 'READ' ? '发现一篇宝藏作品，这声音让人爱了！不信你不着迷！' : '我正在听这篇朗读示范，这发音，播音专业水准！你也来听听！'
-                            resolve({
-                              title,
-                              path: `/pages/pkPage/index?videoId=${video.userRead.id}&uid=${wx.getStorageSync('uid')}`,
-                              imageUrl: res.tempFilePath
-                            })
-                          },
-                          fail(res) {
-                            reject()
+              let peiyin = canvas.createImage();
+              peiyin.src = '/static/peiyin.jpg';
+              peiyin.onload = () => {
+                ctx.drawImage(peiyin, 0, 211, 375, 89);
+                //分享
+                let fx = canvas.createImage();
+                fx.src = '/static/share.png'
+                fx.onload = () => {
+                  ctx.drawImage(fx, 12, 220, 20, 20)
+                  ctx.fillText('分享', 36, 238)
+                  // 收藏，一个一个渲染
+                  let sc = canvas.createImage();
+                  sc.src = '/static/no_collect.png'
+                  sc.onload = () => {
+                    ctx.drawImage(sc, 110, 220, 19, 19)
+                    ctx.fillText('收藏', 134, 238)
+                    // 评论
+                    let pl = canvas.createImage();
+                    pl.src = '/static/comment.png'
+                    pl.onload = () => {
+                      ctx.drawImage(pl, 228, 222, 22, 22)
+                      ctx.fillText(video.userRead.commentAmount || 0, 340, 238)
+                      //点赞
+                      let dz = canvas.createImage();
+                      dz.src = video.isLike ? '/static/heart_colored.png' : '/static/heart.png'
+                      dz.onload = () => {
+                        ctx.drawImage(dz, 318, 222, 22, 22)
+                        ctx.fillText(video.userRead.likeAmount || 0, 254, 238)
+                        if (video.userReadExtend.resourcesType == 1) {
+                          let aBg = canvas.createImage();
+                          aBg.src = '/static/shareAudioBg.png';
+                          aBg.onload = () => {
+                            ctx.drawImage(aBg, 127.5, 38, 120, 120);
+                            let rate = 0.5
+                            ctx.arc(
+                              Math.floor(375 * rate),
+                              98,
+                              Math.floor(100 * rate),
+                              0,
+                              2 * Math.PI
+                            );
+                            ctx.clip() //裁剪
+                            let coverImg = canvas.createImage();
+                            coverImg.src = video.userRead.coverImg;
+                            coverImg.onload = () => {
+                              ctx.drawImage( //定位在圆圈范围内便会出现
+                                coverImg, //图片暂存路径
+                                129, 42,
+                                110, 110,
+                              );
+                              ctx.restore()
+                            }
                           }
-                        }, this)
-                      }, 500)
+                        }
+                        setTimeout(() => {
+                          wx.canvasToTempFilePath({
+                            canvas: canvas,
+                            success(res) {
+                              let path = video.user.profession == '官方' ? '/pages/reading/index' : '/pages/pkPage/index'
+                              let title = wx.getStorageSync('uid') == video.user.uid ? '我的新作品发布啦，快来捧场点赞！' : video.userRead.type == 'READ' ? '发现一篇宝藏作品，这声音让人爱了！不信你不着迷！' : '我正在听这篇朗读示范，这发音，播音专业水准！你也来听听！'
+                              resolve({
+                                title,
+                                path: `${path}?videoId=${video.userRead.id}&uid=${wx.getStorageSync('uid')}`,
+                                imageUrl: res.tempFilePath
+                              })
+                            },
+                            fail(res) {
+                              reject()
+                            }
+                          }, this)
+                        }, 500)
+                      }
                     }
                   }
                 }

mixins/video.js

@@ -108,7 +108,7 @@ module.exports = Behavior({
                           canvas: canvas,
                           success(res) {
                             resolve({
-                              title: '请欣赏我的课文朗读作品，点赞+评论。',
+                              title: '我的新作品发布啦，快来捧场点赞！',
                               path: `/pages/index?readId=${video.id}&uid=${wx.getStorageSync('uid')}`,
                               imageUrl: res.tempFilePath
                             })

pages/childClassify/index.wxml

@@ -16,7 +16,7 @@
   <!-- 内容区域 -->
   <scroll-view wx:if="{{list.length>0}}" class="worksList" style="{{childType?'padding-top:10rpx':''}}" scroll-y="true"
     enhanced show-scrollbar="{{false}}" scroll-top="{{scrollTop}}" bindscrolltolower='loadMore'>
-    <view class="worksBox" wx:for="{{list}}" wx:key="id">
+    <view class="worksBox" wx:for="{{list}}" wx:key="id" data-id="{{item.id}}" bindtap="goRead">
       <view class="left">
         <image src="{{item.coverImg}}" class="cover" wx:if="{{item.resourcesType==0}}" />
         <view class="audioCover" style="background-image: url({{item.backgroundVirtualImg}});" wx:else>
@@ -38,7 +38,7 @@
           </view>
         </view>
       </view>
-      <view class="goRead" data-id="{{item.id}}" bindtap="goRead">去朗读</view>
+      <view class="goRead">去朗读</view>
     </view>
   </scroll-view>
   <emptyBg wx:if="{{type=='search'&&list.length==0}}" message="没有找到想要的内容~"></emptyBg>

pages/index/index.js

@@ -134,7 +134,6 @@ Page({
       if (target.dataset.type != '3') {
         this.resetData()
       }
-
     }
   },
   closeDesktop() {

pages/match/index.js

@@ -47,7 +47,7 @@ Page({
   // 获取范文
   async getModelTexts() {
     let bannerList = await getModelTexts({
-      grade: 'PRIMARY_FIRST_GRADE' || this.data.userInfo.grade
+      grade: this.data.userInfo.grade || 'PRIMARY_FIRST_GRADE'
     })
     this.setData({
       bannerList

pages/match/index.wxml

@@ -2,7 +2,7 @@
 <view class="matchBox">
   <image src="" class="headerImg" />
   <view class="rule" bindtap="jumpIntro">
-    活动规则
+    比赛规则
   </view>
   <button class="resetBtn" style="border: none;" open-type="contact" plain="true">
     <image src="/static/kaka.png" class="kaka" />

pages/ranking/index.less

@@ -80,8 +80,8 @@
     .tips {
       position: absolute;
       left: 0px;
-      top: 10rpx;
-      padding: 6rpx 10rpx 6rpx 24rpx;
+      top: 20rpx;
+      padding: 6rpx 16rpx 6rpx 10rpx;
       border-top-right-radius: 25rpx;
       border-bottom-right-radius: 25rpx;
       font-size: 26rpx;
@@ -92,7 +92,7 @@
     .tips2 {
       position: absolute;
       right: 24rpx;
-      top: 80rpx;
+      top: 20rpx;
       padding: 10rpx 5rpx;
       border-radius: 50%;
       font-size: 26rpx;

pages/ranking/index.wxss

@@ -68,8 +68,8 @@
 .rankingBox .podiumBox .tips {
   position: absolute;
   left: 0px;
-  top: 10rpx;
-  padding: 6rpx 10rpx 6rpx 24rpx;
+  top: 20rpx;
+  padding: 6rpx 16rpx 6rpx 10rpx;
   border-top-right-radius: 25rpx;
   border-bottom-right-radius: 25rpx;
   font-size: 26rpx;
@@ -79,7 +79,7 @@
 .rankingBox .podiumBox .tips2 {
   position: absolute;
   right: 24rpx;
-  top: 80rpx;
+  top: 20rpx;
   padding: 10rpx 5rpx;
   border-radius: 50%;
   font-size: 26rpx;

pages/reading/index.js

@@ -526,81 +526,83 @@ Page({
           pic.src = video.userReadExtend && video.userReadExtend.resourcesType == 1 ? video.userReadExtend.backgroundVirtualImg : video.userRead.coverImg;
           pic.onload = () => {
             ctx.drawImage(pic, 0, 0, 375, 211);
-            if (video.userReadExtend.resourcesType == 1) {
-              let aBg = canvas.createImage();
-              aBg.src = '/static/shareAudioBg.png';
-              aBg.onload = () => {
-                ctx.drawImage(aBg, 127.5, 38, 120, 120);
-                let rate = 0.5
-                ctx.arc(
-                  Math.floor(375 * rate),
-                  98,
-                  Math.floor(100 * rate),
-                  0,
-                  2 * Math.PI
-                );
-                ctx.clip() //裁剪
-                let coverImg = canvas.createImage();
-                coverImg.src = video.userRead.coverImg;
-                coverImg.onload = () => {
-                  ctx.drawImage( //定位在圆圈范围内便会出现
-                    coverImg, //图片暂存路径
-                    129, 42,
-                    110, 110,
-                  );
-                  ctx.restore()
-                }
-              }
-            }
-          }
-          let peiyin = canvas.createImage();
-          peiyin.src = '/static/peiyin.jpg';
-          peiyin.onload = () => {
-            ctx.drawImage(peiyin, 0, 211, 375, 89);
-            //分享
-            let fx = canvas.createImage();
-            fx.src = '/static/share.png'
-            fx.onload = () => {
-              ctx.drawImage(fx, 12, 220, 20, 20)
-              ctx.fillText('分享', 36, 238)
-              // 收藏，一个一个渲染
-              let sc = canvas.createImage();
-              sc.src = '/static/no_collect.png'
-              sc.onload = () => {
-                ctx.drawImage(sc, 110, 220, 19, 19)
-                ctx.fillText('收藏', 134, 238)
-                //点赞
-                let dz = canvas.createImage();
-                dz.src = '/static/heart.png'
-                dz.onload = () => {
-                  ctx.drawImage(dz, 318, 222, 22, 22)
-                  ctx.fillText(0, 254, 238)
-                  // 评论
-                  let pl = canvas.createImage();
-                  pl.src = '/static/comment.png'
-                  pl.onload = () => {
-                    ctx.drawImage(pl, 228, 222, 22, 22)
-                    ctx.fillText(0, 340, 238)
-                    setTimeout(() => {
-                      wx.canvasToTempFilePath({
-                        canvas: canvas,
-                        success(res) {
-                          resolve({
-                            title: '我的新作品发布啦，快来捧场点赞！',
-                            path: `/pages/pkPage/index?videoId=${wx.getStorageSync('shareVideoId')}&uid=${wx.getStorageSync('uid')}`,
-                            imageUrl: res.tempFilePath
-                          })
-                        },
-                        fail(res) {
-                          reject()
+            let peiyin = canvas.createImage();
+            peiyin.src = '/static/peiyin.jpg';
+            peiyin.onload = () => {
+              ctx.drawImage(peiyin, 0, 211, 375, 89);
+              //分享
+              let fx = canvas.createImage();
+              fx.src = '/static/share.png'
+              fx.onload = () => {
+                ctx.drawImage(fx, 12, 220, 20, 20)
+                ctx.fillText('分享', 36, 238)
+                // 收藏，一个一个渲染
+                let sc = canvas.createImage();
+                sc.src = '/static/no_collect.png'
+                sc.onload = () => {
+                  ctx.drawImage(sc, 110, 220, 19, 19)
+                  ctx.fillText('收藏', 134, 238)
+                  //点赞
+                  let dz = canvas.createImage();
+                  dz.src = '/static/heart.png'
+                  dz.onload = () => {
+                    ctx.drawImage(dz, 318, 222, 22, 22)
+                    ctx.fillText(0, 254, 238)
+                    // 评论
+                    let pl = canvas.createImage();
+                    pl.src = '/static/comment.png'
+                    pl.onload = () => {
+                      ctx.drawImage(pl, 228, 222, 22, 22)
+                      ctx.fillText(0, 340, 238)
+                      if (video.userReadExtend.resourcesType == 1) {
+                        let aBg = canvas.createImage();
+                        aBg.src = '/static/shareAudioBg.png';
+                        aBg.onload = () => {
+                          ctx.drawImage(aBg, 127.5, 38, 120, 120);
+                          let rate = 0.5
+                          ctx.arc(
+                            Math.floor(375 * rate),
+                            98,
+                            Math.floor(100 * rate),
+                            0,
+                            2 * Math.PI
+                          );
+                          ctx.clip() //裁剪
+                          let coverImg = canvas.createImage();
+                          coverImg.src = video.userRead.coverImg;
+                          coverImg.onload = () => {
+                            ctx.drawImage( //定位在圆圈范围内便会出现
+                              coverImg, //图片暂存路径
+                              129, 42,
+                              110, 110,
+                            );
+                            ctx.restore()
+                          }
                         }
-                      }, this)
-                    }, 500)
+                      }
+                      setTimeout(() => {
+                        wx.canvasToTempFilePath({
+                          canvas: canvas,
+                          success(res) {
+                            resolve({
+                              title: '我的新作品发布啦，快来捧场点赞！',
+                              path: `/pages/pkPage/index?videoId=${wx.getStorageSync('shareVideoId')}&uid=${wx.getStorageSync('uid')}`,
+                              imageUrl: res.tempFilePath
+                            })
+                          },
+                          fail(res) {
+                            reject()
+                          }
+                        }, this)
+                      }, 500)
+                    }
                   }
                 }
               }
             }
+
           }
+
         })
     })
   },