Merge remote-tracking branch 'origin/master'

pages/activityList/activity/authorBoost.vue

@@ -209,9 +209,9 @@
 			this.receiverId = options.receiverId;
 			console.log(this.senderId);
 			if (!this.$u.test.isEmpty(this.senderId)) {
-				this.val = "https://music.nanyue6688.comm/vote-h5/index.html#/pages/activityList/activity/authorBoost?activityId=" + this.activityId + '&receiverId=' + this.receiverId + "&agenterId=" + this.senderId;
+				this.val = "https://music.nanyue6688.com/vote-h5/index.html#/pages/activityList/activity/authorBoost?activityId=" + this.activityId + '&receiverId=' + this.receiverId + "&agenterId=" + this.senderId;
 			} else {
-				this.val = "https://music.nanyue6688.comm/vote-h5/index.html#/pages/activityList/activity/authorBoost?activityId=" + this.activityId + '&receiverId=' + this.receiverId;
+				this.val = "https://music.nanyue6688.com/vote-h5/index.html#/pages/activityList/activity/authorBoost?activityId=" + this.activityId + '&receiverId=' + this.receiverId;
 			}
 			console.log("*********************=>",this.val);
 			this.getBoostDetail(options.activityId, options.receiverId);

pages/index/guide.vue

@@ -86,7 +86,6 @@
 						url = url + "?userId=" +  this.userId;
 						console.log(url);
 						window.location.href = url;
-						// window.location.href = 'https://music.nanyue6688.comm/vote-h5/index.html#/pages/index/guide?userId=' + this.userId + '&openId=' + res.openid;
 					}
 				}
 			},