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/XingmaLabDetailPage/XingmaLabDetailPage.less

@@ -44,6 +44,8 @@
         width: 66rpx;
         height: 66rpx;
         border-radius: 50%;
+        object-fit: contain;
+        background-color: #f8f9fa;
       }
 
       // 昵称
@@ -104,9 +106,10 @@
     top: 207rpx;
     border-radius: 24rpx;
     position: absolute;
-    background-size: cover;
+    background-size: contain;
     background-repeat: no-repeat;
     background-position: center;
+    background-color: #f8f9fa;
   }
 
   .xingmalabdetailpagenum {

pages/XingmaLabDetailPage/XingmaLabDetailPage.vue

@@ -13,7 +13,7 @@
 			<!-- 用户信息 -->
 			<div class="xingmalabdetailpageuserinfo">
 				<image v-if="detailData.avatar" :src="detailData.avatar" class="xingmalabdetailpageavatar"
-					mode="aspectFill" />
+					mode="aspectFit" />
 				<span class="xingmalabdetailpagenickname">{{ detailData.nickname || '星妈用户' }}</span>
 			</div>
 		</div>
@@ -26,7 +26,7 @@
 		</span>
 		<span class="xingmalabdetailpagepicbg"
 			:style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.picBg)})` }"></span>
-		<image v-if="detailData.imgUrl" :src="detailData.imgUrl" class="xingmalabdetailpagepic" mode="aspectFill" />
+		<image v-if="detailData.imgUrl" :src="detailData.imgUrl" class="xingmalabdetailpagepic" mode="aspectFit" />
 		<span class="xingmalabdetailpagenum">{{ config.texts.collectionNumber }}{{ detailData.bizNo || collectionNumber
 		}}</span>
 		<div class="xingmalabdetailpagebottomcon" v-if="detailData.state === 1">

pages/XingmaLabPublishPage/XingmaLabPublishPage.less

@@ -144,6 +144,17 @@
         &:hover {
           opacity: 0.8;
         }
+
+        // 禁用状态样式
+        &.disabled-publish-btn {
+          opacity: 0.5;
+          cursor: not-allowed;
+          pointer-events: none;
+          
+          &:hover {
+            opacity: 0.5;
+          }
+        }
       }
     }
 
@@ -154,8 +165,9 @@
       left: 32rpx;
       top: 0rpx;
       position: absolute;
-      object-fit: cover;
+      object-fit: contain;
       border-radius: 16rpx;
+      background-color: #f8f9fa;
     }
 
     .xingmalabpublishpageselcpver {
@@ -272,8 +284,9 @@
       left: 108rpx;
       top: 356rpx;
       position: absolute;
-      object-fit: cover;
+      object-fit: contain;
       border-radius: 16rpx;
+      background-color: #f8f9fa;
     }
 
     .xingmalabpublishpagesucnum {
@@ -525,6 +538,8 @@
             height: 100%;
             border-radius: 12rpx;
             border: none;
+            object-fit: contain;
+            background-color: #f8f9fa;
           }
 
           .avatar-placeholder {

pages/XingmaLabPublishPage/XingmaLabPublishPage.vue

@@ -13,11 +13,9 @@
 			<!-- 底部按钮区域 -->
 			<div class="xingmalabpublishpagenoselbottomcon" v-if="!hasContent">
 				<span class="xingmalabpublishpagenoselbottomconbg"
-					:style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.noSel.bottomConBg)})` }"
-					@click="handleImageUpload"></span>
+					:style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.noSel.bottomConBg)})` }"></span>
 				<span class="xingmalabpublishpagenoselbottomconbtn"
-					:style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.noSel.bottomConBtn)})` }"
-					@click="handleImageUpload"></span>
+					:style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.noSel.bottomConBtn)})` }"></span>
 			</div>
 
 			<div class="xingmalabpublishpageselbottomcon" v-if="hasContent">
@@ -34,7 +32,7 @@
 				@click="handleImageUpload"></span>
 
 			<!-- 已上传图片显示 -->
-			<image v-if="uploadedImage" :src="uploadedImage" class="xingmalabpublishpageselpic" mode="aspectFill" />
+			<image v-if="uploadedImage" :src="uploadedImage" class="xingmalabpublishpageselpic" mode="aspectFit" />
 			<span class="xingmalabpublishpageselcpver" v-if="uploadedImage"
 				:style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.sel.cpver)})` }"></span>
 			<span class="xingmalabpublishpageselretry" v-if="uploadedImage"
@@ -58,7 +56,7 @@
 			</span>
 			<span class="xingmalabpublishpagesucpicbg"
 				:style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.suc.picBg)})` }"></span>
-			<image v-if="uploadedImage" :src="uploadedImage" class="xingmalabpublishpagesucpic" mode="aspectFill" />
+			<image v-if="uploadedImage" :src="uploadedImage" class="xingmalabpublishpagesucpic" mode="aspectFit" />
 			<span class="xingmalabpublishpagesucnum">{{ config.texts.suc.numberPrefix }}{{ publishNumber }}</span>
 		</div>
 
@@ -87,7 +85,7 @@
 						<view class="avatar-section">
 							<button class="avatar-btn" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
 								<image v-if="tempUserInfo.avatarUrl" :src="tempUserInfo.avatarUrl" class="avatar-image"
-									mode="aspectFill" />
+									mode="aspectFit" />
 								<view v-else class="avatar-placeholder">
 									<image :src="$baseUrl + getImageUrl(config.images.xingmaDefaultAvatar)"
 										class="avatar-icon" />
@@ -548,7 +546,10 @@ const generatePublishNumber = () => {
 const handleSuccessBtnClick = () => {
 	console.log('点击成功状态按钮')
 	// 这里可以添加完成后的跳转逻辑
-	uni.navigateBack()
+	// uni.navigateBack()
+	uni.redirectTo({
+		url: '/pages/xingmaLab/xingmaLab'
+	})
 }
 
 // 生命周期

pages/xingmaLab/xingmaLab.less

@@ -170,6 +170,8 @@
                 width: 48rpx;
                 height: 48rpx;
                 border-radius: 50%;
+                object-fit: contain;
+                background-color: #f8f9fa;
               }
               
               .nick_name_text{
@@ -431,6 +433,8 @@
                     width: 40rpx;
                     height: 40rpx;
                     border-radius: 50%;
+                    object-fit: contain;
+                    background-color: #f8f9fa;
                   }
 
                   .creator-name {
@@ -605,6 +609,8 @@
                     width: 40rpx;
                     height: 40rpx;
                     border-radius: 50%;
+                    object-fit: contain;
+                    background-color: #f8f9fa;
                   }
 
                   .creator-name {

pages/xingmaLab/xingmaLab.vue

@@ -39,7 +39,7 @@
 						<text class="item_desc">{{ item.content }}</text>
 						<view class="nicheng_shoucang_zhaungtai">
 							<view class="nicheng_shoucang_item">
-								<image class="avatar_img" :src="`${item.avatar}`" mode="aspectFill" />
+								<image class="avatar_img" :src="`${item.avatar}`" mode="aspectFit" />
 								<text class="nick_name_text">{{ item.nickname }}</text>
 								<text class="shoucang_text">{{ item.collection ? '已收藏' : '未收藏' }}</text>
 								<image class="shoucang_icon"
@@ -106,7 +106,7 @@
 									<view class="item-title">{{ item.content }}</view>
 								<view class="item-meta">
 									<view class="creator-info">
-											<image class="creator-avatar" :src="item.avatar" mode="aspectFill" />
+											<image class="creator-avatar" :src="item.avatar" mode="aspectFit" />
 										<text class="creator-name">{{ item.nickname }}</text>
 										</view>
 									</view>
@@ -151,7 +151,7 @@
 									<view class="item-title">{{ item.content }}</view>
 								<view class="item-meta">
 									<view class="creator-info">
-											<image class="creator-avatar" :src="item.avatar" mode="aspectFill" />
+											<image class="creator-avatar" :src="item.avatar" mode="aspectFit" />
 											<text class="creator-name">{{ item.nickname }}</text>
 										</view>
 									</view>