Merge branch 'master' of http://39.105.58.247:3100/yidiandao/ydd_front

mer_uniapp/components/discoverDetails/index.vue

@@ -581,7 +581,7 @@
 						console.log('条码内容：' + res.result);
 						setTimeout(function() {
 							uni.navigateTo({
-								url: `/pages/game_dazi/code_content/index?link=${res.result}`
+								url: `/pages/game_dazi/code_content/index?link=${encodeURIComponent(res.result)}`
 							});
 						}, 1000);
 						myGameJoinIdApi(that.noteDetails.id).then(res => {

mer_uniapp/pages/game_dazi/code_content/index.vue

@@ -19,7 +19,7 @@
 			};
 		},
 		onLoad(option) {
-			this.src = option.link || '';
+			this.src = decodeURIComponent(option.link || '');
 		},
 	}
 </script>