Rorschach 6 years ago
parent
commit
aadbd9d842

+ 11 - 1
component/share/share.js

@@ -136,6 +136,7 @@ Component({
 
       }
       if (this.data.shareType === 'group') {
+        console.log(data)
         console.log('团购分享')
         this.setData({
           shareFlag: !this.data.shareFlag,
@@ -152,6 +153,7 @@ Component({
           groupPurchaseInfo: data.groupPurchaseInfo
         })
       }
+      
       if (this.data.shareType === 'class') {
         console.log('课程分享')
         this.setData({
@@ -329,7 +331,15 @@ Component({
           ctx.setFontSize(16)
         ctx.setFillStyle('#444')
         ctx.fillText('郎朗读书声,是世上最美的声音', (375 - ctx.measureText('郎朗读书声,是世上最美的声音').width) / 2 ,351)
-        ctx.drawImage(this.data.iconImg, 12, 176, 351, 145);
+        if(this.data.groupPurchaseInfo.productId === 1){
+          ctx.drawImage('../../../static/share/poster_1.jpg', 12, 176, 351, 145);
+        }
+        if(this.data.groupPurchaseInfo.productId === 2){
+          ctx.drawImage('../../../static/share/poster_2.jpg', 12, 176, 351, 145);
+        }
+        if(this.data.groupPurchaseInfo.productId === 3){
+          ctx.drawImage('../../../static/share/poster_3.jpg', 12, 176, 351, 145);
+        }
         // ctx.drawImage('../../../static/groupImg/Rectangle 41.png', 134, 358, 59, 20);
         ctx.setFontSize(17)
         ctx.setFillStyle('#A95A00')

+ 1 - 1
component/share/share.wxss

@@ -61,7 +61,7 @@
 .Preservation {
     position: absolute;
     left: 15%;
-    top: 1150rpx;
+    top: 1000rpx;
     width: 536rpx;
     height: 80rpx;
     color: #fff;

+ 2 - 2
pages/groupPage/collage-details/collage-details.js

@@ -171,9 +171,9 @@ Page({
     const groupId = this.data.groupId;
     const id = this.data.orderId;
     return {
-      title: '小学课文朗读',
+      title: '老师同学都在玩的配音show,你还在等什么?',
       path: `pages/groupPage/group-details/group-details?productId=${productId}&id=${id}&groupId=${groupId}`,
-      imageUrl: '../../../static/groupImg/shareBg.png',
+      imageUrl: '../../../static/share/group_icon.jpg',
       success: function (res) {
         // 转发成功
         console.log("转发成功:" + JSON.stringify(res));

+ 7 - 5
pages/groupPage/collage-details/collage-details.wxss

@@ -60,11 +60,13 @@
 }
 
 .headImg-item .tuanzhangIcon {
-    position: absolute;
-    right: -20rpx;
-    top: -10rpx;
-    width: 80rpx;
-    height: 30rpx;
+    position:absolute;
+right:-40rpx;
+top:20rpx;
+width:80rpx;
+height:30rpx;
+background:#61ca54;
+
 }
 
 .bg-boder {

+ 2 - 2
pages/groupPage/make-money/make-money.js

@@ -132,9 +132,9 @@ Page({
     const groupId = this.data.groupId;
     const id = this.data.orderId;
     return {
-      title: '小学课文朗读',
+      title: '老师同学都在玩的配音show,你还在等什么?',
       path: `pages/groupPage/group-details/group-details?productId=${productId}&id=${id}&groupId=${groupId}`,
-      imageUrl: '../../../static/groupImg/shareBg.png',
+      imageUrl: '../../../static/share/group_icon.jpg',
       success: function (res) {
         // 转发成功
         console.log("转发成功:" + JSON.stringify(res));

+ 3 - 2
pages/main/class/class.js

@@ -111,7 +111,7 @@ Page({
     return {
         title: '老师同学都在玩的配音show,你还在等什么?',
         path: `pages/main/class/class?id=${this.data.id}&title=${this.data.title}`,
-        imageUrl: this.data.iconImg
+        imageUrl: '../../../static/share/class_icon.jpg'
     }
 },
   goToWorks: function (e) {
@@ -121,7 +121,7 @@ Page({
       this.videoCtx.stop(); 
     }
     console.log(e);
-    let readId = e.target.dataset.id;
+    let readId = e.currentTarget.dataset.id;
     let title = this.data.title;
     wx.navigateTo({
       url: `../../social/works/works?id=${readId}&title=${title}`
@@ -158,6 +158,7 @@ Page({
         temp.likes = item.userRead.likeAmount ? item.userRead.likeAmount : 0;
         temp.uid = item.userRead.uid;
         temp.id = item.userRead.id;
+        console.log(item.userRead)
         this.data.works.push(temp);
       });
       this.setData({

+ 3 - 2
pages/main/class/class.wxss

@@ -154,10 +154,11 @@ height:106rpx;
     display: flex;
     flex-direction: column;
     margin-left: 12rpx;
+    flex: 1;
 }
 
 .workCard .nickName {
-    width: 200rpx;
+    /* width: 200rpx; */
     height: 44rpx;
     color: #000;
     font-size: 32rpx;
@@ -174,7 +175,7 @@ height:106rpx;
 .readWorksSection .likes {
     display: flex;
     flex-direction: column;
-    margin-left: 270rpx;
+    /* margin-left: 270rpx; */
     width: 104rpx;
     overflow: hidden;
     text-align: center;

+ 1 - 1
pages/social/works/works.js

@@ -203,7 +203,7 @@ Page({
         return {
             title: '一样的课文,不一样的味道!我的配音表演已开始,求各位大咖围观、点评!',
             path: `pages/social/works/works?id=${this.data.id}&title=${this.data.title}&shareCard=true`,
-            imageUrl: this.data.iconImg
+            imageUrl: '../../../static/share/works_icon.jpg'
         }
     },
     follow: function () {

+ 1 - 1
pages/social/works/works.wxml

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

BIN
static/groupImg/Bitmap1.png


BIN
static/groupImg/shareBg.png


BIN
static/share/class_icon.jpg


BIN
static/share/group_icon.jpg


BIN
static/share/poster_1.jpg


BIN
static/share/poster_2.jpg


BIN
static/share/poster_3.jpg


BIN
static/share/works_icon.jpg