last commit

jasscia · Jan 4, 2018 · 54cd135 · 54cd135
1 parent f4d0416
commit 54cd135
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 6 deletions.
diff --git a/image/1.png b/image/1.png
diff --git a/image/10.png b/image/10.png
diff --git a/image/2.png b/image/2.png
diff --git a/image/3.png b/image/3.png
diff --git a/image/4.png b/image/4.png
diff --git a/image/5.png b/image/5.png
diff --git a/image/6.png b/image/6.png
diff --git a/image/7.png b/image/7.png
diff --git a/image/8.png b/image/8.png
diff --git a/image/9.png b/image/9.png
diff --git a/pages/imageeditor/imageeditor.js b/pages/imageeditor/imageeditor.js
@@ -5,8 +5,6 @@ const app = getApp()
 Page({
   data: {
     bgPic:null,
-    imageResource:"",
-    combine:false,
     imgList:[1,2,3,4,5,6,7,8,9,10],
     currentHatId:1,
 

diff --git a/pages/index/index.js b/pages/index/index.js
@@ -35,10 +35,10 @@ Page({
             userInfo: res.userInfo,
             bgPic: res.userInfo.avatarUrl
           });
+          this.assignPicChoosed();
         }
       })
     }
-    this.assignPicChoosed();
   },
   chooseImage(from){
     wx.chooseImage({
@@ -47,16 +47,15 @@ Page({
       sourceType: [from.target.dataset.way],
       success:(res)=> {
         var tempFilePaths = res.tempFilePaths;
-        console.log(tempFilePaths);
         this.setData({
           bgPic:res.tempFilePaths[0]
         });
         this.assignPicChoosed();
       },
-      fail: function (res) {
+      fail: (res)=>{
         this.assignPicChoosed();
         },
-      complete: function (res) {
+      complete: (res)=>{
         this.assignPicChoosed();
         },
     })