Skip to content

飞
飞鹤小程序
Commit e62296b6 authored by spc's avatar spc
Browse files
Options

Merge branch 'feihesanqi_20251014' of http://gitlab.dui88.com/fh/20250528_FHQ1... 

Merge branch 'feihesanqi_20251014' of http://gitlab.dui88.com/fh/20250528_FHQ1 into feihesanqi_20251014
parents ff8eaa13 a03176d4
Show whitespace changes
Inline Side-by-side
Showing with 91 additions and 95 deletions
components/SeckillSection.less
View file @ e62296b6
......@@ -15,8 +15,8 @@
justify-content: space-between;
.credits_sale_title {
font-size: 32rpx;
font-weight: bold;
font-size: 30rpx;
font-weight: 600;
margin-left: 16rpx;
color: #1d1e25;
......@@ -107,7 +107,7 @@
// 弧形三角形样式 - 使用base64 SVG背景图
.triangle-left {
position: absolute;
left: -100rpx;
left: -99rpx;
top: 0;
pointer-events: none;
width: 200rpx;
......@@ -119,7 +119,7 @@
.triangle-right {
position: absolute;
right: -100rpx;
right: -99rpx;
top: 0;
pointer-events: none;
width: 200rpx;
......@@ -211,7 +211,7 @@
.tab_time_text {
&.start_time_text {
font-size: 30rpx;
font-weight: 100;
font-weight: 600;
// 颜色通过内联样式动态设置
}
}
......@@ -319,9 +319,8 @@
width: 100%;
height: 220rpx; // 正方形，宽度撑满父级
background: #f5f5f5;
border-radius: 10rpx;
margin-bottom: 10rpx;
border: 2rpx dashed #e0e0e0;
border-radius: 18rpx;
margin-bottom: 18rpx;
position: relative;
overflow: hidden;
......@@ -329,6 +328,7 @@
width: 100%;
height: 100%;
object-fit: cover;
border-radius: 18rpx;
}
}
......@@ -368,7 +368,6 @@
display: flex;
align-items: center;
justify-content: center;
transition: all 0.3s ease;
// 背景色通过内联样式动态设置
&.disabled {
......@@ -379,6 +378,7 @@
.credits_sale_button_text {
font-size: 24rpx;
color: #fff;
font-weight: 500;
}
&.disabled .credits_sale_button_text {
......@@ -405,7 +405,7 @@
.good_image_placeholder {
width: 260rpx;
height: 260rpx;
border-radius: 15rpx;
border-radius: 18rpx;
flex-shrink: 0;
position: relative;
overflow: hidden;
......@@ -415,6 +415,7 @@
width: 100%;
height: 100%;
object-fit: cover;
border-radius: 18rpx;
}
}
......
components/SeckillSection.vue
View file @ e62296b6
......@@ -2,7 +2,7 @@
<view class="credits_sale_section" v-if="shouldShowSection">
<!-- 标题区域 -->
<view class="credits_sale_area">
<text class="credits_sale_title" :class="`item-${itemIndex}`" :style="{ color: getColor('textColor')[itemIndex] }">积分限时购</text>
<text class="credits_sale_title" :class="`item-${itemIndex}`" :style="{ color: getColor('textColor')[itemIndex] }">积分限时秒杀</text>
</view>
<!-- 积分限时购内容容器 -->
......@@ -647,82 +647,82 @@ const generateTestSeckillData = () => {
"priceSale": "200.00",
"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": "立即抢购"},
"credits": 150,
"creditsType": "CREDITS",
"creditsTypeName": "积分",
"goods": {
"id": 102,
"goodsName": "测试商品B - 正在进行中",
"goodsImage": ["https://via.placeholder.com/150/4CAF50/FFFFFF?text=GoodB"],
"id": 203,
"goodsName": "限时秒杀商品C - 正在进行中",
"goodsImage": ["https://via.placeholder.com/150/9C27B0/FFFFFF?text=SeckillC"],
"credits": "150",
"priceSale": "300.00",
"stock": 5
"stock": 12
},
"priceSale": "300.00",
"stock": 5
"stock": 12
}
],
"sessionKey": "session_1_ongoing",
"start": session1Start
"sessionKey": "session_2_ongoing",
"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,
// "goods": [
// {
......
components/integralArea/InviteGift.less
View file @ e62296b6
......@@ -3,9 +3,9 @@
margin-bottom: 30rpx;
.invite_gift_title {
font-size: 36rpx;
font-size: 30rpx;
font-weight: bold;
color: #333333;
color: #000000;
margin-bottom: 20rpx;
display: block;
......@@ -59,11 +59,11 @@
.invite_button {
width: 172rpx;
height: 62rpx;
background: linear-gradient(to right, #A07B4D 0%, #C09A60 100%);
background: linear-gradient(to right, #916633 0%, #AB7A44 100%);
border-radius: 30rpx;
display: flex;
margin-top: 30rpx;
margin-left: 30rpx;
margin-left: 0rpx;
align-items: center;
justify-content: center;
box-shadow: 0 2rpx 8rpx rgba(160, 123, 77, 0.3);
......@@ -100,7 +100,7 @@
.record_button {
position: absolute;
width: 146rpx;
height: 62rpx;
height: 52rpx;
top: 16rpx;
right: 20rpx;
background: rgba(255, 255, 255, 0.8);
......@@ -121,13 +121,8 @@
}
.record_arrow {
font-size: 20rpx;
color: #999999;
font-weight: bold;
&.item-4 {
color: #D7D7D7;
}
width: 11rpx;
height: 18rpx;
}
&.item-4 {
......
components/integralArea/InviteGift.vue
View file @ e62296b6
......@@ -29,7 +29,7 @@
<!-- 邀请记录按钮 -->
<view class="record_button" :class="`item-${itemIndex}`" @click="handleRecordClick">
<text class="record_text" :class="`item-${itemIndex}`">邀请记录</text>
<text class="record_arrow" :class="`item-${itemIndex}`">{{`>`}}</text>
<image class="record_arrow" :class="`item-${itemIndex}`" :src="$baseUrl + 'integral/1023/yaoqingjiluIcon.png'" mode="aspectFit" />
</view>
<!-- 3D星星角色 -->
......
pages/invate/sharepage.vue
View file @ e62296b6
......@@ -204,7 +204,6 @@ const onGetPhoneNumber = async (e) => {
const { inviteCode: ivtCode, unionId: uid } = initInviteParams();
isLogin.value = true;
console.log(2222222222);
// 如果有邀请码，调用助力接口
if (ivtCode && isLogin.value) {
await callAssistInvite(ivtCode, uid);
......
views/Integral.less
View file @ e62296b6
......@@ -986,7 +986,7 @@
display: flex;
// justify-content: space-between;
align-items: center;
margin-bottom: 30rpx;
margin-bottom: 24rpx;
.card_title {
font-size: 32rpx;
......@@ -1017,7 +1017,7 @@
.benefits_container {
display: flex;
gap: 12rpx;
gap: 24rpx;
margin-top: 0;
// 当商品数量小于等于2时，调整gap并居中
......@@ -1123,7 +1123,7 @@
bottom: 20rpx;
width: 250rpx;
height: 62rpx;
background: linear-gradient(90deg, #D3A458 0%, #B8941F 100%);
background: linear-gradient(90deg, #916633 0%, #AB7A44 100%);
border-radius: 30rpx;
text-align: center;
line-height: 62rpx;
......@@ -1190,14 +1190,14 @@
}
text-overflow: ellipsis;
white-space: nowrap;
width: 100%;
width: 95%;
}
.benefit_points {
text-align: left;
font-size: 22rpx;
color: #333333;
width: 100%;
width: 95%;
margin-bottom: 16rpx;
&.item-1 {
color: #284A6C;
......@@ -1217,9 +1217,9 @@
}
.exchange_button {
width: 100%;
width: 96%;
height: 60rpx;
background: #D3A458;
background: linear-gradient(90deg, #916633 0%, #AB7A44 100%);
border-radius: 30rpx;
display: flex;
align-items: center;
......@@ -1550,7 +1550,7 @@
.exchange_button {
width: 100%;
height: 60rpx;
background: #D3A458;
background: linear-gradient(90deg, #916633 0%, #AB7A44 100%);
border-radius: 30rpx;
display: flex;
align-items: center;
......
views/Integral.vue
View file @ e62296b6
......@@ -2826,6 +2826,7 @@ const handleInviteClick = () => {
buttonName: "去邀请",
});
console.log('islogin.valuehandleInviteClick=', islogin.value);
if (!islogin.value) {
needReinit.value = true;
jump({
......
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