优化

h5/pages/main/index/index.vue

@@ -99,6 +99,34 @@
 					} catch (e) {
 						uni.navigateTo({ url: info.jump })
 					}
+				} else if (info.jump.indexOf('/pages/main/combo/combo') !== -1) {
+					try {
+						const response = await $api('CheckChildCare', { person_id: $store.user.person_id }, { loading: true, loading_text: ' ' })
+						$response(response, () => {
+							const { check, path } = response.data
+							if (!path) {
+								uni.navigateTo({ url: info.jump })
+							} else {
+								if (check == 1) {
+									uni.showModal({
+										title: '提示',
+										content: '即将跳转到儿保科，是否确认？',
+										success: (res) => {
+											if (res.confirm) {
+												wx.miniProgram.navigateTo({ url: path.startsWith('/') ? path : '/' + path })
+											}
+										}
+									})
+								} else {
+									wx.miniProgram.navigateTo({ url: path.startsWith('/') ? path : '/' + path })
+								}
+							}
+						}, {}, () => {
+							uni.navigateTo({ url: info.jump })
+						})
+					} catch (e) {
+						uni.navigateTo({ url: info.jump })
+					}
 				} else if (switch_arr.includes(info.jump)) {
 					uni.switchTab({
 						url: info.jump
@@ -207,8 +235,31 @@
 					 	url: "/pages/main/order/order"+canshu
 					 })
 				 }else if(!!$props.path && $props.path=='combo'){
-					 uni.navigateTo({
+					 $api('CheckChildCare', { person_id: $store.user.person_id }, { loading: true, loading_text: ' ' }).then(response => {
-					 	url: "/pages/main/combo/combo"
+					   $response(response, () => {
+					     const { check, path } = response.data
+					     if (!path) {
+					       uni.navigateTo({ url: "/pages/main/combo/combo" })
+					     } else {
+					       if (check == 1) {
+					         uni.showModal({
+					           title: '提示',
+					           content: '即将跳转到儿保科，是否确认？',
+					           success: (res) => {
+					             if (res.confirm) {
+					               wx.miniProgram.navigateTo({ url: path.startsWith('/') ? path : '/' + path })
+					             }
+					           }
+					         })
+					       } else {
+					         wx.miniProgram.navigateTo({ url: path.startsWith('/') ? path : '/' + path })
+					       }
+					     }
+					   }, {}, () => {
+					     uni.navigateTo({ url: "/pages/main/combo/combo" })
+					   })
+					 }).catch(e => {
+					   uni.navigateTo({ url: "/pages/main/combo/combo" })
 					 })
 				 }
 			});

h5/pages/main/order/src/order.vue

@@ -218,7 +218,7 @@
 	//去预约
 	const toPlan=async (id)=>{
 		try {
-			const person_id = order_info.person_id || $store.user.person_id
+			const person_id = order_info.value.person_id || $store.user.person_id
 			const response = await $api('CheckChildCare', { person_id }, { loading: true, loading_text: ' ' })
 			$response(response, () => {
 				const { check, path } = response.data

h5/pages/user/fenzhen/fenzhen.vue

@@ -374,30 +374,30 @@
 
 								<view class="more_wrapper mt-20rpx" v-if="i.more === fenzhen_active && !!fenzhen_info">
 									<template v-for="(item, index) in fenzhen_info.list" :key="index">
-										<view class="between h-90rpx b-0 b-b-1 b-solid b-#EAEAEA"
+										<view class="between min-h-90rpx py-10rpx b-0 b-b-1 b-solid b-#EAEAEA"
 											v-if="item.status == 1 || item.status == 2">
-											<view class="text-#000000 text-30rpx">{{ item.name }}</view>
+											<view class="flex-1 text-#000000 text-30rpx break-all">{{ item.name }}</view>
-											<view class="center">
+											<view class="center shrink-0">
 												<text @click="qijian(item)"
 													class="rounded-full text-28rpx center w-105rpx h-48rpx text-#E95515 bg-#FAECE6">弃检</text>
 											</view>
 										</view>
-										<view class="between h-90rpx b-0 b-b-1 b-solid b-#EAEAEA" v-if="item.status == 4">
+										<view class="between min-h-90rpx py-10rpx b-0 b-b-1 b-solid b-#EAEAEA" v-if="item.status == 4">
-											<view class="text-#000000 text-30rpx">
+											<view class="flex-1 text-#000000 text-30rpx break-all">
 												<view>{{ item.name }}</view>
 												<view class="text-#141414 text-28rpx">{{ item.time }}</view>
 											</view>
-											<view class="center">
+											<view class="center shrink-0">
 												<text
 													class="rounded-full text-28rpx center w-105rpx h-48rpx mr-30rpx text-#239EA3 bg-#E5F3F2">完成</text>
 											</view>
 										</view>
-										<view class="between b-0 b-b-1 b-solid b-#EAEAEA" v-if="item.status == 5">
+										<view class="between min-h-90rpx py-10rpx b-0 b-b-1 b-solid b-#EAEAEA" v-if="item.status == 5">
-											<view class="text-#000000 text-30rpx">
+											<view class="flex-1 text-#000000 text-30rpx break-all">
 												<view>{{ item.name }}</view>
 												<view class="text-#141414 text-28rpx">{{ item.time }}</view>
 											</view>
-											<view class="center">
+											<view class="center shrink-0">
 												<text class="rounded-full text-28rpx center w-105rpx h-48rpx text-#6d89a3 bg-#E5F3F2">已弃检</text>
 											</view>
 										</view>