Commit 813a6ef6 authored by 王炽's avatar 王炽

66666

parent f143e96b
......@@ -16,10 +16,10 @@ const {
// request.js
// 通常可以吧 baseUrl 单独放在一个 js 文件了
// const baseUrl = "http://172.16.230.108:7777/pmall";
const baseUrl = "https://momclub-uat.feihe.com/pmall";//测试环境
// const baseUrl = "https://momclub-uat.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"
const baseUrl = "https://feihe.m.duibatest.com.cn/pmall"
const request = (options = {}) => {
// 在这里可以对请求头进行一些设置
......
......@@ -37,7 +37,7 @@
<!-- 底部按钮 -->
<view
class="bottom-button"
v-if="!(status1 === 4000 && !props.isshowLock)"
v-if="(!hasBaby && islogin) ? true : !(status1 === 4000 && !props.isshowLock)"
:style="{
background: `url(${$baseUrl}integral/1021/shengriliBtnBg${props.index}.png) no-repeat center/contain`
}"
......@@ -50,7 +50,7 @@
<image
class="bottom-button"
v-if="status1 === 4000 && !props.isshowLock"
v-if="(!hasBaby && islogin) ? false : status1 === 4000 && !props.isshowLock"
:src="`${$baseUrl}integral/1021/daikaiqiDisBtn${props.index}.png`"
mode="aspectFit"
@click="handleUpgrade_daikaiqi"
......@@ -63,6 +63,8 @@ import { defineProps, defineEmits, onMounted, ref } from 'vue'
import { showLoading, hideLoading } from '../../utils'
import { fetchBirthdayGiftJSON } from '../../api/integral'
import { useUserStore } from "../../stores/user";
const isShowShengjiBtn = () => {
let show = false;
if(props.isshowLock){
......@@ -100,6 +102,9 @@ const props = defineProps({
const emit = defineEmits(['points-click', 'coupon-click', 'upgrade'])
const getBtnName = () => {
if(!hasBaby.value){
return '去添加';
}
const btnName = '';
switch(status1.value){
case 4000:
......@@ -170,7 +175,26 @@ const getColor = () => {
}
const status1 = ref(0);
const hasBaby = ref(false);
const islogin = ref(true);
onMounted(async () => {
const userStore = useUserStore();
const memberInfo = userStore.memberInfo;
if(memberInfo.memberId == "not_login"){
islogin.value = false;
}else{
islogin.value = true
}
if(userStore.babyInfo?.allBabyBaseInfo && userStore.babyInfo?.allBabyBaseInfo.length > 0){
hasBaby.value = true;
}else{
hasBaby.value = false;
return;
}
showLoading();
const data = await fetchBirthdayGiftJSON();
if(data.success){
......
......@@ -627,16 +627,18 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
const orderUpgrade = ref(false);
// const maxVal = ref([]);
const integralData = ref({
"tupianBanben": "1021",
"swiper": [],
"quanyitiaozhuanInfo": {
"suyuanyou": {
"swiper": [
],
"quanyitiaozhuanInfo":{
"suyuanyou":{
"qubaoming": {
"url": "https://member.feihe.com/memberH5/#/SyySignupInfo?activityCode=syy20250806&sceneCode=WXG01",
"type": 3
}
},
"shengrili": {
"shengrili":{
"qushiyong": {
"url": "subPackages/shopMainProcess/coupons/couponList",
"type": 2,
......@@ -647,41 +649,41 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
}
}
},
"vipLvInfo": [
"vipLvInfo":[
{
"currentLvTip": "currentLvTip0.png",
"barVip": "barVip0.png",
"barBgVip": "barBgVip0.png",
"vipLvBg": "vipLvBg0.png",
"vipLvIcon": "vipLvIcon0.png"
"currentLvTip":"currentLvTip0.png",
"barVip":"barVip0.png",
"barBgVip":"barBgVip0.png",
"vipLvBg":"vipLvBg0.png",
"vipLvIcon":"vipLvIcon0.png",
},
{
"currentLvTip": "currentLvTip1.png",
"barVip": "barVip1.png",
"barBgVip": "barBgVip1.png",
"vipLvBg": "vipLvBg1.png",
"vipLvIcon": "vipLvIcon1.png"
"currentLvTip":"currentLvTip1.png",
"barVip":"barVip1.png",
"barBgVip":"barBgVip1.png",
"vipLvBg":"vipLvBg1.png",
"vipLvIcon":"vipLvIcon1.png",
},
{
"currentLvTip": "currentLvTip2.png",
"barVip": "barVip2.png",
"barBgVip": "barBgVip2.png",
"vipLvBg": "vipLvBg2.png",
"vipLvIcon": "vipLvIcon2.png"
"currentLvTip":"currentLvTip2.png",
"barVip":"barVip2.png",
"barBgVip":"barBgVip2.png",
"vipLvBg":"vipLvBg2.png",
"vipLvIcon":"vipLvIcon2.png",
},
{
"currentLvTip": "currentLvTip3.png",
"barVip": "barVip3.png",
"barBgVip": "barBgVip3.png",
"vipLvBg": "vipLvBg3.png",
"vipLvIcon": "vipLvIcon3.png"
"currentLvTip":"currentLvTip3.png",
"barVip":"barVip3.png",
"barBgVip":"barBgVip3.png",
"vipLvBg":"vipLvBg3.png",
"vipLvIcon":"vipLvIcon3.png",
},
{
"currentLvTip": "currentLvTip4.png",
"barVip": "barVip4.png",
"barBgVip": "barBgVip4.png",
"vipLvBg": "vipLvBg4.png",
"vipLvIcon": "vipLvIcon4.png"
"currentLvTip":"currentLvTip4.png",
"barVip":"barVip4.png",
"barBgVip":"barBgVip4.png",
"vipLvBg":"vipLvBg4.png",
"vipLvIcon":"vipLvIcon4.png",
}
],
"viplv": {
......@@ -692,41 +694,17 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
"imgPlatinum3.png",
"imgPlatinum4.png"
],
"imgBgs": [
"imgBgs":[
"imgPlatinumBg0.png",
"imgPlatinumBg1.png",
"imgPlatinumBg2.png",
"imgPlatinumBg3.png",
"imgPlatinumBg4.png"
],
"nickNameColors": [
"#1d1e25",
"#1d1e25",
"#1d1e25",
"#1d1e25",
"#ffffff"
],
"dangqianColors": [
"#b27c1e",
"#447ab0",
"#332288",
"#674513",
"#674513"
],
"vipLvIcon": [
"imgPlatinumIcon0.png",
"imgPlatinumIcon1.png",
"imgPlatinumIcon2.png",
"imgPlatinumIcon3.png",
"imgPlatinumIcon4.png"
],
"vipNameImgs": [
"imgPlatinumName0.png",
"imgPlatinumName1.png",
"imgPlatinumName2.png",
"imgPlatinumName3.png",
"imgPlatinumName4.png"
],
"nickNameColors":["#1d1e25","#1d1e25","#1d1e25","#1d1e25","#ffffff"],
"dangqianColors":["#b27c1e","#447ab0","#332288","#674513","#674513"],
"vipLvIcon":["imgPlatinumIcon0.png","imgPlatinumIcon1.png","imgPlatinumIcon2.png","imgPlatinumIcon3.png","imgPlatinumIcon4.png"],
"vipNameImgs":["imgPlatinumName0.png","imgPlatinumName1.png","imgPlatinumName2.png","imgPlatinumName3.png","imgPlatinumName4.png"],
"upLvTxts": [
"扫罐内码或下单有机会提升至/V2铂金会员",
"扫罐内码或下单有机会提升至/V3钻石会员",
......@@ -780,7 +758,7 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
"url": "https://mom.feihe.com/member/mine/pointStrategy",
"type": 3
},
"quanyiBgs": [
"quanyiBgs":[
{
"lockImg": "quanyiLockBg0.png",
"unlockImg": "quanyiunLockBg0.png",
......@@ -810,7 +788,8 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
"unlockImg": "quanyiunLockBg4.png",
"selectImg": "quanyiSelectBg4.png",
"quanyiNum": 9
}
},
],
"imgInfos": [
{
......@@ -1098,6 +1077,168 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
}
}
],
"lingyuan": [
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "643301938280182989",
"skuId": "643301938280182990",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
"envVersion": "release"
}
},
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "570770855028876907",
"skuId": "570770855028876908",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
"envVersion": "release"
}
},
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "643302772176787321",
"skuId": "643302772176787322",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
"envVersion": "release"
}
},
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "650261586675438161",
"skuId": "650261761758111604",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
"envVersion": "release"
}
},
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "637115498514653835",
"skuId": "637115498514653836",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
"envVersion": "release"
}
},
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "637462885116453461",
"skuId": "637462885116453462",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
"envVersion": "release"
}
},
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "637125264624522797",
"skuId": "637125264624522798",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
"envVersion": "release"
}
},
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "664995106239801237",
"skuId": "664995106239801238",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
"envVersion": "release"
}
},
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "566750277742626607",
"skuId": "566750277742626608",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
"envVersion": "release"
}
},
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "664992929630904330",
"skuId": "702706680618457075",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
"envVersion": "release"
}
},
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "479814938702811385",
"skuId": "479814938702811386",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
"envVersion": "release"
}
},
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "477231839213998660",
"skuId": "477231839213998661",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
"envVersion": "release"
}
},
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "710238004623156187",
"skuId": "710238148411278894",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
"envVersion": "release"
}
},
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "637105594356118250",
"skuId": "637105594356118251",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
"envVersion": "release"
}
},
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "446767559140140163",
"skuId": "446767559140140164",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
"envVersion": "release"
}
},
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "575869473685026384",
"skuId": "575869473689219730",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
"envVersion": "release"
}
}
],
"beiwei": [
{
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
......@@ -1335,31 +1476,31 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
const selectIdx = ref(-1);//权益选中id
const isshowShouqi = ref(false);//是否收起权益
const isshowQuanyiDetail = ref(false);//是否显示权益详情
const swiperData = ref(integralData.value.swiper);//banner图片地方
const vipLvIcons = ref(integralData.value.viplv.imgs);//会员等级图标
const vipLvNameImgs = ref(integralData.value.viplv.vipNameImgs);//会员等级名称图片
const vipLvIconBgs = ref(integralData.value.viplv.imgBgs);//会员等级图标背景
const nickNameColors = ref(integralData.value.viplv.nickNameColors);//会员等级昵称颜色
const dangqianColors = ref(integralData.value.viplv.dangqianColors);//当前等级颜色
const upLvTxts = ref(integralData.value.viplv.upLvTxts);//会员等级提升文字
const vipIntegral = ref(integralData.value.vipIntegral);//积分明细\
const clickMore = ref(integralData.value.clickMore);//点击更多
const vipActive = ref(integralData.value.vipActive);//会员活动
const tabInfo = ref(integralData.value.goodsListData.tabInfo);//tabbar信息
const listCommon = ref(integralData.value.goodsListData.listCommon);//商品列表通用信息
const goodsData = ref(integralData.value.goodsListData.goodsData);//商品数据
const productIdUrl = ref(integralData.value.goodsListData.productIdUrl);//商品跳转链接
const imgInfos = ref(integralData.value.qunyiInfo.imgInfos);//权益信息
const vipRule = ref(integralData.value.qunyiInfo.vipRule);//会员规则跳转
const swiperData = ref(integralData.value?.swiper);//banner图片地方
const vipLvIcons = ref(integralData.value?.viplv?.imgs);//会员等级图标
const vipLvNameImgs = ref(integralData.value?.viplv?.vipNameImgs);//会员等级名称图片
const vipLvIconBgs = ref(integralData.value?.viplv?.imgBgs);//会员等级图标背景
const nickNameColors = ref(integralData.value?.viplv?.nickNameColors);//会员等级昵称颜色
const dangqianColors = ref(integralData.value?.viplv?.dangqianColors);//当前等级颜色
const upLvTxts = ref(integralData.value?.viplv?.upLvTxts);//会员等级提升文字
const vipIntegral = ref(integralData.value?.vipIntegral);//积分明细\
const clickMore = ref(integralData.value?.clickMore);//点击更多
const vipActive = ref(integralData.value?.vipActive);//会员活动
const tabInfo = ref(integralData.value?.goodsListData?.tabInfo);//tabbar信息
const listCommon = ref(integralData.value?.goodsListData?.listCommon);//商品列表通用信息
const goodsData = ref(integralData.value?.goodsListData?.goodsData);//商品数据
const productIdUrl = ref(integralData.value?.goodsListData?.productIdUrl);//商品跳转链接
const imgInfos = ref(integralData.value?.qunyiInfo?.imgInfos);//权益信息
const vipRule = ref(integralData.value?.qunyiInfo?.vipRule);//会员规则跳转
const vipLvsQuanyi = ref([]);//会员不同等级权益
const points = ref(0);//积分
const gradeList = ref([]);
const vipQuanyiUrl = ref(integralData.value.qunyiInfo.vipQuanyiUrl);//会员权益图标点击跳转
const vipQuanyiUrl = ref(integralData.value?.qunyiInfo?.vipQuanyiUrl);//会员权益图标点击跳转
const activeIndex = ref(0);//tabbar选中项
const showRegisterLayer = ref(false);
const tupianBanben = ref(integralData.value.tupianBanben);//图片版本号
const tupianBanben = ref(integralData.value?.tupianBanben);//图片版本号
const vipLevel = ref(0);
......@@ -1371,8 +1512,8 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
const lastScrollLeft = ref(0);
const vipQuanyiData = ref(integralData.value.qunyiInfo.vipLvsQuanyi);
const quanyiBgs = ref(integralData.value.qunyiInfo.quanyiBgs);
const vipQuanyiData = ref(integralData.value?.qunyiInfo?.vipLvsQuanyi);
const quanyiBgs = ref(integralData.value?.qunyiInfo?.quanyiBgs);
const recentAnnualPointsTotal = ref(0);
const nextGradeScoreRuleMin = ref(0);
......@@ -1638,25 +1779,25 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
const {data} = await fetchIntegralJSON();
integralData.value = {...data};
swiperData.value = integralData.value.swiper;
vipLvIcons.value = integralData.value.viplv.imgs;
vipLvIconBgs.value = integralData.value.viplv.imgBgs;
vipLvNameImgs.value = integralData.value.viplv.vipNameImgs;
vipIntegral.value = integralData.value.vipIntegral;
clickMore.value = integralData.value.clickMore;
vipActive.value = integralData.value.vipActive;
tabInfo.value = integralData.value.goodsListData.tabInfo;
listCommon.value = integralData.value.goodsListData.listCommon;
goodsData.value = integralData.value.goodsListData.goodsData;
productIdUrl.value = integralData.value.goodsListData.productIdUrl;
vipRule.value = integralData.value.qunyiInfo.vipRule;
imgInfos.value = integralData.value.qunyiInfo.imgInfos;
vipQuanyiUrl.value = integralData.value.qunyiInfo.vipQuanyiUrl;
swiperData.value = integralData.value?.swiper;
vipLvIcons.value = integralData.value?.viplv?.imgs;
vipLvIconBgs.value = integralData.value?.viplv?.imgBgs;
vipLvNameImgs.value = integralData.value?.viplv?.vipNameImgs;
vipIntegral.value = integralData.value?.vipIntegral;
clickMore.value = integralData.value?.clickMore;
vipActive.value = integralData.value?.vipActive;
tabInfo.value = integralData.value?.goodsListData?.tabInfo;
listCommon.value = integralData.value?.goodsListData?.listCommon;
goodsData.value = integralData.value?.goodsListData?.goodsData;
productIdUrl.value = integralData.value?.goodsListData?.productIdUrl;
vipRule.value = integralData.value?.qunyiInfo?.vipRule;
imgInfos.value = integralData.value?.qunyiInfo?.imgInfos;
vipQuanyiUrl.value = integralData.value?.qunyiInfo?.vipQuanyiUrl;
// vipQuanyiData.value = [];////??????
vipQuanyiData.value = integralData.value.qunyiInfo.vipLvsQuanyi;
tupianBanben.value = integralData.value.tupianBanben;
quanyiBgs.value = integralData.value.qunyiInfo.quanyiBgs;
quanyitiaozhuanInfo.value = integralData.value.quanyitiaozhuanInfo;
vipQuanyiData.value = integralData.value?.qunyiInfo?.vipLvsQuanyi;
tupianBanben.value = integralData.value?.tupianBanben;
quanyiBgs.value = integralData.value?.qunyiInfo?.quanyiBgs;
quanyitiaozhuanInfo.value = integralData.value?.quanyitiaozhuanInfo;
quanyiListIcon.value = [];
imgInfos.value.forEach((element,index) => {
......@@ -2186,8 +2327,28 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
}
};
// 页面跳转-添加宝宝
const navigateTo = (url) => {
uni.navigateTo({
url,
animationDuration: 0,
fail: (err) => {
console.error("页面跳转失败:", err);
uni.showToast({
title: "页面跳转失败",
icon: "none",
});
},
});
};
const handleGoToShop_shengrili = async (data) => {
console.log('生日礼', data.index);
if(!(userStore.babyInfo?.allBabyBaseInfo && userStore.babyInfo?.allBabyBaseInfo.length > 0) && islogin.value){
//没有宝宝,跳转到添加宝宝页面
navigateTo("/pages/person/person?type=add");
}
switch(data.index){
case 4000:
......
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