合并

app.json

@@ -25,7 +25,7 @@
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#61CA54",
-    "navigationBarTitleText": "小学语文课文朗读",
+    "navigationBarTitleText": "小学语文朗读配音",
     "navigationBarTextStyle": "white",
     "backgroundColor": "#61CA54",
     "onReachBottomDistance": 50

component/follow/follow.js

@@ -58,6 +58,7 @@ export const followInit = (that) => {
         temp.img = item.userRead.iconImg;
         temp.id = item.userRead.id;
         temp.title = item.userRead.title;
+        temp.summary = item.userRead.summary;
         temp.time = formatDate(item.userRead.gmtCreated, 3);
         // 还差一些字段
         that.data.followData.push(temp);

component/follow/follow.wxml

@@ -11,7 +11,7 @@
       <image class="wareCardImg" src="{{item.img}}" />
       <text class="wareCardTitle">{{item.title}}</text>
       <view class="bottomData">
-        <text class="wareCardTip">{{item.grade}}</text>
+        <text class="wareCardTip">{{item.summary}}</text>
         <view class="wareCardPlays">
             <image class="wareCardPlaysImg" src="../../static/image/hotPlays.png" />
             <text>{{item.plays}}</text>

component/hot/hot.js

@@ -94,7 +94,7 @@ export const hotInit = (that) => {
         oTemp.img = item.boothContent;
         oTemp.classId = item.operationContent;
         oTemp.title = item.title;
-        oTemp.grade = item.summary;
+        oTemp.summary = item.summary;
         recommendTemp.push(oTemp);
       });
       let bannerIndex = 'hotData.banner';
@@ -117,7 +117,7 @@ export const hotInit = (that) => {
         recommendRes.forEach(item => {
           const temp = {};
           temp.title = item.userRead.title;
-          temp.grade = item.userRead.title;
+          temp.summary = item.userRead.summary;
           temp.img = item.userRead.iconImg;
           temp.plays = item.userRead.playAmount ? item.userRead.playAmount : 0;
           temp.likes = item.userRead.likeAmount ? item.userRead.likeAmount : 0;

component/hot/hot.wxml

@@ -26,7 +26,7 @@
                 <image class="wareCardImg" src="{{item.img}}" />
                 <text class="wareCardTitle">{{item.title}}</text>
                 <view class="bottomData">
-                    <text class="wareCardTip">{{item.grade}}</text>
+                    <text class="wareCardTip">{{item.summary}}</text>
                     <!-- <view class="wareCardPlays">
                         <image class="wareCardPlaysImg" src="../../static/image/hotPlays.png" />
                         <text>{{item.plays}}</text>
@@ -51,7 +51,7 @@
                 <image class="wareCardImg" src="{{item.img}}" />
                 <text class="wareCardTitle">{{item.title}}</text>
                 <view class="bottomData">
-                    <text class="wareCardTip">{{item.grade}}</text>
+                    <text class="wareCardTip">{{item.summary}}</text>
                     <view class="wareCardPlays">
                         <image class="wareCardPlaysImg" src="../../static/image/hotPlays.png" />
                         <text>{{item.plays}}</text>

component/share/share.js

@@ -8,6 +8,10 @@ Component({
     shareType: {
       type: 'String',
       value: ''
+    },
+    shareId: {
+      type: 'String',
+      value: ''
     }
   },
 
@@ -22,7 +26,9 @@ Component({
     iconImg: '',
     title: '',
     path: '',
-    QRCode:''
+    QRCodeImagePath:'',
+    QRCodeImageLocalPath:'',
+    groupPurchaseInfo:{}
   },
 
   /**
@@ -55,36 +61,52 @@ Component({
           }
         })
         .then(() => {
-          ctx.drawImage(this.data.QRCode, 217, 374, 135, 135);
-          console.log(ctx)
-          ctx.draw(true, function (res) {
-            wx.canvasToTempFilePath({
-              x: 0,
-              y: 0,
-              width: 370,
-              height: 507,
-              destWidth: 370,
-              destHeight: 507,
-              canvasId: 'myCanvas',
-              success: (res) => {
-                console.log(res.tempFilePath)
-                wx.saveImageToPhotosAlbum({
-                  filePath: res.path,
-                  success(res) {
-                    console.log(res);
+          debugger;
+          wx.getImageInfo({
+            src: this.data.QRCodeImagePath,//服务器返回的图片地址
+            success: function (res) {
+              //res.path是网络图片的本地地址
+              ctx.drawImage(res.path, 227, 364, 135, 135);
+
+
+
+
+              ctx.draw(true, function (res) {
+                wx.canvasToTempFilePath({
+                  x: 0,
+                  y: 0,
+                  width: 370,
+                  height: 507,
+                  destWidth: 370,
+                  destHeight: 507,
+                  canvasId: 'myCanvas',
+                  success: (res) => {
+                    console.log(res.tempFilePath)
+                    wx.saveImageToPhotosAlbum({
+                      filePath: res.path,
+                      success(res) {
+                        console.log(res);
+                      }
+                    })
+                    that.setData({
+                      imgUrls: res.tempFilePath
+                    }, () => {
+                      wx.hideLoading();
+                    })
+                  },
+                  fail: (res) => {
+                    console.log(res)
                   }
                 })
-                that.setData({
-                  imgUrls: res.tempFilePath
-                }, () => {
-                  wx.hideLoading();
-                })
-              },
-              fail: (res) => {
-                console.log(res)
-              }
-            })
-          })
+              })
+
+
+
+            },
+            fail: function (res) {
+              //失败回调
+            }
+          });
         })
 
 
@@ -92,6 +114,7 @@ Component({
 
     },
     share: function (data) {
+      debugger;
       if (this.data.shareType === 'works') {
 
         this.setData({
@@ -103,7 +126,8 @@ Component({
           // path: data.path,
           QRData:{
             page: data.path,
-            scene: data.scene
+            scene: data.scene,
+            qrCodeId: this.data.shareId
           }
         })
 
@@ -111,7 +135,18 @@ Component({
       if (this.data.shareType === 'group') {
         console.log('团购分享')
         this.setData({
-          shareFlag: !this.data.shareFlag
+          shareFlag: !this.data.shareFlag,
+          avatar: data.avatar,
+          author: data.author,
+          iconImg: data.iconImg,
+          title: data.title,
+          // path: data.path,
+          QRData:{
+            page: data.path,
+            scene: data.scene,
+            qrCodeId: this.data.shareId
+          },
+          groupPurchaseInfo: data.groupPurchaseInfo
         })
       }
       if (this.data.shareType === 'class') {
@@ -127,11 +162,12 @@ Component({
       let download = new Promise((resolve, reject) => {
         let QRCode = () => {
           // 生成二维码并下载
+          debugger;
           httpRequestApi.createQRCode(this.data.QRData).success(res => {
             // let base64 = wx.arrayBufferToBase64(res.data);
             // console.log(a)
             this.setData({
-              QRCode: res.data
+              QRCodeImagePath: res.data.data
             })
             // wx.downloadFile({
             //   url: res,
@@ -146,7 +182,7 @@ Component({
   
             //   }
             // });
-            console.log(this.data.QRCode)
+            console.log(this.data.QRCodeImagePath)
             console.log(res)
             resolve();
           })
@@ -251,27 +287,27 @@ Component({
     // 分享团购的主体内容
     drawGroupGut: function (ctx) {
       let group = new Promise((resolve, reject) => {
-        resolve(() => {
+        //resolve(() => {
           ctx.fillText('郎朗读书声是世上最美的声音', 50, 138)
-          ctx.drawImage('../../../static/groupImg/Combined Shape.png', 11, 348, 196, 65);
+        ctx.drawImage(this.data.groupPurchaseInfo.bgImg, 9, 205, 352, 145);
           ctx.drawImage('../../../static/groupImg/Rectangle 41.png', 134, 358, 59, 20);
           ctx.setFontSize(14)
           ctx.setFillStyle('#fff')
-          ctx.fillText('五人团', 149, 373)
+          ctx.fillText(`${this.data.groupPurchaseInfo.headcount}人团`, 149, 373)
           ctx.setFontSize(16)
           ctx.setFillStyle('#A95A00')
-          ctx.fillText('原价', 24, 373)
+          ctx.fillText('原价', 20, 373)
           ctx.setStrokeStyle('red')
           ctx.moveTo(64, 368)
           ctx.lineTo(114, 368)
           ctx.stroke()
-          ctx.fillText('￥99元', 64, 373)
+          ctx.fillText(`￥${parseFloat(this.data.groupPurchaseInfo.originPrice / 100).toFixed(2)}元`, 64, 373)
           ctx.setFontSize(18)
           ctx.fillText('团购价仅需', 20, 403)
-          ctx.fillText('元', 144, 403)
+          ctx.fillText('元', 174, 403)
           ctx.setFontSize(20)
           ctx.setFillStyle('red')
-          ctx.fillText('￥1', 109, 403)
+          ctx.fillText(`￥${parseFloat(this.data.groupPurchaseInfo.price / 100).toFixed(2)}`, 109, 403)
           ctx.drawImage('../../../static/groupImg/share_bottom.png', 3, 419, 370, 192);
           ctx.setFontSize(20)
           ctx.setFillStyle('red')
@@ -279,9 +315,10 @@ Component({
           ctx.setFontSize(18)
           ctx.setFillStyle('#000')
           ctx.fillText('长按识别二维码参加团购', 9, 493)
-        })
+        //})
+        resolve();
       })
-      return group();
+      return group;
     },
 
 

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

@@ -8,6 +8,8 @@ Page({
    */
   data: {
     hideFlag: true,
+    groupPurchaseInfo: {},
+    organizer: {},
     surplusNum: '',
     joinUserList: [],
     surplusList: [],
@@ -31,11 +33,6 @@ Page({
     ]
   },
 
-  //分享好友触发事件
-  eventListener: function () {
-    //console.log(1);
-  },
-
   //规则页显示和隐藏
   hide: function () {
     this.setData({
@@ -43,14 +40,25 @@ Page({
     })
   },
   //显示分享页 
-  share: function () {
-    console.log(this.shareDialog)
-    this.shareDialog.share();
+  openShare: function () {
+    this.shareDialog = this.selectComponent("#share-dialog");
+    const data = {
+      avatar: this.data.organizer.avatar,
+      author: this.data.organizer.wechatName,
+      iconImg: this.data.groupPurchaseInfo.bgImg,
+      title: this.data.groupPurchaseInfo.productTitle,
+      path: `pages/groupPage/collage-details/collage-details`,
+      scene: `QR${this.data.orderId}`,
+      groupPurchaseInfo: this.data.groupPurchaseInfo
+    }
+    this.shareDialog.share(data);
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    options.scene = 'QR1541862338777268';
+    debugger;
     wx.setNavigationBarTitle({
       title: '拼团详情'
     })
@@ -58,7 +66,7 @@ Page({
     if(!options.orderId) {
       return false;
     }
-    const orderId = options.orderId;
+    const orderId = options.orderId ? options.orderId : options.scene.replace('QR', '');
     this.setData({
       orderId
     })
@@ -72,6 +80,8 @@ Page({
       //时间转换
       const timeList = util.formatTime(res.data.data.groupPurchaseOrder.closeTime - res.data.data.groupPurchaseOrder.gmtModified);
       this.setData({
+        groupPurchaseInfo: res.data.data.groupPurchaseInfo,
+        organizer: res.data.data.organizer,
         surplusNum,
         joinUserList: res.data.data.joinUserList,
         surplusList: this.data.surplusList,

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

@@ -46,7 +46,7 @@
                 分             
             </view>
         </view>
-        <view class="invitation-btn" bindtap="share">
+        <view class="invitation-btn" bindtap="openShare">
             <image src="../../../static/groupImg/Invitation.png"></image>
             <text>邀请朋友参加</text>
         </view>
@@ -61,7 +61,7 @@
     </view>
 </view> 
 <canvas canvas-id="myCanvas" style="width:370px; height: 507px; position: absolute; left: -99rpx; top: -999rpx;"></canvas>
-<shareDialog id="share-dialog" shareType='group' bindcustomevent="eventListener"/>
+<shareDialog id="share-dialog" shareType='group' shareId="{{orderId}}"/>
 
 <popup
     typeOf="sendSuccess"

pages/groupPage/grade-details/grade-details.wxml

@@ -8,7 +8,7 @@
         </view>
         <view class="catalog">
             <image src="../../../static/groupImg/Rectangle 34@2x.png"></image>
-            <text>语文目录</text>
+            <text>课文目录</text>
         </view>
         <view class="catalog-list">
             <view class="catalog-item" wx:for="{{lessonList}}" wx:key="{{index}}" data-id="{{item.id}}" data-title="{{item.title}}" bindtap="goToClass">

pages/groupPage/group-details/group-details.wxml

@@ -48,7 +48,7 @@
         </view>
         <view class="catalog">
             <image src="../../../static/groupImg/Rectangle 34@2x.png"></image>
-            <text>语文目录</text>
+            <text>课文目录</text>
         </view>
         <view class="catalog-list">
             <view class="catalog-item" wx:for="{{lessonList}}" wx:key="{{index}}" data-id="{{item.id}}" data-title="{{item.title}}">

pages/social/works/works.js

@@ -21,11 +21,14 @@ Page({
         ifReward: false,
         id: '',
         path: '',
-        replyModal: false
+        replyModal: false,
+        totalRead: 0
         // shareFlag: false
     },
     onLoad: function (option) {
         console.log(option)
+        debugger;
+        let id = option.id ? option.id : option.scene.replace('QR', '')
 
         wx.setNavigationBarTitle({
             title: option.title //页面标题为路由参数
@@ -33,10 +36,10 @@ Page({
 
         this.setData({
             title: option.title,
-            id: option.id
+            id
         })
         this.uid = wx.getStorageSync('uid');
-        this.getWorks(this.uid, option.id);
+        this.getWorks(this.uid, id);
     },
     onHide: function(){
         if(this.innerAudioContext){
@@ -51,19 +54,22 @@ Page({
     getWorks: function (uid, id) {
         httpRequestApi.getWorksDetail(uid, id).success((res) => {
             console.log(res);
-            console.log(id)
+            console.log(id);
             const others = res.data.data.otherRead;
             const author = res.data.data.user;
             const works = res.data.data.userRead;
             const othersTemp = [];
             others.forEach((item) => {
-                const temp = {};
+              const temp = {};
+                temp.uid = item.userRead.id;
+                temp.title = item.userRead.title;
                 temp.image = item.user.avatar;
                 temp.nickName = item.user.wechatName;
                 othersTemp.push(temp);
             });
             this.setData({
-                user: othersTemp,
+                user: othersTemp, 
+                totalRead: res.data.data.totalRead,
                 author: author.wechatName,
                 authorAvatar: author.avatar,
                 authorUid: author.uid,
@@ -198,7 +204,7 @@ Page({
     // 去其他用户的作品页
     goToOthers: function (e) {
         wx.navigateTo({
-            url: `../../main/reading/reading?id=${id}&title=${title}`
+          url: `../../social/works/works?id=${e.currentTarget.dataset.uid}&title=${e.currentTarget.dataset.title}`
         })
     },
     // 查询回复

pages/social/works/works.wxml

@@ -14,20 +14,20 @@
     <view class="userSection">
         <view class="peopleNum">
             <image class="peoplesIcon" src="../../../static/image/peoples.png" />
-            <view class="title">共有12345人完成了录音</view>
+            <view class="title">共有{{totalRead}}人完成了录音</view>
         </view>
         <scroll-view scroll-x class="scrollWrapper" scroll-with-animation="true">
             <view class="avatarRow">
                 <view class="userItem" wx:for="{{user}}" wx:key="{{index}}">
-                    <image src="{{item.image}}" bindtap="goToOthers" data-uid="{{item.uid}}" />
+                    <image src="{{item.image}}" bindtap="goToOthers" data-uid="{{item.uid}}" data-title="{{item.title}}" />
                 </view>
             </view>
         </scroll-view>
     </view>
-    <view class="commentSection">
+    <!-- <view class="commentSection">
         <view class="title">评论（{{total}}）</view>
         <input class="commentInput" bindconfirm="sendHandler" confirm-type="send" placeholder="听了这么多，说点什么吧" bindinput="inputValue"></input>
-    </view>
+    </view> -->
     <view class="commentArea">
         <view class="commentItem" wx:for="{{replyList}}" wx:key="{{index}}">
             <image class="avatar" src="{{item.avatar}}" />
@@ -68,7 +68,7 @@
     </view>
     <!-- 分享框 -->
     <canvas canvas-id="myCanvas" style="width:370px;z-index=99999; height: 507px; position: absolute; left: -99rpx; top: -999rpx;"></canvas>
-    <shareDialog id="share-dialog" shareType='works' />
+    <shareDialog id="share-dialog" shareType='works' shareId="{{id}}" />
     <!-- 评论框 -->
     <view class="replySection" wx:if="{{replyModal}}">
         <input bindblur="bindTextAreaBlur"  bindconfirm="replySB" confirm-type="send" placeholder="回复" bindinput="inputSBValue" auto-focus auto-height />

project.config.json

@@ -36,12 +36,12 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 5,
+			"current": 0,
 			"list": [
 				{
 					"id": 0,
 					"name": "edit",
-					"pathName": "pages/user/walletDetails/walletDetails",
+					"pathName": "pages/groupPage/my-group/my-group",
 					"query": ""
 				},
 				{