666666

.gitignore

 unpackage/
 dist/
 node_modules/
+.DS_Store
\ No newline at end of file

.vscode/settings.json

+{
+  "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
+  }
+}
+

api/reservation/reservation-request.js

@@ -9,6 +9,7 @@ import {
 //const baseUrl = 'https://feihe.jzvcode.com/feihe';
 //const baseUrl = 'https://factory-walk-test.feihe.com/feihe';
 const baseUrl = 'https://factory-walk.feihe.com/feihe';
+//const baseUrl = 'https://factory-walk-uat.feihe.com/feihe';
 
 const request = (options = {}) => {
   // 对options.data 进行一些处理 

components/BabyFeedSwitchPopup.vue

@@ -3,21 +3,12 @@
         <view class="popup-content" @click.stop>
             <!-- 喂养方式列表 -->
             <view class="feed-list">
-                <view 
-                    v-for="(item, index) in feedOptions" 
-                    :key="index"
-                    class="feed-item"
-                    :class="{ selected: selectedIndex === index }"
-                    @click="selectFeed(index)"
-                >
+                <view v-for="(item, index) in feedOptions" :key="index" class="feed-item"
+                    :class="{ selected: selectedIndex === index }" @click="selectFeed(index)">
                     <!-- 选中背景 -->
-                    <image 
-                        v-if="selectedIndex === index"
-                        class="feed-item-bg" 
-                        :src="`${$baseUrl}shengzhangTool/1001/changeFeed/itemBg.png`" 
-                        mode="aspectFit"
-                    />
-                    
+                    <image v-if="selectedIndex === index" class="feed-item-bg"
+                        :src="`${$baseUrl}shengzhangTool/1001/changeFeed/itemBg.png`" mode="aspectFit" />
+
                     <!-- 喂养方式文本 -->
                     <text class="feed-text">{{ item.name }}</text>
                 </view>
@@ -25,30 +16,21 @@
 
             <!-- 底部按钮 -->
             <view class="bottom-buttons">
-                <image 
-                    class="cancel-btn"
-                    :class="{'cancel-btn-active': isCancelPressed}"
+                <image class="cancel-btn" :class="{ 'cancel-btn-active': isCancelPressed }"
                     :src="`${$baseUrl}shengzhangTool/1001/changeFeed/cancelBtn.png`"
-                    @touchstart="handleCancelTouchStart"
-                    @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"
-                />
+                    @touchstart="handleCancelTouchStart" @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" />
             </view>
         </view>
     </view>
 </template>
 
 <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({
     visible: {
@@ -90,6 +72,12 @@ const selectedFeedText = ref('母乳+奶粉混合喂养')
 const selectFeed = (index) => {
     selectIndex.value = index
     emit('update:selectedIndex', index)
+    md.sensorPopLogTake({
+        xcxPopClick: "true",
+        toolName: "生长曲线",
+        popName: "喂养方式选择弹窗",
+        buttonName: feedOptions.value[index].name
+    });
 }
 
 // 取消按钮事件
@@ -109,13 +97,19 @@ const handleOkTouchStart = () => {
 
 const handleOkTouchEnd = () => {
     isOkPressed.value = false
-    
+    md.sensorPopLogTake({
+        xcxPopClick: "true",
+        toolName: "生长曲线",
+        popName: "喂养方式选择弹窗",
+        buttonName: "确认"
+    });
     const index = selectIndex.value
     const selectedFeed = feedOptions.value[index]
-    
+
     // 发送事件通知主页面
     emit('change', selectedFeed, index)//只能传一个参数
-    closePopup()
+
+    closePopup("nonePop")
 }
 
 // 点击喂养方式选择
@@ -127,24 +121,38 @@ const openFeedSelector = () => {
 // 处理喂养方式选择变化
 const onFeedChange = (feedOption, index) => {
     isLoadingFeed.value = true
-    
+
     console.log('选择了喂养方式:', feedOption, index)
     selectedFeedText.value = feedOption.name
     currentFeedIndex.value = index
-    
+
     // 模拟保存数据
     setTimeout(() => {
         isLoadingFeed.value = false
     }, 300)
 }
 
-const closePopup = () => {
+const closePopup = (type) => {
+    if (type !== 'nonePop') {
+        md.sensorPopLogTake({
+            xcxPopClick: "true",
+            toolName: "生长曲线",
+            popName: "喂养方式选择弹窗",
+            buttonName: "取消"
+        });
+    }
     emit('update:visible', false)
-}
-
-onMounted(() => {
-})
 
+    watch(() => props.visible, (newVal) => {
+        if (newVal) {
+            md.sensorPopLogTake({
+                xcxPopExposure: "true",
+                toolName: "生长曲线",
+                popName: "喂养方式选择弹窗"
+            });
+        }
+    })
+}
 </script>
 
 <style lang="less" scoped>
@@ -173,7 +181,7 @@ onMounted(() => {
             overflow-y: auto;
             padding-left: 30rpx;
             padding-right: 30rpx;
-            
+
             .feed-item {
                 position: relative;
                 display: flex;
@@ -183,18 +191,18 @@ onMounted(() => {
                 margin-bottom: 20rpx;
                 border-radius: 16rpx;
                 background-color: #fff;
-                
+
                 &.selected {
                     background-color: transparent;
                 }
-                
+
                 .feed-item-bg {
                     position: absolute;
                     width: 689rpx;
                     height: 108rpx;
                     z-index: 1;
                 }
-                
+
                 .feed-text {
                     position: relative;
                     z-index: 2;
@@ -212,22 +220,22 @@ onMounted(() => {
             padding-top: 20rpx;
             padding-left: 30rpx;
             padding-right: 30rpx;
-            
+
             .cancel-btn {
                 width: 334rpx;
                 height: 97rpx;
                 transition: transform 0.1s ease-out;
-                
+
                 &.cancel-btn-active {
                     transform: scale(0.95);
                 }
             }
-            
+
             .ok-btn {
                 width: 334rpx;
                 height: 97rpx;
                 transition: transform 0.1s ease-out;
-                
+
                 &.ok-btn-active {
                     transform: scale(0.95);
                 }
@@ -251,23 +259,22 @@ onMounted(() => {
     display: flex;
     align-items: center;
     cursor: pointer; // 添加手型光标
-    
+
     .feeding-value {
         font-size: 28rpx;
         color: #666;
         margin-right: 8rpx;
     }
-    
+
     .dropdown-icon {
         width: 20rpx;
         height: 20rpx;
         transition: transform 0.3s ease; // 添加旋转动画
     }
-    
+
     // 可选：添加点击反馈效果
     &:active {
         opacity: 0.7;
     }
 }
 </style>
-

components/BabySwitchPopup.vue

@@ -67,6 +67,7 @@
 <script setup>
 import { ref, defineEmits, defineProps, onMounted } from 'vue'
 import { useUserStore } from "@/stores/user";
+import md from '../md.js'
 
 // const props = defineProps({
 //     visible: {
@@ -104,6 +105,12 @@ const handleOkTouchStart = () => {
 }
 
 const handleOkTouchEnd = async () => {
+    md.sensorPopLogTake({
+        xcxPopClick: "true",
+        toolName: "生长曲线",
+        popName: "切换宝宝弹窗",
+        buttonName: "确认"
+    });
     isOkPressed.value = false
 
     const index = selectIndex.value;
@@ -116,11 +123,23 @@ const handleOkTouchEnd = async () => {
 }
 
 const closePopup = () => {
+    md.sensorPopLogTake({
+        xcxPopClick: "true",
+        toolName: "生长曲线",
+        popName: "切换宝宝弹窗",
+        buttonName: "关闭"
+    });
     emit('update:visible', false)
 }
 
 const selectIndex = ref(0)
 const selectBaby = (index) => {
+    md.sensorPopLogTake({
+        xcxPopClick: "true",
+        toolName: "生长曲线",
+        popName: "切换宝宝弹窗",
+        buttonName: "宝宝列表"
+    });
     selectIndex.value = index;
     emit('update:selectedIndex', index);
 }
@@ -135,6 +154,11 @@ onMounted(() => {
     const selectedIndexInList = babyList.value.findIndex(item => item.selected === true)
     console.log('选中宝宝的索引:', selectedIndexInList)
     selectIndex.value = selectedIndexInList;
+    md.sensorPopLogTake({
+        xcxPopExposure: "true",
+        toolName: "生长曲线",
+        popName: "切换宝宝弹窗"
+    });
 
 })
 

components/BabyTestTipsPopup.vue

@@ -27,7 +27,8 @@
 </template>
 
 <script setup>
-import { ref, defineEmits, defineProps } from 'vue'
+import { ref, defineEmits, defineProps,watch } from 'vue'
+import md from '../md.js'
 
 const props = defineProps({
     visible: {
@@ -67,11 +68,27 @@ const handleOkTouchStart = () => {
 const handleOkTouchEnd = () => {
     isOkPressed.value = false
     closePopup()
+    md.sensorPopLogTake({
+        xcxPopClick: "true",
+        toolName: "生长曲线",
+        popName: "测量方式提示弹窗",
+        buttonName: "我知道了"
+    });
 }
 
 const closePopup = () => {
     emit('update:visible', false)
 }
+watch(() => props.visible, (newVal) => {
+    if (newVal) {
+        md.sensorPopLogTake({
+            xcxPopExposure: "true",
+            toolName: "生长曲线",
+            popName: "测量方式提示弹窗"
+        });
+    }
+})
+
 </script>
 
 <style lang="less" scoped>

components/DatePickerPopup.vue

@@ -65,7 +65,8 @@
 </template>
 
 <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({
     visible: {
@@ -107,6 +108,9 @@ const yearRange = computed(() => {
     return yearRange
 })
 
+onMounted(() => {
+   
+})
 
 // 生成月份范围 (1-12)
 const monthRange = computed(() => {
@@ -252,6 +256,12 @@ const handleOkTouchEnd = () => {
 }
 
 const closePopup = () => {
+    md.sensorPopLogTake({
+        xcxPopClick: "true",
+        toolName: "生长曲线",
+        popName: "选择本次测评日期弹窗",
+        buttonName: "关闭"
+    });
     // 格式化日期为 YYYY-MM-DD
     const year = currentDate.value.getFullYear()
     const month = String(currentDate.value.getMonth() + 1).padStart(2, '0')

components/pointRightsCom/babyClass.vue

@@ -111,9 +111,9 @@
 </template>
 
 <script setup>
-import { getCurrentInstance } from 'vue'
+import { getCurrentInstance,onMounted,computed } from 'vue'
 import { BABY_CLASS_IMAGES } from './babyClassImages.js'
-import { computed } from 'vue'
+import md from '../../md.js'
 
 // 获取全局属性
 const { proxy } = getCurrentInstance()
@@ -144,7 +144,15 @@ const getColor = () => {
     ]
     return colors[props.currentLevel];
 }
-
+onMounted(() => {
+    md.sensorComponentLogTake({
+        xcxComponentExposure: "true",
+        pageName: "积分服务页",
+        componentName: "会员权益",
+        componentContent: "育儿课程-查看育儿课程"
+    });
+   
+})
 
 // 等级映射常量
 const LEVEL_MAP = {
@@ -165,6 +173,12 @@ const userLevelName = computed(() => LEVEL_MAP[props.userLevel])
 const jump = (level) => {
     console.log(`跳转到 ${level} 等级页面`)
 
+    md.sensorComponentLogTake({
+        xcxComponentClick: "true",
+        pageName: "积分服务页",
+        componentName: "会员权益",
+        componentContent: "育儿课程-查看育儿课程"
+    });
     // 检查用户等级是否符合要求
     // const levelOrder = [0, 1, 2, 3, 4]; // gold, platinum, diamond, starlight, starshine
     // const userLevelIndex = levelOrder.indexOf(props.userLevel);

components/pointRightsCom/monthGift.vue

@@ -481,6 +481,7 @@ import { getCurrentInstance, reactive, computed, onMounted, watch, onUnmounted }
 import { MONTH_GIFT_IMAGES } from './monthGiftImages.js'
 import { monthlyGiftIndex, monthlyGiftDrawOne, monthlyGiftDrawAll } from '../../api/monthGift.js'
 import { jump } from '../../utils/index.js'
+import md from '../../md.js'
 // import popupJingxuan from '../popup-jingxuan/popup-jingxuan.vue'
 
 // 获取全局属性
@@ -609,6 +610,12 @@ const closeJingxuanPopup = () => {
 }
 
 const handleCouponClick = async (level) => {
+    md.sensorComponentLogTake({
+        xcxComponentClick: "true",
+        pageName: "积分服务页",
+        componentName: "会员权益",
+        componentContent: "月月礼-"+getCouponButtonText(currentLevelName.value)
+    });
     console.log("handleCouponClick level:", level, "state.couponStatus:", state.couponStatus)
 
     if (state.couponStatus[level] === 'used') {
@@ -654,6 +661,12 @@ const handleCouponClick = async (level) => {
 }
 
 const handleBuyClick = async (level) => {
+    md.sensorComponentLogTake({
+        xcxComponentClick: "true",
+        pageName: "积分服务页",
+        componentName: "会员权益",
+        componentContent: "月月礼-" +getBuyButtonText(currentLevelName.value)
+    });
     console.log(`Clicked buy for ${level}`)
 
     // 检查用户等级是否符合领取条件（优先级最高）
@@ -755,6 +768,12 @@ const handleBuyClick = async (level) => {
 const switchTimeSlot = (index) => {
     state.selectedTimeSlot = index
     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(() => {
     }
 })
 
+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 () => {
     console.log('MonthGift component mounted, current level:', props.currentLevel, props.userLevel)
     await fetchMonthlyGiftData()
+
+    initExposure();
 })
 
 // 调试函数：打印当前状态

components/pointRightsCom/yearGift.vue

@@ -144,8 +144,9 @@
 </template>
 
 <script setup>
-import { getCurrentInstance, computed } from 'vue'
+import { getCurrentInstance, computed,onMounted } from 'vue'
 import { YEAR_GIFT_IMAGES } from './yearGiftImages.js'
+import md from '../../md.js'
 
 // 获取全局属性
 const { proxy } = getCurrentInstance()
@@ -199,9 +200,22 @@ const buttonInfo = computed(() => {
         };
     }
 })
-
+onMounted(() => {
+    md.sensorComponentLogTake({
+        xcxComponentExposure: "true",
+        pageName: "积分服务页",
+        componentName: "会员权益",
+        componentContent: "周岁礼-"+buttonInfo.value.text
+    });
+})
 // 按钮点击事件处理
 const handleButtonClick = () => {
+    md.sensorComponentLogTake({
+        xcxComponentClick: "true",
+        pageName: "积分服务页",
+        componentName: "会员权益",
+        componentContent: "周岁礼-"+buttonInfo.value.text
+    });
     if (buttonInfo.value.action === 'upgrade') {
         // 跳转到升级页面
         uni.navigateTo({

components/quanyi/aibenxinrenli.vue

@@ -33,7 +33,7 @@
         mode="aspectFit"
         @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>
     
     <!-- 说明文字 -->
@@ -47,6 +47,7 @@
 
 <script setup>
 import { defineProps, defineEmits, onMounted } from 'vue'
+import md from '../../md.js'
 
 // 定义组件名称
 defineOptions({
@@ -105,6 +106,12 @@ const isShowBtn = () => {
 }
 
 onMounted(() => {
+  md.sensorComponentLogTake({
+    xcxComponentExposure: "true",
+    pageName: "积分服务页",
+    componentName: "会员权益",
+    componentContent: "爱本新人礼-去升级"
+  });
   console.log('props.isshowLocksdfsdfsdfsdsf===', props.isshowLock)
 })
 
@@ -113,6 +120,12 @@ const emit = defineEmits(['upgrade'])
 
 // 去升级按钮点击
 const handleUpgrade = () => {
+  md.sensorComponentLogTake({
+    xcxComponentClick: "true",
+    pageName: "积分服务页",
+    componentName: "会员权益",
+    componentContent: "爱本新人礼-去升级"
+  });
   emit('upgrade', {
     index: props.index
   })

components/quanyi/jinjili.vue

@@ -32,7 +32,7 @@
         mode="aspectFit"
         @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 class="description" :style="{ marginTop: getTop() }">
@@ -44,13 +44,24 @@
 </template>
 
 <script setup>
-import { defineProps, defineEmits } from 'vue'
+import { defineProps, defineEmits,onMounted } from 'vue'
+import md from '../../md.js'
 
 // 定义组件名称
 defineOptions({
   name: 'jinjili'
 })
 
+onMounted(() => {
+
+  md.sensorComponentLogTake({
+    xcxComponentExposure: "true",
+    pageName: "积分服务页",
+    componentName: "会员权益",
+    componentContent: "晋级礼-去升级"
+  });
+})
+
 const getBgName = () => {
   if(props.isshowLock){
     return props.index + ""
@@ -94,6 +105,12 @@ const emit = defineEmits(['upgrade'])
 
 // 去升级按钮点击
 const handleUpgrade = () => {
+  md.sensorComponentLogTake({
+    xcxComponentClick: "true",
+    pageName: "积分服务页",
+    componentName: "会员权益",
+    componentContent: "晋级礼-去升级"
+  });
   emit('upgrade', {
     index: props.index
   })

components/quanyi/mianfeiwenzhen.vue

@@ -8,13 +8,23 @@
     </view>
     
     <!-- 底部按钮 -->
-    <image 
+    <!-- <image 
       class="bottom-button" 
       :src="$baseUrl +  `integral/1021/mianfeiwenzhenQushiyongBtn${props.index}.png`"
       mode="aspectFit"
       @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">
       <text class="desc-text" :style="{ color: getColor()[props.index].titleDetail }">
@@ -25,7 +35,8 @@
 </template>
 
 <script setup>
-import { defineProps, defineEmits } from 'vue'
+import { defineProps, defineEmits,onMounted } from 'vue'
+import md from '../../md.js'
 
 // 定义组件名称
 defineOptions({
@@ -40,6 +51,14 @@ const props = defineProps({
   }
 })
 
+onMounted(() => {
+  md.sensorComponentLogTake({
+    xcxComponentExposure: "true",
+    pageName: "积分服务页",
+    componentName: "会员权益",
+    componentContent: "免费问诊-立即使用"
+  });
+})
 // 定义组件事件
 const emit = defineEmits(['doctor-click', 'use-now'])
 
@@ -52,9 +71,16 @@ const handleDoctorGridClick = () => {
 
 // 立即使用按钮点击
 const handleUseNow = () => {
+  md.sensorComponentLogTake({
+    xcxComponentClick: "true",
+    pageName: "积分服务页",
+    componentName: "会员权益",
+    componentContent: "免费问诊-立即使用"
+  });
   emit('use-now', {
     index: props.index
   })
+
 }
 
 // 颜色配置
@@ -110,11 +136,27 @@ const getColor = () => {
     }
   }
   
+  // .bottom-button {
+  //   width: 442rpx;
+  //   height: 86rpx;
+  //   margin: 0 auto;
+  //   margin-top: 470rpx;
+  // }
+
   .bottom-button {
     width: 442rpx;
     height: 86rpx;
     margin: 0 auto;
     margin-top: 470rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .bottom-button-text {
+      font-size: 26rpx;
+      color: #ffffff;
+      font-weight: bold;
+    }
   }
   
   .description {

components/quanyi/shengrili.vue

@@ -44,7 +44,7 @@
             mode="aspectFit"
             @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>
 
 
@@ -62,6 +62,7 @@
 import { defineProps, defineEmits, onMounted, ref } from 'vue'
 import { showLoading, hideLoading } from '../../utils'
 import { fetchBirthdayGiftJSON } from '../../api/integral'
+import md from '../../md.js'
 
 import { useUserStore } from "../../stores/user";
 
@@ -146,7 +147,12 @@ const handleUpgrade = async () => {
     index: status1.value,
     userStore:useUserStore()
   })
-  
+  md.sensorComponentLogTake({
+    xcxComponentClick: "true",
+    pageName: "积分服务页",
+    componentName: "会员权益",
+    componentContent: "生日礼-"+getBtnName()
+  });
 }
 
 // 待开启按钮点击
@@ -183,7 +189,7 @@ const status1 = ref(0);
 const hasBaby = ref(false);
 const islogin = ref(true);
 onMounted(async () => {
-
+   
     const userStore = useUserStore();
 
     const memberInfo = userStore.memberInfo;
@@ -218,6 +224,12 @@ onMounted(async () => {
     }
     console.log('data', data);
     hideLoading();
+    md.sensorComponentLogTake({
+        xcxComponentExposure: "true",
+        pageName: "积分服务页",
+        componentName: "会员权益",
+        componentContent: "生日礼-"+getBtnName()
+    });
 })
 
 

components/quanyi/suyuanyou.vue

@@ -45,7 +45,7 @@
 import { defineProps, defineEmits, ref, onMounted } from 'vue'
 import { showLoading, hideLoading } from '../../utils';
 import { fetchActivityStateJSON } from '../../api/integral';
-
+import md from '../../md.js'
 const handleUpgrade_daikaiqi = () => {
   uni.showToast({
     title: '活动暂未开启',
@@ -97,6 +97,12 @@ const emit = defineEmits(['upgrade'])
 
 // 去升级按钮点击
 const handleUpgrade = () => {
+  md.sensorComponentLogTake({
+    xcxComponentClick: "true",
+    pageName: "积分服务页",
+    componentName: "会员权益",
+    componentContent: "溯源游-"+(props.isshowLock ? '去升级' : '立即报名')
+  });
   emit('upgrade', {
     index: props.index
   })
@@ -148,6 +154,13 @@ onMounted(async () => {
   }
 
   hideLoading();
+
+  md.sensorComponentLogTake({
+    xcxComponentExposure: "true",
+    pageName: "积分服务页",
+    componentName: "会员权益",
+    componentContent: "溯源游-"+(props.isshowLock ? '去升级' : '立即报名')
+  });
 })
 
 </script>
@@ -200,7 +213,7 @@ onMounted(async () => {
 
     .bottom-button-text {
       font-size: 26rpx;
-      color: #ffe3c3;
+      color: #ffffff;
       font-weight: bold;
     }
   }

components/quanyi/zhuanduanli.vue

@@ -32,7 +32,7 @@
         mode="aspectFit"
         @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>
     
     <!-- 说明文字 -->
@@ -46,7 +46,8 @@
 </template>
 
 <script setup>
-import { defineProps, defineEmits } from 'vue'
+import { defineProps, defineEmits,onMounted } from 'vue'
+import md from '../../md.js'
 
 // 定义组件名称
 defineOptions({
@@ -66,6 +67,16 @@ const props = defineProps({
   }
 })
 
+onMounted(() => {
+
+  md.sensorComponentLogTake({
+    xcxComponentExposure: "true",
+    pageName: "积分服务页",
+    componentName: "会员权益",
+    componentContent: "转段礼-去升级"
+  });
+})
+
 const getBgName = () => {
   if(props.isshowLock){
     return props.index + ""
@@ -96,6 +107,12 @@ const emit = defineEmits(['upgrade'])
 
 // 去升级按钮点击
 const handleUpgrade = () => {
+  md.sensorComponentLogTake({
+    xcxComponentClick: "true",
+    pageName: "积分服务页",
+    componentName: "会员权益",
+    componentContent: "转段礼-去升级"
+  });
   emit('upgrade', {
     index: props.index
   })

components/shengzhangQuxianTipsPopup.vue

@@ -25,7 +25,8 @@
 </template>
 
 <script setup>
-import { defineProps, defineEmits } from 'vue'
+import { defineProps, defineEmits,watch } from 'vue'
+import md from '../md.js'
 
 // 定义props
 const props = defineProps({
@@ -40,8 +41,24 @@ const emit = defineEmits(['close'])
 
 // 关闭弹窗
 const closePopup = () => {
+    md.sensorPopLogTake({
+        xcxPopClick: "true",
+        toolName: "生长曲线",
+        popName: "生长曲线介绍弹窗",
+        buttonName: "我知道了"
+    });
     emit('close')
 }
+
+watch(() => props.visible, (newVal) => {
+    if (newVal) {
+        md.sensorPopLogTake({
+            xcxPopExposure: "true",
+            toolName: "生长曲线",
+            popName: "生长曲线介绍弹窗"
+        });
+    }
+})
 </script>
 
 <style lang="less" scoped>

manifest.json

@@ -52,7 +52,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx88ab296d52e9835d",
+        "appid" : "wxc83b55d61c7fc51d",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
@@ -65,7 +65,8 @@
                 "desc" : "请允许获取位置信息，用于提供附近服务"
             }
         },
-		"requiredBackgroundModes": ["share"]
+        "requiredBackgroundModes" : [ "share" ],
+        "embeddedAppIdList": ["wx4205ec55b793245e"]
     },
     "mp-alipay" : {
         "usingComponents" : true

md.js

@@ -62,13 +62,13 @@ const sensorLog = (evt) => {
     trackObj[key] = logObj[key];
   }
   if (xcxPage && xcxPage.length > 0) {
-    console.warn("xcxPage", trackObj);
+    // console.warn("xcxPage", trackObj);
     sensors.track("xcxPage", {
       ...trackObj,
     });
   }
   if (xcxClick && xcxClick.length > 0) {
-    console.warn("xcxClick", trackObj);
+    // console.warn("xcxClick", trackObj);
     sensors.track("xcxClick", {
       ...trackObj,
     });
@@ -91,10 +91,101 @@ const sensorLogTake = (logObj) => {
   };
   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 {
   init,
   sensors,
   login,
   sensorLog,
   sensorLogTake,
+  sensorComponentLog,
+  sensorComponentLogTake,
+  sensorPopLog,
+  sensorPopLogTake,
 };

mock/brand.json

@@ -3,6 +3,7 @@
     {
       "videoUrl": "https://course.feihe.com/momclub-picture/brandpage/bannerVideo.mp4",
       "link": {},
+      "title": "北纬47°黄金种植带",
       "url": "brandpage/Banner41.png"
     },
     {
@@ -11,14 +12,16 @@
         "type": 3,
         "url": "https://mp.weixin.qq.com/s/0eMxbWB3R_0g06HZPUEj5Q"
       },
+      "title": "飞鹤自由牧场",
       "url": "brandpage/Banner42.png"
     },
     {
       "link": {
         "extra": {},
-        "type": 3,
-        "url": "https://factory.feihe.com/user/#/web"
+        "type": 1,
+        "url": "/reservation/home/index"
       },
+      "title": "飞鹤哈尔滨智能产业园",
       "url": "brandpage/Banner44.png"
     }
   ],
@@ -26,7 +29,8 @@
     "finderUserName": "",
     "videoUrl": "brandpage/videoChannel/video2Channel/V1/1.mp4",
     "posterUrl": "",
-    "feedId": ""
+    "feedId": "",
+    "title": "品牌故事视频2"
   },
   "product": [
     [
@@ -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",
   "erqiPeizhi": {
     "ipImg4": "https://course.feihe.com/momclub-picture/brandpage/ip4.png",
+    "ipTitle3": "视频号",
     "title1": "飞鹤产品家族",
+    "ipTitle4": "小红书",
     "title2": "飞鹤品牌IP鹤小飞一家",
+    "ipTitle1": "毛绒可爱发夹",
     "title3": "飞鹤ESG",
+    "ipTitle2": "大容量吨吨桶水杯",
     "iphexiaofeiUrl": "https://course.feihe.com/momclub-picture/brandpage/v1_iphexiaofei.png",
     "ipImg1": "https://course.feihe.com/momclub-picture/brandpage/v1_ip1.png",
     "ipImg3": "https://course.feihe.com/momclub-picture/brandpage/ip3.png",
@@ -489,7 +497,8 @@
     "finderUserName": "sphgexisAi0pRGm",
     "videoUrl": "brandpage/videoChannel/video1Channel/V2/1.mp4",
     "posterUrl": "",
-    "feedId": "export/UzFfAgtgekIEAQAAAAAABbEMmxr36QAAAAstQy6ubaLX4KHWvLEZgBPEgaJkYSYbLr6JzNPgMJp7tTZCYcYsIpU6Z0fgSnSE"
+    "feedId": "export/UzFfAgtgekIEAQAAAAAABbEMmxr36QAAAAstQy6ubaLX4KHWvLEZgBPEgaJkYSYbLr6JzNPgMJp7tTZCYcYsIpU6Z0fgSnSE",
+    "title": "品牌故事视频1"
   },
   "esgInfoList": [
     [

package-lock.json

 {
-  "name": "20250528_FHQ1",
-  "lockfileVersion": 3,
   "requires": true,
-  "packages": {
-    "": {
-      "dependencies": {
-        "crypto-js": "^4.2.0"
-      }
-    },
-    "node_modules/crypto-js": {
+  "lockfileVersion": 1,
+  "dependencies": {
+    "crypto-js": {
       "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=="
     }
   }

pages/addPostnatal/addPostnatal.vue

@@ -217,6 +217,12 @@ const onAdd = () => {
 		}
 	})
 	popup.value.open()
+	md.sensorComponentLogTake({
+		xcxPopExposure: "true",
+		toolName: "产检提醒",
+		popName: "选择产检项目弹窗"
+		
+	});
 	// 回显数据
 	if (listData.value.length > 0) {
 		// 回显数据 - 将 listData 中的数据同步到 selectedAirports
@@ -224,7 +230,15 @@ const onAdd = () => {
 	}
 }
 // 关闭项目弹窗
-const onPopupClose = () => {
+const onPopupClose = (type) => {
+	if (type !== 'nonePop') {
+		md.sensorPopLogTake({
+			xcxPopClick: "true",
+			toolName: "产检提醒",
+			popName: "选择产检项目弹窗",
+			buttonName: "关闭"
+		});
+	}
 	wx.setPageStyle({
 		style: {
 			overflow: 'auto'
@@ -232,6 +246,7 @@ const onPopupClose = () => {
 	})
 	selectedAirports.value = []
 	popup.value.close()
+	
 }
 // 检查是否已选中
 const isSelected = (id) => {
@@ -246,6 +261,12 @@ const toggleSelect = (airport) => {
 			id: airport.id,
 			itemName: airport.itemName
 		});
+		md.sensorComponentLogTake({
+			xcxPopClick: "true",
+			toolName: "产检提醒",
+			popName: "选择产检项目弹窗",
+			buttonName: airport.itemName
+		});
 	} else {
 		selectedAirports.value.splice(index, 1);
 	}
@@ -259,7 +280,13 @@ const saveSelection = () => {
 	const uniqueMap = new Map();
 	combined.forEach(item => uniqueMap.set(item.id, item));
 	listData.value = Array.from(uniqueMap.values());
-	onPopupClose();
+	onPopupClose("nonePop");
+	md.sensorPopLogTake({
+		xcxPopClick: "true",
+		toolName: "产检提醒",
+		popName: "选择产检项目弹窗",
+		buttonName: "确认"
+	});
 };
 // // 移除已选项目
 // const removeSelected = (airport) => {

pages/feedingIndex/feedingIndex.vue

@@ -1885,6 +1885,12 @@ async function completeRecord() {
 		// 显示成功弹窗
 		successPopup.value.open()
 
+		md.sensorPopLogTake({
+			xcxPopExposure: "true",
+			toolName: "喂养记录",
+			popName: "添加成功弹窗"
+		});
+
 
 
 
@@ -2406,6 +2412,7 @@ function showAddFoodPopup(categoryName) {
 		pageName: "喂养工具首页",
 		buttonName: "辅食添加" + categoryName,
 	});
+	
 	// 防连点检查
 	if (foodSelectionState.value.isAddingFood) {
 		console.log('防连点：添加辅食按钮被阻止')
@@ -2439,7 +2446,11 @@ function showAddFoodPopup(categoryName) {
 	foodSelectionState.value.newFoodItem = ''
 	// 显示弹窗
 	addFoodPopup.value.open()
-
+	md.sensorPopLogTake({
+		xcxPopExposure: "true",
+		toolName: "喂养记录",
+		popName: "新增辅食弹窗",
+	});
 	// 立即重置防连点状态（弹窗显示后）
 	setTimeout(() => {
 		foodSelectionState.value.isAddingFood = false
@@ -2458,6 +2469,12 @@ function toggleCategoryExpansion(categoryName) {
 function cancelAddFood() {
 	addFoodPopup.value.close()
 	foodSelectionState.value.newFoodItem = ''
+	md.sensorPopLogTake({
+		xcxPopClick: "true",
+		toolName: "喂养记录",
+		popName: "新增辅食弹窗",
+		buttonName: "取消"
+	});
 }
 
 function confirmAddFood() {
@@ -2465,6 +2482,12 @@ function confirmAddFood() {
 		console.log('防连点：添加辅食按钮被阻止')
 		return
 	}
+	md.sensorPopLogTake({
+		xcxPopClick: "true",
+		toolName: "喂养记录",
+		popName: "新增辅食弹窗",
+		buttonName: "添加"
+	});
 	foodSelectionState.value.isAddingFood = true
 	console.log('防连点：设置添加辅食状态为true')
 
@@ -3246,7 +3269,11 @@ async function startPollingRecognitionResult(taskId) {
 							voiceRecognitionState.value.voiceDateTime = `${year}-${month}-${day} ${hours}:${minutes}:00`
 						}
 						voiceRecognitionState.value.showResultPage = true
-
+						md.sensorPopLogTake({
+							xcxPopExposure: "true",
+							toolName: "喂养记录",
+							popName: "语音识别结果弹窗"
+						});
 						// 显示识别成功提示
 						uni.showToast({
 							title: '语音识别成功',
@@ -3402,7 +3429,12 @@ function formatRecordingDuration(seconds) {
 
 function reRecognize() {
 	console.log('重新识别...')
-
+	md.sensorPopLogTake({
+		xcxPopClick: "true",
+		toolName: "喂养记录",
+		popName: "语音识别结果弹窗",
+		buttonName: "不对，重新识别"
+	});
 	// 清理轮询状态
 	clearPollingInterval()
 
@@ -3429,6 +3461,12 @@ async function completeVoiceRecord() {
 	if (isSubmitting.value) {
 		return
 	}
+	md.sensorPopLogTake({
+		xcxPopClick: "true",
+		toolName: "喂养记录",
+		popName: "语音识别结果弹窗",
+		buttonName: "完成记录"
+	});
 
 	const detailText = voiceRecognitionState.value.recognizedText.trim()
 
@@ -3486,6 +3524,11 @@ async function completeVoiceRecord() {
 		// 显示成功弹窗
 		successPopup.value.open()
 
+		md.sensorPopLogTake({
+			xcxPopExposure: "true",
+			toolName: "喂养记录",
+			popName: "添加成功弹窗"
+		});
 	} catch (error) {
 		console.error('保存语音记录失败:', error)
 		// uni.hideLoading()
@@ -3543,11 +3586,23 @@ async function onSuccessJump() {
 		},
 	});	// 关闭弹窗
 	successPopup.value.close()
+	md.sensorPopLogTake({
+		xcxPopClick: "true",
+		toolName: "喂养记录",
+		popName: "添加成功弹窗",
+		buttonName: "咨询专家"
+	});
 }
 
 function onSuccessClose() {
 	// 关闭弹窗
 	successPopup.value.close()
+	md.sensorPopLogTake({
+		xcxPopClick: "true",
+		toolName: "喂养记录",
+		popName: "添加成功弹窗",
+		buttonName: "关闭"
+	});
 	// 跳转至记录页面
 	uni.navigateTo({
 		url: '/pages/feedingRecord/feedingRecord'

pages/feedingRecord/feedingRecord.vue

@@ -723,9 +723,24 @@ function editRecord(index) {
 
   editingRecord.value = { index, record }
   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
   editingRecord.value = null
   editForm.value = { time: '', type: '', content: '' }
@@ -800,6 +815,12 @@ function onEditTypeChange(event) {
 }
 
 async function saveEditRecord() {
+  md.sensorPopLogTake({
+    xcxPopClick: "true",
+    toolName: "喂养记录",
+    popName: "日历页确认修改内容弹窗",
+    buttonName: "保存修改"
+  });
   if (!editForm.value.time || !editForm.value.type) {
     uni.showToast({ title: '请填写完整信息', icon: 'none' })
     return
@@ -868,7 +889,7 @@ async function saveEditRecord() {
         icon: 'none'
       })
 
-      closeEditPopup()
+      closeEditPopup('nonePop')
 
       // 清空缓存，确保获取最新数据
       clearCache()

pages/index/index.vue

@@ -38,7 +38,7 @@ const shareOptions = {
   0: {
     title: "8000万中国妈妈信赖的育儿品牌",
     path: "/pages/index/index?pageType=home",
-    imageUrl: $baseUrl + "share/share_home.png",
+    imageUrl: $baseUrl + "share/share_home0901.jpg",
   },
   1: {
     title: "飞鹤提供家庭营养一站式解决方案",

pages/naming/naming.vue

@@ -170,10 +170,10 @@
 					<view class="item_line"></view>
 				</view>
 
-				<!--避讳字-->
+				<!--避免字-->
 				<view class="taboo_word">
 					<view class="item_top">
-						<span class="title_txt">避讳字</span>
+						<span class="title_txt">避免字</span>
 						<input class="taboo_input" :placeholder="showPlaceholder2 ? '示例：然、萌' : ''" v-model="avoidChars"
 							@blur="e => enforceSeparator(e, 2)" @click="showPlaceholder2 = false" />
 					</view>
@@ -293,7 +293,7 @@
 	//必有字
 	const requiredChars = ref('');
 	const showPlaceholder2 = ref(true);
-	//避讳字
+	//避免字
 	const avoidChars = ref('');
 	//期望风格
 	const expectedStyle = ref('');
@@ -416,7 +416,7 @@
 		return input.length <= filtered.length || input === filtered
 	}
 
-	//设置必有字和避讳字，用、隔开每一个字
+	//设置必有字和避免字，用、隔开每一个字
 	const enforceSeparator = (e, idx) => {
 		let text = e.detail.value
 		// 1. 移除所有现有分隔符（避免干扰）

pages/person/person.vue

@@ -82,7 +82,7 @@
             }"
           >
             <text class="form-label">
-              {{getlabelFn(item)}}
+              {{ getlabelFn(item) }}
               <!-- {{ item.label }} -->
               <text v-if="item.required" class="required">*</text>
             </text>
@@ -232,7 +232,7 @@ import { showLoading, hideLoading } from "../../utils/index.js";
 import { updateBabyInfo, getGestationalWeeks } from "../../api/user.js";
 import { usePageCfgStore } from "../../stores/pageCfg";
 import md from "../../md.js";
-import { jump, JumpType } from '../../utils/index.js';
+import { jump, JumpType } from "../../utils/index.js";
 const userStore = useUserStore();
 const pageType = ref("add");
 const babyId = ref("");
@@ -511,6 +511,13 @@ const onPickerChange = (e, name) => {
 const onRadioChange = (e, name) => {
   formData.value[name] = e.detail.value;
 };
+
+const sleep = (delay) => {
+  return new Promise((resolve) => {
+    setTimeout(() => resolve(), delay);
+  });
+};
+
 const onSubmit = async (e) => {
   md.sensorLogTake({
     xcxClick: "我的页面-信息修改页点击",
@@ -579,23 +586,24 @@ const onSubmit = async (e) => {
   hideLoading();
 
   if (res.success) {
-    data?.id &&
-      userStore.setBabyNickCache(data?.id, formData.value.babyName);
+    data?.id && userStore.setBabyNickCache(data?.id, formData.value.babyName);
 
-    uni.showToast({
-      title: "提交成功",
-      icon: "success",
-    });
-    uni.navigateBack();
     // jump({
-		// 	type: JumpType.INNER,
-		// 	url: "/pages/index/index"
-		// })
+    // 	type: JumpType.INNER,
+    // 	url: "/pages/index/index"
+    // })
     showLoading();
+    await sleep(3000);
     await userStore.loadUserInfo();
     await userStore.loadBabyInfo();
     await userStore.loadHomeInfo();
     hideLoading();
+
+    uni.showToast({
+      title: "提交成功",
+      icon: "success",
+    });
+    uni.navigateBack();
   } else {
     uni.showToast({
       title: res.message,
@@ -674,21 +682,18 @@ function onDateStatusChange(status) {
   }
   return true;
 }
-const getlabelFn =(item) =>{
+const getlabelFn = (item) => {
   if (item.name === "babyBirthday") {
-    item.label = formData.value.babyStage == 1 ? '预产日期':'宝宝出生日期'
+    item.label = formData.value.babyStage == 1 ? "预产日期" : "宝宝出生日期";
   }
-  return item.label
-}
+  return item.label;
+};
 // getLabelByValue 支持所有映射字段
 const getLabelByValue = (item, value) => {
- 
   if (item.name === "babyStage") {
-   
     return babyStageMap.find((i) => i.value === value)?.label || "";
   }
   if (item.name === "babyType") {
-   
     return babyTypeMap.find((i) => i.value === value)?.label || "";
   }
 
@@ -699,8 +704,12 @@ const getLabelByValue = (item, value) => {
   // // 添加根据切换状态修改文案
   if (item.name === "babyBirthday") {
     // console.log("🚀 ~ getLabelByValue ~ formData:", formData.value, item)
-    item.placeholder = formData.value.babyBirthday? formData.value.babyBirthday : formData.value.babyStage == 1 ? '请选择预产日期':'请选择出生日期'
-    return item.placeholder
+    item.placeholder = formData.value.babyBirthday
+      ? formData.value.babyBirthday
+      : formData.value.babyStage == 1
+      ? "请选择预产日期"
+      : "请选择出生日期";
+    return item.placeholder;
   }
   return value;
 };
@@ -740,7 +749,6 @@ const initData = () => {
 
   // 更新表单项的选项数据
   formItems.value.forEach((item) => {
-   
     if (item.name === "contentPreference") {
       item.range = contentLikeOptions.value;
     } else if (item.name === "productPreference") {
@@ -761,7 +769,6 @@ const initData = () => {
         formData.value.babyStage == 2 ? "请选择出生日期" : "请选择预产日期";
     }
   });
-  
 };
 
 onMounted(() => {
@@ -774,13 +781,13 @@ onMounted(() => {
 });
 
 onLoad((options) => {
-  console.log("🚀 ~ options-新增和修改:", options)
+  console.log("🚀 ~ options-新增和修改:", options);
   // debugger;
   pageType.value = options.type || "add";
   babyId.value = options.id || "";
   if (pageType.value === "edit") {
     const baby = userStore.babyInfo;
-    console.log("🚀 ~ baby:", baby)
+    console.log("🚀 ~ baby:", baby);
     formData.value.babyStage = baby.babyStage ?? 2;
     formData.value.babyName = baby.babyName || "";
     formData.value.babyBirthday = baby.content?.babyBirthday || "";

pages/postnatalCheckUp/postnatalCheckUp.vue

 <template>
 	<view>
 		<view class="postnatal">
-		
-      <!-- 自定义头部 -->
+
+			<!-- 自定义头部 -->
 			<!-- <customize-navigation>
 				<template v-slot:navbar-content>
 					<view class="page-top">
@@ -11,10 +11,10 @@
 						<view class="page_title">产检提醒</view>
 					</view>
 				</template>
-			</customize-navigation> -->
+</customize-navigation> -->
 			<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">
 						<image class="banner-img" :src="`${item.img}`" mode="aspectFill"
 							@click="handleBannerClick(item, index)" />
@@ -46,7 +46,7 @@
 				</view>
 				<!-- 产检记录 -->
 				<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}`]"
 						v-for="({ id, checkupDate, index, pregnancyWeek, status, examinationItems, type }, i) in homeInfo.checkupList"
 						@click="onDetails(id, type)" :key="i">
@@ -79,7 +79,7 @@
 							重点：{{ getProject(examinationItems) }}
 						</view>
 					</view>
-				<!-- </view> -->
+					<!-- </view> -->
 				</scroll-view>
 			</view>
 			<!-- 新增产检 -->
@@ -112,12 +112,13 @@
 					</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>
 </template>
@@ -127,7 +128,8 @@ import {
 	ref,
 	getCurrentInstance,
 	onMounted,
-	nextTick
+	nextTick,
+	watch
 } from 'vue'
 import {
 	onLoad,
@@ -193,6 +195,7 @@ const visible = ref(false)
 // 时间
 const time = ref('')
 
+const isClickClose = ref(false)
 // 保存要修改的id
 const editId = ref(null)
 
@@ -258,7 +261,7 @@ const backHandler = () => {
 const handleBannerClick = (item, index) => {
 	console.log(item)
 	let buttonName = '';
-	switch(index){
+	switch (index) {
 		case 0:
 			buttonName = '第一张焦点图';
 			break;
@@ -285,7 +288,7 @@ const handleBannerClick = (item, index) => {
 		})
 	}
 
-	
+
 }
 // 新增体检
 const onAdd = () => {
@@ -306,7 +309,14 @@ const onBtn = (type) => {
 	switch (type) {
 		case 0:
 			// 如果授权就不弹出提醒
-	    showPicker.value = isWxNotification.value ? true : false
+			showPicker.value = isWxNotification.value ? true : false
+			if (showPicker.value) {
+				md.sensorPopLogTake({
+					xcxPopExposure: "true",
+					toolName: "产检提醒",
+					popName: "设置提醒时间弹窗"
+				});
+			}
 			buttonName = '提醒'
 
 			break;
@@ -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;
+	
 }
 // 选择提醒事件
 const handleChange = (e) => {
@@ -343,10 +362,15 @@ const handleChange = (e) => {
 }
 // 确认选择
 const handleConfirm = () => {
-	
+	md.sensorPopLogTake({
+		xcxPopClick: "true",
+		toolName: "产检提醒",
+		popName: "设置提醒时间弹窗",
+		buttonName: "确认"
+	});
 	selectedValue.value = options[pickerValue.value].id;
 	console.log(selectedValue.value, homeInfo.value.wxTemplateId, babyId.value)
-	close();
+	close("nonePop");
 	// 订阅提醒
 	uni.requestSubscribeMessage({
 		tmplIds: [homeInfo.value.wxTemplateId],
@@ -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) => {
 	md.sensorLogTake({
@@ -372,45 +408,61 @@ const onEdit = (id, newTime) => {
 	time.value = newTime
 	visible.value = true
 	editId.value = id
+	isClickClose.value = false
+	md.sensorPopLogTake({
+		xcxPopExposure: "true",
+		toolName: "产检提醒",
+		popName: "选择产检时间弹窗"
+	});
 }
+
+
+
 // 选择日期回调确认
 const handleDateConfirm = (date) => {
 	console.log('选择的日期是：', date);
 	time.value = date;
 	console.log(editId.value, time.value)
 	onEditTime()
+	isClickClose.value = true
+	md.sensorPopLogTake({
+		xcxPopClick: "true",
+		toolName: "产检提醒",
+		popName: "选择产检时间弹窗",
+		buttonName: "确认"
+	});
 }
 // 添加计算滚动位置的方法
 const scrollToCurrentWeek = async () => {
-  // 确保数据已加载
-  if (!homeInfo.value || !homeInfo.value.gestationalWeeks || !homeInfo.value.checkupList) return;
-  
-  // 找到当前孕周对应的产检项
-  const currentItem = homeInfo.value.checkupList.find(
-    item => item.pregnancyWeek == homeInfo.value.gestationalWeeks
-  );
-  
-  if (!currentItem) return;
-  
-  // 等待DOM更新
-  await nextTick();
-  
-  // 创建选择器查询
-  const query = uni.createSelectorQuery().in(proxy);
-  query.select(`.item-${currentItem.index}`).boundingClientRect();
-  query.select('.postnatal-con-record').boundingClientRect();
-  
-  query.exec((rects) => {
-    if (!rects[0] || !rects[1]) return;
-    
-    const [itemRect, containerRect] = rects;
-    
-    // 计算元素在容器内的相对位置
-    const position = itemRect.top - containerRect.top;
-    
-    // 设置滚动位置（增加20px的缓冲距离）
-    scrollTop.value = position + 20;
-  });
+	// 确保数据已加载
+	if (!homeInfo.value || !homeInfo.value.gestationalWeeks || !homeInfo.value.checkupList) return;
+
+	// 找到当前孕周对应的产检项
+	const currentItem = homeInfo.value.checkupList.find(
+		item => item.pregnancyWeek == homeInfo.value.gestationalWeeks
+	);
+
+	if (!currentItem) return;
+
+	// 等待DOM更新
+	await nextTick();
+
+	// 创建选择器查询
+	const query = uni.createSelectorQuery().in(proxy);
+	query.select(`.item-${currentItem.index}`).boundingClientRect();
+	query.select('.postnatal-con-record').boundingClientRect();
+
+	query.exec((rects) => {
+		if (!rects[0] || !rects[1]) return;
+
+		const [itemRect, containerRect] = rects;
+
+		// 计算元素在容器内的相对位置
+		const position = itemRect.top - containerRect.top;
+
+		// 设置滚动位置（增加20px的缓冲距离）
+		scrollTop.value = position + 20;
+	});
 };
 // 保存订阅消息
 const getWxNotificationFn = async (notificationDate, wxTemplateId, babyId) => {
@@ -464,16 +516,16 @@ const getInfoFn = async () => {
 		uni.setStorageSync('dueDate', data.dueDate)
 
 		// 新增：调用滚动方法
-    scrollToCurrentWeek()
+		scrollToCurrentWeek()
 	} else {
 		uni.showToast({
 			title: message,
 			icon: "none",
 		});
-		
+
 	}
 
-    
+
 }
 
 // 获取banner图
@@ -495,43 +547,43 @@ const getSettingFn = () => {
 		success(res) {
 			// console.log(res.authSetting, '授权信息')
 			console.log(res.subscriptionsSetting, '订阅信息')
-			if(res.subscriptionsSetting.itemSettings){
-              isWxNotification.value = false
-              console.log("🚀 ~ success ~ isWxNotification111:", isWxNotification.value)
+			if (res.subscriptionsSetting.itemSettings) {
+				isWxNotification.value = false
+				console.log("🚀 ~ success ~ isWxNotification111:", isWxNotification.value)
 			} else {
-			  isWxNotification.value = true
-			  console.log("🚀 ~ success ~ isWxNotification222:", isWxNotification.value)
+				isWxNotification.value = true
+				console.log("🚀 ~ success ~ isWxNotification222:", isWxNotification.value)
 			}
 		}
 	})
 }
 // 提示弹窗回调
-const onBabyChange= ()=>{
+const onBabyChange = () => {
 	publicFn()
 }
 // 公共函数
 const publicFn = () => {
-  console.log("🚀 ~ onShow ~ userStore:", userStore.babyInfo)
+	console.log("🚀 ~ onShow ~ userStore:", userStore.babyInfo)
 	const babyInfo = userStore.babyInfo
-	if(babyInfo && babyInfo.babyStage == 1){
+	if (babyInfo && babyInfo.babyStage == 1) {
 		isTip.value = false
-		babyId.value =  userStore.babyInfo?.content?.id
+		babyId.value = userStore.babyInfo?.content?.id
 		getSettingFn()
-	  // 获取banner图
-  	postnatalJSONFn()
+		// 获取banner图
+		postnatalJSONFn()
 		// 获取信息
 		getInfoFn()
-	} else{
+	} else {
 		isTip.value = true
 	}
 }
 onShow(async () => {
-   await userStore.loadBabyInfo()
-	 console.log('宝宝信息加载完成:', userStore.babyInfo)
-   publicFn()
+	await userStore.loadBabyInfo()
+	console.log('宝宝信息加载完成:', userStore.babyInfo)
+	publicFn()
 })
 onMounted(() => {
-
+	isClickClose.value = false
 	md.sensorLogTake({
 		xcxPage: "小程序页面浏览事件",
 		pageName: "产检提醒首页"
@@ -561,8 +613,9 @@ onMounted(() => {
 			align-items: center;
 			margin-top: 50rpx;
 			font-weight: 500;
-      flex-shrink: 0;
+			flex-shrink: 0;
 			height: 32rpx;
+
 			.info-c {
 				width: 2rpx;
 				height: 22rpx;
@@ -582,7 +635,8 @@ onMounted(() => {
 			display: flex;
 			justify-content: space-between;
 			margin-bottom: 30rpx;
-            flex-shrink: 0;
+			flex-shrink: 0;
+
 			.btn-item {
 				display: flex;
 				align-items: center;
@@ -813,6 +867,7 @@ onMounted(() => {
 	height: 177rpx;
 	border-radius: 12rpx;
 	overflow: hidden;
+
 	.banner-img {
 		width: 100%;
 		height: 100%;

pages/product/product.vue

@@ -107,13 +107,13 @@ export default {
 			});
 		},
 	},
-	// onShareAppMessage() {
-	// 	return {
-	// 		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,
-	// 		imageUrl: this.shareImg
-	// 	}
-	// },
+	onShareAppMessage() {
+		return {
+			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,
+			imageUrl: this.shareImg
+		}
+	},
 	
 }
 </script>

pages/productionDetails/productionDetails.vue

@@ -459,11 +459,14 @@ const onRemind = () => {
 	}
 	// 如果授权就不弹出提醒
 	showPicker.value = isWxNotification.value ? true : false
+
+	
 }
 
 // 提醒关闭
 const close = () => {
 	showPicker.value = false;
+	
 }
 
 // 选择提醒事件
@@ -472,6 +475,7 @@ const handleChange = (e) => {
 }
 // 确认选择
 const handleConfirm = () => {
+	
 	selectedValue.value = options[pickerValue.value].id;
 	console.log(selectedValue.value, infoData.value.wxTemplateId, babyId.value)
 	close();

pages/shengzhangTools/shengzhangTools.vue

@@ -380,6 +380,11 @@ const showDatePicker = () => {
 	});
 
 	console.log('显示日期选择器')
+	md.sensorPopLogTake({
+        xcxPopExposure: "true",
+        toolName: "生长曲线",
+        popName: "选择本次测评日期弹窗"
+    });
 	showDatePickerPopup.value = true
 }
 

pages/syWebview/syWebview.vue

@@ -164,6 +164,8 @@ onShareAppMessage((options) => {
 	console.log('分享数据:', share.value)
 	console.log('分享选项:', options)
 
+	debugger;
+
 	md.sensorLogTake({
 		xcxClick: "suyuan202508H5Click",
 		pageName: "星妈会分享页",

reservation/home/index.less

@@ -81,8 +81,8 @@
     height: 200rpx;
     overflow: hidden;
     image {
-      width: 54rpx;
-      height: 54rpx;
+      width: 58rpx;
+      height: 58rpx;
     }
   }
 }

reservation/home/index.vue

@@ -24,13 +24,13 @@
       <view class="footer-item blur-bg" @click="gofeihe()">
         <view>
           <image
-            style="width: 59rpx; height: 59rpx"
-            src="@/assets/reservation-images/twitter.png"
+            style="width: 64rpx; height: 64rpx"
+            src="@/assets/reservation-images/twitter_new.png"
             mode="widthFix"
           >
           </image>
         </view>
-        <view>了解飞鹤</view>
+        <view style="margin-top:4rpx;">了解飞鹤</view>
       </view>
       <view
         class="footer-item blur-bg"
@@ -38,11 +38,11 @@
       >
         <view>
           <image
-            src="@/assets/reservation-images/briefcase.png"
+            src="@/assets/reservation-images/briefcase_new.png"
             mode="widthFix"
           ></image>
         </view>
-        <view>现在预约</view>
+        <view style="margin-top:4rpx;">现在预约</view>
       </view>
       <view
         class="footer-item blur-bg"
@@ -50,11 +50,11 @@
       >
         <view>
           <image
-            src="@/assets/reservation-images/calendar.png"
+            src="@/assets/reservation-images/calendar_new.png"
             mode="widthFix"
           ></image>
         </view>
-        <view>预约记录</view>
+        <view style="margin-top:4rpx;">预约记录</view>
       </view>
     </view>
     <!-- 底部箭头 -->
@@ -98,7 +98,6 @@ const changeCurrent = () => {
 
 const handleScrollChange = (e) => {
   console.log(e)
-  console.log(123)
   current.value = e.detail.current
 }
 

stores/pageCfg.js

 import { defineStore } from "pinia";
-import { myObj } from "../mock/my";
 import { fetchUserJSON } from "@/api/user";
 
 export const usePageCfgStore = defineStore("pageCfg", {

utils/exposure.js

@@ -58,8 +58,13 @@ class ExposureTracker {
                     const isVisible = this.isElementInViewport(res, scrollTop);
                     if (isVisible && !value.isExposed) {
                         value.isExposed = true;
+                        
                         // 触发埋点
-                        md.sensorLogTake(value.logParams);
+                        if(value.logParams.xcxComponentExposure){
+                            md.sensorComponentLogTake(value.logParams);
+                        }else{
+                            md.sensorLogTake(value.logParams);
+                        }
                     }
                 });
         });

utils/index.js

@@ -36,7 +36,11 @@ export function jump({ type, url, extra = {} }) {
 
       console.log("jumpParams:", jumpParams);
 
-      uni.navigateToMiniProgram(jumpParams);
+      if(extra.embedded){
+        uni.openEmbeddedMiniProgram(jumpParams);
+      }else{
+        uni.navigateToMiniProgram(jumpParams);
+      }
       break;
     case JumpType.H5:
       // 跳转到 https 网络链接

views/Integral.vue

@@ -55,8 +55,49 @@
 						:src="$baseUrl +  `integral/${tupianBanben}/${item?.currentLvTip}`"
 						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">
@@ -94,43 +135,6 @@
 						</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
 					class="chakanshengjigonglueTxt"
 					:style="{ color: getColor('chakangonglue')[index] }"
@@ -1514,6 +1518,7 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
 		} 
 		
 	}
+	
 
 	//isshowShouqi 为true 时，展示收起按详情，为false 时，展示查看详情
 	const handleZhankaiClick = () => {
@@ -1764,15 +1769,27 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
 		}
 
 		hideLoading();
+		initExposure();
 	});
 
+	const initExposure = () => {
+		imgInfos.value.forEach((item, index) => {
+			md.sensorComponentLogTake({
+				xcxComponentExposure: "true",
+				pageName: "积分服务页",
+				componentName: "会员权益",
+				componentContent: "会员权益-" + item.name
+			});
+		});
+	}
+
 	const initNetData = () => {
 		console.log('initNetData');
 		
 		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": "4",
+//   "grade": "0",
 //   "gradeList": [
 //     {
 //       "grade": "0",
@@ -1810,10 +1827,10 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
 //   "memberId": "CRM000000000948094264",
 //   "memberName": "文慧17637145052",
 //   "mobile": "17637145052",
-//   "nextGradeScoreRuleMin": 10000,
-//   "orderUpgrade": true,
+//   "nextGradeScoreRuleMin": 1,
+//   "orderUpgrade": false,
 //   "points": 999,
-//   "recentAnnualPointsTotal": 5500,
+//   "recentAnnualPointsTotal": 0,
 //   "willExpiredPoints": 100000
 // };
 
@@ -2030,8 +2047,7 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
 		const type = item.type;
 		const extra = item.extra;
 
-
-
+		extra.embedded = true;	//半屏拉起小程序
 
 		console.log('url11111=',url);
 
@@ -2142,7 +2158,12 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
 			pageName: "积分服务页-首屏",
 			buttonName: `${item.name}`,
 		});
-
+		md.sensorComponentLogTake({
+			xcxComponentClick: "true",
+			pageName: "积分服务页",
+			componentName: "会员权益",
+			componentContent: "会员权益-" + item.name
+		});
 		console.log('selectIdx.value=', selectIdx.value);
 		
 		// const url = vipQuanyiUrl.value.url; 
@@ -2483,8 +2504,55 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
 						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;
 						top: 207rpx;
 						width: 320rpx;
@@ -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 {
 					font-size: 24rpx;
 					position: absolute;