2.1

component/flowerBox/flowerBox.js

@@ -42,12 +42,14 @@ Component({
             this.setData({
               animationData: this.animation.export()
             })
-            this.replace();
+            setTimeout(()=>{
+              this.replace();
+            },100)
           },
           // 复位
           replace: function(){
             this.animation = wx.createAnimation({
-              duration: 1,
+              duration: 17,
               timingFunction: 'linear',
             })
             this.animation.opacity(1).step();

component/my/my.wxml

@@ -15,7 +15,7 @@
             <image class="edit-img" src="../../static/image/edit_new.png" />
             <view class='mine-category'>
               <view class='amount-text'>{{ myData.user.playAmount || 0 }} 播放</view>
-              <view class='amount-text'>{{ myData.user.likeAmount || 0 }} 赞</view>
+              <!-- <view class='amount-text'>{{ myData.user.likeAmount || 0 }} 赞</view> -->
               <view class='amount-text'>{{ myData.user.fansAmount || 0 }} 粉丝</view>
             </view>
           </view>
@@ -32,7 +32,7 @@
         </view>
         <view class="flower-tips" wx:if="{{myData.user.unfinishedAmount > 0}}">
           <text class="flower-last">{{myData.user.unfinishedAmount }}</text>
-          个任务福利还没有领哦
+          个任务福利还没有完成
         </view>
                 <view class="flower-tips" wx:if="{{myData.user.unfinishedAmount <= 0}}">
           今天任务全部完成，真棒
@@ -52,7 +52,7 @@
             <view>小红花：{{myData.user.integralAmount || 0 }}</view>
             <view class="flower-tips-text">
               <text class="flower-last">{{myData.user.unfinishedAmount }}</text>
-              个任务福利还没有领哦
+              个任务福利还没有完成
             </view>
           </view>
         </view>

component/my/my.wxss

@@ -122,7 +122,7 @@ page {
   width: 471rpx;
   font-size: 24rpx;
   display: flex;
-  justify-content: space-between;
+  /* justify-content: space-between; */
   color: #767676;
   margin-top: 37rpx;
   padding-right: 37rpx;
@@ -130,6 +130,7 @@ page {
 
 .amount-text {
   font-weight: 400;
+  margin-right:125rpx;
 }
 
 image {

component/share/share.js

@@ -140,7 +140,7 @@ Component({
       console.log('花二维码')
       console.log(this.data)
       console.log(this.data.avatar)
-      ctx.drawImage(this.data.QRCodeImagePath, 35, 353, 90, 90);
+      ctx.drawImage(this.data.QRCodeImagePath, 35, 351, 90, 90);
       ctx.draw();
       setTimeout(() => {
         wx.canvasToTempFilePath({

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">还有<text class="red-text">{{unfinishedCount}}</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

@@ -93,7 +93,7 @@
   position: relative;
   overflow: hidden;
   width: 100%;
-  height: 484rpx;
+  height: 496rpx;
   background: #fff;
   /* padding: 26rpx; */
   /* border-radius: 12rpx; */
@@ -106,7 +106,7 @@
   position: relative;
   overflow: hidden;
   width: 100%;
-  height: 484rpx;
+  height: 496rpx;
   background: #fff;
   margin: 0 auto 20rpx;
 }

pages/main/reading/reading.js

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

pages/main/searchResult/searchResult.wxss

@@ -11,7 +11,7 @@
     position: relative;
     overflow: hidden;
     width: 100%;
-    height: 374rpx;
+    height: 384rpx;
     background: #fff;
     /* padding: 26rpx; */
     /* border-radius: 12rpx; */

pages/social/prize/prize.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/social/prize/prize.wxml

@@ -1,3 +1,3 @@
 <view class="prize-page">
-    <image class="prize-icon" />
+    <image class="prize-icon" src="https://efunbox.lingjiao.cn/activity/resource/poster/xx_01.jpg" />
 </view>

pages/social/prize/prize.wxss

@@ -1,9 +1,13 @@
 .prize-page{
     width: 100%;
-    height: 100%;
-    overflow: hidden;
+    /* height: 100%; */
+    /* overflow: hidden; */
+    background: rgb(247, 90, 9);
+    min-height:100%;
 }
 .prize-icon{
     width: 750rpx;
     height: 1334rpx;
+    margin: 0 auto;
+
 }

pages/social/works/works.js

@@ -58,16 +58,21 @@ Page({
     },
     onLoad: function (option) {
         console.log(option)
-        if (option.flowerCount > 0) {
+        console.log(option.flowerCount)
+        console.log(option.flowerCount === 0)
+        if (option.flowerCount) {
             this.setData({
-                flowerNum: option.flowerCount
+                fromReading: true
             })
-        }
-        if (option.flowerCount) {
             this.flowerAnimationHandler();
-            setTimeout(() => {
-                this.openShare();
-            }, 300)
+            // setTimeout(() => {
+            //     this.openShare();
+            // }, 300)
+            if (option.flowerCount > 0) {
+                this.setData({
+                    flowerNum: option.flowerCount
+                })
+            }
         }
         getOpenidSessionKey((res) => {
             let id = option.id ? option.id : option.scene.replace('QR', '')
@@ -89,8 +94,10 @@ Page({
                 id,
                 myUid: this.uid,
                 stackSize
+            },()=>{
+                this.getWorks(this.uid, id);
             })
-            this.getWorks(this.uid, id);
+            
         }, (error) => {
             this.setData({
                 hide: !this.data.hide,
@@ -177,20 +184,25 @@ Page({
                 console.log('音频暂停')
             })
             this.innerAudioContext.src = this.data.audioSrc; // 这里可以是录音的临时路径
-
+            if(this.data.fromReading){
+                setTimeout(()=>{
+                    this.openShare()
+                })
+            }
 
 
         });
     },
     onShow() {
-        console.log(this.data.stackSize)
-        this.setData({
-            replyList: [],
-            pageNo: 1,
-            pageSize: 2
-        }, () => {
-            this.getReply();
-        })
+        if(this.data.myUid){
+            this.setData({
+                replyList: [],
+                pageNo: 1,
+                pageSize: 2
+            }, () => {
+                this.getReply();
+            })
+        }
     },
     videoPlayHandler: function () {
         this.setData({
@@ -204,6 +216,7 @@ Page({
         // + 1 + 1的动画
         this.setData({
             addComeOut: 'add-one-come-out'
+            // isLike: true
         })
         setTimeout(() => {
             if (this.data.addComeOut) {
@@ -236,6 +249,11 @@ Page({
     },
     // 弹出分享框
     openShare: function (e) {
+        console.log(this.data.authorAvatar)
+        console.log(this.data.author)
+        console.log(this.data.iconImg)
+        console.log(this.data.title)
+        console.log(this.data.id)
         if (this.data.authorAvatar && this.data.author && this.data.iconImg && this.data.title && this.data.id) {
             this.shareDialog = this.selectComponent("#share-dialog");
             const data = {

pages/social/works/works.wxml

@@ -33,7 +33,7 @@
         <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" />
+            <image src="../../../static/image/add_flower.png" />
         </view>
         <input class="commentInput" bindconfirm="sendHandler" value="{{inputValue}}" confirm-type="send" placeholder="听了这么多，说点什么吧" bindinput="inputValue"></input>
     </view>

pages/social/works/works.wxss

@@ -86,8 +86,8 @@
 .like {
     display: inline-block;
     margin-left: 20rpx;
-    width: 34rpx;
-    height: 39rpx;
+    width: 82rpx;
+    height: 54rpx;
     font-size: 28rpx;
     border-radius: 30rpx;
     text-align: center;
@@ -95,13 +95,14 @@
     position: relative;
     float: right;
     margin-right: 51rpx;
-    margin-top: 12rpx;
+    /* margin-top: 12rpx; */
+    /* border: solid 3rpx #fc3b3b; */
+
 }
 
 .like image {
-    width: 34rpx;
-    height: 39rpx;
-
+    width: 82rpx;
+    height: 54rpx;
 }
 
 @keyframes numberMove {
@@ -111,7 +112,8 @@
     }
 
     to {
-        bottom: 110rpx;
+        bottom: 200rpx;
+        font-size:50rpx;
         opacity: 0;
     }
 }
@@ -123,14 +125,14 @@
     width: 23rpx;
     height: 23rpx;
     position: absolute;
-    left: 0;
-    bottom: 20rpx;
+    left: 44rpx;
+    bottom: 24rpx;
     opacity: 1;
 }
 
 .add-one-come-out {
-    animation: numberMove 1.3s ease;
-    -webkit-animation: numberMove 1.3s ease;
+    animation: numberMove 1s ease;
+    -webkit-animation: numberMove 1s ease;
 }
 
 

pages/user/myEdit/myEdit.wxml

@@ -8,7 +8,7 @@
           </input>
         </view>
         <view class='edit-img'>
-          <image src='../../../static/image/edit.png' class='icon'></image>
+          <image src='../../../static/image/edit_new.png' class='icon'></image>
         </view>
       </view>
       <view class='sex-box'>
@@ -28,7 +28,7 @@
             </view>
         </picker>
          <view class='edit-img'>
-          <image src='../../../static/image/edit.png' class='icon'></image>
+          <image src='../../../static/image/edit_new.png' class='icon'></image>
         </view>
       </view>
       <view class='occupation-box'>
@@ -44,7 +44,7 @@
         <text class='setting-title'>学校</text>
         <input name='address' maxlength="14" class='address' type='text' placeholder='{{user.schoolName}}' value='{{ user.schoolName }}' bindblur='saveAddress'></input>
         <view class='edit-image'>
-          <image src='../../../static/image/edit.png' class='icon'></image>
+          <image src='../../../static/image/edit_new.png' class='icon'></image>
         </view>
       </view>
       <view class="submit-btn">

pages/user/mycollection/mycollection.wxss

@@ -10,7 +10,7 @@
   position: relative;
   overflow: hidden;
   width: 100%;
-  height: 374rpx;
+  height: 385rpx;
   background: #fff;
   /* border-radius: 12rpx; */
   margin: 0 auto 20rpx;

pages/user/myread/myread.wxss

@@ -13,7 +13,7 @@
   position: relative;
   overflow: hidden;
   width: 100%;
-  height: 484rpx;
+  height: 496rpx;
   background: #fff;
   /* padding: 26rpx; */
   /* border-radius: 12rpx; */

pages/user/myworks/myworks.wxml

@@ -50,7 +50,7 @@
           <text>粉丝</text>
         </view>
       </view>
-      <view class='point-count'>
+      <!-- <view class='point-count'>
         <view class='color' style="padding-right:60rpx;">{{ wareCards.likeAmount || 0 }}</view>
         <view class='border-right'>
           <view class='point-img'>
@@ -58,12 +58,12 @@
           </view>
           <text>赞</text>
         </view>
-      </view>
+      </view> -->
       <view class='flower-count'>
         <view class='color'>{{ wareCards.integralAmount || 0 }}</view>
         <view class='border-right'>
-          <view class='play-img'>
-            <image src='../../../static/image/flower.png'></image>
+          <view class='point-img'>
+            <image src='../../../static/image/flower_small_pink.png'></image>
           </view>
           <text>红花</text>
         </view>

pages/user/myworks/myworks.wxss

@@ -112,18 +112,20 @@ page {
 }
 
 .occupation-title {
-  position: absolute;
-  left: 44rpx;
-  bottom: -10rpx;
-  width: 68rpx;
-  height: 26rpx;
-  background: #61CA54;
-  border-radius: 180rpx;
-  z-index: 600;
-  /* line-height: 26rpx; */
-  text-align: center;
-  color: #FFFFFF;
-  font-size: 18rpx;
+  width:60rpx;
+height:30rpx;
+background:rgba(97, 202, 84, 1);
+border-radius:15rpx;
+font-size:22rpx;
+font-weight:800;
+color:rgba(255, 255, 255, 1);
+line-height:30rpx;
+text-align:center;
+position:absolute;
+bottom:-10rpx;
+left:48rpx;
+
+
 }
 
 .avatar-msg {
@@ -169,6 +171,7 @@ page {
   position: absolute;
   top: 246rpx;
   left: 5%;
+  justify-content: space-around;
 }
 
 .border-right {
@@ -200,6 +203,7 @@ page {
   margin-bottom: 6rpx;
 }
 
+
 .red-heart {
   width: 26rpx;
   height: 22rpx;
@@ -208,8 +212,8 @@ page {
 }
 
 .point-img {
-  width: 28rpx;
-  height: 24rpx;
+  width: 24rpx;
+  height: 26rpx;
   margin-right: 6rpx;
   margin-bottom: 6rpx;
 }
@@ -265,7 +269,7 @@ image {
   position: relative;
   overflow: hidden;
   width: 100%;
-  height: 484rpx;
+  height: 496rpx;
   background: #fff;
   margin: 0 auto 20rpx;
 }

project.config.json

@@ -12,7 +12,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.3.2",
-	"appid": "wx8961a3e5512f307c",
+	"appid": "wxdfa8a4f1623d28db",
 	"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": []

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/'
 }