Skip to content

飞
飞鹤小程序
Commit 5bc08d1b authored by 王炽's avatar 王炽
Browse files
Options

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

Merge branch 'xingmaLab20250820' of http://gitlab2.dui88.com/fh/20250528_FHQ1 into xingmaLab20250820
parents d15b5e71 285f81ba
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 16 deletions
pages/XingmaLabDetailPage/XingmaLabDetailPage.less
View file @ 5bc08d1b
...@@ -44,6 +44,8 @@ ...@@ -44,6 +44,8 @@
width: 66rpx; width: 66rpx;
height: 66rpx; height: 66rpx;
border-radius: 50%; border-radius: 50%;
object-fit: contain;
background-color: #f8f9fa;
} }
// 昵称 // 昵称
...@@ -104,9 +106,10 @@ ...@@ -104,9 +106,10 @@
top: 207rpx; top: 207rpx;
border-radius: 24rpx; border-radius: 24rpx;
position: absolute; position: absolute;
background-size: cover; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-color: #f8f9fa;
} }
.xingmalabdetailpagenum { .xingmalabdetailpagenum {
......
pages/XingmaLabDetailPage/XingmaLabDetailPage.vue
View file @ 5bc08d1b
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<!-- 用户信息 --> <!-- 用户信息 -->
<div class="xingmalabdetailpageuserinfo"> <div class="xingmalabdetailpageuserinfo">
<image v-if="detailData.avatar" :src="detailData.avatar" class="xingmalabdetailpageavatar" <image v-if="detailData.avatar" :src="detailData.avatar" class="xingmalabdetailpageavatar"
mode="aspectFill" /> mode="aspectFit" />
<span class="xingmalabdetailpagenickname">{{ detailData.nickname || '星妈用户' }}</span> <span class="xingmalabdetailpagenickname">{{ detailData.nickname || '星妈用户' }}</span>
</div> </div>
</div> </div>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</span> </span>
<span class="xingmalabdetailpagepicbg" <span class="xingmalabdetailpagepicbg"
:style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.picBg)})` }"></span> :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 class="xingmalabdetailpagenum">{{ config.texts.collectionNumber }}{{ detailData.bizNo || collectionNumber
}}</span> }}</span>
<div class="xingmalabdetailpagebottomcon" v-if="detailData.state === 1"> <div class="xingmalabdetailpagebottomcon" v-if="detailData.state === 1">
......
pages/XingmaLabPublishPage/XingmaLabPublishPage.less
View file @ 5bc08d1b
...@@ -144,6 +144,17 @@ ...@@ -144,6 +144,17 @@
&:hover { &:hover {
opacity: 0.8; opacity: 0.8;
} }
// 禁用状态样式
&.disabled-publish-btn {
opacity: 0.5;
cursor: not-allowed;
pointer-events: none;
&:hover {
opacity: 0.5;
}
}
} }
} }
...@@ -154,8 +165,9 @@ ...@@ -154,8 +165,9 @@
left: 32rpx; left: 32rpx;
top: 0rpx; top: 0rpx;
position: absolute; position: absolute;
object-fit: cover; object-fit: contain;
border-radius: 16rpx; border-radius: 16rpx;
background-color: #f8f9fa;
} }
.xingmalabpublishpageselcpver { .xingmalabpublishpageselcpver {
...@@ -272,8 +284,9 @@ ...@@ -272,8 +284,9 @@
left: 108rpx; left: 108rpx;
top: 356rpx; top: 356rpx;
position: absolute; position: absolute;
object-fit: cover; object-fit: contain;
border-radius: 16rpx; border-radius: 16rpx;
background-color: #f8f9fa;
} }
.xingmalabpublishpagesucnum { .xingmalabpublishpagesucnum {
...@@ -525,6 +538,8 @@ ...@@ -525,6 +538,8 @@
height: 100%; height: 100%;
border-radius: 12rpx; border-radius: 12rpx;
border: none; border: none;
object-fit: contain;
background-color: #f8f9fa;
} }
.avatar-placeholder { .avatar-placeholder {
......
pages/XingmaLabPublishPage/XingmaLabPublishPage.vue
View file @ 5bc08d1b
...@@ -13,11 +13,9 @@ ...@@ -13,11 +13,9 @@
<!-- 底部按钮区域 --> <!-- 底部按钮区域 -->
<div class="xingmalabpublishpagenoselbottomcon" v-if="!hasContent"> <div class="xingmalabpublishpagenoselbottomcon" v-if="!hasContent">
<span class="xingmalabpublishpagenoselbottomconbg" <span class="xingmalabpublishpagenoselbottomconbg"
:style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.noSel.bottomConBg)})` }" :style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.noSel.bottomConBg)})` }"></span>
@click="handleImageUpload"></span>
<span class="xingmalabpublishpagenoselbottomconbtn" <span class="xingmalabpublishpagenoselbottomconbtn"
:style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.noSel.bottomConBtn)})` }" :style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.noSel.bottomConBtn)})` }"></span>
@click="handleImageUpload"></span>
</div> </div>
<div class="xingmalabpublishpageselbottomcon" v-if="hasContent"> <div class="xingmalabpublishpageselbottomcon" v-if="hasContent">
...@@ -34,7 +32,7 @@ ...@@ -34,7 +32,7 @@
@click="handleImageUpload"></span> @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" <span class="xingmalabpublishpageselcpver" v-if="uploadedImage"
:style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.sel.cpver)})` }"></span> :style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.sel.cpver)})` }"></span>
<span class="xingmalabpublishpageselretry" v-if="uploadedImage" <span class="xingmalabpublishpageselretry" v-if="uploadedImage"
...@@ -58,7 +56,7 @@ ...@@ -58,7 +56,7 @@
</span> </span>
<span class="xingmalabpublishpagesucpicbg" <span class="xingmalabpublishpagesucpicbg"
:style="{ backgroundImage: `url(${$baseUrl}${getImageUrl(config.images.suc.picBg)})` }"></span> :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> <span class="xingmalabpublishpagesucnum">{{ config.texts.suc.numberPrefix }}{{ publishNumber }}</span>
</div> </div>
...@@ -87,7 +85,7 @@ ...@@ -87,7 +85,7 @@
<view class="avatar-section"> <view class="avatar-section">
<button class="avatar-btn" open-type="chooseAvatar" @chooseavatar="onChooseAvatar"> <button class="avatar-btn" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
<image v-if="tempUserInfo.avatarUrl" :src="tempUserInfo.avatarUrl" class="avatar-image" <image v-if="tempUserInfo.avatarUrl" :src="tempUserInfo.avatarUrl" class="avatar-image"
mode="aspectFill" /> mode="aspectFit" />
<view v-else class="avatar-placeholder"> <view v-else class="avatar-placeholder">
<image :src="$baseUrl + getImageUrl(config.images.xingmaDefaultAvatar)" <image :src="$baseUrl + getImageUrl(config.images.xingmaDefaultAvatar)"
class="avatar-icon" /> class="avatar-icon" />
...@@ -548,7 +546,10 @@ const generatePublishNumber = () => { ...@@ -548,7 +546,10 @@ const generatePublishNumber = () => {
const handleSuccessBtnClick = () => { const handleSuccessBtnClick = () => {
console.log('点击成功状态按钮') console.log('点击成功状态按钮')
// 这里可以添加完成后的跳转逻辑 // 这里可以添加完成后的跳转逻辑
uni.navigateBack() // uni.navigateBack()
uni.redirectTo({
url: '/pages/xingmaLab/xingmaLab'
})
} }
// 生命周期 // 生命周期
......
pages/xingmaLab/xingmaLab.less
View file @ 5bc08d1b
...@@ -170,6 +170,8 @@ ...@@ -170,6 +170,8 @@
width: 48rpx; width: 48rpx;
height: 48rpx; height: 48rpx;
border-radius: 50%; border-radius: 50%;
object-fit: contain;
background-color: #f8f9fa;
} }
.nick_name_text{ .nick_name_text{
...@@ -431,6 +433,8 @@ ...@@ -431,6 +433,8 @@
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
border-radius: 50%; border-radius: 50%;
object-fit: contain;
background-color: #f8f9fa;
} }
.creator-name { .creator-name {
...@@ -605,6 +609,8 @@ ...@@ -605,6 +609,8 @@
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
border-radius: 50%; border-radius: 50%;
object-fit: contain;
background-color: #f8f9fa;
} }
.creator-name { .creator-name {
......
pages/xingmaLab/xingmaLab.vue
View file @ 5bc08d1b
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<text class="item_desc">{{ item.content }}</text> <text class="item_desc">{{ item.content }}</text>
<view class="nicheng_shoucang_zhaungtai"> <view class="nicheng_shoucang_zhaungtai">
<view class="nicheng_shoucang_item"> <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="nick_name_text">{{ item.nickname }}</text>
<text class="shoucang_text">{{ item.collection ? '已收藏' : '未收藏' }}</text> <text class="shoucang_text">{{ item.collection ? '已收藏' : '未收藏' }}</text>
<image class="shoucang_icon" <image class="shoucang_icon"
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<view class="item-title">{{ item.content }}</view> <view class="item-title">{{ item.content }}</view>
<view class="item-meta"> <view class="item-meta">
<view class="creator-info"> <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> <text class="creator-name">{{ item.nickname }}</text>
</view> </view>
</view> </view>
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
<view class="item-title">{{ item.content }}</view> <view class="item-title">{{ item.content }}</view>
<view class="item-meta"> <view class="item-meta">
<view class="creator-info"> <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> <text class="creator-name">{{ item.nickname }}</text>
</view> </view>
</view> </view>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment