Merge branch 'master' into dev

# Conflicts:
#	.DS_Store
#	components/pointRightsCom/babyClass.vue
#	mock/brand.json
#	mock/home.json
#	mock/integral.json
#	mock/my.json
#	package-lock.json
#	pages.json
#	views/Brand.vue
#	views/My.vue

components/pointRightsCom/babyClass.vue

@@ -17,9 +17,9 @@
             <image class="diamondbtn" :src="`${$baseUrl}${BABY_CLASS_IMAGES.DIAMOND.BTN}`" mode="aspectFit"
                 @click="jump('diamond')"></image>
             <!-- <image class="diamonddesc" :src="`${$baseUrl}${BABY_CLASS_IMAGES.DIAMOND.DESC}`" mode="aspectFit"></image> -->
-<!--            <view class="diamonddesc" :style="{ color: getColor() }">
-                7类课程：⼩⼉常⻅病-急救，产后恢复运动实操课，痱⼦，尿布疹，⼩⼉常⻅病-常⻅疾病护理，新⽣⼉⻩疸，⼉童安全⽤药操作课
-            </view>-->
+            <view class="diamonddesc" :style="{ color: getColor() }">
+                <!-- 7类课程：⼩⼉常⻅病-急救，产后恢复运动实操课，痱⼦，尿布疹，⼩⼉常⻅病-常⻅疾病护理，新⽣⼉⻩疸，⼉童安全⽤药操作课 -->
+            </view>
         </view>
 
         <view v-if="currentLevelName === 'starshine'" class="starshine">
@@ -40,9 +40,9 @@
                 @click="jump('starshine')"></image>
             <!-- <image class="starshinedesc" :src="`${$baseUrl}${BABY_CLASS_IMAGES.STARSHINE.DESC}`" mode="aspectFit">
             </image> -->
-<!--            <view class="starshinedesc" :style="{ color: getColor() }">
-                7类课程：⼩⼉常⻅病-急救，产后恢复运动实操课，痱⼦，尿布疹，⼩⼉常⻅病-常⻅疾病护理，新⽣⼉⻩疸，⼉童安全⽤药操作课
-            </view>-->
+            <view class="starshinedesc" :style="{ color: getColor() }">
+                <!-- 7类课程：⼩⼉常⻅病-急救，产后恢复运动实操课，痱⼦，尿布疹，⼩⼉常⻅病-常⻅疾病护理，新⽣⼉⻩疸，⼉童安全⽤药操作课 -->
+            </view>
         </view>
 
         <view v-if="currentLevelName === 'starlight'" class="starlight">
@@ -63,9 +63,9 @@
                 @click="jump('starlight')"></image>
             <!-- <image class="starlightdesc" :src="`${$baseUrl}${BABY_CLASS_IMAGES.STARLIGHT.DESC}`" mode="aspectFit">
             </image> -->
-<!--            <view class="starlightdesc" :style="{ color: getColor() }">
-                7类课程：⼩⼉常⻅病-急救，产后恢复运动实操课，痱⼦，尿布疹，⼩⼉常⻅病-常⻅疾病护理，新⽣⼉⻩疸，⼉童安全⽤药操作课
-            </view>-->
+            <view class="starlightdesc" :style="{ color: getColor() }">
+                <!-- 7类课程：⼩⼉常⻅病-急救，产后恢复运动实操课，痱⼦，尿布疹，⼩⼉常⻅病-常⻅疾病护理，新⽣⼉⻩疸，⼉童安全⽤药操作课 -->
+            </view>
         </view>
 
         <view v-if="currentLevelName === 'gold'" class="gold">
@@ -80,9 +80,9 @@
             <image class="goldbtn" :src="`${$baseUrl}${BABY_CLASS_IMAGES.GOLD.BTN}`" mode="aspectFit"
                 @click="jump('gold')"></image>
             <!-- <image class="golddesc" :src="`${$baseUrl}${BABY_CLASS_IMAGES.GOLD.DESC}`" mode="aspectFit"></image> -->
-<!--            <view class="golddesc" :style="{ color: getColor() }">
-                5类课程：产检，⼉童疫苗，婴幼⼉护理，⼩⼉发热，⼩⼉7种常⻅病的治疗⽅法和⽤药原则
-            </view>-->
+            <view class="golddesc" :style="{ color: getColor() }">
+                <!-- 5类课程：产检，⼉童疫苗，婴幼⼉护理，⼩⼉发热，⼩⼉7种常⻅病的治疗⽅法和⽤药原则 -->
+            </view>
         </view>
 
         <view v-if="currentLevelName === 'platinum'" class="platinum">
@@ -102,9 +102,9 @@
             <image class="platinumbtn" :src="`${$baseUrl}${BABY_CLASS_IMAGES.PLATINUM.BTN}`" mode="aspectFit"
                 @click="jump('platinum')"></image>
             <!-- <image class="platinumdesc" :src="`${$baseUrl}${BABY_CLASS_IMAGES.PLATINUM.DESC}`" mode="aspectFit"></image> -->
-<!--            <view class="platinumdesc" :style="{ color: getColor() }">
-                5类课程：产检，⼉童疫苗，婴幼⼉护理，⼩⼉发热，⼩⼉7种常⻅病的治疗⽅法和⽤药原则
-            </view>-->
+            <view class="platinumdesc" :style="{ color: getColor() }">
+                <!-- 5类课程：产检，⼉童疫苗，婴幼⼉护理，⼩⼉发热，⼩⼉7种常⻅病的治疗⽅法和⽤药原则 -->
+            </view>
         </view>
 
     </view>
@@ -195,8 +195,7 @@ const jump = (level) => {
 
     // 跳转到 H5 页面，地址暂时默认 https://www.baidu.com
     // 可以根据不同等级跳转到不同的地址
-    //const url = 'https://member.feihe.com/memberH5/#/courses'
-    const url = 'https://mom.feihe.com/expertsView?from=home'
+    const url = 'https://mom.feihe.com/babyWikipedia';
 
     // 使用 uni.navigateTo 跳转到 webview 页面
     uni.navigateTo({

components/pointRightsCom/babyClassImages.js

@@ -6,10 +6,10 @@ export const BABY_CLASS_IMAGES = {
   DIAMOND: {
     BG: `pointRights/babyClass/${version}/DiamondBg.png`,
     TITLE: `pointRights/babyClass/${version}/DiamondTitle.png`,
-    IPS1: `pointRights/babyClass/${version}/DiamondIps1.png`,
-    IPS2: `pointRights/babyClass/${version}/DiamondIps2.png`,
-    IPS3: `pointRights/babyClass/${version}/DiamondIps3.png`,
-    IPS4: `pointRights/babyClass/${version}/DiamondIps4.png`,
+    IPS1: `pointRights/babyClass/${version}/DiamondIps1-1.png`,
+    IPS2: `pointRights/babyClass/${version}/DiamondIps2-1.png`,
+    IPS3: `pointRights/babyClass/${version}/DiamondIps3-1.png`,
+    IPS4: `pointRights/babyClass/${version}/DiamondIps4-1.png`,
     BTN: `pointRights/babyClass/${version}/DiamondBtn.png`,
     DESC: `pointRights/babyClass/${version}/DiamondDesc.png`
   },
@@ -18,10 +18,10 @@ export const BABY_CLASS_IMAGES = {
   STARSHINE: {
     BG: `pointRights/babyClass/${version}/StarshineBg.png`,
     TITLE: `pointRights/babyClass/${version}/StarshineTitle.png`,
-    IPS1: `pointRights/babyClass/${version}/StarshineIps1.png`,
-    IPS2: `pointRights/babyClass/${version}/StarshineIps2.png`,
-    IPS3: `pointRights/babyClass/${version}/StarshineIps3.png`,
-    IPS4: `pointRights/babyClass/${version}/StarshineIps4.png`,
+    IPS1: `pointRights/babyClass/${version}/StarshineIps1-1.png`,
+    IPS2: `pointRights/babyClass/${version}/StarshineIps2-1.png`,
+    IPS3: `pointRights/babyClass/${version}/StarshineIps3-1.png`,
+    IPS4: `pointRights/babyClass/${version}/StarshineIps4-1.png`,
     BTN: `pointRights/babyClass/${version}/StarshineBtn3.png`,
     DESC: `pointRights/babyClass/${version}/StarshineDesc.png`
   },
@@ -30,10 +30,10 @@ export const BABY_CLASS_IMAGES = {
   STARLIGHT: {
     BG: `pointRights/babyClass/${version}/StarlightBg.png`,
     TITLE: `pointRights/babyClass/${version}/StarlightTitle.png`,
-    IPS1: `pointRights/babyClass/${version}/StarlightIps1.png`,
-    IPS2: `pointRights/babyClass/${version}/StarlightIps2.png`,
-    IPS3: `pointRights/babyClass/${version}/StarlightIps3.png`,
-    IPS4: `pointRights/babyClass/${version}/StarlightIps4.png`,
+    IPS1: `pointRights/babyClass/${version}/StarlightIps1-1.png`,
+    IPS2: `pointRights/babyClass/${version}/StarlightIps2-1.png`,
+    IPS3: `pointRights/babyClass/${version}/StarlightIps3-1.png`,
+    IPS4: `pointRights/babyClass/${version}/StarlightIps4-1.png`,
     BTN: `pointRights/babyClass/${version}/StarlightBtn.png`,
     DESC: `pointRights/babyClass/${version}/StarlightDesc.png`
   },
@@ -42,10 +42,10 @@ export const BABY_CLASS_IMAGES = {
   GOLD: {
     BG: `pointRights/babyClass/${version}/GoldIpsBg.png`,
     TITLE: `pointRights/babyClass/${version}/GoldIpsTitle.png`,
-    IPS1: `pointRights/babyClass/${version}/GoldIps1.png`,
-    IPS2: `pointRights/babyClass/${version}/GoldIps2.png`,
-    IPS3: `pointRights/babyClass/${version}/GoldIps3.png`,
-    IPS4: `pointRights/babyClass/${version}/GoldIps4.png`,
+    IPS1: `pointRights/babyClass/${version}/GoldIps1-1.png`,
+    IPS2: `pointRights/babyClass/${version}/GoldIps2-1.png`,
+    IPS3: `pointRights/babyClass/${version}/GoldIps3-1.png`,
+    IPS4: `pointRights/babyClass/${version}/GoldIps4-1.png`,
     BTN: `pointRights/babyClass/${version}/GoldBtn.png`,
     DESC: `pointRights/babyClass/${version}/GoldDesc.png`
   },
@@ -54,10 +54,10 @@ export const BABY_CLASS_IMAGES = {
   PLATINUM: {
     BG: `pointRights/babyClass/${version}/PlatinumBg.png`,
     TITLE: `pointRights/babyClass/${version}/PlatinumTitle.png`,
-    IPS1: `pointRights/babyClass/${version}/PlatinumIps1.png`,
-    IPS2: `pointRights/babyClass/${version}/PlatinumIps2.png`,
-    IPS3: `pointRights/babyClass/${version}/PlatinumIps3.png`,
-    IPS4: `pointRights/babyClass/${version}/PlatinumIps4.png`,
+    IPS1: `pointRights/babyClass/${version}/PlatinumIps1-1.png`,
+    IPS2: `pointRights/babyClass/${version}/PlatinumIps2-1.png`,
+    IPS3: `pointRights/babyClass/${version}/PlatinumIps3-1.png`,
+    IPS4: `pointRights/babyClass/${version}/PlatinumIps4-1.png`,
     BTN: `pointRights/babyClass/${version}/PlatinumBtn.png`,
     DESC: `pointRights/babyClass/${version}/PlatinumDesc2.png`
   }

mock/my.json

@@ -306,6 +306,7 @@
 			"desc": "产品溯源",
 			"bgUrl": "my/suyuan.png"
 		}, {
+			"hidden": true,
 			"link": {
 				"extra": {},
 				"type": 3,
@@ -341,14 +342,32 @@
 		],
 		"specialAttentionOptions": ["过敏", "长肉", "肠道", "消化", "脑发育"],
 		"activeInfo": [{
-			"img": "https://course.feihe.com/momclub-picture/my/vipAct251009001.jpg",
+			"img": "https://course.feihe.com/momclub-picture/my/vipAct251019001.png",
 			"extra": {
 				"envVersion": "release",
 				"appId": "wx4205ec55b793245e"
 			},
 			"type": 2,
-			"title": "兑换礼品",
-			"url": "/subPackages/shopMainList/topicNew/index?id=1001165"
+			"title": "玉米",
+			"url": "/subPackages/shopMainProcess/product/index?productId=822672030077575915&skuId=822672030077575917"
+		}, {
+			"img": "https://course.feihe.com/momclub-picture/my/vipAct251019101.png",
+			"extra": {
+				"envVersion": "release",
+				"appId": "wx4205ec55b793245e"
+			},
+			"type": 2,
+			"title": "积分市集",
+			"url": "/subPackages/shopMainList/topicNew/index?id=1001167"
+		}, {
+			"img": "https://course.feihe.com/momclub-picture/my/vipAct251019201.png",
+			"extra": {
+				"envVersion": "release",
+				"appId": "wx4205ec55b793245e"
+			},
+			"type": 2,
+			"title": "樊文花",
+			"url": "/subPackages/shopMainProcess/product/index?productId=821844522041316920&skuId=821844522041316921"
 		}],
 		"channelOptions": ["电商（京东/天猫）", "母婴店"]
 	}

pages.json

@@ -206,8 +206,8 @@
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom",
 				"enableShare": true,
-				"shareAppMessage": true,
-				"shareTimeline": false
+				"enableShareAppMessage": true,
+				"enableShareTimeline": true
 			}
 		},
 		{

pages/XingmaLabDetailPage/XingmaLabDetailPage.less

+.page1{
+  height: calc(100vh - 218rpx);
+}
+.page2{
+  height: 100vh !important;
+}
 // 星妈实验室详情页面样式
 .xingmalabdetailpage {
   width: 750rpx;
-  height: calc(100vh - 218rpx);
   left: 0rpx;
   top: 0rpx;
   overflow-y: auto;

views/Brand.vue

@@ -567,11 +567,11 @@ export default {
 					md.sensorComponentLogTake(evt.currentTarget.dataset.comlog);
 				}
 			}
-			const { productId, skuId, contentImg, contentImgLen, shareTitle, shareImg, title, link } = item;
+			const { productId, skuId, contentImg, contentImgLen, shareTitle, shareImg, title, entrySource } = item;
 			const tabName = this.productTabList[this.channelTabIndex];
 			
-			if(productId && skuId){
-				const url = `subPackages/shopMainProcess/product/index?productId=${productId}&skuId=${skuId}&entrySource=xmh_wechatmp_brand_profamily`;
+			if(productId && skuId && entrySource){
+				const url = `subPackages/shopMainProcess/product/index?productId=${productId}&skuId=${skuId}&entrySource=${entrySource}`;
 				const type = JumpType.MINI;
 				const extra = {
 					appId: 'wx4205ec55b793245e',	//星妈优选小程序

views/My.vue

@@ -310,7 +310,10 @@ const handleEditProfile = (e) => {
     componentContent: "资料编辑"
   })
 
-  const type = userStore.babyInfo?.allBabyBaseInfo?.length ? "edit" : "add";
+  const type = userStore.babyInfo?.allBabyBaseInfo?.length == 0 ? "add" : "edit";
+  babyId.value = userStore.babyInfo?.allBabyBaseInfo?.find(
+    (item) => item.selected
+  )?.id;
 
   if (type === "edit") {
     babyId.value = userStore.babyInfo?.allBabyBaseInfo.find(
@@ -389,16 +392,19 @@ const initExposure = () => {
 
 }
 
-// onShow(async () => {
-//   console.log('onShow')
-//   await userStore.loadMemberInfo();
-//   points.value = userStore.memberInfo?.points;
-//   console.log('userStore.memberInfo=', userStore.memberInfo)
-
-// })
+onShow(async () => {
+  console.log('onShow')
+  await userStore.loadMemberInfo();
+  points.value = userStore.memberInfo?.points;
+  console.log('userStore.memberInfo=', userStore.memberInfo)
+})
 
 // 获取用户信息
 const initData = async () => {
+  // 确保加载会员信息以获取手机号
+  await userStore.loadMemberInfo();
+  points.value = userStore.memberInfo?.points;
+  
   if (
     userStore?.userInfo?.memberId &&
     userStore?.userInfo?.memberId == "not_login"
@@ -455,10 +461,10 @@ const getRealtimePhoneNumber = async (e) => {
   }
   await userStore.phoneCallback(e.detail, async () => {
     showRegisterLayer.value = true;
-    // // 新增数据刷新逻辑
+    // 简化回调，避免重复调用接口
     showLoading();
-    await userStore.loadMemberInfo();
     await pageCfgStore.fetchCfg();
+    // 只调用一次initData，loadMemberInfo已在initData内部处理
     initData();
     hideLoading();
   });
@@ -545,7 +551,8 @@ onMounted(async () => {
   });
   showLoading();
   await userStore.loadMemberInfo();
-
+  points.value = userStore.memberInfo?.points;
+  
   await pageCfgStore.fetchCfg();
 
   console.log("pageCfgStore.contentCfg====", pageCfgStore.contentCfg);
@@ -599,7 +606,7 @@ onMounted(async () => {
 watch([() => userStore.userInfo, () => userStore.babyInfo], () => {
   console.log("userInfo/babyInfo变化", userStore.userInfo, userStore.babyInfo);
   initData();
-  babyId.value = userStore.babyInfo?.allBabyBaseInfo.find(
+  babyId.value = userStore.babyInfo?.allBabyBaseInfo?.find(
     (item) => item.selected
   )?.id;
 });