Skip to content

飞
飞鹤小程序
Commit 821b80a8 authored by spc's avatar spc
Browse files
Options

Merge branch 'master' into 20250901_915Act

parents 426127d7 21692b07
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6108 additions and 5083 deletions
components/BabySwitchPopup.vue
View file @ 821b80a8
...@@ -4,68 +4,45 @@ ...@@ -4,68 +4,45 @@
<!-- 弹窗头部 --> <!-- 弹窗头部 -->
<view class="popup-header"> <view class="popup-header">
<text class="popup-title">切换宝宝</text> <text class="popup-title">切换宝宝</text>
<image <image class="close-btn" :src="`${$baseUrl}shengzhangTool/1001/changeBaby/closeBtn.png`"
class="close-btn" mode="aspectFit" @click="closePopup" />
:src="`${$baseUrl}shengzhangTool/1001/changeBaby/closeBtn.png`"
mode="aspectFit"
@click="closePopup"
/>
</view> </view>
<!-- 宝宝列表 --> <!-- 宝宝列表 -->
<view class="baby-list"> <view class="baby-list">
<view <view v-for="(baby, index) in babyList" :key="index" class="baby-item"
v-for="(baby, index) in babyList" :class="{ selected: selectIndex === index }" @click="selectBaby(index)">
:key="index"
class="baby-item"
:class="{ selected: selectIndex === index }"
@click="selectBaby(index)"
>
<!-- 选中背景 --> <!-- 选中背景 -->
<image <image v-if="selectIndex === index" class="baby-item-bg"
v-if="selectIndex === index" :src="`${$baseUrl}shengzhangTool/1001/changeBaby/babyItemBg.png`" mode="aspectFit" />
class="baby-item-bg"
:src="`${$baseUrl}shengzhangTool/1001/changeBaby/babyItemBg.png`"
mode="aspectFit"
/>
<!-- 宝宝头像 --> <!-- 宝宝头像 -->
<image <image class="baby-avatar"
class="baby-avatar" :src="baby.babyAvatar || `https://course.feihe.com/momclub-picture/common/default_avatar.png`"
:src="baby.babyAvatar || `https://course.feihe.com/momclub-picture/common/default_avatar.png`" mode="aspectFill" />
mode="aspectFill"
/>
<!-- 宝宝信息 --> <!-- 宝宝信息 -->
<view class="baby-info"> <view class="baby-info">
<view class="baby-name-row"> <view class="baby-name-row">
<text class="baby-name">{{ baby.babyName }}</text> <text class="baby-name">{{ baby.babyName }}</text>
<image <image class="gender-icon"
class="gender-icon" :src="baby.babyGender === 'M' ? `${$baseUrl}shengzhangTool/1001/sex1.png` : `${$baseUrl}shengzhangTool/1001/sex0.png`"
:src="baby.babyGender === 'M' ? `${$baseUrl}shengzhangTool/1001/sex1.png` : `${$baseUrl}shengzhangTool/1001/sex0.png`" mode="aspectFit" />
mode="aspectFit"
/>
</view> </view>
<text class="baby-birthday">宝宝生日: {{ baby.babyBirthday }}</text> <text class="baby-birthday">宝宝生日: {{ baby.babyBirthday }}</text>
</view> </view>
</view> </view>
</view> </view>
<image <image class="ok-btn" :class="{ 'ok-btn-active': isOkPressed }"
class="ok-btn" :src="`${$baseUrl}shengzhangTool/1001/changeBaby/okBtn.png`" @touchstart="handleOkTouchStart"
:class="{'ok-btn-active': isOkPressed}" @touchend="handleOkTouchEnd" mode="aspectFit"></image>
:src="`${$baseUrl}shengzhangTool/1001/changeBaby/okBtn.png`"
@touchstart="handleOkTouchStart"
@touchend="handleOkTouchEnd"
mode="aspectFit"
></image>
</view> </view>
</view> </view>
</template> </template>
<script setup> <script setup>
import { ref, defineEmits, defineProps, onMounted } from 'vue' import { ref, defineEmits, defineProps, onMounted, watch } from 'vue'
import { useUserStore } from "@/stores/user"; import { useUserStore } from "@/stores/user";
import md from '../md.js' import md from '../md.js'
...@@ -91,12 +68,13 @@ const props = defineProps({ ...@@ -91,12 +68,13 @@ const props = defineProps({
} }
}) })
const userStore = useUserStore(); const userStore = useUserStore();
const emit = defineEmits(['update:visible', 'update:selectedIndex', 'change']) const emit = defineEmits(['update:visible', 'update:selectedIndex', 'change'])
const selectHandle = () => { const selectHandle = () => {
} }
const isOkPressed = ref(false) const isOkPressed = ref(false)
...@@ -145,9 +123,10 @@ const selectBaby = (index) => { ...@@ -145,9 +123,10 @@ const selectBaby = (index) => {
} }
const babyList = ref([]); const babyList = ref([]);
onMounted(() => { const initListData = () => {
babyList.value = (userStore.babyInfo?.allBabyBaseInfo || []).filter(tem => tem.babyStage === 2); babyList.value = (userStore.babyInfo?.allBabyBaseInfo || []).filter(tem => tem.babyStage === 2);
if(babyList.value === null){ if (babyList.value === null) {
babyList.value = []; babyList.value = [];
} }
...@@ -159,6 +138,16 @@ onMounted(() => { ...@@ -159,6 +138,16 @@ onMounted(() => {
toolName: "生长曲线", toolName: "生长曲线",
popName: "切换宝宝弹窗" popName: "切换宝宝弹窗"
}); });
}
watch(() => props.visible, (val, oldVal) => {
if (val && !oldVal) {
// 打开的时候更新数据
initListData();
}
}, { immediate: true })
onMounted(() => {
initListData();
}) })
...@@ -192,13 +181,13 @@ onMounted(() => { ...@@ -192,13 +181,13 @@ onMounted(() => {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 40rpx 30rpx 20rpx; padding: 40rpx 30rpx 20rpx;
.popup-title { .popup-title {
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
color: #333; color: #333;
} }
.close-btn { .close-btn {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
...@@ -223,11 +212,11 @@ onMounted(() => { ...@@ -223,11 +212,11 @@ onMounted(() => {
height: 129rpx; height: 129rpx;
border-radius: 16rpx; border-radius: 16rpx;
background-color: #fff; background-color: #fff;
&.selected { &.selected {
background-color: transparent; background-color: transparent;
} }
.baby-item-bg { .baby-item-bg {
position: absolute; position: absolute;
top: 0; top: 0;
...@@ -238,7 +227,7 @@ onMounted(() => { ...@@ -238,7 +227,7 @@ onMounted(() => {
height: 100%; height: 100%;
z-index: 1; z-index: 1;
} }
.baby-avatar { .baby-avatar {
position: relative; position: relative;
z-index: 2; z-index: 2;
...@@ -247,30 +236,30 @@ onMounted(() => { ...@@ -247,30 +236,30 @@ onMounted(() => {
border-radius: 50%; border-radius: 50%;
margin-right: 20rpx; margin-right: 20rpx;
} }
.baby-info { .baby-info {
position: relative; position: relative;
z-index: 2; z-index: 2;
flex: 1; flex: 1;
.baby-name-row { .baby-name-row {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 8rpx; margin-bottom: 8rpx;
.baby-name { .baby-name {
font-size: 28rpx; font-size: 28rpx;
font-weight: bold; font-weight: bold;
color: #333; color: #333;
margin-right: 10rpx; margin-right: 10rpx;
} }
.gender-icon { .gender-icon {
width: 24rpx; width: 24rpx;
height: 24rpx; height: 24rpx;
} }
} }
.baby-birthday { .baby-birthday {
font-size: 24rpx; font-size: 24rpx;
color: #666; color: #666;
...@@ -285,6 +274,7 @@ onMounted(() => { ...@@ -285,6 +274,7 @@ onMounted(() => {
height: 98rpx; height: 98rpx;
margin-left: 35rpx; margin-left: 35rpx;
margin-top: 0rpx; margin-top: 0rpx;
&.ok-btn-active { &.ok-btn-active {
transform: scale(0.95); transform: scale(0.95);
} }
...@@ -292,12 +282,4 @@ onMounted(() => { ...@@ -292,12 +282,4 @@ onMounted(() => {
} }
} }
</style> </style>
\ No newline at end of file
components/popup-tip/popup-tip.vue
View file @ 821b80a8
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
</template> </template>
</view> </view>
<view class="form-btn" @click="onAdd"> <view class="form-btn" @click="onAdd">
<image v-if="isType == '0' || isType == '2'" :src="`${$baseUrl}chanjianTool/1001/icon23.png`"></image> <image v-if="isType == '0' || isType == '2'" :src="`${$baseUrl}chanjianTool/1001/icon23.png`"></image>
<template v-if="type == '1'"> <template v-if="type == '1'">
...@@ -43,6 +44,8 @@ ...@@ -43,6 +44,8 @@
<template v-if="type == '2'"> <template v-if="type == '2'">
{{ isType == '0' ? '添加状态' : isType == '3' ? '我知道了' : isType == '1' ? '切换状态' : '修改状态' }} {{ isType == '0' ? '添加状态' : isType == '3' ? '我知道了' : isType == '1' ? '切换状态' : '修改状态' }}
</template> </template>
<button v-if="isNotLogin" type="primary" class="phone-button" open-type="getPhoneNumber"
@getphonenumber="getRealtimePhoneNumber" />
</view> </view>
</view> </view>
</view> </view>
...@@ -53,7 +56,8 @@ import { ...@@ -53,7 +56,8 @@ import {
ref, ref,
onMounted, onMounted,
computed, computed,
defineEmits defineEmits,
watch
} from 'vue' } from 'vue'
import { useUserStore } from "@/stores/user"; import { useUserStore } from "@/stores/user";
// 接受父组件参数 // 接受父组件参数
...@@ -61,6 +65,10 @@ const props = defineProps({ ...@@ -61,6 +65,10 @@ const props = defineProps({
type: { type: {
type: String, type: String,
default: '1', // 1 非宝宝状态 2 非孕中状态 default: '1', // 1 非宝宝状态 2 非孕中状态
},
isNotLogin: {
type: Boolean,
default: false //是否未登录
} }
}) })
// 用户信息 // 用户信息
...@@ -68,7 +76,7 @@ const userStore = useUserStore(); ...@@ -68,7 +76,7 @@ const userStore = useUserStore();
const babyInfo = ref(userStore.babyInfo) const babyInfo = ref(userStore.babyInfo)
// 回调函数 // 回调函数
const emit = defineEmits([ 'statusChange', 'close']) const emit = defineEmits(['statusChange', 'close'])
const isType = ref('0') // 0 添加状态或者宝宝 1 切换状态 2 修改状态 3 宝宝已达上限 const isType = ref('0') // 0 添加状态或者宝宝 1 切换状态 2 修改状态 3 宝宝已达上限
...@@ -77,18 +85,18 @@ const babyBaseId = ref('') ...@@ -77,18 +85,18 @@ const babyBaseId = ref('')
// 产检信息 // 产检信息
const pregnancyStatus = computed(() => { const pregnancyStatus = computed(() => {
return isType.value == '0' ? '新增孕中' return isType.value == '0' ? '新增孕中'
: isType.value == '1' ? '切换孕中' : isType.value == '1' ? '切换孕中'
: isType.value == '2' ? '修改备孕' : isType.value == '2' ? '修改备孕'
: ''; : '';
}) })
// 生长曲线和喂养记录 // 生长曲线和喂养记录
const babyStatus = computed(() => { const babyStatus = computed(() => {
return isType.value == '0' ? '新增宝宝' return isType.value == '0' ? '新增宝宝'
: isType.value == '1' ? '切换宝宝' : isType.value == '1' ? '切换宝宝'
: isType.value == '2' ? (babyInfo.value.babyStage == 0 ? '修改备孕' : : isType.value == '2' ? (babyInfo.value.babyStage == 0 ? '修改备孕' :
babyInfo.value.babyStage == 1 ? '修改孕中' : '') babyInfo.value.babyStage == 1 ? '修改孕中' : '')
: ''; : '';
}) })
// 跳转新增宝宝状态页面 // 跳转新增宝宝状态页面
const navigateToFn = () => { const navigateToFn = () => {
...@@ -98,12 +106,30 @@ const navigateToFn = () => { ...@@ -98,12 +106,30 @@ const navigateToFn = () => {
url: `/pages/person/person?type=${type}` url: `/pages/person/person?type=${type}`
}) })
} }
const getRealtimePhoneNumber = async (e) => {
console.log("获取手机号码", e);
if (e.detail.errMsg !== "getPhoneNumber:ok") {
uni.showToast({
title: "请授权使用手机号",
icon: "none",
});
return;
}
await userStore.phoneCallback(e.detail, () => { }, () => {
emit('afterPhone') //如果没有宝宝信息，页面中处理宝宝注册信息
});
console.log("closeclosecloseclose");
emit('close')
emit('statusChange') //借用这个事件，刷新下页面数据
};
// 切换状态 需要对应的宝宝id 直接请求接口 // 切换状态 需要对应的宝宝id 直接请求接口
const switchState = async () => { const switchState = async () => {
console.log('切换状态', babyBaseId.value) console.log('切换状态', babyBaseId.value)
await userStore.changeBabySelected(babyBaseId.value); await userStore.changeBabySelected(babyBaseId.value);
// 发送事件 通知主页面 // 发送事件 通知主页面
emit('statusChange') emit('statusChange')
} }
// 修改状态 需要对应备胎的id 跳转到编辑页面 // 修改状态 需要对应备胎的id 跳转到编辑页面
...@@ -117,8 +143,12 @@ const modifyState = async () => { ...@@ -117,8 +143,12 @@ const modifyState = async () => {
url: `/pages/person/person?type=${type}&id=${babyBaseId.value}` url: `/pages/person/person?type=${type}&id=${babyBaseId.value}`
}) })
} }
//这里新增一下未登录的情况，点击事件直接去拉起手机号授权
// 跳转新增产检页面 // 跳转新增产检页面
const onAdd = () => { const onAdd = () => {
if (props.isNotLogin == true) {
return;
}
// 0 添加状态或者宝宝 1 切换状态 2 修改状态 3 宝宝已达上限 // 0 添加状态或者宝宝 1 切换状态 2 修改状态 3 宝宝已达上限
switch (isType.value) { switch (isType.value) {
case '0': case '0':
...@@ -131,17 +161,28 @@ const onAdd = () => { ...@@ -131,17 +161,28 @@ const onAdd = () => {
modifyState() modifyState()
break; break;
case '3': case '3':
uni.navigateBack() if (getCurrentPages().length > 1) {
uni.navigateBack()
} else {
uni.reLaunch({
url: '/pages/index/index'
})
}
break; break;
default: default:
break; break;
} }
} }
onMounted(() => { onMounted(async () => {
if (props.isNotLogin) {
await userStore.wxAutoLogin();
}
// 宝宝生长测试和喂养记录 // 宝宝生长测试和喂养记录
console.log('babyInfo-获取宝宝', babyInfo.value) console.log('babyInfo-获取宝宝', babyInfo.value)
const babyBaseInfo = babyInfo.value.allBabyBaseInfo const babyBaseInfo = babyInfo?.value?.allBabyBaseInfo
console.log("🚀 ~ babyBaseInfo:", babyBaseInfo) console.log("🚀 ~ babyBaseInfo:", babyBaseInfo)
// 有宝宝状态 // 有宝宝状态
if (babyBaseInfo) { if (babyBaseInfo) {
...@@ -168,7 +209,7 @@ onMounted(() => { ...@@ -168,7 +209,7 @@ onMounted(() => {
// } // }
babyBaseId.value = babyInfo.value.content.id; babyBaseId.value = babyInfo.value.content.id;
isType.value = '2'; isType.value = '2';
} }
} }
// 产检提醒 // 产检提醒
...@@ -205,14 +246,14 @@ onMounted(() => { ...@@ -205,14 +246,14 @@ onMounted(() => {
// 如果找到符合条件的 baby，取出它的 id 并赋值 // 如果找到符合条件的 baby，取出它的 id 并赋值
babyBaseId.value = stageOneBaby.id; babyBaseId.value = stageOneBaby.id;
} else { // 修改 } else { // 修改
console.log('没有找到符合条件的 baby', babyInfo.value); console.log('没有找到符合条件的 baby', babyInfo.value);
// // 判断没有备孕的状态 // // 判断没有备孕的状态
// if (!babyBaseInfo.some(baby => baby.babyStage == 0)) { // if (!babyBaseInfo.some(baby => baby.babyStage == 0)) {
// isType.value = '0' // isType.value = '0'
// } else { // } else {
// const stageZeroBaby = babyBaseInfo.find(baby => baby.babyStage == 0); // const stageZeroBaby = babyBaseInfo.find(baby => baby.babyStage == 0);
babyBaseId.value = babyInfo.value.content.id; babyBaseId.value = babyInfo.value.content.id;
isType.value = '2'; isType.value = '2';
// } // }
} }
...@@ -319,11 +360,19 @@ onMounted(() => { ...@@ -319,11 +360,19 @@ onMounted(() => {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-top: 55rpx; margin-top: 55rpx;
position: relative;
image { image {
width: 42rpx; width: 42rpx;
height: 42rpx; height: 42rpx;
margin-right: 12rpx; margin-right: 12rpx;
} }
.phone-button {
width: 100%;
height: 100%;
position: absolute;
opacity: 0;
}
} }
</style> </style>
\ No newline at end of file
md.js
View file @ 821b80a8
...@@ -6,7 +6,7 @@ const init = (SENSORS_URL) => { ...@@ -6,7 +6,7 @@ const init = (SENSORS_URL) => {
sensors.setPara({ sensors.setPara({
name: "sensors", name: "sensors",
server_url: SENSORS_URL, server_url: SENSORS_URL,
show_log: true, show_log: false,
autoTrack: { autoTrack: {
appLaunch: true, // 默认为 true，false 则关闭 $MPLaunch 事件采集 appLaunch: true, // 默认为 true，false 则关闭 $MPLaunch 事件采集
appShow: true, // 默认为 true，false 则关闭 $MPShow 事件采集 appShow: true, // 默认为 true，false 则关闭 $MPShow 事件采集
...@@ -178,6 +178,15 @@ const sensorPopLogTake = (logObj) => { ...@@ -178,6 +178,15 @@ const sensorPopLogTake = (logObj) => {
sensorPopLog(evt); sensorPopLog(evt);
}; };
const sensorUserLogTake = (logObj) => {
if (!logObj) {
return;
}
sensors.track("xcxUserStatus", {
...logObj,
});
};
export default { export default {
init, init,
sensors, sensors,
...@@ -188,4 +197,5 @@ export default { ...@@ -188,4 +197,5 @@ export default {
sensorComponentLogTake, sensorComponentLogTake,
sensorPopLog, sensorPopLog,
sensorPopLogTake, sensorPopLogTake,
sensorUserLogTake
}; };
mock/home.json
View file @ 821b80a8
...@@ -120,6 +120,12 @@ ...@@ -120,6 +120,12 @@
}, },
"channelTabListMianTitle": "有声频道", "channelTabListMianTitle": "有声频道",
"swiperList": [ "swiperList": [
{
"videoUrl": "homepage/homeSwiper/V1/9_1.mp4",
"link": {},
"title": "教师节banner",
"url": "homepage/homeSwiper/V1/9.gif"
},
{ {
"img": "homepage/homeSwiper/V1/7.jpg", "img": "homepage/homeSwiper/V1/7.jpg",
"link": { "link": {
......
mock/integral.json 0 → 100644
View file @ 821b80a8
This diff is collapsed.
mock/my.json
View file @ 821b80a8
This source diff could not be displayed because it is too large. You can view the blob instead.
pages/XingmaLabDetailPage/XingmaLabDetailPage.vue
View file @ 821b80a8
...@@ -52,7 +52,9 @@ ...@@ -52,7 +52,9 @@
<button open-type="getPhoneNumber" @getphonenumber="(e) => onGetPhoneNumber(e, 'like')" <button open-type="getPhoneNumber" @getphonenumber="(e) => onGetPhoneNumber(e, 'like')"
class="auth-like-btn phone-auth-btn-cover"></button> class="auth-like-btn phone-auth-btn-cover"></button>
<!-- 分享按钮授权覆盖 - 移除这个，让分享按钮正常工作 --> <!-- 分享按钮授权覆盖 -->
<button open-type="getPhoneNumber" @getphonenumber="(e) => onGetPhoneNumber(e, 'share')"
class="auth-share-btn phone-auth-btn-cover"></button>
</div> </div>
</div> </div>
</view> </view>
...@@ -72,7 +74,7 @@ defineOptions({ ...@@ -72,7 +74,7 @@ defineOptions({
}) })
// 响应式数据 // 响应式数据
const collectionNumber = ref('123456789') const collectionNumber = ref('')
const recordId = ref('') // 添加记录ID的响应式变量 const recordId = ref('') // 添加记录ID的响应式变量
const detailData = ref({ const detailData = ref({
content: '', content: '',
...@@ -267,9 +269,9 @@ const handleGoBack = () => { ...@@ -267,9 +269,9 @@ const handleGoBack = () => {
} }
} }
// 生命周期 // 页面初始化逻辑
onMounted(async (options) => { const initPage = async () => {
md.sensorComponentLogTake({ md.sensorComponentLogTake({
xcxComponentExposure: "true", xcxComponentExposure: "true",
pageName: "星妈lab-藏品详情页", pageName: "星妈lab-藏品详情页",
...@@ -284,7 +286,6 @@ onMounted(async (options) => { ...@@ -284,7 +286,6 @@ onMounted(async (options) => {
componentContent: "分享" componentContent: "分享"
}); });
// 调用 home 接口获取登录状态 // 调用 home 接口获取登录状态
await homeStore.loadHomeInfo() await homeStore.loadHomeInfo()
...@@ -297,7 +298,6 @@ onMounted(async (options) => { ...@@ -297,7 +298,6 @@ onMounted(async (options) => {
recordId.value = id // 立即保存ID，确保分享时能获取到 recordId.value = id // 立即保存ID，确保分享时能获取到
await fetchDetailData(id) await fetchDetailData(id)
md.sensorComponentLogTake({ md.sensorComponentLogTake({
xcxComponentExposure: "true", xcxComponentExposure: "true",
pageName: "星妈lab-藏品详情页", pageName: "星妈lab-藏品详情页",
...@@ -305,7 +305,7 @@ onMounted(async (options) => { ...@@ -305,7 +305,7 @@ onMounted(async (options) => {
componentContent: "藏品详情页+" + detailData.value.content componentContent: "藏品详情页+" + detailData.value.content
}); });
} else { } else {
console.warn('⚠️ 未获取到页面参数 id', options, currentPage.options) console.warn('⚠️ 未获取到页面参数 id', currentPage.options)
// uni.showToast({ // uni.showToast({
// title: '参数错误', // title: '参数错误',
// icon: 'none' // icon: 'none'
...@@ -323,6 +323,22 @@ onMounted(async (options) => { ...@@ -323,6 +323,22 @@ onMounted(async (options) => {
withShareTicket: true, withShareTicket: true,
menus: ['shareAppMessage'] menus: ['shareAppMessage']
}) })
}
// 生命周期
onMounted(async (options) => {
console.log('星妈lab详情页面已加载')
// 先进行自动登录获取基础信息，登录成功后执行页面初始化
try {
console.log('开始执行 normalAutoLogin...')
await userStore.normalAutoLogin(initPage)
console.log('normalAutoLogin 完成')
} catch (error) {
console.error('normalAutoLogin 失败:', error)
// 即使登录失败也执行页面初始化
await initPage()
}
}) })
// 定义分享函数 // 定义分享函数
......
pages/feedingIndex/feedingIndex.vue
View file @ 821b80a8
This diff is collapsed.
pages/person/person.vue
View file @ 821b80a8
This diff is collapsed.
pages/postnatalCheckUp/postnatalCheckUp.vue
View file @ 821b80a8
...@@ -114,11 +114,12 @@ ...@@ -114,11 +114,12 @@
</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" @afterPhone="isShowRegisterLayer = true"
:isNotLogin="isNotLogin" @close="isTip = false"></popup-tip>
<RegisterLayer v-model="isShowRegisterLayer" @confirm="onRegisterConfirm" />
<!-- 使用封装后的日期选择器组件 --> <!-- 使用封装后的日期选择器组件 -->
<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>
...@@ -133,7 +134,9 @@ import { ...@@ -133,7 +134,9 @@ import {
} from 'vue' } from 'vue'
import { import {
onLoad, onLoad,
onShow onShow,
onShareAppMessage,
onShareTimeline
} from '@dcloudio/uni-app' } from '@dcloudio/uni-app'
import { import {
jump, jump,
...@@ -150,6 +153,7 @@ import { ...@@ -150,6 +153,7 @@ import {
} from '../../api/obstetric.js'; } from '../../api/obstetric.js';
// 导入日期选择器组件 // 导入日期选择器组件
import DatePicker from '@/components/DatePicker.vue' import DatePicker from '@/components/DatePicker.vue'
import RegisterLayer from '@/components/RegisterLayer.vue'
const { const {
proxy proxy
} = getCurrentInstance(); } = getCurrentInstance();
...@@ -168,6 +172,8 @@ const isWxNotification = ref(true) ...@@ -168,6 +172,8 @@ const isWxNotification = ref(true)
// 提示弹窗 // 提示弹窗
const isTip = ref(false) const isTip = ref(false)
const isNotLogin = ref(false);
const isShowRegisterLayer = ref(false)
// 弹窗控制 // 弹窗控制
const showPicker = ref(false) const showPicker = ref(false)
...@@ -354,7 +360,7 @@ const close = (type) => { ...@@ -354,7 +360,7 @@ const close = (type) => {
}); });
} }
showPicker.value = false; showPicker.value = false;
} }
// 选择提醒事件 // 选择提醒事件
const handleChange = (e) => { const handleChange = (e) => {
...@@ -562,8 +568,19 @@ const onBabyChange = () => { ...@@ -562,8 +568,19 @@ const onBabyChange = () => {
publicFn() publicFn()
} }
// 公共函数 // 公共函数
const publicFn = () => { const publicFn =async () => {
console.log("🚀 ~ onShow ~ userStore:", userStore.babyInfo)
await userStore.loadUserInfo()
console.log("🚀 ~ onShow ~ userStore:", userStore.userInfo)
isNotLogin.value = false;
if (
userStore?.userInfo?.memberId &&
userStore?.userInfo?.memberId == "not_login" || !userStore.userInfo
) {
isNotLogin.value = true;
}
const babyInfo = userStore.babyInfo const babyInfo = userStore.babyInfo
if (babyInfo && babyInfo.babyStage == 1) { if (babyInfo && babyInfo.babyStage == 1) {
isTip.value = false isTip.value = false
...@@ -577,6 +594,11 @@ const publicFn = () => { ...@@ -577,6 +594,11 @@ const publicFn = () => {
isTip.value = true isTip.value = true
} }
} }
const onRegisterConfirm = async () => {
isShowRegisterLayer.value = false;
await userStore.loadBabyInfo()
publicFn()
}
onShow(async () => { onShow(async () => {
await userStore.loadBabyInfo() await userStore.loadBabyInfo()
console.log('宝宝信息加载完成:', userStore.babyInfo) console.log('宝宝信息加载完成:', userStore.babyInfo)
...@@ -589,6 +611,24 @@ onMounted(() => { ...@@ -589,6 +611,24 @@ onMounted(() => {
pageName: "产检提醒首页" pageName: "产检提醒首页"
}); });
}) })
onShareAppMessage(() => {
return {
title: "产检工具：孕检项目全掌握，产检日程不错过",
path: "/pages/postnatalCheckUp/postnatalCheckUp",
imageUrl: $baseUrl + "share/chanjian.png",
}
});
onShareTimeline(() => {
return {
title: "产检工具：孕检项目全掌握，产检日程不错过",
path: "/pages/postnatalCheckUp/postnatalCheckUp",
imageUrl: $baseUrl + "share/chanjian.png",
}
});
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
pages/shengzhangTestResult/shengzhangTestResult.vue
View file @ 821b80a8
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
</template> </template>
<script setup> <script setup>
import { ref, onMounted } from 'vue' import { ref, onMounted, getCurrentInstance } from 'vue'
import { onLoad, onShareAppMessage } from "@dcloudio/uni-app"; import { onLoad, onShareAppMessage } from "@dcloudio/uni-app";
import { useShengzhangStore } from '../../stores/shengzhangResult.js'; import { useShengzhangStore } from '../../stores/shengzhangResult.js';
import { formatDate, jump, JumpType } from '../../utils/index.js'; import { formatDate, jump, JumpType } from '../../utils/index.js';
...@@ -320,7 +320,8 @@ import md from '../../md'; ...@@ -320,7 +320,8 @@ import md from '../../md';
const isRecords = ref(false); const isRecords = ref(false);
const shareText = ref('') const shareText = ref('')
const { proxy } = getCurrentInstance();
const $baseUrl = proxy.$baseUrl;
onLoad((options) => { onLoad((options) => {
isRecords.value = options.isRecords; isRecords.value = options.isRecords;
// activeTab.value = isRecords.value ? 'history' : 'latest'; // activeTab.value = isRecords.value ? 'history' : 'latest';
...@@ -699,9 +700,9 @@ const backFailHandler = () => { ...@@ -699,9 +700,9 @@ const backFailHandler = () => {
onShareAppMessage(() => { onShareAppMessage(() => {
return { return {
title: shareText.value, title: shareText.value || "生长测评：精准评估宝宝发育水平",
path: `/pages/shengzhangTestResult/shengzhangTestResult`, path: `/pages/shengzhangTestResult/shengzhangTestResult`,
imageUrl: '' imageUrl: $baseUrl + "share/shengzhang.png",
} }
}) })
...@@ -713,10 +714,21 @@ onMounted(async () => { ...@@ -713,10 +714,21 @@ onMounted(async () => {
xcxPage: "测评结果页", xcxPage: "测评结果页",
pageName: "测评结果页" pageName: "测评结果页"
}); });
const userStore = useUserStore();
//获取历史记录 //获取历史记录
const historyListData = await getGrowthHistoryList(); const historyListData = await getGrowthHistoryList();
console.log(userStore.babyInfo?.content?.id+'--------------------',shengzhangStore?.getGrowthCurveDataInfoHeight?.userDataPoints)
if(!userStore.babyInfo?.content?.id ){
jump({
type: JumpType.INNER,
url: "/pages/shengzhangTools/shengzhangTools"
})
return;
}
if(!historyListData.success || (!historyListData.data || historyListData.data.length == 0)){ if(!historyListData.success || (!historyListData.data || historyListData.data.length == 0)){
showNoValBg.value = true; showNoValBg.value = true;
return; return;
...@@ -761,7 +773,7 @@ onMounted(async () => { ...@@ -761,7 +773,7 @@ onMounted(async () => {
} }
} }
const userStore = useUserStore();
const babyId = userStore.babyInfo?.content?.id; const babyId = userStore.babyInfo?.content?.id;
const babyDataHeight = { const babyDataHeight = {
......
pages/shengzhangTools/shengzhangTools.vue
View file @ 821b80a8
This diff is collapsed.
pages/xingmaLab/xingmaLab.vue
View file @ 821b80a8
This diff is collapsed.
stores/user.js
View file @ 821b80a8
...@@ -71,7 +71,7 @@ export const useUserStore = defineStore("userInfo", { ...@@ -71,7 +71,7 @@ export const useUserStore = defineStore("userInfo", {
* @param {Object} data : {encryptedData, iv, code} * @param {Object} data : {encryptedData, iv, code}
* @returns * @returns
*/ */
async phoneCallback(data, onOpenRegisterFn = () => { }) { async phoneCallback(data, onOpenRegisterFn = () => { }, cb) {
uni.login({ uni.login({
provider: "weixin", provider: "weixin",
success: async (res) => { success: async (res) => {
...@@ -86,7 +86,11 @@ export const useUserStore = defineStore("userInfo", { ...@@ -86,7 +86,11 @@ export const useUserStore = defineStore("userInfo", {
code: data.code, code: data.code,
codeLogin: res.code, codeLogin: res.code,
}); });
!babyExistence && onOpenRegisterFn && onOpenRegisterFn(); !babyExistence && onOpenRegisterFn && onOpenRegisterFn();
if (!babyExistence.value && cb) {
cb();
}
const homeStore = useHomeStore(); const homeStore = useHomeStore();
await homeStore.setBabyExistence(babyExistence); await homeStore.setBabyExistence(babyExistence);
...@@ -115,7 +119,7 @@ export const useUserStore = defineStore("userInfo", { ...@@ -115,7 +119,7 @@ export const useUserStore = defineStore("userInfo", {
// 缓存用户memberId // 缓存用户memberId
uni.setStorageSync('memberId', data?.memberId) uni.setStorageSync('memberId', data?.memberId)
} }
this.userInfo = data; this.userInfo = data;
}, },
setBabyNickCache(id, name) { setBabyNickCache(id, name) {
......
utils/index.js
View file @ 821b80a8
...@@ -36,7 +36,7 @@ export function jump({ type, url, extra = {} }) { ...@@ -36,7 +36,7 @@ export function jump({ type, url, extra = {} }) {
console.log("jumpParams:", jumpParams); console.log("jumpParams:", jumpParams);
if(extra.embedded){ if(extra.embedded || jumpParams.appId === 'wx4205ec55b793245e'){ // 星妈优选的小程序都为半屏拉起
uni.openEmbeddedMiniProgram(jumpParams); uni.openEmbeddedMiniProgram(jumpParams);
}else{ }else{
uni.navigateToMiniProgram(jumpParams); uni.navigateToMiniProgram(jumpParams);
......
views/Home.vue
View file @ 821b80a8
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<swiper-item v-for="(item, index) in toolList.tools" :key="index" <swiper-item v-for="(item, index) in toolList.tools" :key="index"
:class="['swiperItem', { 'active': currentIndex === index }]"> :class="['swiperItem', { 'active': currentIndex === index }]">
<view class="tool"> <view class="tool">
<button v-if="homeStore && !homeStore.isLogin && item.title!='星妈起名' && item.title!='体质测试'" <button v-if="homeStore && !homeStore.isLogin && item.title!='星妈起名' && item.title!='喂养工具' && item.title!='产检提醒' && item.title!='宝宝生长测评' && item.title!='体质测试'"
open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber" class="sq_btn"></button> open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber" class="sq_btn"></button>
<image class="tool_bg" :src="$baseUrl + item.icon" @tap="handleToolClick(item)"> <image class="tool_bg" :src="$baseUrl + item.icon" @tap="handleToolClick(item)">
</image> </image>
......
views/My.vue
View file @ 821b80a8
...@@ -100,8 +100,9 @@ ...@@ -100,8 +100,9 @@
<view class="tool-list"> <view class="tool-list">
<view class="tool-item" v-for="item in toolList" :key="item.title" @click="handleToolClick(item)"> <view class="tool-item" v-for="item in toolList" :key="item.title" @click="handleToolClick(item)">
<image class="tool-icon" :src="$baseUrl + item.bgUrl" mode="aspectFit" /> <image class="tool-icon" :src="$baseUrl + item.bgUrl" mode="aspectFit" />
<!-- || item.title == '产检提醒' || item.title == '喂养记录' || item.title == '生长测评' -->
<button <button
v-if="(item.title == '医生问诊' || item.title == '产检提醒' || item.title == '喂养记录' || item.title == '生长测评') && !cfgStatus.isRegister" v-if="(item.title == '医生问诊') && !cfgStatus.isRegister"
class="tool-btn-register" type="primary" open-type="getPhoneNumber" class="tool-btn-register" type="primary" open-type="getPhoneNumber"
@getphonenumber="getRealtimePhoneNumber" /> @getphonenumber="getRealtimePhoneNumber" />
</view> </view>
...@@ -268,7 +269,7 @@ const handleToolClick = async (item) => { ...@@ -268,7 +269,7 @@ const handleToolClick = async (item) => {
} }
// 三个工具校验是否授权 // 三个工具校验是否授权
else if (item.title === "生长测评" || item.title === "喂养记录" || item.title === "产检提醒") { else if (item.title === "生长测评" || item.title === "喂养记录" || item.title === "产检提醒") {
if (!cfgStatus.value.isRegister) return; // if (!cfgStatus.value.isRegister) return;
jump({ type: item.link.type, url: item.link.url }); jump({ type: item.link.type, url: item.link.url });
} }
else { else {
...@@ -404,6 +405,8 @@ const initData = async () => { ...@@ -404,6 +405,8 @@ const initData = async () => {
// 已出生或孕中显示 // 已出生或孕中显示
cfgStatus.value.showDetail = __showDetail; cfgStatus.value.showDetail = __showDetail;
if (__showDetail) { if (__showDetail) {
wheelOptions.value = wheelOptions.value =
babyInfo.value.babyStage == 2 babyInfo.value.babyStage == 2
......
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