Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents 3fee9902 740e186e
Showing 1 changed file with 19 additions and 7 deletions
packageB/pages/luckactivity/luckinfo/luckinfo.js
@@ -564,13 +564,6 @@ Page({
  
  
 						} else {
-							// console.log('请求出错');
-							if(self.data.luckInfo.vip_act_num != 0) {
-								self.setData({
-									'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1,
-								});
-							};
-							
 							let thxIndexArr = self.data.thxIndexArr;
 							const random = Math.random() * thxIndexArr.length >> 0;
 							const index = thxIndexArr[random];
@@ -580,6 +573,25 @@ Page({
 								$lucky.stop(index);
 								self.data.start = false;
 							}, 3000);
+							
+							
+							if(res.data.code == -1) {
+								wx.showToast({
+									title: res.data.msg,
+									icon: 'none',
+								});
+								self.data.luckInfo.msgInfo = res.data.msg;
+								return;
+								// self.data.start = true;
+							};
+							// console.log('请求出错');
+							if(self.data.luckInfo.vip_act_num != 0) {
+								self.setData({
+									'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1,
+								});
+							};
+							
+							
 						};
 					},