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

mer_uniapp/components/discoverDetails/index.vue

@@ -571,23 +571,25 @@
 				this.$refs.codeRef.open('bottom')
 			},
 			onScan() {
+				let that = this;
 				// 只允许通过相机扫码
 				uni.scanCode({
-					onlyFromCamera: true,
+					onlyFromCamera: false,
 					scanType: 'qrCode',
 					success: function(res) {
 						console.log('条码类型：' + res.scanType);
 						console.log('条码内容：' + res.result);
-						let that = this;
 						setTimeout(function() {
 							uni.navigateTo({
-								url: res.result
+								url: `/pages/game_dazi/code_content/index?link=${res.result}`
 							});
 						}, 1000);
 						myGameJoinIdApi(that.noteDetails.id).then(res => {
 							that.$util.Tips({
 								title: '加入成功'
 							});
+							that.$refs.joinDialog.close();
+							that.$refs.codeRef.close();
 						}).catch(err => {
 							uni.showToast({
 								title: err,

mer_uniapp/pages.json

@@ -572,6 +572,13 @@
 					"navigationStyle": "custom",
 					"enablePullDownRefresh": false
 				}
+			}, {
+				"path": "code_content/index",
+				"style": {
+					"navigationBarTitleText": "详情",
+					"navigationStyle": "custom",
+					"enablePullDownRefresh": false
+				}
 			}]
 		},
 		{

mer_uniapp/pages/discover/discover_user/index.vue

@@ -239,7 +239,7 @@
 				this.isShowSignature = false;
 			},
 			//编辑个性签名
-			onEdit() {
+			onEdit(str) {
 				if (this.userInfo.id == this.uid) {
 					this.fieldStr = str;
 					this.isShowSignature = true;

mer_uniapp/pages/game_dazi/code_content/index.vue

@@ -0,0 +1,28 @@
+<template>
+	<web-view :src="src"></web-view>
+</template>
+
+<script>
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	export default {
+		data() {
+			return {
+				src: '',
+			};
+		},
+		onLoad(option) {
+			this.src = option.link || '';
+		},
+	}
+</script>
+
+<style lang="scss">
+</style>

mer_uniapp/pages/game_dazi/index.vue

@@ -107,7 +107,7 @@
 		<!-- 学校 -->
 		<uni-popup ref="schoolRef" :is-mask-click="false">
 			<view class="w-full flex-center" :style="{height: windowHeight + 'px'}">
-				<navigator hover-class='none' url='/pages/discover/discover_user/index'>
+				<navigator hover-class='none' url='/pages/discover/discover_user/index?dazi=dazi'>
 					<image src="http://39.105.58.247:20800/crmebimage/public/store/2025/05/20/ac4f4703de5d4a8c9490e7e27c9f25b8pzzy4l1ywq.png" mode="heightFix" style="height: 694rpx;width: 616rpx;"></image>
 				</navigator>
 			</view>