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

pages/postnatalCheckUp/postnatalCheckUp.vue

@@ -36,6 +36,7 @@
 					</view>
 				</view>
 				<!-- 按钮 -->
+				<!-- <button open-type="openSetting">提醒</button> -->
 				<view class="postnatal-con-btn">
 					<view class="btn-item" v-for="({ name, imageSrc, type }, index) in btnList" :key="index"
 						@click="onBtn(type)">
@@ -155,6 +156,9 @@ const babyId = ref(userStore.babyInfo?.content?.id)
 
 const back_btn = ref('')
 
+// 是否授权
+const isWxNotification = ref(true)
+
 // 弹窗控制
 const showPicker = ref(false)
 // 提醒时间选项
@@ -283,7 +287,8 @@ const onBtn = (type) => {
 	// type 0 提醒 1  报告单 2 日历
 	switch (type) {
 		case 0:
-			showPicker.value = true
+			// 如果授权就不弹出提醒
+	        showPicker.value = isWxNotification.value ? true : false
 			break;
 		case 1:
 			uni.navigateTo({
@@ -309,6 +314,7 @@ const handleChange = (e) => {
 }
 // 确认选择
 const handleConfirm = () => {
+	
 	selectedValue.value = options[pickerValue.value].id;
 	console.log(selectedValue.value, homeInfo.value.wxTemplateId, babyId.value)
 	close();
@@ -362,6 +368,8 @@ const getWxNotificationFn = async (notificationDate, wxTemplateId, babyId) => {
 			icon: 'none'
 		})
 	}
+	// 获取用户授权信息
+	getSettingFn()
 }
 // 修改产检时间
 const onEditTime = async () => {
@@ -409,8 +417,25 @@ const postnatalJSONFn = async () => {
 		});
 	}
 }
-
+//  获取用户授权信息
+const getSettingFn = () => {
+	wx.getSetting({
+		withSubscriptions: true,
+		success(res) {
+			// console.log(res.authSetting, '授权信息')
+			console.log(res.subscriptionsSetting, '订阅信息')
+			if(res.subscriptionsSetting.itemSettings){
+              isWxNotification.value = false
+              console.log("🚀 ~ success ~ isWxNotification111:", isWxNotification.value)
+			} else {
+			  isWxNotification.value = true
+			  console.log("🚀 ~ success ~ isWxNotification222:", isWxNotification.value)
+			}
+		}
+	})
+}
 onShow(() => {
+	getSettingFn()
 	// 获取banner图
 	postnatalJSONFn()
 	// 获取信息
@@ -615,7 +640,7 @@ onShow(() => {
 	/* 弹窗容器样式 */
 	.picker-layer-panel {
 		width: 100vw;
-		height: 46vh;
+		height: 745rpx;
 		background: #f6f8fa;
 		border-top-left-radius: 24rpx;
 		border-top-right-radius: 24rpx;

pages/productionDetails/productionDetails.vue

@@ -174,6 +174,9 @@ import { useUserStore } from "@/stores/user";
 const userStore = useUserStore();
 const babyId = ref(userStore.babyInfo?.content?.id)
 
+// 是否授权
+const isWxNotification = ref(true)
+
 // 提醒选择器相关状态
 const showPicker = ref(false)
 const options = [
@@ -414,7 +417,8 @@ const onRemind = () => {
 	if (checkupDate < currentDate) {
 		return;
 	}
-	showPicker.value = true;
+	// 如果授权就不弹出提醒
+	showPicker.value = isWxNotification.value ? true : false
 }
 
 // 提醒关闭
@@ -466,6 +470,8 @@ const getWxNotificationFn = async (notificationDate, wxTemplateId, babyId) => {
 			icon: 'none'
 		})
 	}
+	// 获取用户授权信息
+	getSettingFn()
 }
 // 完成检查
 const onComplete = () => {
@@ -557,12 +563,34 @@ const getDetailFn = async (id) => {
 		});
 	}
 }
+//  获取用户授权信息
+const getSettingFn = () => {
+	wx.getSetting({
+		withSubscriptions: true,
+		success(res) {
+			// console.log(res.authSetting, '授权信息')
+			console.log(res.subscriptionsSetting, '订阅信息')
+			if(res.subscriptionsSetting.itemSettings){
+              isWxNotification.value = false
+              console.log("🚀 ~ success ~ isWxNotification111:", isWxNotification.value)
+			} else {
+			  isWxNotification.value = true
+			  console.log("🚀 ~ success ~ isWxNotification222:", isWxNotification.value)
+			}
+		}
+	})
+}
 // 获取传过来的参数
 onLoad((options) => {
 	console.log(options)
+	// 获取传过来的参数：id
 	editId.value = options.id
+	// 获取用户授权信息
+	getSettingFn()
+	// 获取详情
 	getDetailFn(options.id)
 })
+
 </script>
 
 <style lang="less" scoped>
@@ -902,7 +930,7 @@ onLoad((options) => {
 	/* 弹窗容器样式 */
 	.picker-layer-panel {
 		width: 100vw;
-		height: 52vh;
+		height: 745rpx;
 		background: #f6f8fa;
 		border-top-left-radius: 24rpx;
 		border-top-right-radius: 24rpx;