Merge branch 'new' of http://8.134.10.79:3000/Leadfyy.co/uniapp-shikongwang into new

pages/center/invite.vue

@@ -52,7 +52,7 @@
 			wx.showToast({
 				title: '生成海报中...',
 				icon: 'loading',
-				duration: 1000
+				duration: 100000
 			});
 			this.getWxCode()
 			this.getBackground()
@@ -159,8 +159,9 @@
 							if (that.imagePath) {
 								that.canvasHidden = true
 								that.maskHidden = true
+								wx.hideToast()
 							}
-							console.log('海报生成成功,图片链接', that.imagePath)
+							console.log('海报生成成功,图片链接', that.imagePath)	
 						},
 						fail: function(res) {
 							console.log(res);

pages/center/wallet.vue

@@ -169,7 +169,11 @@
 			// scroll-view 下拉刷新
 			onRefresherrefresh(){
 				this.isRefresher = true;
-				this.getIncomeList()
+				if(this.current == 0) {
+					this.getIncomeList()
+				}else {
+					this.getWidthList()
+				}
 			}
 		}
 	}