|
@@ -96,24 +96,31 @@ Page({
|
|
|
wx.showLoading({
|
|
|
title: '图片合成中...'
|
|
|
})
|
|
|
- let that = this;
|
|
|
+ let that = this,result = true;
|
|
|
// for (let i = 1; i <= 4; i++) {
|
|
|
// if (wx.getStorageSync('madeCupImgData' + i) || wx.getStorageSync('madeCupFontData' + i)) {
|
|
|
// console.log(i, "iiiii")
|
|
|
// that.getCombImg(that, i);
|
|
|
// }
|
|
|
// }
|
|
|
+
|
|
|
if (wx.getStorageSync('madeCupImgData1') || wx.getStorageSync('madeCupFontData1')) {
|
|
|
that.getCombImg(that, 1);
|
|
|
+ result = false
|
|
|
} else if (wx.getStorageSync('madeCupImgData2') || wx.getStorageSync('madeCupFontData2')) {
|
|
|
that.getCombImg(that, 2);
|
|
|
+ result = false
|
|
|
} else if (wx.getStorageSync('madeCupImgData3') || wx.getStorageSync('madeCupFontData3')) {
|
|
|
that.getCombImg(that, 3);
|
|
|
- } else if (wx.getStorageSync('madeCupImgData4') || wx.getStorageSync('madeCupFontData4')) {
|
|
|
+ result = false
|
|
|
+ }else if (wx.getStorageSync('madeCupImgData4') || wx.getStorageSync('madeCupFontData4')) {
|
|
|
that.getCombImg(that, 4);
|
|
|
- } else {
|
|
|
- wx.hideLoading();
|
|
|
+ result = false
|
|
|
}
|
|
|
+
|
|
|
+ if (result){
|
|
|
+ wx.hideLoading();
|
|
|
+ }
|
|
|
// }
|
|
|
|
|
|
|
|
@@ -252,6 +259,7 @@ Page({
|
|
|
|
|
|
},
|
|
|
getComb(that, imgSrcArray,i,_static) {
|
|
|
+ console.log(imgSrcArray,"imgSrcArray")
|
|
|
if(_static){
|
|
|
let imgTouch = wx.getStorageSync('madeCupImgData' + i);
|
|
|
let dataPositionObj = util.changeCup(i.toString()).dataPositionObj;
|
|
@@ -302,7 +310,12 @@ Page({
|
|
|
},
|
|
|
})
|
|
|
} else {
|
|
|
- wx.hideLoading()
|
|
|
+ if (i < 4) {
|
|
|
+ i = i + 1
|
|
|
+ that.getCombImg(that, i);
|
|
|
+ } else {
|
|
|
+ wx.hideLoading()
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
}
|