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

pages/addPostnatal/addPostnatal.vue

@@ -3,23 +3,23 @@
 		<!-- 产检时间 -->
 		<view class="add-postnatal-time style1">
 			<view class="time-l">
-				<image src="/static/chanjianTool/icon7.png" />
+				<image :src="`${$baseUrl}chanjianTool/1001/icon7.png`" />
 				产检时间
 			</view>
 			<view class="time-r" @click="onChangeTime">
 				{{ time }}
-				<image src="/static/chanjianTool/icon13.png" />
+				<image :src="`${$baseUrl}chanjianTool/1001/icon13.png`" />
 			</view>
 		</view>
 		<!-- 产检项目 -->
 		<view class="add-postnatal-project">
 			<view class="project-info style1">
 				<view class="time-l">
-					<image src="/static/chanjianTool/icon8.png" />
+					<image :src="`${$baseUrl}chanjianTool/1001/icon8.png`" />
 					产检项目
 				</view>
 				<view class="project-r" @click="onAdd">
-					<image src="/static/chanjianTool/icon10.png" />
+					<image :src="`${$baseUrl}chanjianTool/1001/icon10.png`" />
 					添加
 				</view>
 			</view>
@@ -30,7 +30,7 @@
 					<view class="item-name">
 						{{ itemName }}
 					</view>
-					<image @click="onDelete(id)" class="item-img" src="/static/chanjianTool/delete.png"></image>
+					<image @click="onDelete(id)" class="item-img" :src="`${$baseUrl}chanjianTool/1001/delete.png`"></image>
 				</view>
 			</view>
 		</view>
@@ -39,24 +39,24 @@
 		<view class="add-postnatal-bgd">
 			<view class="style1">
 				<view class="time-l">
-					<image src="/static/chanjianTool/icon9.png" />
+					<image :src="`${$baseUrl}chanjianTool/1001/icon9.png`" />
 					本次报告单
 				</view>
 				<view class="time-r" @click="onSeeBtn">
 					查看全部
-					<image src="/static/chanjianTool/icon13.png" />
+					<image :src="`${$baseUrl}chanjianTool/1001/icon13.png`" />
 				</view>
 			</view>
 			<view class="img-list">
 				<view class="upload-image" @click="onUpload">
-					<image src="/static/chanjianTool/icon11.png"></image>
+					<image :src="`${$baseUrl}chanjianTool/1001/icon11.png`"></image>
 				</view>
 				<view class="img-list-item" v-for="(item, index) in bgdImgList" :key="index">
 
 					<view class="item-image" @click="onPreviewImage(item)">
 						<image class="img1" :src="item" mode="widthFix"></image>
 					</view>
-					<image @click="onImageDel(item)" class="img" src="/static/chanjianTool/icon14.png"></image>
+					<image @click="onImageDel(item)" class="img" :src="`${$baseUrl}chanjianTool/1001/icon14.png`"></image>
 				</view>
 			</view>
 		</view>
@@ -73,7 +73,7 @@
 			border-radius="32rpx 32rpx 0 0">
 			<view class="popup container">
 				<view class="popup-close" @click="onPopupClose">
-					<image src="/static/chanjianTool/icon15.png"></image>
+					<image :src="`${$baseUrl}chanjianTool/1001/icon15.png`"></image>
 				</view>
 				<!-- 项目列表 -->
 				<scroll-view scroll-y @touchmove.stop.prevent="" class="airport-list">
@@ -84,15 +84,15 @@
 								<view class="airport-item-radio" @click="toggleSelect(item)">
 									
 									<image class="image-1" v-if="isSelected(item.id)"
-										src="/static/chanjianTool/icon17.png" mode=""></image>
-									<image class="image-2" v-else src="/static/chanjianTool/icon18.png"></image>
+										:src="`${$baseUrl}chanjianTool/1001/icon17.png`" mode=""></image> 
+									<image class="image-2" v-else :src="`${$baseUrl}chanjianTool/1001/icon18.png`"></image>
 									<view class="image-3">
 										{{ item.itemName }}
 									</view>
 									
 								</view>
 								<view class="airport-item-image" @click.stop="onView(item)">
-									<image src="/static/chanjianTool/icon16.png"></image>
+									<image :src="`${$baseUrl}chanjianTool/1001/icon16.png`"></image>
 								</view>
 
 							</view>
@@ -113,7 +113,7 @@
 					<view class="t-1">
 						{{ popupTextObj.itemName }}
 					</view>
-					<image @click="onPopupClose2" src="/static/chanjianTool/icon15.png" mode=""></image>
+					<image @click="onPopupClose2" :src="`${$baseUrl}chanjianTool/1001/icon15.png`" mode=""></image>
 				</view>
 				<view class="text-c">
 					{{ popupTextObj.introduction }}

pages/editPostnatal/editPostnatal.vue

@@ -4,11 +4,11 @@
 		<view class="add-postnatal-project">
 			<view class="project-info style1">
 				<view class="time-l">
-					<image src="/static/chanjianTool/icon8.png" />
+					<image :src="`${$baseUrl}chanjianTool/1001/icon8.png`" />
 					产检项目
 				</view>
 				<view class="project-r" @click="onAdd">
-					<image src="/static/chanjianTool/icon10.png" />
+					<image :src="`${$baseUrl}chanjianTool/1001/icon10.png`" />
 					添加
 				</view>
 			</view>
@@ -19,7 +19,7 @@
 					<view class="item-name">
 						{{ itemName }}
 					</view>
-					<image @click="onDelete(id)" class="item-img" src="/static/chanjianTool/delete.png"></image>
+					<image @click="onDelete(id)" class="item-img" :src="`${$baseUrl}chanjianTool/1001/delete.png`"></image>
 				</view>
 			</view>
 		</view>
@@ -34,7 +34,7 @@
 			border-radius="32rpx 32rpx 0 0">
 			<view class="popup container">
 				<view class="popup-close" @click="onPopupClose">
-					<image src="/static/chanjianTool/icon15.png"></image>
+					<image :src="`${$baseUrl}chanjianTool/1001/icon15.png`"></image>
 				</view>
 				<!-- 项目列表 -->
 				<scroll-view scroll-y @touchmove.stop.prevent="" class="airport-list">
@@ -44,15 +44,15 @@
 							<view v-for="item in group.list" :key="item.id" class="airport-item">
 								<view class="airport-item-radio" @click="toggleSelect(item)">
 									<image class="image-1" v-if="isSelected(item.id)"
-										src="/static/chanjianTool/icon17.png" mode=""></image>
-									<image class="image-2" v-else src="/static/chanjianTool/icon18.png"></image>
+										:src="`${$baseUrl}chanjianTool/1001/icon17.png`" mode=""></image>
+									<image class="image-2" v-else :src="`${$baseUrl}chanjianTool/1001/icon18.png`"></image>
 									<view class="image-3">
 										{{ item.itemName }}
 									</view>
 									
 								</view>
 								<view class="airport-item-image" @click.stop="onView(item)">
-									<image src="/static/chanjianTool/icon16.png"></image>
+									<image :src="`${$baseUrl}chanjianTool/1001/icon16.png`"></image>
 								</view>
 
 							</view>
@@ -73,7 +73,7 @@
 					<view class="t-1">
 						{{ popupTextObj.itemName }}
 					</view>
-					<image @click="onPopupClose2" src="/static/chanjianTool/icon15.png" mode=""></image>
+					<image @click="onPopupClose2" :src="`${$baseUrl}chanjianTool/1001/icon15.png`" mode=""></image>
 				</view>
 				<view class="text-c">
 					{{ popupTextObj.introduction }}

pages/myReportCard/myReportCard.vue

@@ -7,7 +7,7 @@
 		 <customize-navigation>
 			  <template v-slot:navbar-content>
 				 <view class="page-top">
-					<image @tap="backHandler" class="btnback" src="/static/chanjianTool/back.png"></image>
+					<image @tap="backHandler" class="btnback" :src="`${$baseUrl}chanjianTool/1001/back.png`"></image>
 				    <view class="page_title">我的报告单</view>
 				 </view>
 			  </template>
@@ -18,12 +18,12 @@
 					<view class="list-item" v-for="(item, index) in listData" :key="index">
 						<view class="item-time">
 							<view class="item-time-l">
-								<image src="/static/chanjianTool/icon19.png"></image>
+								<image :src="`${$baseUrl}chanjianTool/1001/icon19.png`"></image>
 								{{item.checkupDate}}
 							</view>
 
 							<view class="item-time-r" @click="onDelete(item.id)">
-								<image src="/static/chanjianTool/delete.png"></image>
+								<image :src="`${$baseUrl}chanjianTool/1001/delete.png`"></image>
 							</view>
 						</view>
 						<view class="item-line">
@@ -52,7 +52,7 @@
 				</template>
 				<template v-else>
 					<view class="no-data">
-						<image src="/static/chanjianTool/icon28.png"></image>
+						<image :src="`${$baseUrl}chanjianTool/1001/icon28.png`"></image>
 					</view>
 				</template>
 			</view>
@@ -71,7 +71,7 @@
 				</view>
 			</view>
 			<view class="close-btn-bottom" @tap="onClose">
-				<image src="/static/chanjianTool/icon21.png"></image>
+				<image :src="`${$baseUrl}chanjianTool/1001/icon21.png`"></image>
 			</view>
 		</view>
 	</view>

pages/postnatalCheckUp/postnatalCheckUp.vue

@@ -9,7 +9,7 @@
 			<customize-navigation>
 				<template v-slot:navbar-content>
 					<view class="page-top">
-						<image @tap="backHandler" class="btnback" src="/static/chanjianTool/back.png"></image>
+						<image @tap="backHandler" class="btnback" :src="`${$baseUrl}chanjianTool/1001/back.png`"></image>
 						<view class="page_title">产检提醒</view>
 					</view>
 				</template>
@@ -28,7 +28,7 @@
 						孕{{ homeInfo.gestationalWeeks }}周
 					</view>
 					<view class="info-c">
-						<image class="info-img" src="/static/chanjianTool/line.png"></image>
+						<image class="info-img" :src="`${$baseUrl}chanjianTool/1001/line.png`"></image>
 					</view>
 					<view class="info-r">
 						预产期：{{ homeInfo.dueDate }}
@@ -42,7 +42,7 @@
 						<view class="btn-item-text">
 							{{ name }}
 						</view>
-						<image class="image2" src="/static/chanjianTool/right.png"></image>
+						<image class="image2" :src="`${$baseUrl}chanjianTool/1001/right.png`"></image>
 					</view>
 				</view>
 				<!-- 产检记录 -->
@@ -50,7 +50,7 @@
 					<view class="record-item"
 						v-for="({ id, checkupDate, index, pregnancyWeek, status, examinationItems, type }, i) in homeInfo.checkupList"
 						@click="onDetails(id)" :key="i">
-						<image class="add-image" v-if="type === '1'" src="/static/chanjianTool/bs.png"></image>
+						<image class="add-image" v-if="type === '1'" :src="`${$baseUrl}chanjianTool/1001/bs.png`"></image>
 						<view class="item-t">
 							<view class="item-t-l">
 								第{{ index }}次产检
@@ -60,7 +60,7 @@
 									产检时间：{{ checkupDate ? checkupDate : '---' }}
 								</view>
 								<image @click.stop="onEdit(id, checkupDate)" class="edit-img"
-									src="/static/chanjianTool/edit.png">
+									:src="`${$baseUrl}chanjianTool/1001/edit.png`">
 								</image>
 							</view>
 						</view>
@@ -83,7 +83,7 @@
 			</view>
 			<!-- 新增产检 -->
 			<view class="postnatal-add" @click="onAdd">
-				<image src="/static/chanjianTool/add.png"></image>
+				<image  :src="`${$baseUrl}chanjianTool/1001/add.png`"></image>
 			</view>
 			<!-- 使用封装后的日期选择器组件 -->
 			<DatePicker v-model:visible="visible" :default-date="time" @confirm="handleDateConfirm" />
@@ -138,12 +138,12 @@ const homeInfo = ref({})
 // 按钮列表
 const btnList = ref([{
 	name: '报告单',
-	imageSrc: '/static/chanjianTool/icon2.png',
+	imageSrc: `${$baseUrl}chanjianTool/1001/icon2.png`,
 	type: 1
 },
 {
 	name: '日历',
-	imageSrc: '/static/chanjianTool/icon3.png',
+	imageSrc: `${$baseUrl}chanjianTool/1001/icon3.png`,
 	type: 2
 }
 ])
@@ -161,9 +161,9 @@ const getProject = (projects) => {
 // 根据状态返回图片
 const getSrcUrl = (status) => {
 	const imageMap = {
-		'pending': '/static/chanjianTool/icon4.png',
-		'expired': '/static/chanjianTool/icon5.png',
-		'completed': '/static/chanjianTool/icon6.png',
+		'pending': `${$baseUrl}chanjianTool/1001/icon4.png`,
+		'expired': `${$baseUrl}chanjianTool/1001/icon5.png`,
+		'completed': `${$baseUrl}chanjianTool/1001/icon6.png`
 	};
 	return imageMap[status];
 

pages/productionCalendar/productionCalendar.vue

@@ -21,7 +21,7 @@
 		 <customize-navigation>
 			<template v-slot:navbar-content>
 				<view class="page-top">
-					<image @tap="backHandler" class="btnback" src="/static/chanjianTool/back.png"></image>
+					<image @tap="backHandler" class="btnback" :src="`${$baseUrl}chanjianTool/1001/back.png`"></image>
 					<view class="page_title">
 						<view class="info-l">
 							<image :src="$baseUrl + 'common/default_avatar.png'"></image>
@@ -48,7 +48,7 @@
 							:start="earliestDateString" :end="todayDateString" @change="onDateChange" :clear-icon="false" :border="false">
 							<view class="date-display">
 								<text class="date-text">{{ formatCurrentDate() }}</text>
-								<image src="/static/chanjianTool/icon27.png" class="arrow-icon" />
+								<image :src="`${$baseUrl}chanjianTool/1001/icon27.png`" class="arrow-icon" />
 							</view>
 						</uni-datetime-picker>
 					</view>
@@ -108,7 +108,7 @@
 		</view>
 		<!-- 新增产检 -->
 		<button class="form-btn" @click="onAdd">
-			<image src="/static/chanjianTool/icon23.png"></image>
+			<image :src="`${$baseUrl}chanjianTool/1001/icon23.png`"></image>
 			新增产检
 		</button>
 	</view>

pages/productionDetails/productionDetails.vue

@@ -23,12 +23,12 @@
 					</view>
 					<view class="container-2-r">
 						<view class="r-complete" @click="onComplete">
-							<image v-if="!isCompleted" src="/static/chanjianTool/icon24.png"></image>
-							<image v-else src="/static/chanjianTool/icon25.png"></image>
+							<image v-if="!isCompleted" :src="`${$baseUrl}chanjianTool/1001/icon24.png`"></image>
+							<image v-else :src="`${$baseUrl}chanjianTool/1001/icon25.png`"></image>
 							完成检查
 						</view>
 						<view class="r-remind" @click="onRemind">
-							<image src="/static/chanjianTool/icon26.png"></image>
+							<image :src="`${$baseUrl}chanjianTool/1001/icon26.png`"></image>
 						</view>
 					</view>
 
@@ -41,7 +41,7 @@
 					</view>
 					<view class="container-3-r" @click="onChangeTime(infoData.checkupDate)">
 						{{ infoData.checkupDate ? infoData.checkupDate : '选择时间' }}
-						<image src="/static/chanjianTool/edit.png"></image>
+						<image :src="`${$baseUrl}chanjianTool/1001/edit.png`"></image>
 					</view>
 				</view>
 				<view class="container-4 pad">
@@ -51,7 +51,7 @@
 				<view class="project-box" id="section-0">
 					<view class="project-info">
 						<view class="time-l">
-							<image src="/static/chanjianTool/icon19.png" />
+							<image :src="`${$baseUrl}chanjianTool/1001/icon19.png`" />
 							产检须知
 						</view>
 
@@ -65,7 +65,7 @@
 				<view class="project-box" id="section-1">
 					<view class="project-info">
 						<view class="time-l">
-							<image src="/static/chanjianTool/icon19.png" />
+							<image :src="`${$baseUrl}chanjianTool/1001/icon19.png`" />
 							产检项目
 						</view>
 						<view class="style1" @click="onModify(infoData)">
@@ -87,24 +87,24 @@
 				<view class="project-box" id="section-2">
 					<view class="project-info">
 						<view class="time-l">
-							<image src="/static/chanjianTool/icon19.png" />
+							<image :src="`${$baseUrl}chanjianTool/1001/icon19.png`" />
 							本次报告单
 						</view>
 						<view class="time-r style2" @click="onSeeBtn">
 							查看全部
-							<image src="/static/chanjianTool/icon13.png" />
+							<image :src="`${$baseUrl}chanjianTool/1001/icon13.png`" /> 
 						</view>
 					</view>
 					<view class="img-list">
 						<view class="upload-image" @click="onUpload">
-							<image src="/static/chanjianTool/icon11.png"></image>
+							<image :src="`${$baseUrl}chanjianTool/1001/icon11.png`"></image>
 						</view>
 						<view class="img-list-item" v-for="(item, index) in bgdImgList" :key="index">
 
 							<view class="item-image" @click="onPreviewImage(item)">
 								<image class="img1" :src="item" mode="widthFix"></image>
 							</view>
-							<image @click="onImageDel(item)" class="img" src="/static/chanjianTool/icon14.png"></image>
+							<image @click="onImageDel(item)" class="img" :src="`${$baseUrl}chanjianTool/1001/icon14.png`"></image>
 						</view>
 					</view>
 				</view>

views/My.vue

@@ -470,9 +470,20 @@ onMounted(async () => {
     },
     "title": "喂养记录"
   }
+  const c = {
+    "bgUrl": "my/suyuan.png",
+    "desc": "产检提醒",
+    "link": {
+      "extra": {babyId: babyId.value},
+      "type": 1,
+      "url": "/pages/postnatalCheckUp/postnatalCheckUp"
+    },
+    "title": "产检提醒"
+  }
 
   toolList.value.push(a);
   toolList.value.push(b);
+  toolList.value.push(c);
 });
 
 watch([() => userStore.userInfo, () => userStore.babyInfo], () => {