Merge branch 'xingmaLab20250820' of http://gitlab2.dui88.com/fh/20250528_FHQ1...

Merge branch 'xingmaLab20250820' of http://gitlab2.dui88.com/fh/20250528_FHQ1 into xingmaLab20250820

pages.json

@@ -169,31 +169,28 @@
 			}
 		},
 		{
-			"path" : "pages/testPage/testPage",
-			"style" : 
-			{
-				"navigationBarTitleText" : ""
+			"path": "pages/testPage/testPage",
+			"style": {
+				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path" : "pages/thirdJumpMiddlePage/thirdJumpMiddlePage",
-			"style" : 
-			{
-				"navigationBarTitleText" : ""
+			"path": "pages/thirdJumpMiddlePage/thirdJumpMiddlePage",
+			"style": {
+				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path" : "pages/XingmaLabDetailPage/XingmaLabDetailPage",
-			"style" : 
-			{
-				"navigationBarTitleText" : ""
+			"path": "pages/XingmaLabDetailPage/XingmaLabDetailPage",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/XingmaLabPublishPage/XingmaLabPublishPage",
-			"style" : 
-			{
-				"navigationBarTitleText" : ""
+			"path": "pages/XingmaLabPublishPage/XingmaLabPublishPage",
+			"style": {
+				"navigationBarTitleText": ""
 			}
 		}
 	],

pages/XingmaLabDetailPage/XingmaLabDetailPage.less

@@ -5,7 +5,7 @@
   left: 0rpx;
   top: 0rpx;
   position: absolute;
-  
+
   .xingmalabdetailpagebg {
     width: 750rpx;
     height: 1624rpx;
@@ -16,7 +16,7 @@
     background-repeat: no-repeat;
     background-position: center;
   }
-  
+
   .xingmalabdetailpagetext {
     width: 295rpx;
     height: 31rpx;
@@ -28,7 +28,7 @@
     color: rgba(29, 30, 37, 1);
     text-align: center;
   }
-  
+
   .xingmalabdetailpagepicbg {
     width: 730rpx;
     height: 1030rpx;
@@ -39,7 +39,7 @@
     background-repeat: no-repeat;
     background-position: center;
   }
-  
+
   .xingmalabdetailpagepic {
     width: 688rpx;
     height: 914rpx;
@@ -50,7 +50,7 @@
     background-repeat: no-repeat;
     background-position: center;
   }
-  
+
   .xingmalabdetailpagenum {
     width: 348rpx;
     height: 26rpx;
@@ -62,14 +62,14 @@
     color: rgba(178, 124, 30, 1);
     text-align: center;
   }
-  
+
   .xingmalabdetailpagebottomcon {
     width: 750rpx;
     height: 218rpx;
     left: 0rpx;
     top: 1406rpx;
     position: absolute;
-    
+
     .xingmalabdetailpagebottomconbg {
       width: 750rpx;
       height: 218rpx;
@@ -80,7 +80,7 @@
       background-repeat: no-repeat;
       background-position: center;
     }
-    
+
     .xingmalabdetailpagebottomconlikebtn {
       width: 119rpx;
       height: 44rpx;
@@ -90,14 +90,14 @@
       background-size: cover;
       background-repeat: no-repeat;
       background-position: center;
-      
+
       transition: opacity 0.3s ease;
-      
+
       &:hover {
         opacity: 0.8;
       }
     }
-    
+
     .xingmalabdetailpagebottomconsharebtn {
       width: 121rpx;
       height: 42rpx;
@@ -107,15 +107,15 @@
       background-size: cover;
       background-repeat: no-repeat;
       background-position: center;
-      
+
       transition: opacity 0.3s ease;
-      
+
       &:hover {
         opacity: 0.8;
       }
     }
   }
-  
+
   .xingmalabdetailpagetime {
     width: 203rpx;
     height: 23rpx;
@@ -128,67 +128,6 @@
   }
 }
 
-// 响应式适配
-@media screen and (max-width: 750px) {
-  .xingmalabdetailpage {
-    width: 100vw;
-    height: 100vh;
-    
-    .xingmalabdetailpagebg,
-    .xingmalabdetailpagepicbg,
-    .xingmalabdetailpagepic,
-    .xingmalabdetailpagebottomcon {
-      width: 100%;
-      height: auto;
-      left: 0;
-      top: 0;
-    }
-    
-    .xingmalabdetailpagetext,
-    .xingmalabdetailpagenum,
-    .xingmalabdetailpagetime {
-      position: relative;
-      left: auto;
-      top: auto;
-      margin: 20rpx auto;
-      text-align: center;
-    }
-  }
-}
-
-// 动画效果
-.xingmalabdetailpage {
-  animation: fadeIn 0.5s ease-in-out;
-  
-  .xingmalabdetailpagepic {
-    animation: slideInUp 0.8s ease-out 0.2s both;
-  }
-  
-  .xingmalabdetailpagebottomcon {
-    animation: slideInUp 0.8s ease-out 0.4s both;
-  }
-}
-
-@keyframes fadeIn {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
-}
-
-@keyframes slideInUp {
-  from {
-    opacity: 0;
-    transform: translateY(50rpx);
-  }
-  to {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
-
 // 点赞状态样式
 .xingmalabdetailpage {
   .xingmalabdetailpagebottomconlikebtn {

pages/XingmaLabDetailPage/XingmaLabDetailPage.vue

@@ -49,9 +49,7 @@ const currentTime = computed(() => {
 
 // 方法
 const handleLikeClick = () => {
-	console.log('点击点赞按钮')
 	isLiked.value = !isLiked.value
-	// 这里可以添加点赞逻辑
 	uni.showToast({
 		title: isLiked.value ? '已点赞' : '取消点赞',
 		icon: 'success'
@@ -59,8 +57,6 @@ const handleLikeClick = () => {
 }
 
 const handleShareClick = () => {
-	console.log('点击分享按钮')
-	// 这里可以添加分享逻辑
 	uni.showShareMenu({
 		withShareTicket: true,
 		menus: ['shareAppMessage', 'shareTimeline']
@@ -69,7 +65,7 @@ const handleShareClick = () => {
 
 // 生命周期
 onMounted(() => {
-	console.log('星妈实验室详情页面已加载')
+	// 页面加载完成
 })
 </script>
 

pages/XingmaLabPublishPage/XingmaLabPublishPage.vue

@@ -172,12 +172,12 @@ const hasUserInfo = computed(() => {
 		avatarType: typeof xingmaInfo?.avatar,
 		nicknameType: typeof xingmaInfo?.nickname
 	})
-	
+
 	if (xingmaInfo && xingmaInfo.avatar && xingmaInfo.nickname) {
 		console.log('✅ Store 中有头像昵称信息')
 		return true
 	}
-	
+
 	return false
 })
 
@@ -411,9 +411,9 @@ const handleConfirmPublish = async () => {
 			imgUrl: uploadedImage.value,
 			content: description.value
 		})
-		
+
 		// 执行发布
-		await performPublish()
+		const publishResult = await performPublish()
 
 		// 如果是首次授权发布成功，记录日志
 		if (isFirstTimePublish.value) {
@@ -429,7 +429,8 @@ const handleConfirmPublish = async () => {
 		// 切换到成功状态
 		currentState.value = config.states.SUC
 		successMessage.value = getRandomSuccessMessage()
-		publishNumber.value = generatePublishNumber()
+		// 使用发布接口返回的 bizNo 作为发布编号
+		publishNumber.value = publishResult.data?.bizNo
 
 	} catch (error) {
 		console.error('发布失败:', error)
@@ -474,36 +475,36 @@ const performPublish = async () => {
 			imgUrl: uploadedImage.value, // 初始时是临时文件路径，将在下面上传
 			content: description.value
 		}
-		
+
 		// 上传内容图片
 		if (uploadedImage.value) {
 			try {
 				const uploadedUrl = await uploadImageFunc(uploadedImage.value)
-				params.imgUrl = uploadedUrl
+				params.imageUrl = uploadedUrl
 				console.log('✅ 内容图片上传成功，更新 imgUrl:', uploadedUrl)
 			} catch (uploadError) {
 				console.error('❌ 内容图片上传失败:', uploadError)
 				throw new Error('内容图片上传失败，请重试')
 			}
 		}
-		
+
 		// 如果是首次授权，需要传递nickname和avatar
 		if (isFirstTimePublish.value) {
 			// 直接从临时用户信息中读取，不存储到本地
 			console.log('🔍 检查临时用户信息:', tempUserInfo.value);
 			if (tempUserInfo.value && tempUserInfo.value.avatarUrl && tempUserInfo.value.nickName) {
 				params.nickname = tempUserInfo.value.nickName
-				
+
 				// 上传头像到服务器，使用返回的URL
 				try {
 					console.log('🖼️ 开始上传头像:', tempUserInfo.value.avatarUrl)
-					
+
 					// 将临时文件路径转换为base64
 					const fs = uni.getFileSystemManager()
 					const avatarBase64 = "data:image/jpeg;base64," + fs.readFileSync(tempUserInfo.value.avatarUrl, "base64")
-					
+
 					const avatarUploadRes = await uploadImage(avatarBase64)
-					
+
 					if (avatarUploadRes.success) {
 						params.avatar = avatarUploadRes.data?.url
 						console.log('✅ 头像上传成功，avatar URL:', params.avatar)
@@ -518,21 +519,21 @@ const performPublish = async () => {
 				console.warn('⚠️ 临时用户信息不完整，无法上传头像:', tempUserInfo.value);
 			}
 		}
-		
+
 		console.log('🚀 发布参数:', params)
-		
+
 		// 使用 fetchRecordPublish 调用发布接口
 		const result = await fetchRecordPublish(params)
-		
+
 		console.log('📤 发布接口返回:', result)
-		
+
 		if (result.success) {
 			console.log('✅ 发布成功')
 			return result
 		} else {
 			throw new Error(result.message || '发布失败')
 		}
-		
+
 	} catch (error) {
 		console.error('❌ 发布失败:', error)
 		throw error