发布上线

pages/Instructions/Instructions.wxml

@@ -14,7 +14,7 @@
                     <text>2</text>
                     选择相册类型：公开相册可出现在电视端全部萌娃列表中，别的用户也能看到。私密相册仅可自己看到
                 </view>
-                <image src="../../static/image/2.jpg"></image>
+                <image style="height: 200rpx;" src="../../static/image/2.jpg"></image>
             </view>
             <view class="Explain">
                 <view>

pages/Instructions/Instructions.wxss

@@ -33,5 +33,5 @@
 
 .Explain image {
    width: 100%;
-   height:460rpx;
+   height:420rpx;
 }

pages/access/access.js

@@ -16,6 +16,12 @@ Page({
    */
   onLoad: function (options) {
     console.log(options)
+    if(options.share && !wx.getStorageSync('uid')) {
+      wx.reLaunch({
+        url: '/pages/index/index?ind=0'
+      })
+      return false;
+    }
     this.getPhoneBoxInfo(options.id);
   },
 
@@ -96,6 +102,28 @@ Page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function () {
-
+    return {
+      title: '七彩童年',
+      path: `pages/access/access?share=true`,
+      success: function (res) {
+        // 转发成功
+        console.log("转发成功:" + JSON.stringify(res));
+        // var shareTickets = res.shareTickets;
+        // if (shareTickets.length == 0) {
+        //   return false;
+        // }
+        // //可以获取群组信息
+        // wx.getShareInfo({
+        //   shareTicket: shareTickets[0],
+        //   success: function (res) {
+        //     console.log(res)
+        //   }
+        // })
+      },
+      fail: function (res) {
+        // 转发失败
+        console.log("转发失败:" + JSON.stringify(res));
+      }
+    }
   }
 })

pages/album/album.js

@@ -55,7 +55,7 @@ Page({
       return false;
     };
     wx.chooseImage({
-      count: 1, // 默认9
+      count: 9, // 默认9
       sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
       sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
       success:  (res) => {
@@ -68,6 +68,8 @@ Page({
           mask: true,  
           duration: 1000 
         }) 
+
+        /*
         //调用图片截取方法
         that.showCropper({
           src: tempFilePaths[0],
@@ -121,52 +123,7 @@ Page({
                     content: '上传图片失败'
                   })  
                 }  
-              }); 
-
-
-
-                /*
-                const that = this; 
-                tempFilePaths.forEach(item => {
-                  //上传文件
-                  wx.uploadFile({  
-                    url: HOST + 'wx/file/upload',  
-                    filePath: item,  
-                    name: 'uploadfile_ant',  
-                    header: {  
-                      "Content-Type": "multipart/form-data"  
-                    },  
-                    success: (res) => {  
-                      uploadImgCount++; 
-                      const data = JSON.parse(res.data);
-                      if(data.success) {
-                        //上传文件成功后放到相册里
-                        httpRequestApi.addPhotoList({
-                          path: data.data
-                        }).success((res) => {
-                          if(res.data.success) {
-                            //再次调用相册列表
-                            that.getPhotoList();
-                          }
-                        }).fail(() => {
-                          wx.showModal({  
-                            title: '错误提示',  
-                            content: '图片上传到相册失败'
-                          }) 
-                        });
-                      } 
-                    },  
-                    fail: function (res) {  
-                      wx.hideToast();  
-                      wx.showModal({  
-                        title: '错误提示',  
-                        content: '上传图片失败'
-                      })  
-                    }  
-                  });  
-                });
-                */
-
+              });
             }
             else {
               wx.showModal({
@@ -177,23 +134,68 @@ Page({
             }
           }
         })
-        // wx.navigateTo({
-        //   url: '/pages/clipPhoto/clipPhoto?imageUrl=' + tempFilePaths[0] 
-        // })
+        */
+        /*
+        wx.navigateTo({
+          url: '/pages/clipPhoto/clipPhoto?imageUrl=' + tempFilePaths[0] 
+        })
+        */
+
+               
+      const that = this; 
+      tempFilePaths.forEach(item => {
+        //上传文件
+        wx.uploadFile({  
+          url: HOST + 'wx/file/upload',  
+          filePath: item,  
+          name: 'uploadfile_ant',  
+          header: {  
+            "Content-Type": "multipart/form-data"  
+          },  
+          success: (res) => {   
+            const data = JSON.parse(res.data);
+            if(data.success) {
+              //上传文件成功后放到相册里
+              httpRequestApi.addPhotoList({
+                path: data.data
+              }).success((res) => {
+                if(res.data.success) {
+                  //再次调用相册列表
+                  that.getPhotoList();
+                }
+              }).fail(() => {
+                wx.showModal({  
+                  title: '错误提示',  
+                  content: '图片上传到相册失败'
+                }) 
+              });
+            } 
+          },  
+          fail: function (res) {  
+            wx.hideToast();  
+            wx.showModal({  
+              title: '错误提示',  
+              content: '上传图片失败'
+            })  
+          }  
+        });  
+      });
+
       }
     })
   },
 
   //预览图片
   preview: function ({ currentTarget }) {
-    // const index = currentTarget.dataset.index;
-    // console.log(this.data.photoList[index].path);
+    const index = currentTarget.dataset.index;
     const imageUrl = [];
     for (let item of this.data.photoList) {
       imageUrl.push(item.path)      
     }
+    console.log(this.data.photoList[index].path)
     wx.previewImage({
-      urls: imageUrl
+      urls: imageUrl,
+      current: this.data.photoList[index].path
     })
   },
 
@@ -237,13 +239,6 @@ Page({
   onReachBottom: function () {
 
   },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
   //获取相册列表
   getPhotoList: function () {
     httpRequestApi.getPhotoList({

pages/childMatch/childMatch.js

@@ -20,6 +20,12 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    if(options.share && !wx.getStorageSync('uid')) {
+      wx.reLaunch({
+        url: '/pages/index/index?ind=0'
+      })
+      return false;
+    }
     this.getPhotoBoxList();
   },
 
@@ -77,6 +83,28 @@ Page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function () {
-
+    return {
+      title: '七彩童年',
+      path: `pages/childMatch/childMatch?share=true`,
+      success: function (res) {
+        // 转发成功
+        console.log("转发成功:" + JSON.stringify(res));
+        // var shareTickets = res.shareTickets;
+        // if (shareTickets.length == 0) {
+        //   return false;
+        // }
+        // //可以获取群组信息
+        // wx.getShareInfo({
+        //   shareTicket: shareTickets[0],
+        //   success: function (res) {
+        //     console.log(res)
+        //   }
+        // })
+      },
+      fail: function (res) {
+        // 转发失败
+        console.log("转发失败:" + JSON.stringify(res));
+      }
+    }
   }
 })

pages/clipPhoto/clipPhoto.js

@@ -14,7 +14,6 @@ Page({
     IMG_W: '',
     IMG_H: '',
     clipImage: '',
-    left: '',
     top: '',
     screenW: '',
     screenH: ''
@@ -22,7 +21,6 @@ Page({
   //拖拽事件
   move: function ({ detail }) {
     this.setData({
-      left: detail.x * 2,
       top: detail.y * 2
     })
   },
@@ -32,7 +30,7 @@ Page({
       title: '图片生成中...',
     })
     const img_ratio = this.data.img_ratio;
-    const canvasW = (this.data.screenW / this.data.cropperW) * this.data.IMG_W
+    const canvasW =  this.data.IMG_W;
     const canvasH = (this.data.screenH / this.data.cropperH) * this.data.IMG_H
     const canvasL = 0;
     const canvasT = (this.data.top / this.data.cropperH) * this.data.IMG_H
@@ -46,10 +44,8 @@ Page({
       ctx.drawImage(this.data.imageUrl, canvasL, canvasT, canvasW, canvasH, 0, 0, this.data.screenW / 2, this.data.screenH / 2);
 
     } else {
-      //如果图片比较窄两边留白，留白距离
-      const liubaiLeft = (this.data.screenW / 2 - this.data.cropperW / 2) /2;
       //保存图片分别是图片地址，canvas绘制距离左边距离，距离上边距离，截取原图片宽度，原图片高度，图片在canvas上的左位置，上位置，生成图片的宽，生成图片的高；
-      ctx.drawImage(this.data.imageUrl, canvasL, canvasT, canvasW, canvasH, liubaiLeft, 0, this.data.cropperW, this.data.screenH * img_ratio);
+      ctx.drawImage(this.data.imageUrl, canvasL, canvasT, canvasW, canvasH, 0, 0, this.data.screenW / 2, this.data.screenH / 1.2);
     } 
     ctx.draw(true, () => {
       // 获取画布要裁剪的位置和宽度   
@@ -57,9 +53,9 @@ Page({
         x: 0,
         y: 0,
         width: this.data.screenW / 2,
-        height: this.data.screenH / 2,
+        height: this.data.screenH / 1.2,
         destWidth: this.data.screenW / 2,
-        destHeight: this.data.screenH / 2,
+        destHeight: this.data.screenH / 1.2,
         quality: 0.5,
         canvasId: 'myCanvas',
         success:  (res) => {
@@ -68,7 +64,6 @@ Page({
           this.setData({
             clipImage: res.tempFilePath
           })
-
           //上传文件
           wx.uploadFile({  
             url: HOST + 'wx/file/upload',  
@@ -102,7 +97,8 @@ Page({
                 content: '上传图片失败'
               })  
             }  
-          }); 
+          });
+
           //成功获得地址的地方
           // wx.previewImage({
           //   current: '', // 当前显示图片的http链接
@@ -121,10 +117,8 @@ Page({
     const screenW = wx.getSystemInfoSync().windowWidth * 2;
     //h获取剪裁框的高度，按照16:9来计算高度
     const screenH = screenW / 16 * 9; 
-    console.log('剪裁框宽高',screenW,screenH);
     this.setData({
-      screenW,
-      screenH
+      screenW
     })
     const imageUrl = options.imageUrl;
     this.setData({
@@ -149,12 +143,14 @@ Page({
           this.setData({
             cropperW: 750,
             cropperH: 750 / img_ratio,
+            screenH: 750 / 16 * 9
           })
         } else {
           //竖着显示
           this.setData({
             cropperW: 750 * img_ratio,
-            cropperH: 750
+            cropperH: 750,
+            screenH: (750 * img_ratio) / 16 * 9
           })
         }
       } 

pages/clipPhoto/clipPhoto.wxml

@@ -1,8 +1,8 @@
 <!--pages/clip/clip.wxml-->
 <view class="clip">
     <image class="head-img" style="width:{{cropperW}}rpx;height:{{cropperH}}rpx" src="{{imageUrl}}"></image>
-    <movable-area scale-area style="width:100%;height:{{cropperH}}rpx">
-        <movable-view style="width: 100%; height: {{screenH}}rpx;" bindchange="move" direction="all" scale scale-min="0.5" scale-max="1.8">
+    <movable-area scale-area style="width:{{cropperW}}rpx;height:{{cropperH}}rpx">
+        <movable-view style="width: {{cropperW}}rpx; height: {{screenH}}rpx;" bindchange="move" direction="all">
         </movable-view>
     </movable-area>
     <view class="btn">

pages/clipPhoto/clipPhoto.wxss

@@ -14,7 +14,7 @@ movable-area {
 }
 
 movable-view {
-    border: 4rpx solid #fe9d00;
+    border: 6rpx solid #fe9d00;
     box-sizing: border-box;
 }
 

pages/setName/setName.js

@@ -66,8 +66,10 @@ Page({
       "avatar": this.data.headImg
     }).success(res => {
       if(res.data.success) {
-        //wx.navigateBack();
-        wx.navigateTo({
+        // wx.navigateTo({
+        //   url: '/pages/index/index?ind=2'
+        // })
+        wx.reLaunch({
           url: '/pages/index/index?ind=2'
         })
       }

project.config.json

@@ -11,7 +11,7 @@
 		"newFeature": true
 	},
 	"compileType": "miniprogram",
-	"libVersion": "2.3.0",
+	"libVersion": "2.3.1",
 	"appid": "wx04803862d3dab9ea",
 	"projectname": "Colorful-childhood",
 	"debugOptions": {