调整免费活动云机超过上线

static/microserviceUserH5/vcloud/awardActivity.html

@@ -232,6 +232,7 @@
 			userCardId = 0,
 			awardTimer = null,
 			tab = 1,
+			buyVipType = 'SVIP',
 			flagNum = 1;
 			isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
 			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
@@ -648,7 +649,17 @@
 						if(res.status === 0){
 							cardList = res.data.cardList
 							unAllotTime = res.data.unAllotTime
-							userCardId = cardList[0] && cardList[0].userCardId
+							if(cardList && cardList.length > 0) {
+								cardList.map(item => {
+									if(item.buyVipType === 'SVIP') {
+										userCardId = item.userCardId
+									}
+								})
+								if(userCardId === 0) {
+									buyVipType = cardList[0] && cardList[0].buyVipType || 'SVIP'
+									userCardId = cardList[0] && cardList[0].userCardId || 0
+								}
+							}
 							pageCardList()
 							$('.all-times').eq(0).text(unAllotTime)
 							$('.red').eq(0).text(res.data.totalTime)
@@ -820,6 +831,8 @@
 				}
 			});
 			function getTimeHandle(type) {
+				console.log(userCardId)
+				console.log(buyVipType)
 				if(activityState == 0){
 					stopManyClick(() =>{
 						toastr.error('活动未开始！');
@@ -846,7 +859,7 @@
 							})
 						} else {
 							wx.miniProgram.navigateTo({
-								url: '/packageA/order/renew/index?record=' + userCardId
+								url: `/packageA/order/renew/index?record=${userCardId}&buyVipType=${buyVipType}`
 							})
 						}
 					} else if (isAndroid && window.native) { // 安卓