Skip to content

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

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

parents 1b6a17b3 8ea0ef83
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 24 deletions
.DS_Store
View file @ 7d024f2f
No preview for this file type
api/request.js
View file @ 7d024f2f
......@@ -18,7 +18,7 @@ const {
// const baseUrl = "http://172.16.230.108:7777/pmall";
// const baseUrl = "https://momclub-uat.feihe.com/pmall";//测试环境
// const baseUrl = "https://momclub-test.feihe.com/pmall";
let baseUrl = "https://momclub.feihe.com/pmall";//生产环境
let baseUrl = "https://momclub.feihe.com/pmall";//生产环境
// const baseUrl = "https://docs.dui88.com/mock/1956/api";//mock
// const baseUrl = "https://feihe.m.duibatest.com.cn/pmall"
......
components/integralArea/InviteGift.less
View file @ 7d024f2f
......@@ -59,7 +59,7 @@
.invite_button {
width: 220rpx;
height: 62rpx;
background: linear-gradient(to right, #916633 0%, #AB7A44 100%);
background: linear-gradient(to right, #D1AF82 0%, #E6C7A3 100%); // itemIndex = 0
border-radius: 30rpx;
display: flex;
margin-top: 30rpx;
......@@ -80,11 +80,11 @@
}
&.item-1 {
background: linear-gradient(to right, #5089C1 0%, #6FA2D5 100%);
background: linear-gradient(to right, #8DBAE6 0%, #A0C9F1 100%);
}
&.item-2 {
background: linear-gradient(to right, #7253A5 0%, #9879CC 100%);
background: linear-gradient(to right, #9980C2 0%, #BEA8E2 100%);
}
&.item-3 {
......
components/integralArea/InviteGift.vue
View file @ 7d024f2f
......@@ -14,7 +14,7 @@
<text class="card_description" :class="`item-${itemIndex}`">{{ props.subTitle }}</text>
<!-- 去邀请按钮 -->
<button class="invite_button" :class="`item-${itemIndex}`" @tap="handleInviteClick" :open-type="islogin ? 'share' : ''">
<button class="invite_button" :class="`item-${itemIndex}`" @click="handleInviteClick" :open-type="islogin ? 'share' : ''">
<text class="invite_button_text">去邀请</text>
</button>
</view>
......
views/Integral.less
View file @ 7d024f2f
......@@ -691,14 +691,14 @@
.signin_button {
width: 384rpx;
height: 86rpx;
background: linear-gradient(to left, #916633 0%, #AB7A44 100%); // 更丰富的金色渐变
background: linear-gradient(to left, #D1AF82 0%, #E6C7A3 100%); // itemIndex = 0
// background: #D3A458;
border-radius: 60rpx;
display: flex;
align-items: center;
margin-left: 151rpx;
justify-content: center;
box-shadow: 0 4rpx 15rpx rgba(178, 124, 30, 0.4); // 更明显的金色阴影
// box-shadow: 0 4rpx 15rpx rgba(178, 124, 30, 0.4); // 更明显的金色阴影
margin-top: 46rpx;
transition: transform 0.2s ease;
......@@ -714,12 +714,12 @@
// itemIndex = 1
&.item-1 {
background: linear-gradient(to left, #5089C1 0%, #6FA2D5 100%);
background: linear-gradient(to left, #8DBAE6 0%, #A0C9F1 100%);
}
// itemIndex = 2
&.item-2 {
background: linear-gradient(to left, #7253A5 0%, #9879CC 100%);
background: linear-gradient(to left, #9980C2 0%, #BEA8E2 100%);
}
// itemIndex = 3
......@@ -1222,17 +1222,17 @@
bottom: 20rpx;
width: 250rpx;
height: 62rpx;
background: linear-gradient(90deg, #916633 0%, #AB7A44 100%);
background: linear-gradient(90deg, #D1AF82 0%, #E6C7A3 100%); // itemIndex = 0
border-radius: 30rpx;
text-align: center;
line-height: 62rpx;
&.item-1 {
background: linear-gradient(90deg, #5089C1 0%, #6FA2D5 100%);
background: linear-gradient(90deg, #8DBAE6 0%, #A0C9F1 100%);
}
&.item-2 {
background: linear-gradient(90deg, #7253A5 0%, #9879CC 100%);
background: linear-gradient(90deg, #9980C2 0%, #BEA8E2 100%);
}
&.item-3 {
......@@ -1322,18 +1322,18 @@
.exchange_button {
width: 96%;
height: 60rpx;
background: linear-gradient(90deg, #916633 0%, #AB7A44 100%);
background: linear-gradient(90deg, #D1AF82 0%, #E6C7A3 100%); // itemIndex = 0
border-radius: 30rpx;
display: flex;
align-items: center;
justify-content: center;
&.item-1 {
background: linear-gradient(90deg, #5089C1 0%, #6FA2D5 100%);
background: linear-gradient(90deg, #8DBAE6 0%, #A0C9F1 100%);
}
&.item-2 {
background: linear-gradient(90deg, #7253A5 0%, #9879CC 100%);
background: linear-gradient(90deg, #9980C2 0%, #BEA8E2 100%);
}
&.item-3 {
......@@ -1657,13 +1657,21 @@
.exchange_button {
width: 100%;
height: 60rpx;
background: linear-gradient(90deg, #916633 0%, #AB7A44 100%);
background: linear-gradient(90deg, #D1AF82 0%, #E6C7A3 100%); // itemIndex = 0
border-radius: 30rpx;
display: flex;
align-items: center;
justify-content: center;
transition: transform 0.2s ease;
&.item-1 {
background: linear-gradient(90deg, #8DBAE6 0%, #A0C9F1 100%);
}
&.item-2 {
background: linear-gradient(90deg, #9980C2 0%, #BEA8E2 100%);
}
.credits_sale_button_text {
font-size: 28rpx;
}
......
views/Integral.vue
View file @ 7d024f2f
......@@ -401,7 +401,7 @@
goodItem?.credits }}<text class="price-text0">积分</text><text
class="price-text1">+</text><text class="price-text0">￥</text>{{
goodItem?.priceMarket/ 100 }}</text>
<text v-else-if="Number(goodItem?.priceSale)" class="price-text"><text class="num">￥{{
<text v-else-if="Number(goodItem?.priceMarket)" class="price-text"><text class="num">￥{{
goodItem?.priceMarket / 100 }}</text></text>
<text v-else-if="Number(goodItem?.credits)" class="price-text"><text class="num">{{
goodItem?.credits }}</text>积分</text>
......
views/My.vue
View file @ 7d024f2f
......@@ -21,11 +21,11 @@
<!-- 用户信息区域 -->
<view class="user-info" :style="{ 'min-height': cfgStatus.showDetail ? '343rpx' : '168rpx' }">
<view class="user-header">
<view class="avatar-container" :data-log="{
<view class="avatar-container" @click="handleEditProfile" :data-log="{
xcxClick: '我的页面点击',
pageName: '我的页面',
buttonName: '个人信息修改',
}" @click="handleEditProfile">
}">
<image class="avatar" :src="babyInfo?.content?.babyAvatar ||
$baseUrl + 'common/default_avatar.png'
" mode="widthFix" />
......@@ -39,7 +39,7 @@
pageName: '我的页面',
buttonName: '宝宝信息切换',
}" >
<text class="nickname">{{
<text class="nickname" @click="handleEditProfile">{{
babyInfo?.babyStage === 0
? "备孕"
: babyInfo?.babyStage === 1
......@@ -52,7 +52,7 @@
</view>
</view>
<!-- 积分账户 -->
<view class="integral-account">
<view class="integral-account" @click="handleEditProfile">
<text class="integral-account-text"> 账号： </text>
<text class="integral-account-value">
{{ userStore.memberInfo?.mobile || '' }}</text>
......@@ -979,10 +979,10 @@ defineExpose({});
display: flex;
align-items: center;
justify-content: center;
padding: 10rpx;
margin-left: 20rpx;
// padding: 10rpx;
margin-left: 10rpx;
margin-top: -10rpx;
min-width: 60rpx;
min-width: 40rpx;
min-height: 40rpx;
}
......
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