Skip to content

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

Merge branch 'feihesanqi_20251014' of... 

Merge branch 'feihesanqi_20251014' of http://gitlab2.dui88.com/fh/20250528_FHQ1 into feihesanqi_20251014
parents d234c5de e62296b6
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 86 deletions
components/SeckillSection.less
View file @ 6d2e8a42
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
// 弧形三角形样式 - 使用base64 SVG背景图 // 弧形三角形样式 - 使用base64 SVG背景图
.triangle-left { .triangle-left {
position: absolute; position: absolute;
left: -100rpx; left: -99rpx;
top: 0; top: 0;
pointer-events: none; pointer-events: none;
width: 200rpx; width: 200rpx;
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
.triangle-right { .triangle-right {
position: absolute; position: absolute;
right: -100rpx; right: -99rpx;
top: 0; top: 0;
pointer-events: none; pointer-events: none;
width: 200rpx; width: 200rpx;
...@@ -321,7 +321,6 @@ ...@@ -321,7 +321,6 @@
background: #f5f5f5; background: #f5f5f5;
border-radius: 18rpx; border-radius: 18rpx;
margin-bottom: 18rpx; margin-bottom: 18rpx;
border: 2rpx dashed #e0e0e0;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
...@@ -369,7 +368,6 @@ ...@@ -369,7 +368,6 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
transition: all 0.3s ease;
// 背景色通过内联样式动态设置 // 背景色通过内联样式动态设置
&.disabled { &.disabled {
......
components/SeckillSection.vue
View file @ 6d2e8a42
...@@ -647,82 +647,82 @@ const generateTestSeckillData = () => { ...@@ -647,82 +647,82 @@ const generateTestSeckillData = () => {
"priceSale": "200.00", "priceSale": "200.00",
"stock": 10 "stock": 10
}, },
// {
// "button": {"key": 1, "text": "立即抢购"},
// "credits": 150,
// "creditsType": "CREDITS",
// "creditsTypeName": "积分",
// "goods": {
// "id": 102,
// "goodsName": "测试商品B - 正在进行中",
// "goodsImage": ["https://via.placeholder.com/150/4CAF50/FFFFFF?text=GoodB"],
// "credits": "150",
// "priceSale": "300.00",
// "stock": 5
// },
// "priceSale": "300.00",
// "stock": 5
// }
],
"sessionKey": "session_1_ongoing",
"start": session1Start
},
{
"end": session2End,
"goods": [
{
"button": {"key": 1, "text": "立即抢购"},
"credits": 200,
"creditsType": "CREDITS",
"creditsTypeName": "积分",
"goods": {
"id": 201,
"goodsName": "限时秒杀商品A - 正在进行中",
"goodsImage": ["https://via.placeholder.com/150/FF6B35/FFFFFF?text=SeckillA"],
"credits": "200",
"priceSale": "400.00",
"stock": 15
},
"priceSale": "400.00",
"stock": 15
},
{
"button": {"key": 1, "text": "立即抢购"},
"credits": 300,
"creditsType": "CREDITS",
"creditsTypeName": "积分",
"goods": {
"id": 202,
"goodsName": "限时秒杀商品B - 正在进行中",
"goodsImage": ["https://via.placeholder.com/150/4CAF50/FFFFFF?text=SeckillB"],
"credits": "300",
"priceSale": "600.00",
"stock": 8
},
"priceSale": "600.00",
"stock": 8
},
{ {
"button": {"key": 1, "text": "立即抢购"}, "button": {"key": 1, "text": "立即抢购"},
"credits": 150, "credits": 150,
"creditsType": "CREDITS", "creditsType": "CREDITS",
"creditsTypeName": "积分", "creditsTypeName": "积分",
"goods": { "goods": {
"id": 102, "id": 203,
"goodsName": "测试商品B - 正在进行中", "goodsName": "限时秒杀商品C - 正在进行中",
"goodsImage": ["https://via.placeholder.com/150/4CAF50/FFFFFF?text=GoodB"], "goodsImage": ["https://via.placeholder.com/150/9C27B0/FFFFFF?text=SeckillC"],
"credits": "150", "credits": "150",
"priceSale": "300.00", "priceSale": "300.00",
"stock": 5 "stock": 12
}, },
"priceSale": "300.00", "priceSale": "300.00",
"stock": 5 "stock": 12
} }
], ],
"sessionKey": "session_1_ongoing", "sessionKey": "session_2_ongoing",
"start": session1Start "start": session2Start
}, },
// { // {
// "end": session2End,
// "goods": [
// {
// "button": {"key": 1, "text": "立即抢购"},
// "credits": 200,
// "creditsType": "CREDITS",
// "creditsTypeName": "积分",
// "goods": {
// "id": 201,
// "goodsName": "限时秒杀商品A - 正在进行中",
// "goodsImage": ["https://via.placeholder.com/150/FF6B35/FFFFFF?text=SeckillA"],
// "credits": "200",
// "priceSale": "400.00",
// "stock": 15
// },
// "priceSale": "400.00",
// "stock": 15
// },
// {
// "button": {"key": 1, "text": "立即抢购"},
// "credits": 300,
// "creditsType": "CREDITS",
// "creditsTypeName": "积分",
// "goods": {
// "id": 202,
// "goodsName": "限时秒杀商品B - 正在进行中",
// "goodsImage": ["https://via.placeholder.com/150/4CAF50/FFFFFF?text=SeckillB"],
// "credits": "300",
// "priceSale": "600.00",
// "stock": 8
// },
// "priceSale": "600.00",
// "stock": 8
// },
// {
// "button": {"key": 1, "text": "立即抢购"},
// "credits": 150,
// "creditsType": "CREDITS",
// "creditsTypeName": "积分",
// "goods": {
// "id": 203,
// "goodsName": "限时秒杀商品C - 正在进行中",
// "goodsImage": ["https://via.placeholder.com/150/9C27B0/FFFFFF?text=SeckillC"],
// "credits": "150",
// "priceSale": "300.00",
// "stock": 12
// },
// "priceSale": "300.00",
// "stock": 12
// }
// ],
// "sessionKey": "session_2_ongoing",
// "start": session2Start
// },
// {
// "end": session3End, // "end": session3End,
// "goods": [ // "goods": [
// { // {
......
views/Home.vue
View file @ 6d2e8a42
...@@ -467,7 +467,7 @@ export default { ...@@ -467,7 +467,7 @@ export default {
currentQuestion: '', currentQuestion: '',
correctAnswer: '', correctAnswer: '',
answerAnalysis: '', answerAnalysis: '',
// 悬浮图片相关配置 // 悬浮图片相关配置
floatIcon: { floatIcon: {
// imageUrl: 'homepage/btnclose.png', // imageUrl: 'homepage/btnclose.png',
...@@ -1100,21 +1100,7 @@ export default { ...@@ -1100,21 +1100,7 @@ export default {
// 显示奖励弹窗 // 显示奖励弹窗
showRewardPopup(rewardData) { showRewardPopup(rewardData) {
// 设置奖励信息 // 设置奖励信息
let rewardText = ''; let rewardText = rewardData.prizeName;
if (rewardData.credits) {
// 处理字符串格式的积分
const credits = parseInt(rewardData.credits) || 0;
if (credits > 0) {
rewardText += `${credits}`;
}
}
if (rewardData.prizeName) {
if (rewardText) {
rewardText += `${rewardData.prizeName}`;
} else {
rewardText = rewardData.prizeName;
}
}
// 根据奖品类型设置图片 // 根据奖品类型设置图片
let imageUrl = ''; let imageUrl = '';
......
views/My.vue
View file @ 6d2e8a42
...@@ -103,7 +103,8 @@ ...@@ -103,7 +103,8 @@
</view> </view>
<!-- 完成任务模块 --> <!-- 完成任务模块 -->
<view class="task-module"> <view class="task-module"
v-if="!cfgStatus.isRegister || (babyInfo?.allBabyBaseInfo && babyInfo.allBabyBaseInfo.length > 0)">
<image class="task-guide-bg" :src="$baseUrl + 'homepage/Q3Res/my_taskGuideBg.png'"></image> <image class="task-guide-bg" :src="$baseUrl + 'homepage/Q3Res/my_taskGuideBg.png'"></image>
<image class="task-do-btn" :src="$baseUrl + 'homepage/Q3Res/my_taskDoBtn.png'" @tap="handleTaskClick"></image> <image class="task-do-btn" :src="$baseUrl + 'homepage/Q3Res/my_taskDoBtn.png'" @tap="handleTaskClick"></image>
</view> </view>
...@@ -177,7 +178,7 @@ ...@@ -177,7 +178,7 @@
</view> </view>
<!-- 协议 --> <!-- 协议 -->
<view class="protocol-container"> <!-- <view class="protocol-container">
<image :src="$baseUrl + 'my/protocol.png'" mode="aspectFit" /> <image :src="$baseUrl + 'my/protocol.png'" mode="aspectFit" />
<view class="hot-member" :data-log="{ <view class="hot-member" :data-log="{
xcxClick: '我的页面点击', xcxClick: '我的页面点击',
...@@ -189,7 +190,7 @@ ...@@ -189,7 +190,7 @@
pageName: '我的页面', pageName: '我的页面',
buttonName: '隐私协议', buttonName: '隐私协议',
}" @click="handleHot" data-type="privacy"></view> }" @click="handleHot" data-type="privacy"></view>
</view> </view> -->
<RegisterLayer v-model="showRegisterLayer" @confirm="onRegisterConfirm" /> <RegisterLayer v-model="showRegisterLayer" @confirm="onRegisterConfirm" />
</view> </view>
...@@ -316,7 +317,7 @@ const handleTaskClick = async () => { ...@@ -316,7 +317,7 @@ const handleTaskClick = async () => {
}); });
return; return;
} }
// 已登录，正常执行任务逻辑 // 已登录，正常执行任务逻辑
await integralStore.getSigninAndTaskInfo(false); await integralStore.getSigninAndTaskInfo(false);
globalStore.showTaskPop(integralStore?.signinAndTaskInfo?.data?.taskTodo); globalStore.showTaskPop(integralStore?.signinAndTaskInfo?.data?.taskTodo);
......
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