1
0

2 Коммиты 9a52b1eaed ... 8dd1f3e724

Автор SHA1 Сообщение Дата
  lyqu 8dd1f3e724 Merge branch 'master' of http://192.168.1.218:3000/liyingqu/cyzh-SoundOfMusic-H5 4 лет назад
  lyqu 0bce6ee780 修改 4 лет назад

+ 7 - 7
App.vue

@@ -8,18 +8,19 @@
 			// } else {
 			// 	this.externalBrowser(e);
 			// }
-			if (this.$isWxBrowser() && this.$u.test.isEmpty(e.query)) {
+			if (this.$isWxBrowser() && this.$u.test.isEmpty(e.query.isWxBrowse)) {
 				// uni.reLaunch({
 				// 	url: "/pages/index/guide"
 				// })
-				let path = 'pages/index/guide?login=1';
+				let path = 'pages/index/guide?isWxBrowse=1';
 				window.location.href = authUrl(path);
-			} else if (this.$isWxBrowser() && !this.$u.test.isEmpty(e.query.login)) {
+			} else if (this.$isWxBrowser() && !this.$u.test.isEmpty(e.query.isWxBrowse) && this.$u.test.isEmpty(e.query.userId)) {
 				uni.reLaunch({
-					url: 'pages/index/guide'
+					url: 'pages/index/guide?isWxBrowse=1'
 				})
 			} else if (this.$isWxBrowser() && !this.$u.test.isEmpty(e.query.userId)) {
-				if (e.query.userId != uni.getStorageSync("userId")) {
+				let userId = uni.getStorageSync("userId");
+				if (e.query.userId != userId) {
 					let url = window.location.href;
 					let len = url.indexOf("userId=") - 1
 					let tmp = url.substring(0, len)
@@ -27,10 +28,9 @@
 					window.location.href = tmp
 				} else {
 					uni.reLaunch({
-						url: 'pages/index/guide?userId=' + e.query.userId
+						url: 'pages/index/guide?isWxBrowse=1&userId=' + e.query.userId
 					})
 				}
-				
 			} else {
 				if (!this.$u.test.isEmpty(e.query.userId)) {
 					uni.reLaunch({

+ 1 - 1
pages/activityList/activity/authorBoost.vue

@@ -117,7 +117,7 @@
 				<view style="height: 120upx;"></view>
 				<u-avatar :src="boostDetail.avatar" size="160"></u-avatar>
 				<view class="margin-top" style="font-size: 30upx;font-family: PingFang SC;font-weight: bold;color: #323035;">恭喜您已为{{boostDetail.nickName}}注入{{+boostDetail.presentList[current].hotValue * count}}热力值</view>
-				<view class="margin-tb-xs">{{+boostDetail.presentList[current].pointsValue * count}}已到账,用于积分商城兑换</view>
+				<view class="margin-tb-xs">{{+boostDetail.presentList[current].pointsValue * count}}积分已到账,用于积分商城兑换</view>
 				<view class="text-gray text-sm">购买成功!快去我的订单兑换或捐赠</view>
 				<view class="padding">
 					<u-button class="custom-style" shape="circle" @click="successShow = false">确定</u-button>

+ 1 - 1
pages/activityList/activity/musicBoost.vue

@@ -119,7 +119,7 @@
 				<view style="height: 120upx;"></view>
 				<u-avatar :src="boostDetail.avatar" size="160"></u-avatar>
 				<view class="margin-top" style="font-size: 30upx;font-family: PingFang SC;font-weight: bold;color: #323035;">恭喜您已为{{boostDetail.title}}注入{{+boostDetail.presentList[current].hotValue * count}}热力值</view>
-				<view class="margin-tb-xs">{{+boostDetail.presentList[current].pointsValue * count}}已到账,可用于商城兑换消费</view>
+				<view class="margin-tb-xs">{{+boostDetail.presentList[current].pointsValue * count}}积分已到账,可用于商城兑换消费</view>
 				<view class="text-gray text-sm">购买成功!快去我的订单兑换或捐赠</view>
 				<view class="padding">
 					<u-button class="custom-style" shape="circle" @click="successShow = false">确定</u-button>

+ 2 - 1
pages/index/guide.vue

@@ -83,9 +83,10 @@
 						this.userId = result.id;
 						uni.setStorageSync("userId", result.id);
 						let url = window.location.href;
-						url = url + "?userId=" +  this.userId;
+						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;
 					}
 				}
 			},