Commit ade33df0 authored by 王炽's avatar 王炽

66666

parents 8daf4ab9 0949640f
...@@ -8,13 +8,20 @@ ...@@ -8,13 +8,20 @@
class="baby-item" class="baby-item"
@click="selectBaby(baby)" @click="selectBaby(baby)"
> >
<text>{{ baby.babyName || "暂无昵称" }}</text> <text v-if="baby.babyStage == 0">备孕</text>
<text v-else-if="baby.babyStage == 1">孕中</text>
<text v-else>{{ baby.babyName || "暂无昵称" }}</text>
<view <view
class="selected-icon" class="selected-icon"
:style="{ backgroundColor: baby.selected ? '#d3a358' : '#E8E8E8' }" :style="{ backgroundColor: baby.selected ? '#d3a358' : '#E8E8E8' }"
/> />
</view> </view>
<view v-if="babyList.length < 3" class="baby-item add-item" @click="onAdd"> <view
v-if="babyList.length < 3"
class="baby-item add-item"
@click="onAdd"
>
<image :src="addIcon" class="add-icon" /> <image :src="addIcon" class="add-icon" />
</view> </view>
</view> </view>
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
mask-style="background: rgb(246, 248, 250); z-index: 0;" mask-style="background: rgb(246, 248, 250); z-index: 0;"
indicator-style="border-radius: 10px; height: 50px; background:#ffffff; z-index:0" indicator-style="border-radius: 10px; height: 50px; background:#ffffff; z-index:0"
:value="pickerValue" :value="pickerValue"
:immediate-change="true"
@change="onChange" @change="onChange"
> >
<template v-if="mode === 'date'"> <template v-if="mode === 'date'">
...@@ -118,18 +119,8 @@ const futureYear = futureDate.getFullYear(); ...@@ -118,18 +119,8 @@ const futureYear = futureDate.getFullYear();
const futureMonth = futureDate.getMonth() + 1; const futureMonth = futureDate.getMonth() + 1;
const futureDay = futureDate.getDate(); const futureDay = futureDate.getDate();
// 工具函数:根据日期字符串获取索引 // 工具函数:生成年份数组
function getPickerIndexByDate(dateStr) { function getYears() {
if (!dateStr) return null;
const [year, month, day] = dateStr.split('-').map(Number);
const yearIdx = years.value.findIndex(y => y === year);
const monthIdx = months.value.findIndex(m => m === month);
const dayIdx = days.value.findIndex(d => d === day);
if (yearIdx < 0 || monthIdx < 0 || dayIdx < 0) return null;
return [yearIdx, monthIdx, dayIdx];
}
const years = computed(() => {
const arr = []; const arr = [];
const startYear = currentYear - 3; const startYear = currentYear - 3;
const endYear = futureYear; const endYear = futureYear;
...@@ -137,62 +128,42 @@ const years = computed(() => { ...@@ -137,62 +128,42 @@ const years = computed(() => {
arr.push(i); arr.push(i);
} }
return arr; return arr;
}); }
// 工具函数:生成月份数组
const months = computed(() => { function getMonths(selectedYear) {
const [yearIdx] = pickerValue.value;
const selectedYear = years.value[yearIdx];
const arr = [];
let startMonth = 1; let startMonth = 1;
let endMonth = 12; let endMonth = 12;
if (selectedYear === currentYear - 3) { if (selectedYear === currentYear - 3) {
startMonth = currentMonth; startMonth = currentMonth;
} }
if (selectedYear === futureYear) { if (selectedYear === futureYear) {
endMonth = futureMonth; endMonth = futureMonth;
} }
const arr = [];
for (let i = startMonth; i <= endMonth; i++) { for (let i = startMonth; i <= endMonth; i++) {
arr.push(i); arr.push(i);
} }
return arr; return arr;
}); }
// 工具函数:生成天数数组(含"请选择")
const days = computed(() => { function getDays(selectedYear, selectedMonth) {
const [yearIdx, monthIdx] = pickerValue.value;
const selectedYear = years.value[yearIdx];
const selectedMonth = months.value[monthIdx];
const dayCount = new Date(selectedYear, selectedMonth, 0).getDate(); const dayCount = new Date(selectedYear, selectedMonth, 0).getDate();
const arr = ["请选择"];
let startDay = 1; let startDay = 1;
let endDay = dayCount; let endDay = dayCount;
if (selectedYear === currentYear - 3 && selectedMonth === currentMonth) { if (selectedYear === currentYear - 3 && selectedMonth === currentMonth) {
startDay = currentDay; startDay = currentDay;
} }
if (selectedYear === futureYear && selectedMonth === futureMonth) { if (selectedYear === futureYear && selectedMonth === futureMonth) {
endDay = futureDay; endDay = futureDay;
} }
const arr = ["请选择"];
for (let i = startDay; i <= endDay; i++) { for (let i = startDay; i <= endDay; i++) {
arr.push(i); arr.push(i);
} }
return arr; return arr;
}); }
// custom模式相关
const columns = computed(() => {
if (Array.isArray(props.range[0])) {
return props.range;
} else {
return [props.range];
}
});
const years = computed(() => getYears());
const defaultValue = computed(() => { const defaultValue = computed(() => {
if (props.mode === "date") { if (props.mode === "date") {
// 1. value为索引数组 // 1. value为索引数组
...@@ -200,31 +171,38 @@ const defaultValue = computed(() => { ...@@ -200,31 +171,38 @@ const defaultValue = computed(() => {
return props.value; return props.value;
} }
// 2. value为日期字符串 // 2. value为日期字符串
if (typeof props.value === "string" && props.value.match(/^\d{4}-\d{2}-\d{2}$/)) { if (
typeof props.value === "string" &&
props.value.match(/^\d{4}-\d{2}-\d{2}$/)
) {
const idxArr = getPickerIndexByDate(props.value); const idxArr = getPickerIndexByDate(props.value);
if (idxArr) return idxArr; if (idxArr) return idxArr;
} }
// 3. 默认选中今天 // 3. 默认选中今天
const yearIdx = years.value.findIndex(y => y === currentYear); const yearIdx = years.value.findIndex((y) => y === currentYear);
// 直接用当前年推算可用月份 // 直接用当前年推算可用月份
let tempMonths = []; let tempMonths = [];
let startMonth = 1, endMonth = 12; let startMonth = 1,
endMonth = 12;
if (yearIdx === 0) startMonth = currentMonth; if (yearIdx === 0) startMonth = currentMonth;
if (yearIdx === years.value.length - 1) endMonth = futureMonth; if (yearIdx === years.value.length - 1) endMonth = futureMonth;
for (let i = startMonth; i <= endMonth; i++) tempMonths.push(i); for (let i = startMonth; i <= endMonth; i++) tempMonths.push(i);
const monthIdx = tempMonths.findIndex(m => m === currentMonth); const monthIdx = tempMonths.findIndex((m) => m === currentMonth);
// days // days
let tempDays = ["请选择"]; let tempDays = ["请选择"];
if (yearIdx >= 0 && monthIdx >= 0) { if (yearIdx >= 0 && monthIdx >= 0) {
const selectedYear = years.value[yearIdx]; const selectedYear = years.value[yearIdx];
const selectedMonth = tempMonths[monthIdx]; const selectedMonth = tempMonths[monthIdx];
const dayCount = new Date(selectedYear, selectedMonth, 0).getDate(); const dayCount = new Date(selectedYear, selectedMonth, 0).getDate();
let startDay = 1, endDay = dayCount; let startDay = 1,
if (yearIdx === 0 && selectedMonth === currentMonth) startDay = currentDay; endDay = dayCount;
if (yearIdx === years.value.length - 1 && selectedMonth === futureMonth) endDay = futureDay; if (yearIdx === 0 && selectedMonth === currentMonth)
startDay = currentDay;
if (yearIdx === years.value.length - 1 && selectedMonth === futureMonth)
endDay = futureDay;
for (let i = startDay; i <= endDay; i++) tempDays.push(i); for (let i = startDay; i <= endDay; i++) tempDays.push(i);
} }
const dayIdx = tempDays.findIndex(d => d === currentDay); const dayIdx = tempDays.findIndex((d) => d === currentDay);
return [ return [
yearIdx >= 0 ? yearIdx : 0, yearIdx >= 0 ? yearIdx : 0,
monthIdx >= 0 ? monthIdx : 0, monthIdx >= 0 ? monthIdx : 0,
...@@ -252,6 +230,45 @@ watch( ...@@ -252,6 +230,45 @@ watch(
} }
); );
const months = computed(() => {
const [yearIdx] = pickerValue.value;
const selectedYear = years.value[yearIdx];
return getMonths(selectedYear);
});
const days = computed(() => {
const [yearIdx, monthIdx] = pickerValue.value;
const selectedYear = years.value[yearIdx];
const selectedMonth = months.value[monthIdx];
return getDays(selectedYear, selectedMonth);
});
// custom模式相关
const columns = computed(() => {
if (Array.isArray(props.range[0])) {
return props.range;
} else {
return [props.range];
}
});
// 工具函数:根据日期字符串获取索引
function getPickerIndexByDate(dateStr) {
if (!dateStr) return null;
const [year, month, day] = dateStr.split("-").map(Number);
const yearsArr = getYears();
const yearIdx = yearsArr.findIndex((y) => y === year);
if (yearIdx < 0) return null;
const selectedYear = yearsArr[yearIdx];
const monthsArr = getMonths(selectedYear);
const monthIdx = monthsArr.findIndex((m) => m === month);
if (monthIdx < 0) return null;
const daysArr = getDays(selectedYear, month);
const dayIdx = daysArr.findIndex((d) => d === day);
if (dayIdx < 0) return null;
return [yearIdx, monthIdx, dayIdx];
}
function open() { function open() {
if (props.disabled) return; if (props.disabled) return;
pickerValue.value = [...defaultValue.value]; pickerValue.value = [...defaultValue.value];
...@@ -267,6 +284,7 @@ function confirm() { ...@@ -267,6 +284,7 @@ function confirm() {
if (props.mode === "date") { if (props.mode === "date") {
const [yIdx, mIdx, dIdx] = pickerValue.value; const [yIdx, mIdx, dIdx] = pickerValue.value;
if (dIdx === 0) { if (dIdx === 0) {
props.onPickerChange(""); props.onPickerChange("");
return; return;
...@@ -278,7 +296,6 @@ function confirm() { ...@@ -278,7 +296,6 @@ function confirm() {
const dateStr = `${year}-${String(month).padStart(2, "0")}-${String( const dateStr = `${year}-${String(month).padStart(2, "0")}-${String(
day day
).padStart(2, "0")}`; ).padStart(2, "0")}`;
props.onPickerChange(dateStr);
// 新增:判断状态并回调 // 新增:判断状态并回调
const today = new Date(); const today = new Date();
...@@ -292,7 +309,12 @@ function confirm() { ...@@ -292,7 +309,12 @@ function confirm() {
} else { } else {
status = 1; status = 1;
} }
props.onStatusChange(status);
console.log("status", status);
const changeRes = props.onStatusChange(status);
if (changeRes) {
props.onPickerChange(dateStr);
}
} else { } else {
// 单列时只返回索引,否则返回数组 // 单列时只返回索引,否则返回数组
if (columns.value.length === 1) { if (columns.value.length === 1) {
...@@ -304,6 +326,7 @@ function confirm() { ...@@ -304,6 +326,7 @@ function confirm() {
} }
function onChange(e) { function onChange(e) {
let val = e.detail.value; let val = e.detail.value;
console.log('onChange', val);
if (props.mode === "date") { if (props.mode === "date") {
// 如果天数溢出,自动修正到最大天数 // 如果天数溢出,自动修正到最大天数
const maxDay = days.value.length; const maxDay = days.value.length;
......
...@@ -240,6 +240,7 @@ function openAgreement(e) { ...@@ -240,6 +240,7 @@ function openAgreement(e) {
function onStatusChange(v) { function onStatusChange(v) {
status.value = v; status.value = v;
return true;
} }
function onLayerVisibleChange() {} function onLayerVisibleChange() {}
...@@ -262,6 +263,7 @@ const handleBabyInfoConfirm = throttleTap(async () => { ...@@ -262,6 +263,7 @@ const handleBabyInfoConfirm = throttleTap(async () => {
if (!isBtnActive.value) { if (!isBtnActive.value) {
return; return;
} }
console.log('handleBabyInfoConfirm');
showLoading(); showLoading();
...@@ -278,6 +280,8 @@ const handleBabyInfoConfirm = throttleTap(async () => { ...@@ -278,6 +280,8 @@ const handleBabyInfoConfirm = throttleTap(async () => {
hideLoading(); hideLoading();
visible.value = false;
if (res.success) { if (res.success) {
emit("confirm", { emit("confirm", {
date: date.value, date: date.value,
......
...@@ -54,7 +54,7 @@ export const brandObj = { ...@@ -54,7 +54,7 @@ export const brandObj = {
"contentImg": "0-1", "contentImg": "0-1",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "星飞帆经典 3段", "shareTitle": "星飞帆经典 3段",
"shareImg": "brandpage/share_0_1.png", "shareImg": "brandpage/products/share/0/0_1.png",
}, },
{ {
"bgUrl": "brandpage/pic_0_2.png", "bgUrl": "brandpage/pic_0_2.png",
...@@ -66,7 +66,7 @@ export const brandObj = { ...@@ -66,7 +66,7 @@ export const brandObj = {
"contentImg": "0-2", "contentImg": "0-2",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "星飞帆卓睿 3段", "shareTitle": "星飞帆卓睿 3段",
"shareImg": "brandpage/pic_0_2.png", "shareImg": "brandpage/products/share/0/0_2.png",
}, },
{ {
"bgUrl": "brandpage/pic_0_3.png", "bgUrl": "brandpage/pic_0_3.png",
...@@ -78,7 +78,7 @@ export const brandObj = { ...@@ -78,7 +78,7 @@ export const brandObj = {
"contentImg": "0-3", "contentImg": "0-3",
"contentImgLen": 28, "contentImgLen": 28,
"shareTitle": "星飞帆卓耀 3段", "shareTitle": "星飞帆卓耀 3段",
"shareImg": "brandpage/pic_0_3.png", "shareImg": "brandpage/products/share/0/0_3.png",
}, },
{ {
"bgUrl": "brandpage/pic_0_4.png", "bgUrl": "brandpage/pic_0_4.png",
...@@ -90,7 +90,7 @@ export const brandObj = { ...@@ -90,7 +90,7 @@ export const brandObj = {
"contentImg": "0-4", "contentImg": "0-4",
"contentImgLen": 15, "contentImgLen": 15,
"shareTitle": "爱本跃动蛋白营养粉", "shareTitle": "爱本跃动蛋白营养粉",
"shareImg": "brandpage/pic_0_4.png", "shareImg": "brandpage/products/share/0/0_4.png",
}, },
{ {
"bgUrl": "brandpage/pic_0_5.png", "bgUrl": "brandpage/pic_0_5.png",
...@@ -102,7 +102,7 @@ export const brandObj = { ...@@ -102,7 +102,7 @@ export const brandObj = {
"contentImg": "0-5", "contentImg": "0-5",
"contentImgLen": 15, "contentImgLen": 15,
"shareTitle": "高钙奶酪泡芙脆", "shareTitle": "高钙奶酪泡芙脆",
"shareImg": "brandpage/pic_0_5.png", "shareImg": "brandpage/products/share/0/0_5.png",
}, },
{ {
"bgUrl": "brandpage/pic_0_6.png", "bgUrl": "brandpage/pic_0_6.png",
...@@ -114,7 +114,7 @@ export const brandObj = { ...@@ -114,7 +114,7 @@ export const brandObj = {
"contentImg": "0-6", "contentImg": "0-6",
"contentImgLen": 5, "contentImgLen": 5,
"shareTitle": "北纬47度黄糯玉米", "shareTitle": "北纬47度黄糯玉米",
"shareImg": "brandpage/pic_0_6.png", "shareImg": "brandpage/products/share/0/0_6.png",
} }
], ],
[ [
...@@ -128,7 +128,7 @@ export const brandObj = { ...@@ -128,7 +128,7 @@ export const brandObj = {
"contentImg": "1-1", "contentImg": "1-1",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "星飞帆经典 3段", "shareTitle": "星飞帆经典 3段",
"shareImg": "brandpage/share_1_1.png", "shareImg": "brandpage/products/share/1/1_1.png",
}, },
{ {
"bgUrl": "brandpage/pic_1_2.png", "bgUrl": "brandpage/pic_1_2.png",
...@@ -140,7 +140,7 @@ export const brandObj = { ...@@ -140,7 +140,7 @@ export const brandObj = {
"contentImg": "1-2", "contentImg": "1-2",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "星飞帆卓睿 3段", "shareTitle": "星飞帆卓睿 3段",
"shareImg": "brandpage/pic_1_2.png", "shareImg": "brandpage/products/share/1/1_2.png",
}, },
{ {
"bgUrl": "brandpage/pic_1_3.png", "bgUrl": "brandpage/pic_1_3.png",
...@@ -152,7 +152,7 @@ export const brandObj = { ...@@ -152,7 +152,7 @@ export const brandObj = {
"contentImg": "1-3", "contentImg": "1-3",
"contentImgLen": 28, "contentImgLen": 28,
"shareTitle": "星飞帆卓耀 3段", "shareTitle": "星飞帆卓耀 3段",
"shareImg": "brandpage/pic_1_3.png", "shareImg": "brandpage/products/share/1/1_3.png",
}, },
{ {
"bgUrl": "brandpage/pic_1_4.png", "bgUrl": "brandpage/pic_1_4.png",
...@@ -164,7 +164,7 @@ export const brandObj = { ...@@ -164,7 +164,7 @@ export const brandObj = {
"contentImg": "1-4", "contentImg": "1-4",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "星飞帆卓睿A2奶源", "shareTitle": "星飞帆卓睿A2奶源",
"shareImg": "brandpage/pic_1_4.png", "shareImg": "brandpage/products/share/1/1_4.png",
}, },
{ {
"bgUrl": "brandpage/pic_1_5.png", "bgUrl": "brandpage/pic_1_5.png",
...@@ -176,7 +176,7 @@ export const brandObj = { ...@@ -176,7 +176,7 @@ export const brandObj = {
"contentImg": "1-5", "contentImg": "1-5",
"contentImgLen": 28, "contentImgLen": 28,
"shareTitle": "臻稚卓蓓 3段", "shareTitle": "臻稚卓蓓 3段",
"shareImg": "brandpage/pic_1_5.png", "shareImg": "brandpage/products/share/1/1_5.png",
}, },
{ {
"bgUrl": "brandpage/pic_1_6.png", "bgUrl": "brandpage/pic_1_6.png",
...@@ -188,7 +188,7 @@ export const brandObj = { ...@@ -188,7 +188,7 @@ export const brandObj = {
"contentImg": "1-6", "contentImg": "1-6",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "臻爱倍护 3段", "shareTitle": "臻爱倍护 3段",
"shareImg": "brandpage/pic_1_6.png", "shareImg": "brandpage/products/share/1/1_6.png",
} }
], ],
[ [
...@@ -202,7 +202,7 @@ export const brandObj = { ...@@ -202,7 +202,7 @@ export const brandObj = {
"contentImg": "2-1", "contentImg": "2-1",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "爱本跃动蛋白营养粉", "shareTitle": "爱本跃动蛋白营养粉",
"shareImg": "brandpage/pic_2_1.png", "shareImg": "brandpage/products/share/2/2_1.png",
}, },
{ {
"bgUrl": "brandpage/pic_2_2.png", "bgUrl": "brandpage/pic_2_2.png",
...@@ -214,7 +214,7 @@ export const brandObj = { ...@@ -214,7 +214,7 @@ export const brandObj = {
"contentImg": "2-2", "contentImg": "2-2",
"contentImgLen": 15, "contentImgLen": 15,
"shareTitle": "爱本牛初乳", "shareTitle": "爱本牛初乳",
"shareImg": "brandpage/pic_2_2.png", "shareImg": "brandpage/products/share/2/2_2.png",
}, },
{ {
"bgUrl": "brandpage/pic_2_3.png", "bgUrl": "brandpage/pic_2_3.png",
...@@ -226,7 +226,7 @@ export const brandObj = { ...@@ -226,7 +226,7 @@ export const brandObj = {
"contentImg": "2-3", "contentImg": "2-3",
"contentImgLen": 15, "contentImgLen": 15,
"shareTitle": "爱本每日蛋白营养糊", "shareTitle": "爱本每日蛋白营养糊",
"shareImg": "brandpage/pic_2_3.png", "shareImg": "brandpage/products/share/2/2_3.png",
}, },
{ {
"bgUrl": "brandpage/pic_2_4.png", "bgUrl": "brandpage/pic_2_4.png",
...@@ -238,7 +238,7 @@ export const brandObj = { ...@@ -238,7 +238,7 @@ export const brandObj = {
"contentImg": "2-4", "contentImg": "2-4",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "爱本纤纤益生菌羽衣甘蓝蛋白粉", "shareTitle": "爱本纤纤益生菌羽衣甘蓝蛋白粉",
"shareImg": "brandpage/pic_2_4.png", "shareImg": "brandpage/products/share/2/2_4.png",
}, },
{ {
"bgUrl": "brandpage/pic_2_5.png", "bgUrl": "brandpage/pic_2_5.png",
...@@ -250,7 +250,7 @@ export const brandObj = { ...@@ -250,7 +250,7 @@ export const brandObj = {
"contentImg": "2-5", "contentImg": "2-5",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "爱本参芝初乳肽", "shareTitle": "爱本参芝初乳肽",
"shareImg": "brandpage/pic_2_5.png", "shareImg": "brandpage/products/share/2/2_5.png",
}, },
{ {
"bgUrl": "brandpage/pic_2_6.png", "bgUrl": "brandpage/pic_2_6.png",
...@@ -262,7 +262,7 @@ export const brandObj = { ...@@ -262,7 +262,7 @@ export const brandObj = {
"contentImg": "2-6", "contentImg": "2-6",
"contentImgLen": 15, "contentImgLen": 15,
"shareTitle": "爱本悦眠功能粉", "shareTitle": "爱本悦眠功能粉",
"shareImg": "brandpage/pic_2_6.png", "shareImg": "brandpage/products/share/2/2_6.png",
} }
], ],
[ [
...@@ -276,7 +276,7 @@ export const brandObj = { ...@@ -276,7 +276,7 @@ export const brandObj = {
"contentImg": "3-1", "contentImg": "3-1",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "爱上吃菜乳酪", "shareTitle": "爱上吃菜乳酪",
"shareImg": "brandpage/pic_3_1.png" "shareImg": "brandpage/products/share/3/3_1.png"
}, },
{ {
"bgUrl": "brandpage/pic_3_2.png", "bgUrl": "brandpage/pic_3_2.png",
...@@ -288,7 +288,7 @@ export const brandObj = { ...@@ -288,7 +288,7 @@ export const brandObj = {
"contentImg": "3-2", "contentImg": "3-2",
"contentImgLen": 15, "contentImgLen": 15,
"shareTitle": "高钙奶酪泡芙脆", "shareTitle": "高钙奶酪泡芙脆",
"shareImg": "brandpage/pic_3_2.png", "shareImg": "brandpage/products/share/3/3_2.png",
}, },
{ {
"bgUrl": "brandpage/pic_3_3.png", "bgUrl": "brandpage/pic_3_3.png",
...@@ -300,7 +300,7 @@ export const brandObj = { ...@@ -300,7 +300,7 @@ export const brandObj = {
"contentImg": "3-3", "contentImg": "3-3",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "高纤黑巧乳酪", "shareTitle": "高纤黑巧乳酪",
"shareImg": "brandpage/pic_3_3.png", "shareImg": "brandpage/products/share/3/3_3.png",
}, },
{ {
"bgUrl": "brandpage/pic_3_4.png", "bgUrl": "brandpage/pic_3_4.png",
...@@ -312,7 +312,7 @@ export const brandObj = { ...@@ -312,7 +312,7 @@ export const brandObj = {
"contentImg": "3-4", "contentImg": "3-4",
"contentImgLen": 15, "contentImgLen": 15,
"shareTitle": "超新星水果奶酪", "shareTitle": "超新星水果奶酪",
"shareImg": "brandpage/pic_3_4.png", "shareImg": "brandpage/products/share/3/3_4.png",
}, },
{ {
"bgUrl": "brandpage/pic_3_5.png", "bgUrl": "brandpage/pic_3_5.png",
...@@ -324,7 +324,7 @@ export const brandObj = { ...@@ -324,7 +324,7 @@ export const brandObj = {
"contentImg": "3-5", "contentImg": "3-5",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "厚切流心芝士片", "shareTitle": "厚切流心芝士片",
"shareImg": "brandpage/pic_3_5.png", "shareImg": "brandpage/products/share/3/3_5.png",
}, },
{ {
"bgUrl": "brandpage/pic_3_6.png", "bgUrl": "brandpage/pic_3_6.png",
...@@ -336,7 +336,7 @@ export const brandObj = { ...@@ -336,7 +336,7 @@ export const brandObj = {
"contentImg": "3-6", "contentImg": "3-6",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "嚼奶粉乳酪", "shareTitle": "嚼奶粉乳酪",
"shareImg": "brandpage/pic_3_6.png", "shareImg": "brandpage/products/share/3/3_6.png",
} }
], ],
[ [
...@@ -350,7 +350,7 @@ export const brandObj = { ...@@ -350,7 +350,7 @@ export const brandObj = {
"contentImg": "4-1", "contentImg": "4-1",
"contentImgLen": 5, "contentImgLen": 5,
"shareTitle": "北纬47度白甜糯玉米", "shareTitle": "北纬47度白甜糯玉米",
"shareImg": "brandpage/pic_4_1.png", "shareImg": "brandpage/products/share/4/4_1.png",
}, },
{ {
"bgUrl": "brandpage/pic_4_2.png", "bgUrl": "brandpage/pic_4_2.png",
...@@ -362,7 +362,7 @@ export const brandObj = { ...@@ -362,7 +362,7 @@ export const brandObj = {
"contentImg": "4-2", "contentImg": "4-2",
"contentImgLen": 5, "contentImgLen": 5,
"shareTitle": "北纬47度黄糯玉米", "shareTitle": "北纬47度黄糯玉米",
"shareImg": "brandpage/pic_4_2.png", "shareImg": "brandpage/products/share/4/4_2.png",
}, },
{ {
"bgUrl": "brandpage/pic_4_3.png", "bgUrl": "brandpage/pic_4_3.png",
...@@ -374,7 +374,7 @@ export const brandObj = { ...@@ -374,7 +374,7 @@ export const brandObj = {
"contentImg": "4-3", "contentImg": "4-3",
"contentImgLen": 5, "contentImgLen": 5,
"shareTitle": "北纬47度低GI水果玉米粒袋装", "shareTitle": "北纬47度低GI水果玉米粒袋装",
"shareImg": "brandpage/pic_4_3.png", "shareImg": "brandpage/products/share/4/4_3.png",
}, },
{ {
"bgUrl": "brandpage/pic_4_4.png", "bgUrl": "brandpage/pic_4_4.png",
...@@ -386,7 +386,7 @@ export const brandObj = { ...@@ -386,7 +386,7 @@ export const brandObj = {
"contentImg": "4-4", "contentImg": "4-4",
"contentImgLen": 5, "contentImgLen": 5,
"shareTitle": "北纬47度东北烧烤味玉米段", "shareTitle": "北纬47度东北烧烤味玉米段",
"shareImg": "brandpage/pic_4_4.png", "shareImg": "brandpage/products/share/4/4_4.png",
}, },
{ {
"bgUrl": "brandpage/pic_4_5.png", "bgUrl": "brandpage/pic_4_5.png",
...@@ -398,7 +398,7 @@ export const brandObj = { ...@@ -398,7 +398,7 @@ export const brandObj = {
"contentImg": "4-5", "contentImg": "4-5",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "N47°植物酵素乳", "shareTitle": "N47°植物酵素乳",
"shareImg": "brandpage/pic_4_5.png", "shareImg": "brandpage/products/share/4/4_5.png",
}, },
{ {
"bgUrl": "brandpage/pic_4_6.png", "bgUrl": "brandpage/pic_4_6.png",
...@@ -410,7 +410,7 @@ export const brandObj = { ...@@ -410,7 +410,7 @@ export const brandObj = {
"contentImg": "4-6", "contentImg": "4-6",
"contentImgLen": 8, "contentImgLen": 8,
"shareTitle": "N47°水果玉米汁", "shareTitle": "N47°水果玉米汁",
"shareImg": "brandpage/pic_4_6.png", "shareImg": "brandpage/products/share/4/4_6.png",
} }
] ]
], ],
......
export const homeObj = { export const homeObj = {
"voiceStory":{
"link":{
"type": 3,
"url": "https://mom.feihe.com/babyWikipedia?from=song&sourceFrom=moreTools&source=moreTools&num=1&bir=2024-05-23&monthAge=12&month=null"
}
},
"suggest":{
"link":{
"type": 3,
"url": "https://mom.feihe.com/expertsView?from=home"
}
},
"swiperList": [ "swiperList": [
{ {
"url": "homepage/banner1.jpg", "url": "homepage/banner1.jpg",
...@@ -38,39 +50,61 @@ export const homeObj = { ...@@ -38,39 +50,61 @@ export const homeObj = {
"subTitle": "免费问诊权益", "subTitle": "免费问诊权益",
"bgUrl": "homepage/cardbg1.png", "bgUrl": "homepage/cardbg1.png",
"btnTitle": "三甲医生在线问诊", "btnTitle": "三甲医生在线问诊",
"btnSubTitle": "立即了解" "btnSubTitle": "立即了解",
"link": {
"type": 2,
"url": "subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot",
"extra": {"appId": "wx4205ec55b793245e", "envVersion": "release"}
}
}, },
{ {
"grade": "1", "grade": "1",
"subTitle": "育儿课程权益", "subTitle": "育儿课程权益",
"bgUrl": "homepage/cardbg1.png", "bgUrl": "homepage/cardbg1.png",
"btnTitle": "12类系列课程", "btnTitle": "12类系列课程",
"btnSubTitle": "立即领取", "btnSubTitle": "立即了解",
"showCornerTxt": "待领取" "link": {
"type": 2,
"url": "subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot",
"extra": {"appId": "wx4205ec55b793245e", "envVersion": "release"}
}
}, },
{ {
"grade": "2", "grade": "2",
"subTitle": "育儿课程权益", "subTitle": "育儿课程权益",
"bgUrl": "homepage/cardbg1.png", "bgUrl": "homepage/cardbg1.png",
"btnTitle": "12类系列课程", "btnTitle": "12类系列课程",
"btnSubTitle": "立即领取", "btnSubTitle": "立即了解",
"showCornerTxt": "待领取" "link": {
"type": 2,
"url": "subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot",
"extra": {"appId": "wx4205ec55b793245e", "envVersion": "release"}
}
}, },
{ {
"grade": "3", "grade": "3",
"subTitle": "月月礼权益", "subTitle": "月月礼权益",
"bgUrl": "homepage/cardbg1.png", "bgUrl": "homepage/cardbg1.png",
"btnTitle": "1分购、优惠券", "btnTitle": "1分购、优惠券",
"btnSubTitle": "立即领取", "btnSubTitle": "立即了解",
"showCornerTxt": "待领取" "link": {
"type": 2,
"url": "subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot",
"extra": {"appId": "wx4205ec55b793245e", "envVersion": "release"}
}
}, },
{ {
"grade": "4", "grade": "4",
"subTitle": "月月礼权益", "subTitle": "月月礼权益",
"bgUrl": "homepage/cardbg1.png", "bgUrl": "homepage/cardbg1.png",
"btnTitle": "1分购、优惠券", "btnTitle": "1分购、优惠券",
"btnSubTitle": "立即领取", "btnSubTitle": "立即了解",
"showCornerTxt": "待领取" "link": {
"type": 2,
"url": "subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot",
"extra": {"appId": "wx4205ec55b793245e", "envVersion": "release"}
}
} }
], ],
"vipCardList": [ "vipCardList": [
...@@ -78,8 +112,7 @@ export const homeObj = { ...@@ -78,8 +112,7 @@ export const homeObj = {
"level": "钻石会员", "level": "钻石会员",
"subTitle": "育儿课程权益", "subTitle": "育儿课程权益",
"btnTitle": "12类系列课程", "btnTitle": "12类系列课程",
"btnSubTitle": "立即领取", "btnSubTitle": "立即了解",
"showCornerTxt": "待领取",
"link": { "link": {
"type": 2, "type": 2,
"url": "subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot", "url": "subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot",
...@@ -95,7 +128,8 @@ export const homeObj = { ...@@ -95,7 +128,8 @@ export const homeObj = {
"showCornerTxt": "", "showCornerTxt": "",
"link": { "link": {
"type": 2, "type": 2,
"url": "" "url": "subPackages/shopMainList/topicNew/index?id=1000265&entrySource=xmh_wechatmp_home_recgoods",
"extra": {"appId": "wx4205ec55b793245e", "envVersion": "release"}
}, },
"bgUrl": "homepage/cardbg2.png" "bgUrl": "homepage/cardbg2.png"
}, },
...@@ -105,7 +139,11 @@ export const homeObj = { ...@@ -105,7 +139,11 @@ export const homeObj = {
"btnTitle": "", "btnTitle": "",
"btnSubTitle": "", "btnSubTitle": "",
"showCornerTxt": "", "showCornerTxt": "",
"link": "", "link": {
"type": 1,
"url": "/pages/library/ContentLibrary",
"extra": {}
},
"bgUrl": "homepage/cardbg3.png" "bgUrl": "homepage/cardbg3.png"
} }
], ],
......
var a = { const brandObj = {
"videoUrl": "https://duiba.oss-cn-hangzhou.aliyuncs.com/fh/brandpage/banner_1%E6%85%A2%E4%BA%BA%E8%8A%82x%E9%A3%9E%E9%B9%A4%2B-%2B%E5%9C%9FFINAL.mp4", "videoUrl": "https://duiba.oss-cn-hangzhou.aliyuncs.com/fh/brandpage/banner_1%E6%85%A2%E4%BA%BA%E8%8A%82x%E9%A3%9E%E9%B9%A4%2B-%2B%E5%9C%9FFINAL.mp4",
"swiperList": [ "swiperList": [
{ {
...@@ -54,7 +54,7 @@ var a = { ...@@ -54,7 +54,7 @@ var a = {
"contentImg": "0-1", "contentImg": "0-1",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "星飞帆经典 3段", "shareTitle": "星飞帆经典 3段",
"shareImg": "brandpage/share_0_1.png", "shareImg": "brandpage/products/share/0/0_1.png",
}, },
{ {
"bgUrl": "brandpage/pic_0_2.png", "bgUrl": "brandpage/pic_0_2.png",
...@@ -66,7 +66,7 @@ var a = { ...@@ -66,7 +66,7 @@ var a = {
"contentImg": "0-2", "contentImg": "0-2",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "星飞帆卓睿 3段", "shareTitle": "星飞帆卓睿 3段",
"shareImg": "brandpage/pic_0_2.png", "shareImg": "brandpage/products/share/0/0_2.png",
}, },
{ {
"bgUrl": "brandpage/pic_0_3.png", "bgUrl": "brandpage/pic_0_3.png",
...@@ -78,7 +78,7 @@ var a = { ...@@ -78,7 +78,7 @@ var a = {
"contentImg": "0-3", "contentImg": "0-3",
"contentImgLen": 28, "contentImgLen": 28,
"shareTitle": "星飞帆卓耀 3段", "shareTitle": "星飞帆卓耀 3段",
"shareImg": "brandpage/pic_0_3.png", "shareImg": "brandpage/products/share/0/0_3.png",
}, },
{ {
"bgUrl": "brandpage/pic_0_4.png", "bgUrl": "brandpage/pic_0_4.png",
...@@ -90,7 +90,7 @@ var a = { ...@@ -90,7 +90,7 @@ var a = {
"contentImg": "0-4", "contentImg": "0-4",
"contentImgLen": 15, "contentImgLen": 15,
"shareTitle": "爱本跃动蛋白营养粉", "shareTitle": "爱本跃动蛋白营养粉",
"shareImg": "brandpage/pic_0_4.png", "shareImg": "brandpage/products/share/0/0_4.png",
}, },
{ {
"bgUrl": "brandpage/pic_0_5.png", "bgUrl": "brandpage/pic_0_5.png",
...@@ -102,7 +102,7 @@ var a = { ...@@ -102,7 +102,7 @@ var a = {
"contentImg": "0-5", "contentImg": "0-5",
"contentImgLen": 15, "contentImgLen": 15,
"shareTitle": "高钙奶酪泡芙脆", "shareTitle": "高钙奶酪泡芙脆",
"shareImg": "brandpage/pic_0_5.png", "shareImg": "brandpage/products/share/0/0_5.png",
}, },
{ {
"bgUrl": "brandpage/pic_0_6.png", "bgUrl": "brandpage/pic_0_6.png",
...@@ -114,7 +114,7 @@ var a = { ...@@ -114,7 +114,7 @@ var a = {
"contentImg": "0-6", "contentImg": "0-6",
"contentImgLen": 5, "contentImgLen": 5,
"shareTitle": "北纬47度黄糯玉米", "shareTitle": "北纬47度黄糯玉米",
"shareImg": "brandpage/pic_0_6.png", "shareImg": "brandpage/products/share/0/0_6.png",
} }
], ],
[ [
...@@ -128,7 +128,7 @@ var a = { ...@@ -128,7 +128,7 @@ var a = {
"contentImg": "1-1", "contentImg": "1-1",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "星飞帆经典 3段", "shareTitle": "星飞帆经典 3段",
"shareImg": "brandpage/share_1_1.png", "shareImg": "brandpage/products/share/1/1_1.png",
}, },
{ {
"bgUrl": "brandpage/pic_1_2.png", "bgUrl": "brandpage/pic_1_2.png",
...@@ -140,7 +140,7 @@ var a = { ...@@ -140,7 +140,7 @@ var a = {
"contentImg": "1-2", "contentImg": "1-2",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "星飞帆卓睿 3段", "shareTitle": "星飞帆卓睿 3段",
"shareImg": "brandpage/pic_1_2.png", "shareImg": "brandpage/products/share/1/1_2.png",
}, },
{ {
"bgUrl": "brandpage/pic_1_3.png", "bgUrl": "brandpage/pic_1_3.png",
...@@ -152,7 +152,7 @@ var a = { ...@@ -152,7 +152,7 @@ var a = {
"contentImg": "1-3", "contentImg": "1-3",
"contentImgLen": 28, "contentImgLen": 28,
"shareTitle": "星飞帆卓耀 3段", "shareTitle": "星飞帆卓耀 3段",
"shareImg": "brandpage/pic_1_3.png", "shareImg": "brandpage/products/share/1/1_3.png",
}, },
{ {
"bgUrl": "brandpage/pic_1_4.png", "bgUrl": "brandpage/pic_1_4.png",
...@@ -164,7 +164,7 @@ var a = { ...@@ -164,7 +164,7 @@ var a = {
"contentImg": "1-4", "contentImg": "1-4",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "星飞帆卓睿A2奶源", "shareTitle": "星飞帆卓睿A2奶源",
"shareImg": "brandpage/pic_1_4.png", "shareImg": "brandpage/products/share/1/1_4.png",
}, },
{ {
"bgUrl": "brandpage/pic_1_5.png", "bgUrl": "brandpage/pic_1_5.png",
...@@ -176,7 +176,7 @@ var a = { ...@@ -176,7 +176,7 @@ var a = {
"contentImg": "1-5", "contentImg": "1-5",
"contentImgLen": 28, "contentImgLen": 28,
"shareTitle": "臻稚卓蓓 3段", "shareTitle": "臻稚卓蓓 3段",
"shareImg": "brandpage/pic_1_5.png", "shareImg": "brandpage/products/share/1/1_5.png",
}, },
{ {
"bgUrl": "brandpage/pic_1_6.png", "bgUrl": "brandpage/pic_1_6.png",
...@@ -188,7 +188,7 @@ var a = { ...@@ -188,7 +188,7 @@ var a = {
"contentImg": "1-6", "contentImg": "1-6",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "臻爱倍护 3段", "shareTitle": "臻爱倍护 3段",
"shareImg": "brandpage/pic_1_6.png", "shareImg": "brandpage/products/share/1/1_6.png",
} }
], ],
[ [
...@@ -202,7 +202,7 @@ var a = { ...@@ -202,7 +202,7 @@ var a = {
"contentImg": "2-1", "contentImg": "2-1",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "爱本跃动蛋白营养粉", "shareTitle": "爱本跃动蛋白营养粉",
"shareImg": "brandpage/pic_2_1.png", "shareImg": "brandpage/products/share/2/2_1.png",
}, },
{ {
"bgUrl": "brandpage/pic_2_2.png", "bgUrl": "brandpage/pic_2_2.png",
...@@ -214,7 +214,7 @@ var a = { ...@@ -214,7 +214,7 @@ var a = {
"contentImg": "2-2", "contentImg": "2-2",
"contentImgLen": 15, "contentImgLen": 15,
"shareTitle": "爱本牛初乳", "shareTitle": "爱本牛初乳",
"shareImg": "brandpage/pic_2_2.png", "shareImg": "brandpage/products/share/2/2_2.png",
}, },
{ {
"bgUrl": "brandpage/pic_2_3.png", "bgUrl": "brandpage/pic_2_3.png",
...@@ -226,7 +226,7 @@ var a = { ...@@ -226,7 +226,7 @@ var a = {
"contentImg": "2-3", "contentImg": "2-3",
"contentImgLen": 15, "contentImgLen": 15,
"shareTitle": "爱本每日蛋白营养糊", "shareTitle": "爱本每日蛋白营养糊",
"shareImg": "brandpage/pic_2_3.png", "shareImg": "brandpage/products/share/2/2_3.png",
}, },
{ {
"bgUrl": "brandpage/pic_2_4.png", "bgUrl": "brandpage/pic_2_4.png",
...@@ -238,7 +238,7 @@ var a = { ...@@ -238,7 +238,7 @@ var a = {
"contentImg": "2-4", "contentImg": "2-4",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "爱本纤纤益生菌羽衣甘蓝蛋白粉", "shareTitle": "爱本纤纤益生菌羽衣甘蓝蛋白粉",
"shareImg": "brandpage/pic_2_4.png", "shareImg": "brandpage/products/share/2/2_4.png",
}, },
{ {
"bgUrl": "brandpage/pic_2_5.png", "bgUrl": "brandpage/pic_2_5.png",
...@@ -250,7 +250,7 @@ var a = { ...@@ -250,7 +250,7 @@ var a = {
"contentImg": "2-5", "contentImg": "2-5",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "爱本参芝初乳肽", "shareTitle": "爱本参芝初乳肽",
"shareImg": "brandpage/pic_2_5.png", "shareImg": "brandpage/products/share/2/2_5.png",
}, },
{ {
"bgUrl": "brandpage/pic_2_6.png", "bgUrl": "brandpage/pic_2_6.png",
...@@ -262,7 +262,7 @@ var a = { ...@@ -262,7 +262,7 @@ var a = {
"contentImg": "2-6", "contentImg": "2-6",
"contentImgLen": 15, "contentImgLen": 15,
"shareTitle": "爱本悦眠功能粉", "shareTitle": "爱本悦眠功能粉",
"shareImg": "brandpage/pic_2_6.png", "shareImg": "brandpage/products/share/2/2_6.png",
} }
], ],
[ [
...@@ -276,7 +276,7 @@ var a = { ...@@ -276,7 +276,7 @@ var a = {
"contentImg": "3-1", "contentImg": "3-1",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "爱上吃菜乳酪", "shareTitle": "爱上吃菜乳酪",
"shareImg": "brandpage/pic_3_1.png" "shareImg": "brandpage/products/share/3/3_1.png"
}, },
{ {
"bgUrl": "brandpage/pic_3_2.png", "bgUrl": "brandpage/pic_3_2.png",
...@@ -288,7 +288,7 @@ var a = { ...@@ -288,7 +288,7 @@ var a = {
"contentImg": "3-2", "contentImg": "3-2",
"contentImgLen": 15, "contentImgLen": 15,
"shareTitle": "高钙奶酪泡芙脆", "shareTitle": "高钙奶酪泡芙脆",
"shareImg": "brandpage/pic_3_2.png", "shareImg": "brandpage/products/share/3/3_2.png",
}, },
{ {
"bgUrl": "brandpage/pic_3_3.png", "bgUrl": "brandpage/pic_3_3.png",
...@@ -300,7 +300,7 @@ var a = { ...@@ -300,7 +300,7 @@ var a = {
"contentImg": "3-3", "contentImg": "3-3",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "高纤黑巧乳酪", "shareTitle": "高纤黑巧乳酪",
"shareImg": "brandpage/pic_3_3.png", "shareImg": "brandpage/products/share/3/3_3.png",
}, },
{ {
"bgUrl": "brandpage/pic_3_4.png", "bgUrl": "brandpage/pic_3_4.png",
...@@ -312,7 +312,7 @@ var a = { ...@@ -312,7 +312,7 @@ var a = {
"contentImg": "3-4", "contentImg": "3-4",
"contentImgLen": 15, "contentImgLen": 15,
"shareTitle": "超新星水果奶酪", "shareTitle": "超新星水果奶酪",
"shareImg": "brandpage/pic_3_4.png", "shareImg": "brandpage/products/share/3/3_4.png",
}, },
{ {
"bgUrl": "brandpage/pic_3_5.png", "bgUrl": "brandpage/pic_3_5.png",
...@@ -324,7 +324,7 @@ var a = { ...@@ -324,7 +324,7 @@ var a = {
"contentImg": "3-5", "contentImg": "3-5",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "厚切流心芝士片", "shareTitle": "厚切流心芝士片",
"shareImg": "brandpage/pic_3_5.png", "shareImg": "brandpage/products/share/3/3_5.png",
}, },
{ {
"bgUrl": "brandpage/pic_3_6.png", "bgUrl": "brandpage/pic_3_6.png",
...@@ -336,7 +336,7 @@ var a = { ...@@ -336,7 +336,7 @@ var a = {
"contentImg": "3-6", "contentImg": "3-6",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "嚼奶粉乳酪", "shareTitle": "嚼奶粉乳酪",
"shareImg": "brandpage/pic_3_6.png", "shareImg": "brandpage/products/share/3/3_6.png",
} }
], ],
[ [
...@@ -350,7 +350,7 @@ var a = { ...@@ -350,7 +350,7 @@ var a = {
"contentImg": "4-1", "contentImg": "4-1",
"contentImgLen": 5, "contentImgLen": 5,
"shareTitle": "北纬47度白甜糯玉米", "shareTitle": "北纬47度白甜糯玉米",
"shareImg": "brandpage/pic_4_1.png", "shareImg": "brandpage/products/share/4/4_1.png",
}, },
{ {
"bgUrl": "brandpage/pic_4_2.png", "bgUrl": "brandpage/pic_4_2.png",
...@@ -362,7 +362,7 @@ var a = { ...@@ -362,7 +362,7 @@ var a = {
"contentImg": "4-2", "contentImg": "4-2",
"contentImgLen": 5, "contentImgLen": 5,
"shareTitle": "北纬47度黄糯玉米", "shareTitle": "北纬47度黄糯玉米",
"shareImg": "brandpage/pic_4_2.png", "shareImg": "brandpage/products/share/4/4_2.png",
}, },
{ {
"bgUrl": "brandpage/pic_4_3.png", "bgUrl": "brandpage/pic_4_3.png",
...@@ -374,7 +374,7 @@ var a = { ...@@ -374,7 +374,7 @@ var a = {
"contentImg": "4-3", "contentImg": "4-3",
"contentImgLen": 5, "contentImgLen": 5,
"shareTitle": "北纬47度低GI水果玉米粒袋装", "shareTitle": "北纬47度低GI水果玉米粒袋装",
"shareImg": "brandpage/pic_4_3.png", "shareImg": "brandpage/products/share/4/4_3.png",
}, },
{ {
"bgUrl": "brandpage/pic_4_4.png", "bgUrl": "brandpage/pic_4_4.png",
...@@ -386,7 +386,7 @@ var a = { ...@@ -386,7 +386,7 @@ var a = {
"contentImg": "4-4", "contentImg": "4-4",
"contentImgLen": 5, "contentImgLen": 5,
"shareTitle": "北纬47度东北烧烤味玉米段", "shareTitle": "北纬47度东北烧烤味玉米段",
"shareImg": "brandpage/pic_4_4.png", "shareImg": "brandpage/products/share/4/4_4.png",
}, },
{ {
"bgUrl": "brandpage/pic_4_5.png", "bgUrl": "brandpage/pic_4_5.png",
...@@ -398,7 +398,7 @@ var a = { ...@@ -398,7 +398,7 @@ var a = {
"contentImg": "4-5", "contentImg": "4-5",
"contentImgLen": 10, "contentImgLen": 10,
"shareTitle": "N47°植物酵素乳", "shareTitle": "N47°植物酵素乳",
"shareImg": "brandpage/pic_4_5.png", "shareImg": "brandpage/products/share/4/4_5.png",
}, },
{ {
"bgUrl": "brandpage/pic_4_6.png", "bgUrl": "brandpage/pic_4_6.png",
...@@ -410,7 +410,7 @@ var a = { ...@@ -410,7 +410,7 @@ var a = {
"contentImg": "4-6", "contentImg": "4-6",
"contentImgLen": 8, "contentImgLen": 8,
"shareTitle": "N47°水果玉米汁", "shareTitle": "N47°水果玉米汁",
"shareImg": "brandpage/pic_4_6.png", "shareImg": "brandpage/products/share/4/4_6.png",
} }
] ]
], ],
...@@ -460,5 +460,5 @@ var a = { ...@@ -460,5 +460,5 @@ var a = {
} }
] ]
} }
var b = JSON.stringify(JSON.stringify(a)); var b = JSON.stringify(JSON.stringify(brandObj));
console.log(b); console.log(b);
\ No newline at end of file
var a = { const homeObj = {
"voiceStory":{
"link":{
"type": 3,
"url": "https://mom.feihe.com/babyWikipedia?from=song&sourceFrom=moreTools&source=moreTools&num=1&bir=2024-05-23&monthAge=12&month=null"
}
},
"suggest":{
"link":{
"type": 3,
"url": "https://mom.feihe.com/expertsView?from=home"
}
},
"swiperList": [ "swiperList": [
{ {
"url": "homepage/banner1.jpg", "url": "homepage/banner1.jpg",
...@@ -38,39 +50,61 @@ var a = { ...@@ -38,39 +50,61 @@ var a = {
"subTitle": "免费问诊权益", "subTitle": "免费问诊权益",
"bgUrl": "homepage/cardbg1.png", "bgUrl": "homepage/cardbg1.png",
"btnTitle": "三甲医生在线问诊", "btnTitle": "三甲医生在线问诊",
"btnSubTitle": "立即了解" "btnSubTitle": "立即了解",
"link": {
"type": 2,
"url": "subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot",
"extra": {"appId": "wx4205ec55b793245e", "envVersion": "release"}
}
}, },
{ {
"grade": "1", "grade": "1",
"subTitle": "育儿课程权益", "subTitle": "育儿课程权益",
"bgUrl": "homepage/cardbg1.png", "bgUrl": "homepage/cardbg1.png",
"btnTitle": "12类系列课程", "btnTitle": "12类系列课程",
"btnSubTitle": "立即领取", "btnSubTitle": "立即了解",
"showCornerTxt": "待领取" "link": {
"type": 2,
"url": "subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot",
"extra": {"appId": "wx4205ec55b793245e", "envVersion": "release"}
}
}, },
{ {
"grade": "2", "grade": "2",
"subTitle": "育儿课程权益", "subTitle": "育儿课程权益",
"bgUrl": "homepage/cardbg1.png", "bgUrl": "homepage/cardbg1.png",
"btnTitle": "12类系列课程", "btnTitle": "12类系列课程",
"btnSubTitle": "立即领取", "btnSubTitle": "立即了解",
"showCornerTxt": "待领取" "link": {
"type": 2,
"url": "subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot",
"extra": {"appId": "wx4205ec55b793245e", "envVersion": "release"}
}
}, },
{ {
"grade": "3", "grade": "3",
"subTitle": "月月礼权益", "subTitle": "月月礼权益",
"bgUrl": "homepage/cardbg1.png", "bgUrl": "homepage/cardbg1.png",
"btnTitle": "1分购、优惠券", "btnTitle": "1分购、优惠券",
"btnSubTitle": "立即领取", "btnSubTitle": "立即了解",
"showCornerTxt": "待领取" "link": {
"type": 2,
"url": "subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot",
"extra": {"appId": "wx4205ec55b793245e", "envVersion": "release"}
}
}, },
{ {
"grade": "4", "grade": "4",
"subTitle": "月月礼权益", "subTitle": "月月礼权益",
"bgUrl": "homepage/cardbg1.png", "bgUrl": "homepage/cardbg1.png",
"btnTitle": "1分购、优惠券", "btnTitle": "1分购、优惠券",
"btnSubTitle": "立即领取", "btnSubTitle": "立即了解",
"showCornerTxt": "待领取" "link": {
"type": 2,
"url": "subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot",
"extra": {"appId": "wx4205ec55b793245e", "envVersion": "release"}
}
} }
], ],
"vipCardList": [ "vipCardList": [
...@@ -78,8 +112,7 @@ var a = { ...@@ -78,8 +112,7 @@ var a = {
"level": "钻石会员", "level": "钻石会员",
"subTitle": "育儿课程权益", "subTitle": "育儿课程权益",
"btnTitle": "12类系列课程", "btnTitle": "12类系列课程",
"btnSubTitle": "立即领取", "btnSubTitle": "立即了解",
"showCornerTxt": "待领取",
"link": { "link": {
"type": 2, "type": 2,
"url": "subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot", "url": "subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot",
...@@ -95,7 +128,8 @@ var a = { ...@@ -95,7 +128,8 @@ var a = {
"showCornerTxt": "", "showCornerTxt": "",
"link": { "link": {
"type": 2, "type": 2,
"url": "" "url": "subPackages/shopMainList/topicNew/index?id=1000265&entrySource=xmh_wechatmp_home_recgoods",
"extra": {"appId": "wx4205ec55b793245e", "envVersion": "release"}
}, },
"bgUrl": "homepage/cardbg2.png" "bgUrl": "homepage/cardbg2.png"
}, },
...@@ -105,7 +139,11 @@ var a = { ...@@ -105,7 +139,11 @@ var a = {
"btnTitle": "", "btnTitle": "",
"btnSubTitle": "", "btnSubTitle": "",
"showCornerTxt": "", "showCornerTxt": "",
"link": "", "link": {
"type": 1,
"url": "/pages/library/ContentLibrary",
"extra": {}
},
"bgUrl": "homepage/cardbg3.png" "bgUrl": "homepage/cardbg3.png"
} }
], ],
...@@ -313,6 +351,5 @@ var a = { ...@@ -313,6 +351,5 @@ var a = {
var b = JSON.stringify(JSON.stringify(homeObj));
var b = JSON.stringify(JSON.stringify(a));
console.log(b); console.log(b);
\ No newline at end of file
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"path" : "pages/product/product", "path" : "pages/product/product",
"style" : "style" :
{ {
"navigationBarTitleText": "商品详情", "navigationBarTitleText": "",
"navigationBarBackgroundColor": "#ffffff", "navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "black"
} }
......
...@@ -95,6 +95,14 @@ ...@@ -95,6 +95,14 @@
formData[item.name] || item.placeholder formData[item.name] || item.placeholder
}}</view> }}</view>
</view> </view>
<view
v-else-if="item.type === 'display-obj'"
class="form-input-box"
>
<view class="form-input" style="color: #222">{{
getLabelByValue(item, formData[item.name])
}}</view>
</view>
<!-- 选择器类型 --> <!-- 选择器类型 -->
<picker-custom <picker-custom
v-else-if="item.type === 'picker'" v-else-if="item.type === 'picker'"
...@@ -127,9 +135,12 @@ ...@@ -127,9 +135,12 @@
<view class="form-input-box"> <view class="form-input-box">
<view class="form-input"> <view class="form-input">
{{ {{
(formData[item.name] && (formData[item.name] &&
(formData[item.name].split(",").join("、").length > 11 (formData[item.name].split(",").join("、").length > 11
? formData[item.name].split(",").join("、").slice(0, 11) + "..." ? formData[item.name]
.split(",")
.join("、")
.slice(0, 11) + "..."
: formData[item.name].split(",").join("、"))) || : formData[item.name].split(",").join("、"))) ||
item.placeholder item.placeholder
}} }}
...@@ -305,7 +316,7 @@ const specialAttentionOptions = ref([]); ...@@ -305,7 +316,7 @@ const specialAttentionOptions = ref([]);
const channelOptions = ref([]); const channelOptions = ref([]);
// 表单项配置 // 表单项配置
const formItems = [ const formItems = ref([
{ {
label: "当前状态", label: "当前状态",
name: "babyStage", name: "babyStage",
...@@ -411,7 +422,22 @@ const formItems = [ ...@@ -411,7 +422,22 @@ const formItems = [
range: [], range: [],
mode: "custom", mode: "custom",
}, },
]; ]);
const clearFormFields = () => {
formData.value.babyBirthday = "";
formData.value.dueDate = "";
if (userStore.babyInfo.content?.babyType == "") {
formData.value.babyType = "";
}
formData.value.babyGender = "";
formData.value.feedingType = "";
formData.value.contentPreference = "";
formData.value.productPreference = "";
formData.value.followInfo = "";
formData.value.purchaseChannel = "";
formData.value.gestationalWeeks = "";
};
const getPickerIndex = (item) => { const getPickerIndex = (item) => {
const val = formData.value[item.name]; const val = formData.value[item.name];
...@@ -448,11 +474,11 @@ const getPickerIndex = (item) => { ...@@ -448,11 +474,11 @@ const getPickerIndex = (item) => {
} }
}; };
const onPickerChange = (e, name) => { const onPickerChange = (e, name) => {
const item = formItems.find((i) => i.name === name); const item = formItems.value.find((i) => i.name === name);
if (name === "babyStage") { if (name === "babyStage") {
if ( if (
pageType.value === "edit" && pageType.value === "edit" &&
babyStageMap[e].value < formData.value[name] babyStageMap[e].value < userStore.babyInfo.babyStage
) { ) {
uni.showToast({ uni.showToast({
title: "不能选择更早的阶段", title: "不能选择更早的阶段",
...@@ -463,16 +489,7 @@ const onPickerChange = (e, name) => { ...@@ -463,16 +489,7 @@ const onPickerChange = (e, name) => {
// 当阶段变化时清空相关表单项 // 当阶段变化时清空相关表单项
if (formData.value[name] !== babyStageMap[e].value) { if (formData.value[name] !== babyStageMap[e].value) {
formData.value.babyBirthday = ""; clearFormFields();
formData.value.dueDate = "";
formData.value.babyType = "";
formData.value.babyGender = "";
formData.value.feedingType = "";
formData.value.contentPreference = "";
formData.value.productPreference = "";
formData.value.followInfo = "";
formData.value.purchaseChannel = "";
formData.value.gestationalWeeks = "";
} }
formData.value[name] = babyStageMap[e].value; formData.value[name] = babyStageMap[e].value;
...@@ -494,6 +511,7 @@ const onPickerChange = (e, name) => { ...@@ -494,6 +511,7 @@ const onPickerChange = (e, name) => {
formData.value[name] = item.range[e]; formData.value[name] = item.range[e];
} }
}; };
const onRadioChange = (e, name) => { const onRadioChange = (e, name) => {
formData.value[name] = e.detail.value; formData.value[name] = e.detail.value;
}; };
...@@ -506,7 +524,7 @@ const onSubmit = async (e) => { ...@@ -506,7 +524,7 @@ const onSubmit = async (e) => {
console.log("fieldsToValidate", formData.value); console.log("fieldsToValidate", formData.value);
// 获取必填的表单项 // 获取必填的表单项
const requiredFields = formItems const requiredFields = formItems.value
.filter((item) => fieldsToValidate.includes(item.name) && item.required) .filter((item) => fieldsToValidate.includes(item.name) && item.required)
.map((item) => ({ .map((item) => ({
name: item.name, name: item.name,
...@@ -626,7 +644,18 @@ const handleUploadBackground = async (e) => { ...@@ -626,7 +644,18 @@ const handleUploadBackground = async (e) => {
}); });
}; };
function onDateStatusChange(status) { function onDateStatusChange(status) {
if (pageType.value === "edit" && status < userStore.babyInfo.babyStage) {
uni.showToast({
title: "不能选择更早的阶段",
icon: "none",
});
return false;
}
formData.value.babyStage = status; formData.value.babyStage = status;
if (status !== formData.value.babyStage) {
clearFormFields();
}
return true;
} }
// getLabelByValue 支持所有映射字段 // getLabelByValue 支持所有映射字段
...@@ -677,7 +706,7 @@ const initData = () => { ...@@ -677,7 +706,7 @@ const initData = () => {
channelOptions.value = contentCfg.channelOptions; channelOptions.value = contentCfg.channelOptions;
// 更新表单项的选项数据 // 更新表单项的选项数据
formItems.forEach((item) => { formItems.value.forEach((item) => {
if (item.name === "contentPreference") { if (item.name === "contentPreference") {
item.range = contentLikeOptions.value; item.range = contentLikeOptions.value;
} else if (item.name === "productPreference") { } else if (item.name === "productPreference") {
...@@ -686,6 +715,11 @@ const initData = () => { ...@@ -686,6 +715,11 @@ const initData = () => {
item.range = specialAttentionOptions.value; item.range = specialAttentionOptions.value;
} else if (item.name === "purchaseChannel") { } else if (item.name === "purchaseChannel") {
item.range = channelOptions.value; item.range = channelOptions.value;
} else if (
item.name === "babyType" &&
userStore.babyInfo.content?.babyType != ""
) {
item.type = "display-obj";
} }
}); });
}; };
...@@ -712,7 +746,6 @@ onLoad((options) => { ...@@ -712,7 +746,6 @@ onLoad((options) => {
formData.value.purchaseChannel = baby.content?.purchaseChannel || ""; formData.value.purchaseChannel = baby.content?.purchaseChannel || "";
formData.value.babyAvatar = baby.content?.babyAvatar || ""; formData.value.babyAvatar = baby.content?.babyAvatar || "";
formData.value.backgroundImg = baby.content?.backgroundImg || ""; formData.value.backgroundImg = baby.content?.backgroundImg || "";
formData.value.gestationalWeeks = baby.content?.gestationalWeeks || ""; formData.value.gestationalWeeks = baby.content?.gestationalWeeks || "";
} else { } else {
Object.assign(formData.value, { Object.assign(formData.value, {
......
<template> <template>
<view class="container"> <view class="container">
<image :key="index" v-for="(item,index) in imgList" mode="widthFix" class="productimg" :src="item.imgUrl"></image> <image :key="index" v-for="(item, index) in imgList" mode="widthFix" class="productimg" :src="item.imgUrl">
</image>
<view class="btnbox"> <view class="btnbox">
<image @tap="buyHandler" class="btnbuy" :src="$baseUrl + 'brandpage/btnbuy.png'"></image> <image @tap="buyHandler" class="btnbuy" :src="$baseUrl + 'brandpage/btnbuy.png'"></image>
<button class="btnshare" open-type="share" style="background: none; border: none; padding: 0;"> <button class="btnshare" open-type="share" style="background: none; border: none; padding: 0;">
...@@ -15,14 +16,14 @@ export default { ...@@ -15,14 +16,14 @@ export default {
data() { data() {
return { return {
productId: '', productId: '',
imgLength:0, imgLength: 0,
imgList:[], imgList: [],
productId:'', productId: '',
skuId:'', skuId: '',
contentImg:'', contentImg: '',
contentImgLen:'', contentImgLen: '',
shareTitle:'', shareTitle: '',
shareImg:'' shareImg: ''
} }
}, },
...@@ -30,20 +31,20 @@ export default { ...@@ -30,20 +31,20 @@ export default {
// options 就是跳转时传递的参数对象 // options 就是跳转时传递的参数对象
console.log('页面参数:', options); console.log('页面参数:', options);
const {productId,skuId,contentImg,contentImgLen,shareTitle,shareImg} = options; const { productId, skuId, contentImg, contentImgLen, shareTitle, shareImg } = options;
this.productId = productId; this.productId = productId;
this.skuId = skuId; this.skuId = skuId;
this.contentImg = contentImg; this.contentImg = contentImg;
this.contentImgLen = contentImgLen; this.contentImgLen = contentImgLen;
this.shareTitle = shareTitle; this.shareTitle = shareTitle;
this.shareImg = this.$baseUrl + shareImg; this.shareImg = this.$baseUrl + shareImg;
console.log("this.shareImg:",this.shareImg); console.log("this.shareImg:", this.shareImg);
this.imgList = Array.from({ length: this.contentImgLen }, (_, index) => { this.imgList = Array.from({ length: this.contentImgLen }, (_, index) => {
return { return {
imgUrl: this.$baseUrl + 'brandpage/products/' + contentImg.split('-')[0] + '/' imgUrl: this.$baseUrl + 'brandpage/products/' + contentImg.split('-')[0] + '/'
+ contentImg+'/product_'+contentImg.replace('-','_')+'_'+index + '.jpg' + contentImg + '/product_' + contentImg.replace('-', '_') + '_' + index + '.jpg'
} }
}); });
console.log(this.imgList); console.log(this.imgList);
...@@ -62,12 +63,12 @@ export default { ...@@ -62,12 +63,12 @@ export default {
} }
}) })
}, },
}, },
onShareAppMessage() { onShareAppMessage() {
return { return {
title: this.shareTitle, title: this.shareTitle,
path: '/pages/product/product?id='+this.productId, path: '/pages/product/product?productId=' + this.productId + '&skuId=' + this.skuId + '&contentImg=' + this.contentImg + '&contentImgLen=' + this.contentImgLen + '&shareTitle=' + this.shareTitle + '&shareImg=' + this.shareImg,
imageUrl: this.shareImg imageUrl: this.shareImg
} }
}, },
...@@ -97,6 +98,10 @@ export default { ...@@ -97,6 +98,10 @@ export default {
margin-left: 20rpx; margin-left: 20rpx;
} }
button.btnshare::after {
border: none !important;
}
.btnshare { .btnshare {
width: 350rpx; width: 350rpx;
height: 75rpx; height: 75rpx;
......
This diff is collapsed.
...@@ -61,7 +61,6 @@ export function throttleTap(fn, delay = 1000) { ...@@ -61,7 +61,6 @@ export function throttleTap(fn, delay = 1000) {
return function (...args) { return function (...args) {
const now = Date.now(); const now = Date.now();
if (now - lastTime < delay) { if (now - lastTime < delay) {
// 小于间隔时间,阻止执行 // 小于间隔时间,阻止执行
console.log('防连点') console.log('防连点')
...@@ -71,8 +70,11 @@ export function throttleTap(fn, delay = 1000) { ...@@ -71,8 +70,11 @@ export function throttleTap(fn, delay = 1000) {
lastTime = now; lastTime = now;
clearTimeout(timer); clearTimeout(timer);
// 立即执行一次
fn.apply(this, args);
timer = setTimeout(() => { timer = setTimeout(() => {
fn.apply(this, args); lastTime = 0; // 重置时间
}, delay); }, delay);
} }
} }
......
...@@ -153,7 +153,8 @@ export default { ...@@ -153,7 +153,8 @@ export default {
esgInfoList: [], esgInfoList: [],
qrInfoList: [], qrInfoList: [],
popupIndex: 0, popupIndex: 0,
showVideo:false showVideo:false,
testVideoUrl:''
} }
...@@ -180,6 +181,7 @@ export default { ...@@ -180,6 +181,7 @@ export default {
this.qrInfoList = data.qrInfoList; this.qrInfoList = data.qrInfoList;
this.ipDesc = data.ipDesc; this.ipDesc = data.ipDesc;
this.swiperIconList = data.swiperIconList; this.swiperIconList = data.swiperIconList;
this.testVideoUrl=data.videoUrl;
this.currentVideoUrl=data.videoUrl; this.currentVideoUrl=data.videoUrl;
} }
}, },
...@@ -201,9 +203,9 @@ export default { ...@@ -201,9 +203,9 @@ export default {
this.showVideo = true; this.showVideo = true;
return; return;
// 视频弹窗出现后,video标签的autoplay会自动播放 // 视频弹窗出现后,video标签的autoplay会自动播放
} else if (link) { } else if (_link) {
// 其他跳转逻辑 // 其他跳转逻辑
jump(link); jump(_link);
} }
}, },
jumpProduct(item){ jumpProduct(item){
...@@ -258,6 +260,7 @@ export default { ...@@ -258,6 +260,7 @@ export default {
}); });
}, },
showVideoHandler(){ showVideoHandler(){
this.currentVideoUrl = this.testVideoUrl;
this.showVideo = true; this.showVideo = true;
}, },
closeVideo() { closeVideo() {
......
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
@getphonenumber="onGetPhoneNumber" class="phone-auth-btn-cover"></button> @getphonenumber="onGetPhoneNumber" class="phone-auth-btn-cover"></button>
</view> </view>
</view> </view>
<view class="txtbox"> <view @tap="showPopup(1)" class="txtbox">
<text class="txtlink">星妈会医生在线答疑群,为孩子成长保驾护航</text> <text class="txtlink">星妈会医生在线答疑群,为孩子成长保驾护航</text>
<image class="icon_arrow_yellow" :src="$baseUrl + 'homepage/icon_arrow_yellow.png'"></image> <image class="icon_arrow_yellow" :src="$baseUrl + 'homepage/icon_arrow_yellow.png'"></image>
</view> </view>
<view class="cardScroller"> <view class="cardScroller">
<view class="cardbox"> <view class="cardbox">
<view class="cardboxitem" v-for="cardData in vipCardList" :key="cardData.level"> <view class="cardboxitem" v-for="cardData in vipCardList" :key="cardData.level">
<image class="bg" :src="$baseUrl + cardData.bgUrl"></image> <image @tap="jumpLinkCard(cardData)" class="bg" :src="$baseUrl + cardData.bgUrl"></image>
<text class="level">{{ cardData.level }}</text> <text class="level">{{ cardData.level }}</text>
<text class="subTitle">{{ cardData.subTitle }}</text> <text class="subTitle">{{ cardData.subTitle }}</text>
<view class="showCornerTxt" v-if="cardData.showCornerTxt && cardData.showCornerTxt.length > 0"> <view class="showCornerTxt" v-if="cardData.showCornerTxt && cardData.showCornerTxt.length > 0">
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</view> </view>
</view> </view>
<view class="desc"> <view @tap="jumpLink(voiceStory.link)" class="desc">
滑动或者点击查看全部 <view class="desc1"> 有声故事 > </view> 滑动或者点击查看全部 <view class="desc1"> 有声故事 > </view>
</view> </view>
</view> </view>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</view> </view>
</view> </view>
<view class="desc desc2"> <view @tap="jumpLink(suggest.link)" class="desc desc2">
更多星妈会权威专家服务团 <view class="desc1"> 点击查看 > </view> 更多星妈会权威专家服务团 <view class="desc1"> 点击查看 > </view>
</view> </view>
</view> </view>
...@@ -173,7 +173,9 @@ export default { ...@@ -173,7 +173,9 @@ export default {
qrInfoList: [{ title: '', desc: '', qrUrl: '' }], qrInfoList: [{ title: '', desc: '', qrUrl: '' }],
showVideo: false, showVideo: false,
currentVideoUrl: '', currentVideoUrl: '',
isClickPhoneAuth:false isClickPhoneAuth:false,
voiceStory:{},
suggest:{}
} }
}, },
components:{ components:{
...@@ -217,6 +219,8 @@ export default { ...@@ -217,6 +219,8 @@ export default {
this.bottomLinkList = data.bottomLinkList; this.bottomLinkList = data.bottomLinkList;
this.qrInfoList = data.qrInfoList; this.qrInfoList = data.qrInfoList;
this.vipCardList = data.vipCardList; this.vipCardList = data.vipCardList;
this.voiceStory = data.voiceStory;
this.suggest = data.suggest;
if (this.homeStore.isLogin) { if (this.homeStore.isLogin) {
this.vipCardList[0] = data.vipConfigList.find(item => item.grade === this.homeStore.homeInfo?.grade); this.vipCardList[0] = data.vipConfigList.find(item => item.grade === this.homeStore.homeInfo?.grade);
...@@ -258,6 +262,14 @@ export default { ...@@ -258,6 +262,14 @@ export default {
jump(link); jump(link);
} }
}, },
jumpLinkCard(item){
if(item.btnSubTitle.length>0 && item.btnTitle.length>0){
return;//如果有按钮的话,废弃这个点击事件
}
if(item.link){
jump(item.link);
}
},
jumpLink(link, videoUrl) { jumpLink(link, videoUrl) {
if (videoUrl) { if (videoUrl) {
// 弹出视频 // 弹出视频
...@@ -266,6 +278,9 @@ export default { ...@@ -266,6 +278,9 @@ export default {
return; return;
// 视频弹窗出现后,video标签的autoplay会自动播放 // 视频弹窗出现后,video标签的autoplay会自动播放
} else if (link) { } else if (link) {
if(!link || link === ''){
return;
}
// 其他跳转逻辑 // 其他跳转逻辑
jump(link); jump(link);
} }
...@@ -521,7 +536,7 @@ export default { ...@@ -521,7 +536,7 @@ export default {
.btnTitle { .btnTitle {
position: absolute; position: absolute;
// z-index: 1; // z-index: 1;
width: 169rpx; width: 180rpx;
text-align: center; text-align: center;
font-size: 24rpx; font-size: 24rpx;
color: white; color: white;
......
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