Merge remote-tracking branch 'origin/dev-4.9.3' into uat

microserviceUserH5/vcloud/actFission.html

@@ -7,7 +7,7 @@
 	<meta name="description" content="活动">
 	<title>免费领机</title>
 	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
-	<link rel="stylesheet" href="../static/css/index.css?v=1.0.0.6">
+	<link rel="stylesheet" href="../static/css/index.css?v=1.0.0.5">
 	<link rel="stylesheet" href="../static/css/vant.css" />
 	<script src="../static/js/vender/vue/vue.min.js"></script>
 	<script src="../static/js/vender/vue/vant.min.js"></script>
@@ -295,7 +295,7 @@
 								</div>
 							</div>
 							<div class="right-nav">
-								<p>星动天卡</p>
+								<p>星耀天卡</p>
 								<p class="btn" @click='goGetReward(item.id)' v-if='item.receiveStatus==0'>领取</p>
 								<p class="btn isdisabled" v-if='item.receiveStatus==1'>已领取</p>
 
@@ -317,10 +317,10 @@
 					<div class="img-box">活动规则</div>
 				</div>
 				<div class="rule">
-					<p>1.分享双子星攻略文章至微信好友/微信朋友圈/QQ，好友注册成功后，分享者即可获得1小时星动套餐时长。</p>
+					<p>1.分享双子星攻略文章至微信好友/微信朋友圈/QQ，好友注册成功后，分享者即可获得1小时星耀套餐时长。</p>
 					<p>2.用户通过该分享链接获取的激活码，只针对新注册用户有效领取并兑换一次。</p>
 					<p>3.分享者每日最多分享给10位好友领取激活码并获得注册奖励，且奖励为当日有效，奖励过期不补发。</p>
-					<p>4.分享者若没有云机，需要先创建星动云机才可继续领取奖励。</p>
+					<p>4.分享者若没有云机，需要先创建星耀云机才可继续领取奖励。</p>
 					<p>5.新用户领取的激活码需在有效期内使用，若超过有效期则激活码失效。</p>
 				</div>
 			</div>
@@ -342,7 +342,7 @@
 			data: {
 				isshow: false,
 				token: GetRequest().token ? GetRequest().token :
-					'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyYW5kb20iOiIxNzU4NCIsImNsaWVudCI6IjUiLCJleHAiOjE2NDA5MzEwOTcsInVzZXJuYW1lX2FwcGxldCI6IlJtSWhvMTYzOTEyODEwOCJ9.vA1yHns6KLFyK_ZmQgC6-4O7vGbs08DBVAaveO6yBFo',
+					'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyYW5kb20iOiI3ODM0NyIsImNsaWVudCI6IjUiLCJleHAiOjE2NDA4NDkxMjUsInVzZXJuYW1lX2FwcGxldCI6Iko4VENqMTYzODk0MTc2MyJ9.J4vY-mSQnxh0K9DxNVKbelL1IXMx0GGVTClRKqfbyLo',
 				rewardList: [],
 				queryParams: {
 					pageNum: 1,
@@ -352,7 +352,7 @@
 				finished: false,
 				flag: true,
 				loading: false,
-				finishedText: '没有更多了',
+				finishedText: '',
 				offset: 100,
 				total: 0,
 				shareInfo: {},
@@ -372,7 +372,7 @@
 			},
 			methods: {
 				goReward() {
-					
+
 					this.$toast.loading({
 						duration: 0,
 						message: '加载中...',
@@ -388,7 +388,7 @@
 								return
 							}
 							// this.stopManyClick(() => {
-								this.getShare();
+							this.getShare();
 							// })
 
 						} else {
@@ -396,7 +396,7 @@
 						}
 					})
 
-            
+
 
 
 				},
@@ -458,6 +458,9 @@
 							this.total = res.data.total;
 							if (infolist) {
 								this.rewardList = this.rewardList.concat(infolist);
+								if (this.rewardList.length >= this.queryParams.pageSize) {
+									this.finishedText = '没有更多了'
+								}
 								if (this.rewardList.length >= this.total) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
 									this.finished = true;
 								}

microserviceUserH5/vcloud/doubleChristmasActivity.html

@@ -169,7 +169,7 @@
 		url = url.split('/');
 		var topVal = -0.5;
 		let obj = {};
-		// var baseUrl = 'http://per.cs.se.androidscloud.com'
+		// var baseUrl = 'http://test.androidscloud.com'
 		var loc = window.location.search,
 			n1 = loc.length,//地址的总长度
 			n2 = loc.indexOf("="),//取得=号的位置