Commit 0b381042 authored by spc's avatar spc

Merge branch 'xingmaLab20250820' of http://gitlab2.dui88.com/fh/20250528_FHQ1...

Merge branch 'xingmaLab20250820' of http://gitlab2.dui88.com/fh/20250528_FHQ1 into xingmaLab20250820
parents 8732221e 1e31192b
unpackage/ unpackage/
dist/ dist/
node_modules/ node_modules/
.DS_Store
\ No newline at end of file
{
"editor.semanticHighlighting.enabled": false,
"files.associations": {
"*.wxml": "html",
"*.wxss": "css",
"*.wxs": "javascript"
},
"editor.tokenColorCustomizations": {
"comments": "#9AA0A6",
"textMateRules": [
{
"scope": [
"comment",
"comment.block",
"comment.block.documentation",
"punctuation.definition.comment"
],
"settings": { "foreground": "#9AA0A6" }
},
{
"scope": [
"comment.block.html",
"punctuation.definition.comment.html",
"comment.block.vue",
"punctuation.definition.comment.vue",
"comment.block.vue-html",
"punctuation.definition.comment.vue-html",
"comment.block.xml",
"punctuation.definition.comment.xml"
],
"settings": { "foreground": "#9AA0A6" }
},
{
"scope": [
"comment.block.js",
"comment.line.double-slash.js",
"punctuation.definition.comment.js",
"comment.block.javascript",
"comment.line.double-slash.javascript",
"punctuation.definition.comment.javascript"
],
"settings": { "foreground": "#9AA0A6" }
},
{
"scope": [
"comment.block.css",
"punctuation.definition.comment.css"
],
"settings": { "foreground": "#9AA0A6" }
}
],
"[Default Dark+]": {
"comments": "#9AA0A6",
"textMateRules": [
{
"scope": [
"comment",
"comment.block",
"comment.block.documentation",
"punctuation.definition.comment",
"comment.block.html",
"punctuation.definition.comment.html",
"comment.block.vue",
"punctuation.definition.comment.vue",
"comment.block.vue-html",
"punctuation.definition.comment.vue-html",
"comment.block.xml",
"punctuation.definition.comment.xml",
"comment.block.js",
"comment.line.double-slash.js",
"punctuation.definition.comment.js",
"comment.block.javascript",
"comment.line.double-slash.javascript",
"punctuation.definition.comment.javascript",
"comment.block.css",
"punctuation.definition.comment.css"
],
"settings": { "foreground": "#9AA0A6" }
}
]
},
"[Default Light+]": {
"comments": "#80868B",
"textMateRules": [
{
"scope": [
"comment",
"comment.block",
"comment.block.documentation",
"punctuation.definition.comment",
"comment.block.html",
"punctuation.definition.comment.html",
"comment.block.vue",
"punctuation.definition.comment.vue",
"comment.block.vue-html",
"punctuation.definition.comment.vue-html",
"comment.block.xml",
"punctuation.definition.comment.xml",
"comment.block.js",
"comment.line.double-slash.js",
"punctuation.definition.comment.js",
"comment.block.javascript",
"comment.line.double-slash.javascript",
"punctuation.definition.comment.javascript",
"comment.block.css",
"punctuation.definition.comment.css"
],
"settings": { "foreground": "#80868B" }
}
]
},
"[Cursor Dark]": {
"comments": "#9AA0A6",
"textMateRules": [
{
"scope": [
"comment",
"comment.block",
"comment.block.documentation",
"punctuation.definition.comment",
"comment.block.html",
"punctuation.definition.comment.html",
"comment.block.vue",
"punctuation.definition.comment.vue",
"comment.block.vue-html",
"punctuation.definition.comment.vue-html",
"comment.block.xml",
"punctuation.definition.comment.xml",
"comment.block.js",
"comment.line.double-slash.js",
"punctuation.definition.comment.js",
"comment.block.javascript",
"comment.line.double-slash.javascript",
"punctuation.definition.comment.javascript",
"comment.block.css",
"punctuation.definition.comment.css"
],
"settings": { "foreground": "#9AA0A6" }
}
]
},
"[Cursor Light]": {
"comments": "#80868B",
"textMateRules": [
{
"scope": [
"comment",
"comment.block",
"comment.block.documentation",
"punctuation.definition.comment",
"comment.block.html",
"punctuation.definition.comment.html",
"comment.block.vue",
"punctuation.definition.comment.vue",
"comment.block.vue-html",
"punctuation.definition.comment.vue-html",
"comment.block.xml",
"punctuation.definition.comment.xml",
"comment.block.js",
"comment.line.double-slash.js",
"punctuation.definition.comment.js",
"comment.block.javascript",
"comment.line.double-slash.javascript",
"punctuation.definition.comment.javascript",
"comment.block.css",
"punctuation.definition.comment.css"
],
"settings": { "foreground": "#80868B" }
}
]
}
},
"editor.semanticTokenColorCustomizations": {
"enabled": false
}
}
...@@ -9,6 +9,7 @@ import { ...@@ -9,6 +9,7 @@ import {
//const baseUrl = 'https://feihe.jzvcode.com/feihe'; //const baseUrl = 'https://feihe.jzvcode.com/feihe';
//const baseUrl = 'https://factory-walk-test.feihe.com/feihe'; //const baseUrl = 'https://factory-walk-test.feihe.com/feihe';
const baseUrl = 'https://factory-walk.feihe.com/feihe'; const baseUrl = 'https://factory-walk.feihe.com/feihe';
//const baseUrl = 'https://factory-walk-uat.feihe.com/feihe';
const request = (options = {}) => { const request = (options = {}) => {
// 对options.data 进行一些处理 // 对options.data 进行一些处理
......
...@@ -3,21 +3,12 @@ ...@@ -3,21 +3,12 @@
<view class="popup-content" @click.stop> <view class="popup-content" @click.stop>
<!-- 喂养方式列表 --> <!-- 喂养方式列表 -->
<view class="feed-list"> <view class="feed-list">
<view <view v-for="(item, index) in feedOptions" :key="index" class="feed-item"
v-for="(item, index) in feedOptions" :class="{ selected: selectedIndex === index }" @click="selectFeed(index)">
:key="index"
class="feed-item"
:class="{ selected: selectedIndex === index }"
@click="selectFeed(index)"
>
<!-- 选中背景 --> <!-- 选中背景 -->
<image <image v-if="selectedIndex === index" class="feed-item-bg"
v-if="selectedIndex === index" :src="`${$baseUrl}shengzhangTool/1001/changeFeed/itemBg.png`" mode="aspectFit" />
class="feed-item-bg"
:src="`${$baseUrl}shengzhangTool/1001/changeFeed/itemBg.png`"
mode="aspectFit"
/>
<!-- 喂养方式文本 --> <!-- 喂养方式文本 -->
<text class="feed-text">{{ item.name }}</text> <text class="feed-text">{{ item.name }}</text>
</view> </view>
...@@ -25,30 +16,21 @@ ...@@ -25,30 +16,21 @@
<!-- 底部按钮 --> <!-- 底部按钮 -->
<view class="bottom-buttons"> <view class="bottom-buttons">
<image <image class="cancel-btn" :class="{ 'cancel-btn-active': isCancelPressed }"
class="cancel-btn"
:class="{'cancel-btn-active': isCancelPressed}"
:src="`${$baseUrl}shengzhangTool/1001/changeFeed/cancelBtn.png`" :src="`${$baseUrl}shengzhangTool/1001/changeFeed/cancelBtn.png`"
@touchstart="handleCancelTouchStart" @touchstart="handleCancelTouchStart" @touchend="handleCancelTouchEnd" mode="aspectFit" />
@touchend="handleCancelTouchEnd"
mode="aspectFit" <image class="ok-btn" :class="{ 'ok-btn-active': isOkPressed }"
/> :src="`${$baseUrl}shengzhangTool/1001/changeFeed/okBtn.png`" @touchstart="handleOkTouchStart"
@touchend="handleOkTouchEnd" mode="aspectFit" />
<image
class="ok-btn"
:class="{'ok-btn-active': isOkPressed}"
:src="`${$baseUrl}shengzhangTool/1001/changeFeed/okBtn.png`"
@touchstart="handleOkTouchStart"
@touchend="handleOkTouchEnd"
mode="aspectFit"
/>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script setup> <script setup>
import { ref, defineEmits, defineProps, onMounted } from 'vue' import { ref, defineEmits, defineProps, watch, onMounted } from 'vue'
import md from '../md.js'
const props = defineProps({ const props = defineProps({
visible: { visible: {
...@@ -90,6 +72,12 @@ const selectedFeedText = ref('母乳+奶粉混合喂养') ...@@ -90,6 +72,12 @@ const selectedFeedText = ref('母乳+奶粉混合喂养')
const selectFeed = (index) => { const selectFeed = (index) => {
selectIndex.value = index selectIndex.value = index
emit('update:selectedIndex', index) emit('update:selectedIndex', index)
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "生长曲线",
popName: "喂养方式选择弹窗",
buttonName: feedOptions.value[index].name
});
} }
// 取消按钮事件 // 取消按钮事件
...@@ -109,13 +97,19 @@ const handleOkTouchStart = () => { ...@@ -109,13 +97,19 @@ const handleOkTouchStart = () => {
const handleOkTouchEnd = () => { const handleOkTouchEnd = () => {
isOkPressed.value = false isOkPressed.value = false
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "生长曲线",
popName: "喂养方式选择弹窗",
buttonName: "确认"
});
const index = selectIndex.value const index = selectIndex.value
const selectedFeed = feedOptions.value[index] const selectedFeed = feedOptions.value[index]
// 发送事件通知主页面 // 发送事件通知主页面
emit('change', selectedFeed, index)//只能传一个参数 emit('change', selectedFeed, index)//只能传一个参数
closePopup()
closePopup("nonePop")
} }
// 点击喂养方式选择 // 点击喂养方式选择
...@@ -127,24 +121,38 @@ const openFeedSelector = () => { ...@@ -127,24 +121,38 @@ const openFeedSelector = () => {
// 处理喂养方式选择变化 // 处理喂养方式选择变化
const onFeedChange = (feedOption, index) => { const onFeedChange = (feedOption, index) => {
isLoadingFeed.value = true isLoadingFeed.value = true
console.log('选择了喂养方式:', feedOption, index) console.log('选择了喂养方式:', feedOption, index)
selectedFeedText.value = feedOption.name selectedFeedText.value = feedOption.name
currentFeedIndex.value = index currentFeedIndex.value = index
// 模拟保存数据 // 模拟保存数据
setTimeout(() => { setTimeout(() => {
isLoadingFeed.value = false isLoadingFeed.value = false
}, 300) }, 300)
} }
const closePopup = () => { const closePopup = (type) => {
if (type !== 'nonePop') {
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "生长曲线",
popName: "喂养方式选择弹窗",
buttonName: "取消"
});
}
emit('update:visible', false) emit('update:visible', false)
}
onMounted(() => {
})
watch(() => props.visible, (newVal) => {
if (newVal) {
md.sensorPopLogTake({
xcxPopExposure: "true",
toolName: "生长曲线",
popName: "喂养方式选择弹窗"
});
}
})
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
...@@ -173,7 +181,7 @@ onMounted(() => { ...@@ -173,7 +181,7 @@ onMounted(() => {
overflow-y: auto; overflow-y: auto;
padding-left: 30rpx; padding-left: 30rpx;
padding-right: 30rpx; padding-right: 30rpx;
.feed-item { .feed-item {
position: relative; position: relative;
display: flex; display: flex;
...@@ -183,18 +191,18 @@ onMounted(() => { ...@@ -183,18 +191,18 @@ onMounted(() => {
margin-bottom: 20rpx; margin-bottom: 20rpx;
border-radius: 16rpx; border-radius: 16rpx;
background-color: #fff; background-color: #fff;
&.selected { &.selected {
background-color: transparent; background-color: transparent;
} }
.feed-item-bg { .feed-item-bg {
position: absolute; position: absolute;
width: 689rpx; width: 689rpx;
height: 108rpx; height: 108rpx;
z-index: 1; z-index: 1;
} }
.feed-text { .feed-text {
position: relative; position: relative;
z-index: 2; z-index: 2;
...@@ -212,22 +220,22 @@ onMounted(() => { ...@@ -212,22 +220,22 @@ onMounted(() => {
padding-top: 20rpx; padding-top: 20rpx;
padding-left: 30rpx; padding-left: 30rpx;
padding-right: 30rpx; padding-right: 30rpx;
.cancel-btn { .cancel-btn {
width: 334rpx; width: 334rpx;
height: 97rpx; height: 97rpx;
transition: transform 0.1s ease-out; transition: transform 0.1s ease-out;
&.cancel-btn-active { &.cancel-btn-active {
transform: scale(0.95); transform: scale(0.95);
} }
} }
.ok-btn { .ok-btn {
width: 334rpx; width: 334rpx;
height: 97rpx; height: 97rpx;
transition: transform 0.1s ease-out; transition: transform 0.1s ease-out;
&.ok-btn-active { &.ok-btn-active {
transform: scale(0.95); transform: scale(0.95);
} }
...@@ -251,23 +259,22 @@ onMounted(() => { ...@@ -251,23 +259,22 @@ onMounted(() => {
display: flex; display: flex;
align-items: center; align-items: center;
cursor: pointer; // 添加手型光标 cursor: pointer; // 添加手型光标
.feeding-value { .feeding-value {
font-size: 28rpx; font-size: 28rpx;
color: #666; color: #666;
margin-right: 8rpx; margin-right: 8rpx;
} }
.dropdown-icon { .dropdown-icon {
width: 20rpx; width: 20rpx;
height: 20rpx; height: 20rpx;
transition: transform 0.3s ease; // 添加旋转动画 transition: transform 0.3s ease; // 添加旋转动画
} }
// 可选:添加点击反馈效果 // 可选:添加点击反馈效果
&:active { &:active {
opacity: 0.7; opacity: 0.7;
} }
} }
</style> </style>
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
<script setup> <script setup>
import { ref, defineEmits, defineProps, onMounted } from 'vue' import { ref, defineEmits, defineProps, onMounted } from 'vue'
import { useUserStore } from "@/stores/user"; import { useUserStore } from "@/stores/user";
import md from '../md.js'
// const props = defineProps({ // const props = defineProps({
// visible: { // visible: {
...@@ -104,6 +105,12 @@ const handleOkTouchStart = () => { ...@@ -104,6 +105,12 @@ const handleOkTouchStart = () => {
} }
const handleOkTouchEnd = async () => { const handleOkTouchEnd = async () => {
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "生长曲线",
popName: "切换宝宝弹窗",
buttonName: "确认"
});
isOkPressed.value = false isOkPressed.value = false
const index = selectIndex.value; const index = selectIndex.value;
...@@ -116,11 +123,23 @@ const handleOkTouchEnd = async () => { ...@@ -116,11 +123,23 @@ const handleOkTouchEnd = async () => {
} }
const closePopup = () => { const closePopup = () => {
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "生长曲线",
popName: "切换宝宝弹窗",
buttonName: "关闭"
});
emit('update:visible', false) emit('update:visible', false)
} }
const selectIndex = ref(0) const selectIndex = ref(0)
const selectBaby = (index) => { const selectBaby = (index) => {
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "生长曲线",
popName: "切换宝宝弹窗",
buttonName: "宝宝列表"
});
selectIndex.value = index; selectIndex.value = index;
emit('update:selectedIndex', index); emit('update:selectedIndex', index);
} }
...@@ -135,6 +154,11 @@ onMounted(() => { ...@@ -135,6 +154,11 @@ onMounted(() => {
const selectedIndexInList = babyList.value.findIndex(item => item.selected === true) const selectedIndexInList = babyList.value.findIndex(item => item.selected === true)
console.log('选中宝宝的索引:', selectedIndexInList) console.log('选中宝宝的索引:', selectedIndexInList)
selectIndex.value = selectedIndexInList; selectIndex.value = selectedIndexInList;
md.sensorPopLogTake({
xcxPopExposure: "true",
toolName: "生长曲线",
popName: "切换宝宝弹窗"
});
}) })
......
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
</template> </template>
<script setup> <script setup>
import { ref, defineEmits, defineProps } from 'vue' import { ref, defineEmits, defineProps,watch } from 'vue'
import md from '../md.js'
const props = defineProps({ const props = defineProps({
visible: { visible: {
...@@ -67,11 +68,27 @@ const handleOkTouchStart = () => { ...@@ -67,11 +68,27 @@ const handleOkTouchStart = () => {
const handleOkTouchEnd = () => { const handleOkTouchEnd = () => {
isOkPressed.value = false isOkPressed.value = false
closePopup() closePopup()
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "生长曲线",
popName: "测量方式提示弹窗",
buttonName: "我知道了"
});
} }
const closePopup = () => { const closePopup = () => {
emit('update:visible', false) emit('update:visible', false)
} }
watch(() => props.visible, (newVal) => {
if (newVal) {
md.sensorPopLogTake({
xcxPopExposure: "true",
toolName: "生长曲线",
popName: "测量方式提示弹窗"
});
}
})
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
...@@ -65,7 +65,8 @@ ...@@ -65,7 +65,8 @@
</template> </template>
<script setup> <script setup>
import { ref, defineEmits, defineProps, watch, computed } from 'vue' import { ref, defineEmits, defineProps, watch, computed,onMounted } from 'vue'
import md from '../md.js'
const props = defineProps({ const props = defineProps({
visible: { visible: {
...@@ -107,6 +108,9 @@ const yearRange = computed(() => { ...@@ -107,6 +108,9 @@ const yearRange = computed(() => {
return yearRange return yearRange
}) })
onMounted(() => {
})
// 生成月份范围 (1-12) // 生成月份范围 (1-12)
const monthRange = computed(() => { const monthRange = computed(() => {
...@@ -252,6 +256,12 @@ const handleOkTouchEnd = () => { ...@@ -252,6 +256,12 @@ const handleOkTouchEnd = () => {
} }
const closePopup = () => { const closePopup = () => {
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "生长曲线",
popName: "选择本次测评日期弹窗",
buttonName: "关闭"
});
// 格式化日期为 YYYY-MM-DD // 格式化日期为 YYYY-MM-DD
const year = currentDate.value.getFullYear() const year = currentDate.value.getFullYear()
const month = String(currentDate.value.getMonth() + 1).padStart(2, '0') const month = String(currentDate.value.getMonth() + 1).padStart(2, '0')
......
...@@ -111,9 +111,9 @@ ...@@ -111,9 +111,9 @@
</template> </template>
<script setup> <script setup>
import { getCurrentInstance } from 'vue' import { getCurrentInstance,onMounted,computed } from 'vue'
import { BABY_CLASS_IMAGES } from './babyClassImages.js' import { BABY_CLASS_IMAGES } from './babyClassImages.js'
import { computed } from 'vue' import md from '../../md.js'
// 获取全局属性 // 获取全局属性
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
...@@ -144,7 +144,15 @@ const getColor = () => { ...@@ -144,7 +144,15 @@ const getColor = () => {
] ]
return colors[props.currentLevel]; return colors[props.currentLevel];
} }
onMounted(() => {
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "育儿课程-查看育儿课程"
});
})
// 等级映射常量 // 等级映射常量
const LEVEL_MAP = { const LEVEL_MAP = {
...@@ -165,6 +173,12 @@ const userLevelName = computed(() => LEVEL_MAP[props.userLevel]) ...@@ -165,6 +173,12 @@ const userLevelName = computed(() => LEVEL_MAP[props.userLevel])
const jump = (level) => { const jump = (level) => {
console.log(`跳转到 ${level} 等级页面`) console.log(`跳转到 ${level} 等级页面`)
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "育儿课程-查看育儿课程"
});
// 检查用户等级是否符合要求 // 检查用户等级是否符合要求
// const levelOrder = [0, 1, 2, 3, 4]; // gold, platinum, diamond, starlight, starshine // const levelOrder = [0, 1, 2, 3, 4]; // gold, platinum, diamond, starlight, starshine
// const userLevelIndex = levelOrder.indexOf(props.userLevel); // const userLevelIndex = levelOrder.indexOf(props.userLevel);
......
...@@ -481,6 +481,7 @@ import { getCurrentInstance, reactive, computed, onMounted, watch, onUnmounted } ...@@ -481,6 +481,7 @@ import { getCurrentInstance, reactive, computed, onMounted, watch, onUnmounted }
import { MONTH_GIFT_IMAGES } from './monthGiftImages.js' import { MONTH_GIFT_IMAGES } from './monthGiftImages.js'
import { monthlyGiftIndex, monthlyGiftDrawOne, monthlyGiftDrawAll } from '../../api/monthGift.js' import { monthlyGiftIndex, monthlyGiftDrawOne, monthlyGiftDrawAll } from '../../api/monthGift.js'
import { jump } from '../../utils/index.js' import { jump } from '../../utils/index.js'
import md from '../../md.js'
// import popupJingxuan from '../popup-jingxuan/popup-jingxuan.vue' // import popupJingxuan from '../popup-jingxuan/popup-jingxuan.vue'
// 获取全局属性 // 获取全局属性
...@@ -609,6 +610,12 @@ const closeJingxuanPopup = () => { ...@@ -609,6 +610,12 @@ const closeJingxuanPopup = () => {
} }
const handleCouponClick = async (level) => { const handleCouponClick = async (level) => {
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "月月礼-"+getCouponButtonText(currentLevelName.value)
});
console.log("handleCouponClick level:", level, "state.couponStatus:", state.couponStatus) console.log("handleCouponClick level:", level, "state.couponStatus:", state.couponStatus)
if (state.couponStatus[level] === 'used') { if (state.couponStatus[level] === 'used') {
...@@ -654,6 +661,12 @@ const handleCouponClick = async (level) => { ...@@ -654,6 +661,12 @@ const handleCouponClick = async (level) => {
} }
const handleBuyClick = async (level) => { const handleBuyClick = async (level) => {
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "月月礼-" +getBuyButtonText(currentLevelName.value)
});
console.log(`Clicked buy for ${level}`) console.log(`Clicked buy for ${level}`)
// 检查用户等级是否符合领取条件(优先级最高) // 检查用户等级是否符合领取条件(优先级最高)
...@@ -755,6 +768,12 @@ const handleBuyClick = async (level) => { ...@@ -755,6 +768,12 @@ const handleBuyClick = async (level) => {
const switchTimeSlot = (index) => { const switchTimeSlot = (index) => {
state.selectedTimeSlot = index state.selectedTimeSlot = index
console.log(`切换到时间段: ${state.timeSlots[index].time}`) console.log(`切换到时间段: ${state.timeSlots[index].time}`)
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "月月礼-" + state.timeSlots[state.selectedTimeSlot].time+"-"+getBuyButtonText(currentLevelName.value)
});
} }
// 获取精选好券按钮文本 // 获取精选好券按钮文本
...@@ -974,10 +993,28 @@ onUnmounted(() => { ...@@ -974,10 +993,28 @@ onUnmounted(() => {
} }
}) })
const initExposure = () => {
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "月月礼-" + state.timeSlots[state.selectedTimeSlot].time+"-"+getBuyButtonText(currentLevelName.value)
});
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "月月礼-"+getCouponButtonText(currentLevelName.value)
});
}
// 初始化 // 初始化
onMounted(async () => { onMounted(async () => {
console.log('MonthGift component mounted, current level:', props.currentLevel, props.userLevel) console.log('MonthGift component mounted, current level:', props.currentLevel, props.userLevel)
await fetchMonthlyGiftData() await fetchMonthlyGiftData()
initExposure();
}) })
// 调试函数:打印当前状态 // 调试函数:打印当前状态
......
...@@ -144,8 +144,9 @@ ...@@ -144,8 +144,9 @@
</template> </template>
<script setup> <script setup>
import { getCurrentInstance, computed } from 'vue' import { getCurrentInstance, computed,onMounted } from 'vue'
import { YEAR_GIFT_IMAGES } from './yearGiftImages.js' import { YEAR_GIFT_IMAGES } from './yearGiftImages.js'
import md from '../../md.js'
// 获取全局属性 // 获取全局属性
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
...@@ -199,9 +200,22 @@ const buttonInfo = computed(() => { ...@@ -199,9 +200,22 @@ const buttonInfo = computed(() => {
}; };
} }
}) })
onMounted(() => {
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "周岁礼-"+buttonInfo.value.text
});
})
// 按钮点击事件处理 // 按钮点击事件处理
const handleButtonClick = () => { const handleButtonClick = () => {
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "周岁礼-"+buttonInfo.value.text
});
if (buttonInfo.value.action === 'upgrade') { if (buttonInfo.value.action === 'upgrade') {
// 跳转到升级页面 // 跳转到升级页面
uni.navigateTo({ uni.navigateTo({
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
mode="aspectFit" mode="aspectFit"
@click="handleUpgrade" @click="handleUpgrade"
> >
<text class="bottom-button-text" :style="{ color: props.index == 4 ? '#ffffff' : '#ffe3c3' }">去升级</text> <text class="bottom-button-text" :style="{ color: '#ffffff'}">去升级</text>
</view> </view>
<!-- 说明文字 --> <!-- 说明文字 -->
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
<script setup> <script setup>
import { defineProps, defineEmits, onMounted } from 'vue' import { defineProps, defineEmits, onMounted } from 'vue'
import md from '../../md.js'
// 定义组件名称 // 定义组件名称
defineOptions({ defineOptions({
...@@ -105,6 +106,12 @@ const isShowBtn = () => { ...@@ -105,6 +106,12 @@ const isShowBtn = () => {
} }
onMounted(() => { onMounted(() => {
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "爱本新人礼-去升级"
});
console.log('props.isshowLocksdfsdfsdfsdsf===', props.isshowLock) console.log('props.isshowLocksdfsdfsdfsdsf===', props.isshowLock)
}) })
...@@ -113,6 +120,12 @@ const emit = defineEmits(['upgrade']) ...@@ -113,6 +120,12 @@ const emit = defineEmits(['upgrade'])
// 去升级按钮点击 // 去升级按钮点击
const handleUpgrade = () => { const handleUpgrade = () => {
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "爱本新人礼-去升级"
});
emit('upgrade', { emit('upgrade', {
index: props.index index: props.index
}) })
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
mode="aspectFit" mode="aspectFit"
@click="handleUpgrade" @click="handleUpgrade"
> >
<text class="bottom-button-text" :style="{ color: props.index == 4 ? '#ffffff' : '#ffe3c3' }">去升级</text> <text class="bottom-button-text" :style="{ color: '#ffffff'}">去升级</text>
</view> </view>
<!-- 说明文字 --> <!-- 说明文字 -->
<view class="description" :style="{ marginTop: getTop() }"> <view class="description" :style="{ marginTop: getTop() }">
...@@ -44,13 +44,24 @@ ...@@ -44,13 +44,24 @@
</template> </template>
<script setup> <script setup>
import { defineProps, defineEmits } from 'vue' import { defineProps, defineEmits,onMounted } from 'vue'
import md from '../../md.js'
// 定义组件名称 // 定义组件名称
defineOptions({ defineOptions({
name: 'jinjili' name: 'jinjili'
}) })
onMounted(() => {
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "晋级礼-去升级"
});
})
const getBgName = () => { const getBgName = () => {
if(props.isshowLock){ if(props.isshowLock){
return props.index + "" return props.index + ""
...@@ -94,6 +105,12 @@ const emit = defineEmits(['upgrade']) ...@@ -94,6 +105,12 @@ const emit = defineEmits(['upgrade'])
// 去升级按钮点击 // 去升级按钮点击
const handleUpgrade = () => { const handleUpgrade = () => {
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "晋级礼-去升级"
});
emit('upgrade', { emit('upgrade', {
index: props.index index: props.index
}) })
......
...@@ -8,13 +8,23 @@ ...@@ -8,13 +8,23 @@
</view> </view>
<!-- 底部按钮 --> <!-- 底部按钮 -->
<image <!-- <image
class="bottom-button" class="bottom-button"
:src="$baseUrl + `integral/1021/mianfeiwenzhenQushiyongBtn${props.index}.png`" :src="$baseUrl + `integral/1021/mianfeiwenzhenQushiyongBtn${props.index}.png`"
mode="aspectFit" mode="aspectFit"
@click="handleUseNow" @click="handleUseNow"
/> /> -->
<view
class="bottom-button"
:style="{
background: `url(${$baseUrl}integral/1021/shengriliBtnBg${props.index}.png) no-repeat center/contain`
}"
mode="aspectFit"
@click="handleUseNow"
>
<text class="bottom-button-text">立即使用</text>
</view>
<!-- 说明文字 --> <!-- 说明文字 -->
<view class="description"> <view class="description">
<text class="desc-text" :style="{ color: getColor()[props.index].titleDetail }"> <text class="desc-text" :style="{ color: getColor()[props.index].titleDetail }">
...@@ -25,7 +35,8 @@ ...@@ -25,7 +35,8 @@
</template> </template>
<script setup> <script setup>
import { defineProps, defineEmits } from 'vue' import { defineProps, defineEmits,onMounted } from 'vue'
import md from '../../md.js'
// 定义组件名称 // 定义组件名称
defineOptions({ defineOptions({
...@@ -40,6 +51,14 @@ const props = defineProps({ ...@@ -40,6 +51,14 @@ const props = defineProps({
} }
}) })
onMounted(() => {
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "免费问诊-立即使用"
});
})
// 定义组件事件 // 定义组件事件
const emit = defineEmits(['doctor-click', 'use-now']) const emit = defineEmits(['doctor-click', 'use-now'])
...@@ -52,9 +71,16 @@ const handleDoctorGridClick = () => { ...@@ -52,9 +71,16 @@ const handleDoctorGridClick = () => {
// 立即使用按钮点击 // 立即使用按钮点击
const handleUseNow = () => { const handleUseNow = () => {
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "免费问诊-立即使用"
});
emit('use-now', { emit('use-now', {
index: props.index index: props.index
}) })
} }
// 颜色配置 // 颜色配置
...@@ -110,11 +136,27 @@ const getColor = () => { ...@@ -110,11 +136,27 @@ const getColor = () => {
} }
} }
// .bottom-button {
// width: 442rpx;
// height: 86rpx;
// margin: 0 auto;
// margin-top: 470rpx;
// }
.bottom-button { .bottom-button {
width: 442rpx; width: 442rpx;
height: 86rpx; height: 86rpx;
margin: 0 auto; margin: 0 auto;
margin-top: 470rpx; margin-top: 470rpx;
display: flex;
justify-content: center;
align-items: center;
.bottom-button-text {
font-size: 26rpx;
color: #ffffff;
font-weight: bold;
}
} }
.description { .description {
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
mode="aspectFit" mode="aspectFit"
@click="handleUpgrade" @click="handleUpgrade"
> >
<text class="bottom-button-text" :style="{ color: props.index == 4 ? '#ffffff' : '#ffe3c3' }">{{ getBtnName() }}</text> <text class="bottom-button-text" :style="{ color: '#ffffff' }">{{ getBtnName() }}</text>
</view> </view>
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
import { defineProps, defineEmits, onMounted, ref } from 'vue' import { defineProps, defineEmits, onMounted, ref } from 'vue'
import { showLoading, hideLoading } from '../../utils' import { showLoading, hideLoading } from '../../utils'
import { fetchBirthdayGiftJSON } from '../../api/integral' import { fetchBirthdayGiftJSON } from '../../api/integral'
import md from '../../md.js'
import { useUserStore } from "../../stores/user"; import { useUserStore } from "../../stores/user";
...@@ -146,7 +147,12 @@ const handleUpgrade = async () => { ...@@ -146,7 +147,12 @@ const handleUpgrade = async () => {
index: status1.value, index: status1.value,
userStore:useUserStore() userStore:useUserStore()
}) })
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "生日礼-"+getBtnName()
});
} }
// 待开启按钮点击 // 待开启按钮点击
...@@ -183,7 +189,7 @@ const status1 = ref(0); ...@@ -183,7 +189,7 @@ const status1 = ref(0);
const hasBaby = ref(false); const hasBaby = ref(false);
const islogin = ref(true); const islogin = ref(true);
onMounted(async () => { onMounted(async () => {
const userStore = useUserStore(); const userStore = useUserStore();
const memberInfo = userStore.memberInfo; const memberInfo = userStore.memberInfo;
...@@ -218,6 +224,12 @@ onMounted(async () => { ...@@ -218,6 +224,12 @@ onMounted(async () => {
} }
console.log('data', data); console.log('data', data);
hideLoading(); hideLoading();
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "生日礼-"+getBtnName()
});
}) })
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
import { defineProps, defineEmits, ref, onMounted } from 'vue' import { defineProps, defineEmits, ref, onMounted } from 'vue'
import { showLoading, hideLoading } from '../../utils'; import { showLoading, hideLoading } from '../../utils';
import { fetchActivityStateJSON } from '../../api/integral'; import { fetchActivityStateJSON } from '../../api/integral';
import md from '../../md.js'
const handleUpgrade_daikaiqi = () => { const handleUpgrade_daikaiqi = () => {
uni.showToast({ uni.showToast({
title: '活动暂未开启', title: '活动暂未开启',
...@@ -97,6 +97,12 @@ const emit = defineEmits(['upgrade']) ...@@ -97,6 +97,12 @@ const emit = defineEmits(['upgrade'])
// 去升级按钮点击 // 去升级按钮点击
const handleUpgrade = () => { const handleUpgrade = () => {
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "溯源游-"+(props.isshowLock ? '去升级' : '立即报名')
});
emit('upgrade', { emit('upgrade', {
index: props.index index: props.index
}) })
...@@ -148,6 +154,13 @@ onMounted(async () => { ...@@ -148,6 +154,13 @@ onMounted(async () => {
} }
hideLoading(); hideLoading();
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "溯源游-"+(props.isshowLock ? '去升级' : '立即报名')
});
}) })
</script> </script>
...@@ -200,7 +213,7 @@ onMounted(async () => { ...@@ -200,7 +213,7 @@ onMounted(async () => {
.bottom-button-text { .bottom-button-text {
font-size: 26rpx; font-size: 26rpx;
color: #ffe3c3; color: #ffffff;
font-weight: bold; font-weight: bold;
} }
} }
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
mode="aspectFit" mode="aspectFit"
@click="handleUpgrade" @click="handleUpgrade"
> >
<text class="bottom-button-text" :style="{ color: props.index == 4 ? '#ffffff' : '#ffe3c3' }">去升级</text> <text class="bottom-button-text" :style="{ color:'#ffffff'}">去升级</text>
</view> </view>
<!-- 说明文字 --> <!-- 说明文字 -->
...@@ -46,7 +46,8 @@ ...@@ -46,7 +46,8 @@
</template> </template>
<script setup> <script setup>
import { defineProps, defineEmits } from 'vue' import { defineProps, defineEmits,onMounted } from 'vue'
import md from '../../md.js'
// 定义组件名称 // 定义组件名称
defineOptions({ defineOptions({
...@@ -66,6 +67,16 @@ const props = defineProps({ ...@@ -66,6 +67,16 @@ const props = defineProps({
} }
}) })
onMounted(() => {
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "转段礼-去升级"
});
})
const getBgName = () => { const getBgName = () => {
if(props.isshowLock){ if(props.isshowLock){
return props.index + "" return props.index + ""
...@@ -96,6 +107,12 @@ const emit = defineEmits(['upgrade']) ...@@ -96,6 +107,12 @@ const emit = defineEmits(['upgrade'])
// 去升级按钮点击 // 去升级按钮点击
const handleUpgrade = () => { const handleUpgrade = () => {
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "转段礼-去升级"
});
emit('upgrade', { emit('upgrade', {
index: props.index index: props.index
}) })
......
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
</template> </template>
<script setup> <script setup>
import { defineProps, defineEmits } from 'vue' import { defineProps, defineEmits,watch } from 'vue'
import md from '../md.js'
// 定义props // 定义props
const props = defineProps({ const props = defineProps({
...@@ -40,8 +41,24 @@ const emit = defineEmits(['close']) ...@@ -40,8 +41,24 @@ const emit = defineEmits(['close'])
// 关闭弹窗 // 关闭弹窗
const closePopup = () => { const closePopup = () => {
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "生长曲线",
popName: "生长曲线介绍弹窗",
buttonName: "我知道了"
});
emit('close') emit('close')
} }
watch(() => props.visible, (newVal) => {
if (newVal) {
md.sensorPopLogTake({
xcxPopExposure: "true",
toolName: "生长曲线",
popName: "生长曲线介绍弹窗"
});
}
})
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
"quickapp" : {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
"appid" : "wx88ab296d52e9835d", "appid" : "wxc83b55d61c7fc51d",
"setting" : { "setting" : {
"urlCheck" : false, "urlCheck" : false,
"minified" : true, "minified" : true,
...@@ -65,7 +65,8 @@ ...@@ -65,7 +65,8 @@
"desc" : "请允许获取位置信息,用于提供附近服务" "desc" : "请允许获取位置信息,用于提供附近服务"
} }
}, },
"requiredBackgroundModes": ["share"] "requiredBackgroundModes" : [ "share" ],
"embeddedAppIdList": ["wx4205ec55b793245e"]
}, },
"mp-alipay" : { "mp-alipay" : {
"usingComponents" : true "usingComponents" : true
......
...@@ -62,13 +62,13 @@ const sensorLog = (evt) => { ...@@ -62,13 +62,13 @@ const sensorLog = (evt) => {
trackObj[key] = logObj[key]; trackObj[key] = logObj[key];
} }
if (xcxPage && xcxPage.length > 0) { if (xcxPage && xcxPage.length > 0) {
console.warn("xcxPage", trackObj); // console.warn("xcxPage", trackObj);
sensors.track("xcxPage", { sensors.track("xcxPage", {
...trackObj, ...trackObj,
}); });
} }
if (xcxClick && xcxClick.length > 0) { if (xcxClick && xcxClick.length > 0) {
console.warn("xcxClick", trackObj); // console.warn("xcxClick", trackObj);
sensors.track("xcxClick", { sensors.track("xcxClick", {
...trackObj, ...trackObj,
}); });
...@@ -91,10 +91,101 @@ const sensorLogTake = (logObj) => { ...@@ -91,10 +91,101 @@ const sensorLogTake = (logObj) => {
}; };
sensorLog(evt); sensorLog(evt);
}; };
const sensorComponentLog = (evt) => {
const _dataset = evt.currentTarget.dataset;
const logObj = _dataset.comlog;
if (!logObj) {
return;
}
const { xcxComponentExposure, xcxComponentClick } = logObj;
let trackObj = {};
for (let key in logObj) {
trackObj[key] = logObj[key];
}
if (xcxComponentExposure && xcxComponentExposure.length > 0) {
// console.warn("-----xcxComponentExposure-----", trackObj);
sensors.track("xcxComponentExposure", {
...trackObj,
});
}
if (xcxComponentClick && xcxComponentClick.length > 0) {
// console.warn("-----xcxComponentClick-----", trackObj);
sensors.track("xcxComponentClick", {
...trackObj,
});
}
};
/**
* 主动通过配置数据触发埋点
* @param {*} evt
*/
const sensorComponentLogTake = (logObj) => {
if (!logObj) {
return;
}
const evt = {
currentTarget: {
dataset: {
comlog: logObj,
},
},
};
sensorComponentLog(evt);
};
const sensorPopLog = (evt) => {
const _dataset = evt.currentTarget.dataset;
const logObj = _dataset.poplog;
if (!logObj) {
return;
}
const { xcxPopExposure, xcxPopClick } = logObj;
let trackObj = {};
for (let key in logObj) {
trackObj[key] = logObj[key];
}
if (xcxPopExposure && xcxPopExposure.length > 0) {
// console.warn("-----xcxPopExposure-----", trackObj);
sensors.track("xcxPopExposure", {
...trackObj,
});
}
if (xcxPopClick && xcxPopClick.length > 0) {
// console.warn("-----xcxPopClick-----", trackObj);
sensors.track("xcxPopClick", {
...trackObj,
});
}
};
/**
* 主动通过配置数据触发埋点
* @param {*} evt
*/
const sensorPopLogTake = (logObj) => {
if (!logObj) {
return;
}
const evt = {
currentTarget: {
dataset: {
poplog: logObj,
},
},
};
sensorPopLog(evt);
};
export default { export default {
init, init,
sensors, sensors,
login, login,
sensorLog, sensorLog,
sensorLogTake, sensorLogTake,
sensorComponentLog,
sensorComponentLogTake,
sensorPopLog,
sensorPopLogTake,
}; };
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
{ {
"videoUrl": "https://course.feihe.com/momclub-picture/brandpage/bannerVideo.mp4", "videoUrl": "https://course.feihe.com/momclub-picture/brandpage/bannerVideo.mp4",
"link": {}, "link": {},
"title": "北纬47°黄金种植带",
"url": "brandpage/Banner41.png" "url": "brandpage/Banner41.png"
}, },
{ {
...@@ -11,14 +12,16 @@ ...@@ -11,14 +12,16 @@
"type": 3, "type": 3,
"url": "https://mp.weixin.qq.com/s/0eMxbWB3R_0g06HZPUEj5Q" "url": "https://mp.weixin.qq.com/s/0eMxbWB3R_0g06HZPUEj5Q"
}, },
"title": "飞鹤自由牧场",
"url": "brandpage/Banner42.png" "url": "brandpage/Banner42.png"
}, },
{ {
"link": { "link": {
"extra": {}, "extra": {},
"type": 3, "type": 1,
"url": "https://factory.feihe.com/user/#/web" "url": "/reservation/home/index"
}, },
"title": "飞鹤哈尔滨智能产业园",
"url": "brandpage/Banner44.png" "url": "brandpage/Banner44.png"
} }
], ],
...@@ -26,7 +29,8 @@ ...@@ -26,7 +29,8 @@
"finderUserName": "", "finderUserName": "",
"videoUrl": "brandpage/videoChannel/video2Channel/V1/1.mp4", "videoUrl": "brandpage/videoChannel/video2Channel/V1/1.mp4",
"posterUrl": "", "posterUrl": "",
"feedId": "" "feedId": "",
"title": "品牌故事视频2"
}, },
"product": [ "product": [
[ [
...@@ -477,9 +481,13 @@ ...@@ -477,9 +481,13 @@
"videoUrl": "https://course.feihe.com/momclub-picture/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://course.feihe.com/momclub-picture/brandpage/banner_1%E6%85%A2%E4%BA%BA%E8%8A%82x%E9%A3%9E%E9%B9%A4%2B-%2B%E5%9C%9FFINAL.mp4",
"erqiPeizhi": { "erqiPeizhi": {
"ipImg4": "https://course.feihe.com/momclub-picture/brandpage/ip4.png", "ipImg4": "https://course.feihe.com/momclub-picture/brandpage/ip4.png",
"ipTitle3": "视频号",
"title1": "飞鹤产品家族", "title1": "飞鹤产品家族",
"ipTitle4": "小红书",
"title2": "飞鹤品牌IP鹤小飞一家", "title2": "飞鹤品牌IP鹤小飞一家",
"ipTitle1": "毛绒可爱发夹",
"title3": "飞鹤ESG", "title3": "飞鹤ESG",
"ipTitle2": "大容量吨吨桶水杯",
"iphexiaofeiUrl": "https://course.feihe.com/momclub-picture/brandpage/v1_iphexiaofei.png", "iphexiaofeiUrl": "https://course.feihe.com/momclub-picture/brandpage/v1_iphexiaofei.png",
"ipImg1": "https://course.feihe.com/momclub-picture/brandpage/v1_ip1.png", "ipImg1": "https://course.feihe.com/momclub-picture/brandpage/v1_ip1.png",
"ipImg3": "https://course.feihe.com/momclub-picture/brandpage/ip3.png", "ipImg3": "https://course.feihe.com/momclub-picture/brandpage/ip3.png",
...@@ -489,7 +497,8 @@ ...@@ -489,7 +497,8 @@
"finderUserName": "sphgexisAi0pRGm", "finderUserName": "sphgexisAi0pRGm",
"videoUrl": "brandpage/videoChannel/video1Channel/V2/1.mp4", "videoUrl": "brandpage/videoChannel/video1Channel/V2/1.mp4",
"posterUrl": "", "posterUrl": "",
"feedId": "export/UzFfAgtgekIEAQAAAAAABbEMmxr36QAAAAstQy6ubaLX4KHWvLEZgBPEgaJkYSYbLr6JzNPgMJp7tTZCYcYsIpU6Z0fgSnSE" "feedId": "export/UzFfAgtgekIEAQAAAAAABbEMmxr36QAAAAstQy6ubaLX4KHWvLEZgBPEgaJkYSYbLr6JzNPgMJp7tTZCYcYsIpU6Z0fgSnSE",
"title": "品牌故事视频1"
}, },
"esgInfoList": [ "esgInfoList": [
[ [
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
{ {
"name": "20250528_FHQ1",
"lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "lockfileVersion": 1,
"": { "dependencies": {
"dependencies": { "crypto-js": {
"crypto-js": "^4.2.0"
}
},
"node_modules/crypto-js": {
"version": "4.2.0", "version": "4.2.0",
"resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz", "resolved": "http://npm.dui88.com:80/crypto-js/-/crypto-js-4.2.0.tgz",
"integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==" "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
} }
} }
......
...@@ -217,6 +217,12 @@ const onAdd = () => { ...@@ -217,6 +217,12 @@ const onAdd = () => {
} }
}) })
popup.value.open() popup.value.open()
md.sensorComponentLogTake({
xcxPopExposure: "true",
toolName: "产检提醒",
popName: "选择产检项目弹窗"
});
// 回显数据 // 回显数据
if (listData.value.length > 0) { if (listData.value.length > 0) {
// 回显数据 - 将 listData 中的数据同步到 selectedAirports // 回显数据 - 将 listData 中的数据同步到 selectedAirports
...@@ -224,7 +230,15 @@ const onAdd = () => { ...@@ -224,7 +230,15 @@ const onAdd = () => {
} }
} }
// 关闭项目弹窗 // 关闭项目弹窗
const onPopupClose = () => { const onPopupClose = (type) => {
if (type !== 'nonePop') {
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "产检提醒",
popName: "选择产检项目弹窗",
buttonName: "关闭"
});
}
wx.setPageStyle({ wx.setPageStyle({
style: { style: {
overflow: 'auto' overflow: 'auto'
...@@ -232,6 +246,7 @@ const onPopupClose = () => { ...@@ -232,6 +246,7 @@ const onPopupClose = () => {
}) })
selectedAirports.value = [] selectedAirports.value = []
popup.value.close() popup.value.close()
} }
// 检查是否已选中 // 检查是否已选中
const isSelected = (id) => { const isSelected = (id) => {
...@@ -246,6 +261,12 @@ const toggleSelect = (airport) => { ...@@ -246,6 +261,12 @@ const toggleSelect = (airport) => {
id: airport.id, id: airport.id,
itemName: airport.itemName itemName: airport.itemName
}); });
md.sensorComponentLogTake({
xcxPopClick: "true",
toolName: "产检提醒",
popName: "选择产检项目弹窗",
buttonName: airport.itemName
});
} else { } else {
selectedAirports.value.splice(index, 1); selectedAirports.value.splice(index, 1);
} }
...@@ -259,7 +280,13 @@ const saveSelection = () => { ...@@ -259,7 +280,13 @@ const saveSelection = () => {
const uniqueMap = new Map(); const uniqueMap = new Map();
combined.forEach(item => uniqueMap.set(item.id, item)); combined.forEach(item => uniqueMap.set(item.id, item));
listData.value = Array.from(uniqueMap.values()); listData.value = Array.from(uniqueMap.values());
onPopupClose(); onPopupClose("nonePop");
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "产检提醒",
popName: "选择产检项目弹窗",
buttonName: "确认"
});
}; };
// // 移除已选项目 // // 移除已选项目
// const removeSelected = (airport) => { // const removeSelected = (airport) => {
......
...@@ -1885,6 +1885,12 @@ async function completeRecord() { ...@@ -1885,6 +1885,12 @@ async function completeRecord() {
// 显示成功弹窗 // 显示成功弹窗
successPopup.value.open() successPopup.value.open()
md.sensorPopLogTake({
xcxPopExposure: "true",
toolName: "喂养记录",
popName: "添加成功弹窗"
});
...@@ -2406,6 +2412,7 @@ function showAddFoodPopup(categoryName) { ...@@ -2406,6 +2412,7 @@ function showAddFoodPopup(categoryName) {
pageName: "喂养工具首页", pageName: "喂养工具首页",
buttonName: "辅食添加" + categoryName, buttonName: "辅食添加" + categoryName,
}); });
// 防连点检查 // 防连点检查
if (foodSelectionState.value.isAddingFood) { if (foodSelectionState.value.isAddingFood) {
console.log('防连点:添加辅食按钮被阻止') console.log('防连点:添加辅食按钮被阻止')
...@@ -2439,7 +2446,11 @@ function showAddFoodPopup(categoryName) { ...@@ -2439,7 +2446,11 @@ function showAddFoodPopup(categoryName) {
foodSelectionState.value.newFoodItem = '' foodSelectionState.value.newFoodItem = ''
// 显示弹窗 // 显示弹窗
addFoodPopup.value.open() addFoodPopup.value.open()
md.sensorPopLogTake({
xcxPopExposure: "true",
toolName: "喂养记录",
popName: "新增辅食弹窗",
});
// 立即重置防连点状态(弹窗显示后) // 立即重置防连点状态(弹窗显示后)
setTimeout(() => { setTimeout(() => {
foodSelectionState.value.isAddingFood = false foodSelectionState.value.isAddingFood = false
...@@ -2458,6 +2469,12 @@ function toggleCategoryExpansion(categoryName) { ...@@ -2458,6 +2469,12 @@ function toggleCategoryExpansion(categoryName) {
function cancelAddFood() { function cancelAddFood() {
addFoodPopup.value.close() addFoodPopup.value.close()
foodSelectionState.value.newFoodItem = '' foodSelectionState.value.newFoodItem = ''
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "喂养记录",
popName: "新增辅食弹窗",
buttonName: "取消"
});
} }
function confirmAddFood() { function confirmAddFood() {
...@@ -2465,6 +2482,12 @@ function confirmAddFood() { ...@@ -2465,6 +2482,12 @@ function confirmAddFood() {
console.log('防连点:添加辅食按钮被阻止') console.log('防连点:添加辅食按钮被阻止')
return return
} }
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "喂养记录",
popName: "新增辅食弹窗",
buttonName: "添加"
});
foodSelectionState.value.isAddingFood = true foodSelectionState.value.isAddingFood = true
console.log('防连点:设置添加辅食状态为true') console.log('防连点:设置添加辅食状态为true')
...@@ -3246,7 +3269,11 @@ async function startPollingRecognitionResult(taskId) { ...@@ -3246,7 +3269,11 @@ async function startPollingRecognitionResult(taskId) {
voiceRecognitionState.value.voiceDateTime = `${year}-${month}-${day} ${hours}:${minutes}:00` voiceRecognitionState.value.voiceDateTime = `${year}-${month}-${day} ${hours}:${minutes}:00`
} }
voiceRecognitionState.value.showResultPage = true voiceRecognitionState.value.showResultPage = true
md.sensorPopLogTake({
xcxPopExposure: "true",
toolName: "喂养记录",
popName: "语音识别结果弹窗"
});
// 显示识别成功提示 // 显示识别成功提示
uni.showToast({ uni.showToast({
title: '语音识别成功', title: '语音识别成功',
...@@ -3402,7 +3429,12 @@ function formatRecordingDuration(seconds) { ...@@ -3402,7 +3429,12 @@ function formatRecordingDuration(seconds) {
function reRecognize() { function reRecognize() {
console.log('重新识别...') console.log('重新识别...')
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "喂养记录",
popName: "语音识别结果弹窗",
buttonName: "不对,重新识别"
});
// 清理轮询状态 // 清理轮询状态
clearPollingInterval() clearPollingInterval()
...@@ -3429,6 +3461,12 @@ async function completeVoiceRecord() { ...@@ -3429,6 +3461,12 @@ async function completeVoiceRecord() {
if (isSubmitting.value) { if (isSubmitting.value) {
return return
} }
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "喂养记录",
popName: "语音识别结果弹窗",
buttonName: "完成记录"
});
const detailText = voiceRecognitionState.value.recognizedText.trim() const detailText = voiceRecognitionState.value.recognizedText.trim()
...@@ -3486,6 +3524,11 @@ async function completeVoiceRecord() { ...@@ -3486,6 +3524,11 @@ async function completeVoiceRecord() {
// 显示成功弹窗 // 显示成功弹窗
successPopup.value.open() successPopup.value.open()
md.sensorPopLogTake({
xcxPopExposure: "true",
toolName: "喂养记录",
popName: "添加成功弹窗"
});
} catch (error) { } catch (error) {
console.error('保存语音记录失败:', error) console.error('保存语音记录失败:', error)
// uni.hideLoading() // uni.hideLoading()
...@@ -3543,11 +3586,23 @@ async function onSuccessJump() { ...@@ -3543,11 +3586,23 @@ async function onSuccessJump() {
}, },
}); // 关闭弹窗 }); // 关闭弹窗
successPopup.value.close() successPopup.value.close()
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "喂养记录",
popName: "添加成功弹窗",
buttonName: "咨询专家"
});
} }
function onSuccessClose() { function onSuccessClose() {
// 关闭弹窗 // 关闭弹窗
successPopup.value.close() successPopup.value.close()
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "喂养记录",
popName: "添加成功弹窗",
buttonName: "关闭"
});
// 跳转至记录页面 // 跳转至记录页面
uni.navigateTo({ uni.navigateTo({
url: '/pages/feedingRecord/feedingRecord' url: '/pages/feedingRecord/feedingRecord'
......
...@@ -723,9 +723,24 @@ function editRecord(index) { ...@@ -723,9 +723,24 @@ function editRecord(index) {
editingRecord.value = { index, record } editingRecord.value = { index, record }
showEditPopup.value = true showEditPopup.value = true
md.sensorPopLogTake({
xcxPopExposure: "true",
toolName: "喂养记录",
popName: "日历页确认修改内容弹窗"
});
} }
function closeEditPopup() { function closeEditPopup(type) {
if (type !== 'nonePop') {
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "喂养记录",
popName: "日历页确认修改内容弹窗",
buttonName: "取消"
});
}
showEditPopup.value = false showEditPopup.value = false
editingRecord.value = null editingRecord.value = null
editForm.value = { time: '', type: '', content: '' } editForm.value = { time: '', type: '', content: '' }
...@@ -800,6 +815,12 @@ function onEditTypeChange(event) { ...@@ -800,6 +815,12 @@ function onEditTypeChange(event) {
} }
async function saveEditRecord() { async function saveEditRecord() {
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "喂养记录",
popName: "日历页确认修改内容弹窗",
buttonName: "保存修改"
});
if (!editForm.value.time || !editForm.value.type) { if (!editForm.value.time || !editForm.value.type) {
uni.showToast({ title: '请填写完整信息', icon: 'none' }) uni.showToast({ title: '请填写完整信息', icon: 'none' })
return return
...@@ -868,7 +889,7 @@ async function saveEditRecord() { ...@@ -868,7 +889,7 @@ async function saveEditRecord() {
icon: 'none' icon: 'none'
}) })
closeEditPopup() closeEditPopup('nonePop')
// 清空缓存,确保获取最新数据 // 清空缓存,确保获取最新数据
clearCache() clearCache()
......
...@@ -38,7 +38,7 @@ const shareOptions = { ...@@ -38,7 +38,7 @@ const shareOptions = {
0: { 0: {
title: "8000万中国妈妈信赖的育儿品牌", title: "8000万中国妈妈信赖的育儿品牌",
path: "/pages/index/index?pageType=home", path: "/pages/index/index?pageType=home",
imageUrl: $baseUrl + "share/share_home.png", imageUrl: $baseUrl + "share/share_home0901.jpg",
}, },
1: { 1: {
title: "飞鹤提供家庭营养一站式解决方案", title: "飞鹤提供家庭营养一站式解决方案",
......
...@@ -170,10 +170,10 @@ ...@@ -170,10 +170,10 @@
<view class="item_line"></view> <view class="item_line"></view>
</view> </view>
<!--避字--> <!--避字-->
<view class="taboo_word"> <view class="taboo_word">
<view class="item_top"> <view class="item_top">
<span class="title_txt"></span> <span class="title_txt"></span>
<input class="taboo_input" :placeholder="showPlaceholder2 ? '示例:然、萌' : ''" v-model="avoidChars" <input class="taboo_input" :placeholder="showPlaceholder2 ? '示例:然、萌' : ''" v-model="avoidChars"
@blur="e => enforceSeparator(e, 2)" @click="showPlaceholder2 = false" /> @blur="e => enforceSeparator(e, 2)" @click="showPlaceholder2 = false" />
</view> </view>
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
//必有字 //必有字
const requiredChars = ref(''); const requiredChars = ref('');
const showPlaceholder2 = ref(true); const showPlaceholder2 = ref(true);
//避 //避
const avoidChars = ref(''); const avoidChars = ref('');
//期望风格 //期望风格
const expectedStyle = ref(''); const expectedStyle = ref('');
...@@ -416,7 +416,7 @@ ...@@ -416,7 +416,7 @@
return input.length <= filtered.length || input === filtered return input.length <= filtered.length || input === filtered
} }
//设置必有字和避字,用、隔开每一个字 //设置必有字和避字,用、隔开每一个字
const enforceSeparator = (e, idx) => { const enforceSeparator = (e, idx) => {
let text = e.detail.value let text = e.detail.value
// 1. 移除所有现有分隔符(避免干扰) // 1. 移除所有现有分隔符(避免干扰)
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
}" }"
> >
<text class="form-label"> <text class="form-label">
{{getlabelFn(item)}} {{ getlabelFn(item) }}
<!-- {{ item.label }} --> <!-- {{ item.label }} -->
<text v-if="item.required" class="required">*</text> <text v-if="item.required" class="required">*</text>
</text> </text>
...@@ -232,7 +232,7 @@ import { showLoading, hideLoading } from "../../utils/index.js"; ...@@ -232,7 +232,7 @@ import { showLoading, hideLoading } from "../../utils/index.js";
import { updateBabyInfo, getGestationalWeeks } from "../../api/user.js"; import { updateBabyInfo, getGestationalWeeks } from "../../api/user.js";
import { usePageCfgStore } from "../../stores/pageCfg"; import { usePageCfgStore } from "../../stores/pageCfg";
import md from "../../md.js"; import md from "../../md.js";
import { jump, JumpType } from '../../utils/index.js'; import { jump, JumpType } from "../../utils/index.js";
const userStore = useUserStore(); const userStore = useUserStore();
const pageType = ref("add"); const pageType = ref("add");
const babyId = ref(""); const babyId = ref("");
...@@ -511,6 +511,13 @@ const onPickerChange = (e, name) => { ...@@ -511,6 +511,13 @@ const onPickerChange = (e, name) => {
const onRadioChange = (e, name) => { const onRadioChange = (e, name) => {
formData.value[name] = e.detail.value; formData.value[name] = e.detail.value;
}; };
const sleep = (delay) => {
return new Promise((resolve) => {
setTimeout(() => resolve(), delay);
});
};
const onSubmit = async (e) => { const onSubmit = async (e) => {
md.sensorLogTake({ md.sensorLogTake({
xcxClick: "我的页面-信息修改页点击", xcxClick: "我的页面-信息修改页点击",
...@@ -579,23 +586,24 @@ const onSubmit = async (e) => { ...@@ -579,23 +586,24 @@ const onSubmit = async (e) => {
hideLoading(); hideLoading();
if (res.success) { if (res.success) {
data?.id && data?.id && userStore.setBabyNickCache(data?.id, formData.value.babyName);
userStore.setBabyNickCache(data?.id, formData.value.babyName);
uni.showToast({
title: "提交成功",
icon: "success",
});
uni.navigateBack();
// jump({ // jump({
// type: JumpType.INNER, // type: JumpType.INNER,
// url: "/pages/index/index" // url: "/pages/index/index"
// }) // })
showLoading(); showLoading();
await sleep(3000);
await userStore.loadUserInfo(); await userStore.loadUserInfo();
await userStore.loadBabyInfo(); await userStore.loadBabyInfo();
await userStore.loadHomeInfo(); await userStore.loadHomeInfo();
hideLoading(); hideLoading();
uni.showToast({
title: "提交成功",
icon: "success",
});
uni.navigateBack();
} else { } else {
uni.showToast({ uni.showToast({
title: res.message, title: res.message,
...@@ -674,21 +682,18 @@ function onDateStatusChange(status) { ...@@ -674,21 +682,18 @@ function onDateStatusChange(status) {
} }
return true; return true;
} }
const getlabelFn =(item) =>{ const getlabelFn = (item) => {
if (item.name === "babyBirthday") { if (item.name === "babyBirthday") {
item.label = formData.value.babyStage == 1 ? '预产日期':'宝宝出生日期' item.label = formData.value.babyStage == 1 ? "预产日期" : "宝宝出生日期";
} }
return item.label return item.label;
} };
// getLabelByValue 支持所有映射字段 // getLabelByValue 支持所有映射字段
const getLabelByValue = (item, value) => { const getLabelByValue = (item, value) => {
if (item.name === "babyStage") { if (item.name === "babyStage") {
return babyStageMap.find((i) => i.value === value)?.label || ""; return babyStageMap.find((i) => i.value === value)?.label || "";
} }
if (item.name === "babyType") { if (item.name === "babyType") {
return babyTypeMap.find((i) => i.value === value)?.label || ""; return babyTypeMap.find((i) => i.value === value)?.label || "";
} }
...@@ -699,8 +704,12 @@ const getLabelByValue = (item, value) => { ...@@ -699,8 +704,12 @@ const getLabelByValue = (item, value) => {
// // 添加根据切换状态修改文案 // // 添加根据切换状态修改文案
if (item.name === "babyBirthday") { if (item.name === "babyBirthday") {
// console.log("🚀 ~ getLabelByValue ~ formData:", formData.value, item) // console.log("🚀 ~ getLabelByValue ~ formData:", formData.value, item)
item.placeholder = formData.value.babyBirthday? formData.value.babyBirthday : formData.value.babyStage == 1 ? '请选择预产日期':'请选择出生日期' item.placeholder = formData.value.babyBirthday
return item.placeholder ? formData.value.babyBirthday
: formData.value.babyStage == 1
? "请选择预产日期"
: "请选择出生日期";
return item.placeholder;
} }
return value; return value;
}; };
...@@ -740,7 +749,6 @@ const initData = () => { ...@@ -740,7 +749,6 @@ const initData = () => {
// 更新表单项的选项数据 // 更新表单项的选项数据
formItems.value.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") {
...@@ -761,7 +769,6 @@ const initData = () => { ...@@ -761,7 +769,6 @@ const initData = () => {
formData.value.babyStage == 2 ? "请选择出生日期" : "请选择预产日期"; formData.value.babyStage == 2 ? "请选择出生日期" : "请选择预产日期";
} }
}); });
}; };
onMounted(() => { onMounted(() => {
...@@ -774,13 +781,13 @@ onMounted(() => { ...@@ -774,13 +781,13 @@ onMounted(() => {
}); });
onLoad((options) => { onLoad((options) => {
console.log("🚀 ~ options-新增和修改:", options) console.log("🚀 ~ options-新增和修改:", options);
// debugger; // debugger;
pageType.value = options.type || "add"; pageType.value = options.type || "add";
babyId.value = options.id || ""; babyId.value = options.id || "";
if (pageType.value === "edit") { if (pageType.value === "edit") {
const baby = userStore.babyInfo; const baby = userStore.babyInfo;
console.log("🚀 ~ baby:", baby) console.log("🚀 ~ baby:", baby);
formData.value.babyStage = baby.babyStage ?? 2; formData.value.babyStage = baby.babyStage ?? 2;
formData.value.babyName = baby.babyName || ""; formData.value.babyName = baby.babyName || "";
formData.value.babyBirthday = baby.content?.babyBirthday || ""; formData.value.babyBirthday = baby.content?.babyBirthday || "";
......
<template> <template>
<view> <view>
<view class="postnatal"> <view class="postnatal">
<!-- 自定义头部 --> <!-- 自定义头部 -->
<!-- <customize-navigation> <!-- <customize-navigation>
<template v-slot:navbar-content> <template v-slot:navbar-content>
<view class="page-top"> <view class="page-top">
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
<view class="page_title">产检提醒</view> <view class="page_title">产检提醒</view>
</view> </view>
</template> </template>
</customize-navigation> --> </customize-navigation> -->
<view class="postnatal-con"> <view class="postnatal-con">
<!-- 轮播图 --> <!-- 轮播图 -->
<swiper class="banner-swiper" :autoplay="true" :circular="true" v-if="bannerList.length > 0 "> <swiper class="banner-swiper" :autoplay="true" :circular="true" v-if="bannerList.length > 0">
<swiper-item v-for="(item, index) in bannerList" :key="index"> <swiper-item v-for="(item, index) in bannerList" :key="index">
<image class="banner-img" :src="`${item.img}`" mode="aspectFill" <image class="banner-img" :src="`${item.img}`" mode="aspectFill"
@click="handleBannerClick(item, index)" /> @click="handleBannerClick(item, index)" />
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</view> </view>
<!-- 产检记录 --> <!-- 产检记录 -->
<scroll-view class="postnatal-con-record" scroll-y :scroll-top="scrollTop"> <scroll-view class="postnatal-con-record" scroll-y :scroll-top="scrollTop">
<!-- <view class="postnatal-con-record"> --> <!-- <view class="postnatal-con-record"> -->
<view :class="['record-item', `item-${index}`]" <view :class="['record-item', `item-${index}`]"
v-for="({ id, checkupDate, index, pregnancyWeek, status, examinationItems, type }, i) in homeInfo.checkupList" v-for="({ id, checkupDate, index, pregnancyWeek, status, examinationItems, type }, i) in homeInfo.checkupList"
@click="onDetails(id, type)" :key="i"> @click="onDetails(id, type)" :key="i">
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
重点:{{ getProject(examinationItems) }} 重点:{{ getProject(examinationItems) }}
</view> </view>
</view> </view>
<!-- </view> --> <!-- </view> -->
</scroll-view> </scroll-view>
</view> </view>
<!-- 新增产检 --> <!-- 新增产检 -->
...@@ -112,12 +112,13 @@ ...@@ -112,12 +112,13 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 提示弹窗 --> <!-- 提示弹窗 -->
<popup-tip v-if="isTip" type="2" @statusChange="onBabyChange" @close="isTip = false"></popup-tip> <popup-tip v-if="isTip" type="2" @statusChange="onBabyChange" @close="isTip = false"></popup-tip>
<!-- 使用封装后的日期选择器组件 --> <!-- 使用封装后的日期选择器组件 -->
<DatePicker v-model:visible="visible" :default-date="time" @confirm="handleDateConfirm" /> <DatePicker v-model:visible="visible" :default-date="time" @confirm="handleDateConfirm"
/>
</view> </view>
</view> </view>
</template> </template>
...@@ -127,7 +128,8 @@ import { ...@@ -127,7 +128,8 @@ import {
ref, ref,
getCurrentInstance, getCurrentInstance,
onMounted, onMounted,
nextTick nextTick,
watch
} from 'vue' } from 'vue'
import { import {
onLoad, onLoad,
...@@ -193,6 +195,7 @@ const visible = ref(false) ...@@ -193,6 +195,7 @@ const visible = ref(false)
// 时间 // 时间
const time = ref('') const time = ref('')
const isClickClose = ref(false)
// 保存要修改的id // 保存要修改的id
const editId = ref(null) const editId = ref(null)
...@@ -258,7 +261,7 @@ const backHandler = () => { ...@@ -258,7 +261,7 @@ const backHandler = () => {
const handleBannerClick = (item, index) => { const handleBannerClick = (item, index) => {
console.log(item) console.log(item)
let buttonName = ''; let buttonName = '';
switch(index){ switch (index) {
case 0: case 0:
buttonName = '第一张焦点图'; buttonName = '第一张焦点图';
break; break;
...@@ -285,7 +288,7 @@ const handleBannerClick = (item, index) => { ...@@ -285,7 +288,7 @@ const handleBannerClick = (item, index) => {
}) })
} }
} }
// 新增体检 // 新增体检
const onAdd = () => { const onAdd = () => {
...@@ -306,7 +309,14 @@ const onBtn = (type) => { ...@@ -306,7 +309,14 @@ const onBtn = (type) => {
switch (type) { switch (type) {
case 0: case 0:
// 如果授权就不弹出提醒 // 如果授权就不弹出提醒
showPicker.value = isWxNotification.value ? true : false showPicker.value = isWxNotification.value ? true : false
if (showPicker.value) {
md.sensorPopLogTake({
xcxPopExposure: "true",
toolName: "产检提醒",
popName: "设置提醒时间弹窗"
});
}
buttonName = '提醒' buttonName = '提醒'
break; break;
...@@ -334,8 +344,17 @@ const onBtn = (type) => { ...@@ -334,8 +344,17 @@ const onBtn = (type) => {
} }
// 提醒关闭 // 提醒关闭
const close = () => { const close = (type) => {
if (type !== 'nonePop') {
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "产检提醒",
popName: "设置提醒时间弹窗",
buttonName: "取消"
});
}
showPicker.value = false; showPicker.value = false;
} }
// 选择提醒事件 // 选择提醒事件
const handleChange = (e) => { const handleChange = (e) => {
...@@ -343,10 +362,15 @@ const handleChange = (e) => { ...@@ -343,10 +362,15 @@ const handleChange = (e) => {
} }
// 确认选择 // 确认选择
const handleConfirm = () => { const handleConfirm = () => {
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "产检提醒",
popName: "设置提醒时间弹窗",
buttonName: "确认"
});
selectedValue.value = options[pickerValue.value].id; selectedValue.value = options[pickerValue.value].id;
console.log(selectedValue.value, homeInfo.value.wxTemplateId, babyId.value) console.log(selectedValue.value, homeInfo.value.wxTemplateId, babyId.value)
close(); close("nonePop");
// 订阅提醒 // 订阅提醒
uni.requestSubscribeMessage({ uni.requestSubscribeMessage({
tmplIds: [homeInfo.value.wxTemplateId], tmplIds: [homeInfo.value.wxTemplateId],
...@@ -359,7 +383,19 @@ const handleConfirm = () => { ...@@ -359,7 +383,19 @@ const handleConfirm = () => {
} }
}) })
} }
watch(visible, (newVal) => {
if (!newVal) {
if (isClickClose.value) {
return
}
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "产检提醒",
popName: "选择产检时间弹窗",
buttonName: "取消"
});
}
})
// 编辑时间 // 编辑时间
const onEdit = (id, newTime) => { const onEdit = (id, newTime) => {
md.sensorLogTake({ md.sensorLogTake({
...@@ -372,45 +408,61 @@ const onEdit = (id, newTime) => { ...@@ -372,45 +408,61 @@ const onEdit = (id, newTime) => {
time.value = newTime time.value = newTime
visible.value = true visible.value = true
editId.value = id editId.value = id
isClickClose.value = false
md.sensorPopLogTake({
xcxPopExposure: "true",
toolName: "产检提醒",
popName: "选择产检时间弹窗"
});
} }
// 选择日期回调确认 // 选择日期回调确认
const handleDateConfirm = (date) => { const handleDateConfirm = (date) => {
console.log('选择的日期是:', date); console.log('选择的日期是:', date);
time.value = date; time.value = date;
console.log(editId.value, time.value) console.log(editId.value, time.value)
onEditTime() onEditTime()
isClickClose.value = true
md.sensorPopLogTake({
xcxPopClick: "true",
toolName: "产检提醒",
popName: "选择产检时间弹窗",
buttonName: "确认"
});
} }
// 添加计算滚动位置的方法 // 添加计算滚动位置的方法
const scrollToCurrentWeek = async () => { const scrollToCurrentWeek = async () => {
// 确保数据已加载 // 确保数据已加载
if (!homeInfo.value || !homeInfo.value.gestationalWeeks || !homeInfo.value.checkupList) return; if (!homeInfo.value || !homeInfo.value.gestationalWeeks || !homeInfo.value.checkupList) return;
// 找到当前孕周对应的产检项 // 找到当前孕周对应的产检项
const currentItem = homeInfo.value.checkupList.find( const currentItem = homeInfo.value.checkupList.find(
item => item.pregnancyWeek == homeInfo.value.gestationalWeeks item => item.pregnancyWeek == homeInfo.value.gestationalWeeks
); );
if (!currentItem) return; if (!currentItem) return;
// 等待DOM更新 // 等待DOM更新
await nextTick(); await nextTick();
// 创建选择器查询 // 创建选择器查询
const query = uni.createSelectorQuery().in(proxy); const query = uni.createSelectorQuery().in(proxy);
query.select(`.item-${currentItem.index}`).boundingClientRect(); query.select(`.item-${currentItem.index}`).boundingClientRect();
query.select('.postnatal-con-record').boundingClientRect(); query.select('.postnatal-con-record').boundingClientRect();
query.exec((rects) => { query.exec((rects) => {
if (!rects[0] || !rects[1]) return; if (!rects[0] || !rects[1]) return;
const [itemRect, containerRect] = rects; const [itemRect, containerRect] = rects;
// 计算元素在容器内的相对位置 // 计算元素在容器内的相对位置
const position = itemRect.top - containerRect.top; const position = itemRect.top - containerRect.top;
// 设置滚动位置(增加20px的缓冲距离) // 设置滚动位置(增加20px的缓冲距离)
scrollTop.value = position + 20; scrollTop.value = position + 20;
}); });
}; };
// 保存订阅消息 // 保存订阅消息
const getWxNotificationFn = async (notificationDate, wxTemplateId, babyId) => { const getWxNotificationFn = async (notificationDate, wxTemplateId, babyId) => {
...@@ -464,16 +516,16 @@ const getInfoFn = async () => { ...@@ -464,16 +516,16 @@ const getInfoFn = async () => {
uni.setStorageSync('dueDate', data.dueDate) uni.setStorageSync('dueDate', data.dueDate)
// 新增:调用滚动方法 // 新增:调用滚动方法
scrollToCurrentWeek() scrollToCurrentWeek()
} else { } else {
uni.showToast({ uni.showToast({
title: message, title: message,
icon: "none", icon: "none",
}); });
} }
} }
// 获取banner图 // 获取banner图
...@@ -495,43 +547,43 @@ const getSettingFn = () => { ...@@ -495,43 +547,43 @@ const getSettingFn = () => {
success(res) { success(res) {
// console.log(res.authSetting, '授权信息') // console.log(res.authSetting, '授权信息')
console.log(res.subscriptionsSetting, '订阅信息') console.log(res.subscriptionsSetting, '订阅信息')
if(res.subscriptionsSetting.itemSettings){ if (res.subscriptionsSetting.itemSettings) {
isWxNotification.value = false isWxNotification.value = false
console.log("🚀 ~ success ~ isWxNotification111:", isWxNotification.value) console.log("🚀 ~ success ~ isWxNotification111:", isWxNotification.value)
} else { } else {
isWxNotification.value = true isWxNotification.value = true
console.log("🚀 ~ success ~ isWxNotification222:", isWxNotification.value) console.log("🚀 ~ success ~ isWxNotification222:", isWxNotification.value)
} }
} }
}) })
} }
// 提示弹窗回调 // 提示弹窗回调
const onBabyChange= ()=>{ const onBabyChange = () => {
publicFn() publicFn()
} }
// 公共函数 // 公共函数
const publicFn = () => { const publicFn = () => {
console.log("🚀 ~ onShow ~ userStore:", userStore.babyInfo) console.log("🚀 ~ onShow ~ userStore:", userStore.babyInfo)
const babyInfo = userStore.babyInfo const babyInfo = userStore.babyInfo
if(babyInfo && babyInfo.babyStage == 1){ if (babyInfo && babyInfo.babyStage == 1) {
isTip.value = false isTip.value = false
babyId.value = userStore.babyInfo?.content?.id babyId.value = userStore.babyInfo?.content?.id
getSettingFn() getSettingFn()
// 获取banner图 // 获取banner图
postnatalJSONFn() postnatalJSONFn()
// 获取信息 // 获取信息
getInfoFn() getInfoFn()
} else{ } else {
isTip.value = true isTip.value = true
} }
} }
onShow(async () => { onShow(async () => {
await userStore.loadBabyInfo() await userStore.loadBabyInfo()
console.log('宝宝信息加载完成:', userStore.babyInfo) console.log('宝宝信息加载完成:', userStore.babyInfo)
publicFn() publicFn()
}) })
onMounted(() => { onMounted(() => {
isClickClose.value = false
md.sensorLogTake({ md.sensorLogTake({
xcxPage: "小程序页面浏览事件", xcxPage: "小程序页面浏览事件",
pageName: "产检提醒首页" pageName: "产检提醒首页"
...@@ -561,8 +613,9 @@ onMounted(() => { ...@@ -561,8 +613,9 @@ onMounted(() => {
align-items: center; align-items: center;
margin-top: 50rpx; margin-top: 50rpx;
font-weight: 500; font-weight: 500;
flex-shrink: 0; flex-shrink: 0;
height: 32rpx; height: 32rpx;
.info-c { .info-c {
width: 2rpx; width: 2rpx;
height: 22rpx; height: 22rpx;
...@@ -582,7 +635,8 @@ onMounted(() => { ...@@ -582,7 +635,8 @@ onMounted(() => {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: 30rpx; margin-bottom: 30rpx;
flex-shrink: 0; flex-shrink: 0;
.btn-item { .btn-item {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -813,6 +867,7 @@ onMounted(() => { ...@@ -813,6 +867,7 @@ onMounted(() => {
height: 177rpx; height: 177rpx;
border-radius: 12rpx; border-radius: 12rpx;
overflow: hidden; overflow: hidden;
.banner-img { .banner-img {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
...@@ -107,13 +107,13 @@ export default { ...@@ -107,13 +107,13 @@ export default {
}); });
}, },
}, },
// onShareAppMessage() { onShareAppMessage() {
// return { return {
// title: this.shareTitle, title: this.shareTitle,
// path: '/pages/product/product?productId=' + this.productId + '&skuId=' + this.skuId + '&contentImg=' + this.contentImg + '&contentImgLen=' + this.contentImgLen + '&shareTitle=' + this.shareTitle + '&shareImg=' + this.shareImg + '&tabName=' + this.tabName+'&title=' + this.title, path: '/pages/product/product?productId=' + this.productId + '&skuId=' + this.skuId + '&contentImg=' + this.contentImg + '&contentImgLen=' + this.contentImgLen + '&shareTitle=' + this.shareTitle + '&shareImg=' + this.shareImg + '&tabName=' + this.tabName+'&title=' + this.title,
// imageUrl: this.shareImg imageUrl: this.shareImg
// } }
// }, },
} }
</script> </script>
......
...@@ -459,11 +459,14 @@ const onRemind = () => { ...@@ -459,11 +459,14 @@ const onRemind = () => {
} }
// 如果授权就不弹出提醒 // 如果授权就不弹出提醒
showPicker.value = isWxNotification.value ? true : false showPicker.value = isWxNotification.value ? true : false
} }
// 提醒关闭 // 提醒关闭
const close = () => { const close = () => {
showPicker.value = false; showPicker.value = false;
} }
// 选择提醒事件 // 选择提醒事件
...@@ -472,6 +475,7 @@ const handleChange = (e) => { ...@@ -472,6 +475,7 @@ const handleChange = (e) => {
} }
// 确认选择 // 确认选择
const handleConfirm = () => { const handleConfirm = () => {
selectedValue.value = options[pickerValue.value].id; selectedValue.value = options[pickerValue.value].id;
console.log(selectedValue.value, infoData.value.wxTemplateId, babyId.value) console.log(selectedValue.value, infoData.value.wxTemplateId, babyId.value)
close(); close();
......
...@@ -380,6 +380,11 @@ const showDatePicker = () => { ...@@ -380,6 +380,11 @@ const showDatePicker = () => {
}); });
console.log('显示日期选择器') console.log('显示日期选择器')
md.sensorPopLogTake({
xcxPopExposure: "true",
toolName: "生长曲线",
popName: "选择本次测评日期弹窗"
});
showDatePickerPopup.value = true showDatePickerPopup.value = true
} }
......
...@@ -164,6 +164,8 @@ onShareAppMessage((options) => { ...@@ -164,6 +164,8 @@ onShareAppMessage((options) => {
console.log('分享数据:', share.value) console.log('分享数据:', share.value)
console.log('分享选项:', options) console.log('分享选项:', options)
debugger;
md.sensorLogTake({ md.sensorLogTake({
xcxClick: "suyuan202508H5Click", xcxClick: "suyuan202508H5Click",
pageName: "星妈会分享页", pageName: "星妈会分享页",
......
...@@ -196,6 +196,8 @@ import { onPageScroll, onShow } from "@dcloudio/uni-app"; ...@@ -196,6 +196,8 @@ import { onPageScroll, onShow } from "@dcloudio/uni-app";
import { showLoading, hideLoading, jump, JumpType } from '../../utils/index.js' import { showLoading, hideLoading, jump, JumpType } from '../../utils/index.js'
import { useXingmaLabStore } from '../../stores/xingmaLab' import { useXingmaLabStore } from '../../stores/xingmaLab'
import Xingmalabnotimepop from '../../components/xingmaLab/Xingmalabnotimepop.vue' import Xingmalabnotimepop from '../../components/xingmaLab/Xingmalabnotimepop.vue'
import md from '../../md';
// 定义组件名称 // 定义组件名称
defineOptions({ defineOptions({
name: 'XingmaLab' name: 'XingmaLab'
...@@ -309,6 +311,11 @@ const handleImageLoad = (e, item, index) => { ...@@ -309,6 +311,11 @@ const handleImageLoad = (e, item, index) => {
} }
onShow(async () => { onShow(async () => {
md.sensorLogTake({
xcxPage: "星妈实验室首页页面浏览",
pageName: "星妈实验室首页",
});
console.log('onshow') console.log('onshow')
await xingmaLabStore.loadXingmaInfo(); await xingmaLabStore.loadXingmaInfo();
......
...@@ -81,8 +81,8 @@ ...@@ -81,8 +81,8 @@
height: 200rpx; height: 200rpx;
overflow: hidden; overflow: hidden;
image { image {
width: 54rpx; width: 58rpx;
height: 54rpx; height: 58rpx;
} }
} }
} }
......
...@@ -24,13 +24,13 @@ ...@@ -24,13 +24,13 @@
<view class="footer-item blur-bg" @click="gofeihe()"> <view class="footer-item blur-bg" @click="gofeihe()">
<view> <view>
<image <image
style="width: 59rpx; height: 59rpx" style="width: 64rpx; height: 64rpx"
src="@/assets/reservation-images/twitter.png" src="@/assets/reservation-images/twitter_new.png"
mode="widthFix" mode="widthFix"
> >
</image> </image>
</view> </view>
<view>了解飞鹤</view> <view style="margin-top:4rpx;">了解飞鹤</view>
</view> </view>
<view <view
class="footer-item blur-bg" class="footer-item blur-bg"
...@@ -38,11 +38,11 @@ ...@@ -38,11 +38,11 @@
> >
<view> <view>
<image <image
src="@/assets/reservation-images/briefcase.png" src="@/assets/reservation-images/briefcase_new.png"
mode="widthFix" mode="widthFix"
></image> ></image>
</view> </view>
<view>现在预约</view> <view style="margin-top:4rpx;">现在预约</view>
</view> </view>
<view <view
class="footer-item blur-bg" class="footer-item blur-bg"
...@@ -50,11 +50,11 @@ ...@@ -50,11 +50,11 @@
> >
<view> <view>
<image <image
src="@/assets/reservation-images/calendar.png" src="@/assets/reservation-images/calendar_new.png"
mode="widthFix" mode="widthFix"
></image> ></image>
</view> </view>
<view>预约记录</view> <view style="margin-top:4rpx;">预约记录</view>
</view> </view>
</view> </view>
<!-- 底部箭头 --> <!-- 底部箭头 -->
...@@ -98,7 +98,6 @@ const changeCurrent = () => { ...@@ -98,7 +98,6 @@ const changeCurrent = () => {
const handleScrollChange = (e) => { const handleScrollChange = (e) => {
console.log(e) console.log(e)
console.log(123)
current.value = e.detail.current current.value = e.detail.current
} }
......
import { defineStore } from "pinia"; import { defineStore } from "pinia";
import { myObj } from "../mock/my";
import { fetchUserJSON } from "@/api/user"; import { fetchUserJSON } from "@/api/user";
export const usePageCfgStore = defineStore("pageCfg", { export const usePageCfgStore = defineStore("pageCfg", {
......
...@@ -58,8 +58,13 @@ class ExposureTracker { ...@@ -58,8 +58,13 @@ class ExposureTracker {
const isVisible = this.isElementInViewport(res, scrollTop); const isVisible = this.isElementInViewport(res, scrollTop);
if (isVisible && !value.isExposed) { if (isVisible && !value.isExposed) {
value.isExposed = true; value.isExposed = true;
// 触发埋点 // 触发埋点
md.sensorLogTake(value.logParams); if(value.logParams.xcxComponentExposure){
md.sensorComponentLogTake(value.logParams);
}else{
md.sensorLogTake(value.logParams);
}
} }
}); });
}); });
......
...@@ -36,7 +36,11 @@ export function jump({ type, url, extra = {} }) { ...@@ -36,7 +36,11 @@ export function jump({ type, url, extra = {} }) {
console.log("jumpParams:", jumpParams); console.log("jumpParams:", jumpParams);
uni.navigateToMiniProgram(jumpParams); if(extra.embedded){
uni.openEmbeddedMiniProgram(jumpParams);
}else{
uni.navigateToMiniProgram(jumpParams);
}
break; break;
case JumpType.H5: case JumpType.H5:
// 跳转到 https 网络链接 // 跳转到 https 网络链接
......
This diff is collapsed.
This diff is collapsed.
...@@ -55,8 +55,49 @@ ...@@ -55,8 +55,49 @@
:src="$baseUrl + `integral/${tupianBanben}/${item?.currentLvTip}`" :src="$baseUrl + `integral/${tupianBanben}/${item?.currentLvTip}`"
mode="aspectFit" mode="aspectFit"
/> />
<view class="jifen-progressbar"
v-if="getHuangjinMaxVal()[index] != -1 && !(memberInfo.grade == 0 && !memberInfo.orderUpgrade && points == 1)" <text class="current-xingyaodengji-tips"
v-if="getHuangjinMaxVal()[index] == -1 && !(memberInfo.grade == 0 && !memberInfo.orderUpgrade && points >= 1)"
:style="{ color: getColor('jifen')[index]?.currentPoints }"
> {{ itemIndex == 4 ? '您已经升至最高等级' : '您已超越该等级' }}</text>
<button
v-if="!islogin"
type="primary"
class="phone-button"
open-type="getPhoneNumber"
@getphonenumber="getRealtimePhoneNumber"
/>
</view>
<view class="saoma-tips"
@click="integralHandler" v-if="memberInfo.grade == 0 && !memberInfo.orderUpgrade && points >= 1">
<text class="saoma-tips-text"
:style="{ color: getColor('saomaTips')[index]?.textColor }"
>扫罐内码或下单有机会升级至<text class="saoma-tips-text-lv"
:style="{ color: getColor('saomaTips')[index]?.jifenColor }"
>{{ index == 0 ? gradeList[index + 1]?.gradeName : gradeList[index]?.gradeName }}</text>
</text>
<text class="saoma-tips-text-tips"
:style="{ color: getColor('saomaTips')[index]?.jifenColor }"
>累计积分
<text class="saoma-tips-text-tips-num"
:style="{ color: getColor('saomaTips')[index]?.jifenColor }"
>{{ points }}</text>
<text class="saoma-tips-text-tips-maxnum"
:style="{ color: getColor('saomaTips')[index]?.textColor }"
>/{{ getHuangjinMaxVal()[index] }}</text>
</text>
</view>
<view class="jifen-progressbar"
v-if="getHuangjinMaxVal()[index] != -1 && !(memberInfo.grade == 0 && !memberInfo.orderUpgrade && points >= 1)"
@click="integralHandler"
> >
<!-- 积分标题和数值 --> <!-- 积分标题和数值 -->
<view class="jifen-header"> <view class="jifen-header">
...@@ -94,43 +135,6 @@ ...@@ -94,43 +135,6 @@
</view> </view>
</view> </view>
<text class="current-xingyaodengji-tips"
v-if="getHuangjinMaxVal()[index] == -1 && !(memberInfo.grade == 0 && !memberInfo.orderUpgrade && points == 1)"
:style="{ color: getColor('jifen')[index]?.currentPoints }"
> {{ itemIndex == 4 ? '您已经升至最高等级' : '您已超越该等级' }}</text>
<view class="saoma-tips" v-if="memberInfo.grade == 0 && !memberInfo.orderUpgrade && points == 1">
<text class="saoma-tips-text"
:style="{ color: getColor('saomaTips')[index]?.textColor }"
>扫罐内码或下单有机会升级至<text class="saoma-tips-text-lv"
:style="{ color: getColor('saomaTips')[index]?.jifenColor }"
>{{ gradeList[index]?.gradeName }}</text>
</text>
<text class="saoma-tips-text-tips"
:style="{ color: getColor('saomaTips')[index]?.jifenColor }"
>积分
<text class="saoma-tips-text-tips-num"
:style="{ color: getColor('saomaTips')[index]?.jifenColor }"
>{{ points }}</text>
<text class="saoma-tips-text-tips-maxnum"
:style="{ color: getColor('saomaTips')[index]?.textColor }"
>/{{ getHuangjinMaxVal()[index] }}</text>
</text>
</view>
<button
v-if="!islogin"
type="primary"
class="phone-button"
open-type="getPhoneNumber"
@getphonenumber="getRealtimePhoneNumber"
/>
</view>
<text <text
class="chakanshengjigonglueTxt" class="chakanshengjigonglueTxt"
:style="{ color: getColor('chakangonglue')[index] }" :style="{ color: getColor('chakangonglue')[index] }"
...@@ -1514,6 +1518,7 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue'; ...@@ -1514,6 +1518,7 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
} }
} }
//isshowShouqi 为true 时,展示收起按详情,为false 时,展示查看详情 //isshowShouqi 为true 时,展示收起按详情,为false 时,展示查看详情
const handleZhankaiClick = () => { const handleZhankaiClick = () => {
...@@ -1764,15 +1769,27 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue'; ...@@ -1764,15 +1769,27 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
} }
hideLoading(); hideLoading();
initExposure();
}); });
const initExposure = () => {
imgInfos.value.forEach((item, index) => {
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "会员权益-" + item.name
});
});
}
const initNetData = () => { const initNetData = () => {
console.log('initNetData'); console.log('initNetData');
memberInfo.value = userStore.memberInfo; memberInfo.value = userStore.memberInfo;
// memberInfo.value = {"grade": null, "gradeList": null, "gradeName": null, "maxGrade": false, "memberId": "not_login", "memberName": null, "mobile": null, "nextGradeScoreRuleMin": null, "orderUpgrade": null, "points": null, "recentAnnualPointsTotal": null, "willExpiredPoints": null} ; // memberInfo.value = {"grade": null, "gradeList": null, "gradeName": null, "maxGrade": false, "memberId": "not_login", "memberName": null, "mobile": null, "nextGradeScoreRuleMin": null, "orderUpgrade": null, "points": null, "recentAnnualPointsTotal": null, "willExpiredPoints": null} ;
// memberInfo.value = { // memberInfo.value = {
// "grade": "4", // "grade": "0",
// "gradeList": [ // "gradeList": [
// { // {
// "grade": "0", // "grade": "0",
...@@ -1810,10 +1827,10 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue'; ...@@ -1810,10 +1827,10 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
// "memberId": "CRM000000000948094264", // "memberId": "CRM000000000948094264",
// "memberName": "文慧17637145052", // "memberName": "文慧17637145052",
// "mobile": "17637145052", // "mobile": "17637145052",
// "nextGradeScoreRuleMin": 10000, // "nextGradeScoreRuleMin": 1,
// "orderUpgrade": true, // "orderUpgrade": false,
// "points": 999, // "points": 999,
// "recentAnnualPointsTotal": 5500, // "recentAnnualPointsTotal": 0,
// "willExpiredPoints": 100000 // "willExpiredPoints": 100000
// }; // };
...@@ -2030,8 +2047,7 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue'; ...@@ -2030,8 +2047,7 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
const type = item.type; const type = item.type;
const extra = item.extra; const extra = item.extra;
extra.embedded = true; //半屏拉起小程序
console.log('url11111=',url); console.log('url11111=',url);
...@@ -2142,7 +2158,12 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue'; ...@@ -2142,7 +2158,12 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
pageName: "积分服务页-首屏", pageName: "积分服务页-首屏",
buttonName: `${item.name}`, buttonName: `${item.name}`,
}); });
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "积分服务页",
componentName: "会员权益",
componentContent: "会员权益-" + item.name
});
console.log('selectIdx.value=', selectIdx.value); console.log('selectIdx.value=', selectIdx.value);
// const url = vipQuanyiUrl.value.url; // const url = vipQuanyiUrl.value.url;
...@@ -2483,8 +2504,55 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue'; ...@@ -2483,8 +2504,55 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
position: absolute; position: absolute;
} }
// 积分进度条样式
.jifen-progressbar {
.current-xingyaodengji-tips{
position: absolute;
top:209rpx;
left: 40rpx;
font-size: 18rpx;
}
.phone-button{
width: 692rpx;
height:256rpx;
top: 0rpx;
opacity: 0;
background: #6f6d67;
}
}
.saoma-tips{
position: absolute;
top:209rpx;
left: 40rpx;
font-size: 18rpx;
display: flex;
flex-direction: column;
.saoma-tips-text{
font-size: 18rpx;
.saoma-tips-text-lv{
font-size: 18rpx;
}
}
.saoma-tips-text-tips{
font-size: 18rpx;
.saoma-tips-text-tips-num{
font-size: 18rpx;
}
.saoma-tips-text-tips-maxnum{
font-size: 18rpx;
}
}
}
// 积分进度条样式
.jifen-progressbar {
position: absolute; position: absolute;
top: 207rpx; top: 207rpx;
width: 320rpx; width: 320rpx;
...@@ -2561,52 +2629,6 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue'; ...@@ -2561,52 +2629,6 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
} }
} }
.current-xingyaodengji-tips{
position: absolute;
top:209rpx;
left: 40rpx;
font-size: 18rpx;
}
.saoma-tips{
position: absolute;
top:209rpx;
left: 40rpx;
font-size: 18rpx;
display: flex;
flex-direction: column;
.saoma-tips-text{
font-size: 18rpx;
.saoma-tips-text-lv{
font-size: 18rpx;
}
}
.saoma-tips-text-tips{
font-size: 18rpx;
.saoma-tips-text-tips-num{
font-size: 18rpx;
}
.saoma-tips-text-tips-maxnum{
font-size: 18rpx;
}
}
}
.phone-button{
width: 692rpx;
height:256rpx;
top: 0rpx;
opacity: 0;
background: #6f6d67;
}
}
.chakanshengjigonglueTxt { .chakanshengjigonglueTxt {
font-size: 24rpx; font-size: 24rpx;
position: absolute; position: absolute;
......
This diff is collapsed.
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