Commit 9b7caabe authored by weishengfei's avatar weishengfei

feat(popup-tip): 弹窗提示组件功能增强

- 增加了状态上限提示和相应逻辑处理
- 优化了宝宝状态和孕中状态的切换逻辑
- 添加了修改备孕状态的功能
- 重构了弹窗内容和按钮显示逻辑
- 优化了跳转和事件回调机制
parent 30d0fcbd
This diff is collapsed.
...@@ -586,11 +586,11 @@ const onSubmit = async (e) => { ...@@ -586,11 +586,11 @@ const onSubmit = async (e) => {
title: "提交成功", title: "提交成功",
icon: "success", icon: "success",
}); });
// uni.navigateBack(); uni.navigateBack();
jump({ // jump({
type: JumpType.INNER, // type: JumpType.INNER,
url: "/pages/index/index" // url: "/pages/index/index"
}) // })
showLoading(); showLoading();
await userStore.loadUserInfo(); await userStore.loadUserInfo();
await userStore.loadBabyInfo(); await userStore.loadBabyInfo();
...@@ -774,10 +774,12 @@ onMounted(() => { ...@@ -774,10 +774,12 @@ onMounted(() => {
}); });
onLoad((options) => { onLoad((options) => {
console.log("🚀 ~ options-新增和修改:", options)
pageType.value = options.type || "add"; pageType.value = options.type || "add";
babyId.value = options.id || ""; babyId.value = options.id || "";
if (pageType.value === "edit") { if (pageType.value === "edit") {
const baby = userStore.babyInfo; const baby = userStore.babyInfo;
console.log("🚀 ~ baby:", baby)
formData.value.babyStage = baby.babyStage ?? 2; formData.value.babyStage = baby.babyStage ?? 2;
formData.value.babyName = baby.babyName || ""; formData.value.babyName = baby.babyName || "";
formData.value.babyBirthday = baby.content?.babyBirthday || ""; formData.value.babyBirthday = baby.content?.babyBirthday || "";
......
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
</view> </view>
<!-- 提示弹窗 --> <!-- 提示弹窗 -->
<popup-tip v-if="isTip" type="2"></popup-tip> <popup-tip v-if="isTip" type="2" @statusChange="onBabyChange"></popup-tip>
<!-- 使用封装后的日期选择器组件 --> <!-- 使用封装后的日期选择器组件 -->
<DatePicker v-model:visible="visible" :default-date="time" @confirm="handleDateConfirm" /> <DatePicker v-model:visible="visible" :default-date="time" @confirm="handleDateConfirm" />
...@@ -155,7 +155,7 @@ const $baseUrl = proxy.$baseUrl; ...@@ -155,7 +155,7 @@ const $baseUrl = proxy.$baseUrl;
// 用户信息 // 用户信息
const userStore = useUserStore(); const userStore = useUserStore();
const babyId = ref(userStore.babyInfo?.content?.id) const babyId = ref('')
const back_btn = ref('') const back_btn = ref('')
...@@ -478,19 +478,27 @@ const getSettingFn = () => { ...@@ -478,19 +478,27 @@ const getSettingFn = () => {
} }
}) })
} }
onShow(() => { // 提示弹窗回调
getSettingFn() const onBabyChange= ()=>{
// 获取banner图 publicFn()
postnatalJSONFn() }
console.log("🚀 ~ onShow ~ userStore:", userStore.babyInfo) // 公共函数
const publicFn = () => {
console.log("🚀 ~ onShow ~ userStore:", userStore.babyInfo)
const babyInfo = userStore.babyInfo const babyInfo = userStore.babyInfo
if(babyInfo && babyInfo.babyStage == 1){ if(babyInfo && babyInfo.babyStage == 1){
babyId.value = userStore.babyInfo?.content?.id
getSettingFn()
// 获取banner图
postnatalJSONFn()
// 获取信息
getInfoFn() getInfoFn()
} else{ } else{
isTip.value = true isTip.value = true
} }
// 获取信息 }
onShow(() => {
publicFn()
}) })
</script> </script>
......
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