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

@@ -191,7 +191,8 @@
 		{
 			"path": "pages/XingmaLabPublishPage/XingmaLabPublishPage",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
 			}
 		}
 	],

pages/XingmaLabPublishPage/XingmaLabPublishPage.less

@@ -17,19 +17,37 @@
     background-position: center;
   }
 
+  // 返回按钮
+  .xingmalabpublishpagebackbtn {
+    width: 20rpx;
+    height: 33rpx;
+    left: 31rpx;
+    top: 88rpx;
+    position: absolute;
+    background-size: contain;
+    background-repeat: no-repeat;
+    background-position: center;
+    z-index: 1000;
+    transition: opacity 0.3s ease;
+
+    &:hover {
+      opacity: 0.8;
+    }
+  }
+
   // 未选择状态
   .xingmalabpublishpagenosel {
     width: 750rpx;
     height: 1416rpx;
     left: 0rpx;
-    top: 208rpx;
+    top: 308rpx;
     position: absolute;
 
     .xingmalabpublishpagenoseltextplaceholder {
       width: 684rpx;
       height: 160rpx;
       left: 33rpx;
-      top: 949rpx;
+      top: 1129rpx;
       position: absolute;
       font-size: 32rpx;
       line-height: 1.5;
@@ -48,7 +66,7 @@
       width: 750rpx;
       height: 218rpx;
       left: 0rpx;
-      top: 1198rpx;
+      top: 1378rpx;
       position: absolute;
 
       .xingmalabpublishpagenoselbottomconbg {
@@ -84,7 +102,7 @@
       width: 686rpx;
       height: 912rpx;
       left: 32rpx;
-      top: 0rpx;
+      top: 180rpx;
       position: absolute;
       background-size: cover;
       background-repeat: no-repeat;
@@ -106,7 +124,7 @@
       width: 684rpx;
       height: 160rpx;
       left: 33rpx;
-      top: 949rpx;
+      top: 1129rpx;
       color: rgba(0, 0, 0, 1);
     }
 
@@ -115,7 +133,7 @@
       width: 750rpx;
       height: 218rpx;
       left: 0rpx;
-      top: 1198rpx;
+      top: 1378rpx;
       position: absolute;
 
       .xingmalabpublishpageselbottomconpublishbtnbg {
@@ -163,7 +181,7 @@
       width: 686rpx;
       height: 912rpx;
       left: 32rpx;
-      top: 0rpx;
+      top: 180rpx;
       position: absolute;
       object-fit: contain;
       border-radius: 16rpx;
@@ -174,7 +192,7 @@
       width: 686rpx;
       height: 189rpx;
       left: 32rpx;
-      top: 723rpx;
+      top: 903rpx;
       position: absolute;
       opacity: 0.3;
       background-size: cover;
@@ -186,7 +204,7 @@
       width: 270rpx;
       height: 76rpx;
       left: 240rpx;
-      top: 804rpx;
+      top: 984rpx;
       position: absolute;
       background-size: cover;
       background-repeat: no-repeat;
@@ -205,14 +223,14 @@
     width: 750rpx;
     height: 1416rpx;
     left: 0rpx;
-    top: 208rpx;
+    top: 308rpx;
     position: absolute;
 
     .xingmalabpublishpagesucbottomconicon {
-      width: 125rpx;
-      height: 148rpx;
-      left: 312rpx;
-      top: 0rpx;
+      width: 133rpx;
+      height: 152rpx;
+      left: 314rpx;
+      top: 182rpx;
       position: absolute;
       background-size: cover;
       background-repeat: no-repeat;
@@ -223,7 +241,7 @@
       width: 750rpx;
       height: 218rpx;
       left: 0rpx;
-      top: 1195rpx;
+      top: 1375rpx;
       position: absolute;
 
       .xingmalabpublishpagesucbottomconbg {
@@ -259,7 +277,7 @@
       width: 538rpx;
       height: 117rpx;
       left: 111rpx;
-      top: 191rpx;
+      top: 371rpx;
       position: absolute;
       font-size: 30rpx;
       color: rgba(29, 30, 37, 1);
@@ -271,7 +289,7 @@
       width: 576rpx;
       height: 812rpx;
       left: 87rpx;
-      top: 341rpx;
+      top: 521rpx;
       position: absolute;
       background-size: cover;
       background-repeat: no-repeat;
@@ -282,7 +300,7 @@
       width: 534rpx;
       height: 708rpx;
       left: 108rpx;
-      top: 356rpx;
+      top: 536rpx;
       position: absolute;
       object-fit: contain;
       border-radius: 16rpx;
@@ -293,7 +311,7 @@
       width: 222rpx;
       height: 25rpx;
       left: 271rpx;
-      top: 1081rpx;
+      top: 1261rpx;
       position: absolute;
       font-size: 32rpx;
       line-height: 25rpx;
@@ -654,8 +672,8 @@
   }
 }
 
-		// 调试信息样式
-		.debug-info {
+// 调试信息样式
+.debug-info {
   position: absolute;
   top: 20rpx;
   right: 20rpx;
@@ -672,4 +690,4 @@
     margin-bottom: 10rpx;
     line-height: 1.4;
   }
-		}
+}

pages/XingmaLabPublishPage/XingmaLabPublishPage.vue

 <template>
 	<view class="xingmalabpublishpage ">
-		<span class="xingmalabpublishpagebg"
-			:style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.background)})` }"></span>
+		<!-- <span class="xingmalabpublishpagebg"
+			:style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.background)})` }"></span> -->
 
 		<!-- 主内容区域 -->
 		<div class="xingmalabpublishpagenosel" v-if="currentState !== config.states.SUC">
@@ -103,8 +103,7 @@
 
 				<view class="user-info-actions">
 					<button class="action-btn reject-btn" @click="handleRejectAuth">拒绝</button>
-					<button class="action-btn allow-btn" @click="handleAllowAuth"
-						:disabled="!tempUserInfo.avatarUrl || !tempUserInfo.nickName">允许</button>
+					<button class="action-btn allow-btn" @click="handleAllowAuth">允许</button>
 				</view>
 			</view>
 		</uni-popup>
@@ -204,6 +203,7 @@ const publishCountInfo = computed(() => {
 	}
 })
 
+
 // 图片上传处理
 const handleImageUpload = () => {
 	if (isUploading.value) return
@@ -365,14 +365,24 @@ const handleRejectAuth = () => {
 
 // 允许授权
 const handleAllowAuth = () => {
-	if (!tempUserInfo.value.avatarUrl || !tempUserInfo.value.nickName) {
+	console.log('允许授权', tempUserInfo.value)
+
+	if (!tempUserInfo.value.avatarUrl) {
 		uni.showToast({
-			title: '请选择头像和输入昵称',
+			title: '请输入头像',
+			icon: 'none'
+		})
+		return
+	}
+	if (!tempUserInfo.value.nickName) {
+		uni.showToast({
+			title: '请输入昵称',
 			icon: 'none'
 		})
 		return
 	}
 
+
 	// 关闭授权弹窗
 	userInfoPopup.value.close()
 
@@ -570,6 +580,15 @@ onMounted(async () => {
 
 	// 生成随机成功文案
 	successMessage.value = getRandomSuccessMessage()
+
+
+	// 重置临时用户信息
+	tempUserInfo.value = {
+		avatarUrl: '',
+		nickName: ''
+	}
+	// 显示用户信息授权弹窗
+	userInfoPopup.value.open()
 })
 </script>
 

pages/XingmaLabPublishPage/config.js

@@ -8,6 +8,9 @@ export const xingmaLabConfig = {
     // 背景图片
     background: `XingmaLabPublishPage/${version}/XingmaLabPublishPageBg.png`,
 
+    // 返回按钮
+    backBtn: `XingmaLabDetailPage/${version}/XingmaLabDetailPageBackBtn.png`,
+
     xingmaLogo: `XingmaLabPublishPage/${version}/XingmaLogo.png`,
 
     xingmaDefaultAvatar: `XingmaLabPublishPage/${version}/XingmaLabDefaultAvatar.png`,
@@ -30,7 +33,7 @@ export const xingmaLabConfig = {
 
     // 成功状态图片
     suc: {
-      bottomConIcon: `XingmaLabPublishPage/${version}/XingmaLabPublishPageSucBottomConIcon.png`,
+      bottomConIcon: `XingmaLabPublishPage/${version}/suc_icon3.png`,
       bottomConBg: `XingmaLabPublishPage/${version}/XingmaLabPublishPageSucBottomConBg.png`,
       bottomConBtn: `XingmaLabPublishPage/${version}/XingmaLabPublishPageSucBottomConBtn.png`,
       picBg: `XingmaLabPublishPage/${version}/XingmaLabPublishPageSucPicBg.png`,