fixed

subPackages/momclub/actList.vue

@@ -28,9 +28,12 @@
 								</view>
 							</view>
 							<view v-else class="left-two">
-								{{ formatActivityTime(item.activityStartTime, item.activityEndTime).split(',')[1]
-								}}<br />
-								{{ formatActivityTime(item.activityStartTime, item.activityEndTime).split(',')[2] }}
+								<view>
+									{{ formatActivityTime(item.activityStartTime, item.activityEndTime).split(',')[1]}}
+								</view>
+								<view>
+									{{ formatActivityTime(item.activityStartTime, item.activityEndTime).split(',')[2] }}
+								</view>
 							</view>
 						</view>
 						<view class="content-main">
@@ -113,10 +116,10 @@ const formatActivityTime = (startTime, endTime) => {
 	const [eMonth, eDate, eHours, eMinutes] = getParts(end);
 	if (sMonth === eMonth && sDate === eDate) {
 		//不跨日
-		return `${sMonth}/${sDate},${sHours}:${sMinutes}-${eHours}:${eMinutes}`;
-	} else if (sMonth === eMonth) {
-		//跨日
-		return `${sMonth}月,${sDate}日-${eDate}日`;
+		return `${sMonth}月${sDate}日,${sHours}:${sMinutes}-${eHours}:${eMinutes}`;
+	// } else if (sMonth === eMonth) {
+	// 	//跨日
+	// 	return `${sMonth}月,${sDate}日-${eDate}日`;
 	} else {
 		//跨月
 		return `,${sMonth}月${sDate}日-,${eMonth}月${eDate}日`;
@@ -349,7 +352,10 @@ onShow(async()=> {
 						.left-two {
 							font-size: 24rpx;
 							font-weight: 500;
-							line-height: 36rpx;
+							height: 72rpx;
+							display: flex;
+							flex-direction: column;
+							justify-content: space-between;
 						}
 					}
 

subPackages/momclub/component/FormTree.vue

@@ -165,11 +165,10 @@
 					</view>
 				</view>
 			</view>
-			<view class="white-bg"></view> 
 			<view v-if="item.subFormList && item.subFormList.length > 0" v-for="(subItm, subIndex) in item.subFormList"
 				:key="subIndex">
-				<view v-if="(!isView && subItm.isShow) || (isView && subItm.hasFilledOut) ">
-					<view v-if="(!isView && subItm.isShow) || (isView && subItm.hasFilledOut)" class='line-dash'></view>
+				<view v-if="(!isView && subItm.isShow) || (isView && subItm.hasFilledOut)">
+					<view v-if="(!isView && subItm.isShow && !subItm.isFirstFound) || (isView && subItm.hasFilledOut)" class='line-dash'></view>
 					<form-tree v-bind="{ item: subItm, index, visible, areaVisible, formData, isView }"
 						@addSubForm="() => emit('addSubForm', subIndex)"
 						@delSubForm="() => emit('delSubForm', subIndex)"
@@ -191,7 +190,7 @@
 </template>
 
 <script setup>
-import { ref, watch, onMounted, computed, toRefs } from 'vue'
+import { toRefs } from 'vue'
 import FormTree from './formTree.vue'
 const props = defineProps({
 	item: {
@@ -251,8 +250,11 @@ const hasFilledOutList = (list)=>{
 		.form-del {
 			color: #C3C3C3;
 			background-color: #F7F7F7;
-			padding: 8rpx 40rpx;
 			border-radius: 30rpx;
+			width: 140rpx;
+			height: 52rpx;
+			line-height: 52rpx;
+			text-align: center;
 		}
 	}
 
@@ -470,12 +472,12 @@ const hasFilledOutList = (list)=>{
 	}
 
 	.sub-box {
-		margin-bottom: 20rpx;
 		.sub-warp-one{
 			display: flex;
 			justify-content: center;
 			align-items: center;
 			color: #B27C1E;
+			margin-bottom: 20rpx;
 			.sub-item-one {
 				width: 520rpx;
 			}
@@ -485,6 +487,7 @@ const hasFilledOutList = (list)=>{
 			justify-content: space-between;
 			align-items: center;
 			color: #B27C1E;
+			margin-bottom: 20rpx;
 			.sub-item-two {
 				width: 320rpx;
 			}
@@ -495,6 +498,7 @@ const hasFilledOutList = (list)=>{
 			flex-wrap: wrap;
 			color: #B27C1E;
 			width: calc(100vw - 59rpx);
+			margin-bottom: 20rpx;
 			.sub-item-three {
 				width: 208rpx;
 				margin-right: 17rpx;
@@ -516,17 +520,11 @@ const hasFilledOutList = (list)=>{
 			border: 1px solid #B27C1E;
 			background: rgba(211, 164, 88, 0.1);
 			margin-top: 20rpx;
+			margin-bottom: 20rpx;
 		}
 		.gray {
 			opacity: 0.2;
 		}
-		.white-bg{
-			position: relative;
-			width: 100%;
-			height: 4rpx;
-			background-color: #fff;
-			top: 43rpx;
-		}
 	}
 }
 </style>
\ No newline at end of file

subPackages/momclub/component/resultDialog.vue

@@ -197,7 +197,7 @@ defineExpose({
 			}
 
 			.content-pad {
-				padding-bottom: 40rpx;
+				// padding-bottom: 40rpx;
 				text-align: center;
 			}
 
@@ -272,7 +272,7 @@ defineExpose({
 			max-width: 564rpx;
 			border-radius: 38rpx;
 			background: #FFFFFF;
-			padding: 15rpx 0rpx 20rpx;
+			padding: 15rpx 20rpx 20rpx;
 			box-sizing: border-box;
 			display: flex;
 			flex-direction: column;

subPackages/momclub/sign.vue

@@ -68,7 +68,7 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue'
+import { ref, watch, computed } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import { signupFormApi, formCommitApi, uploadFileApi } from '@/api/momclub/index.js';
 import NoticeDialog from './component/noticeDialog.vue'
@@ -495,6 +495,32 @@ onLoad(async (options) => {
 	console.log(query.value, 'query.value')
 	getInfo()
 })
+watch(() => formData.value, (newVal) => {
+    if (newVal) {
+        console.log(newVal,'fwatch')
+        newVal.forEach(item => {
+            if (item.subFormList && item.subFormList.length > 0) {
+                let flag = false;
+                item.subFormList.forEach(subItem => {
+                    if (subItem.isShow) {
+                        if (!flag) {
+                            subItem.isFirstFound = true;
+                            flag = true;
+                        } else {
+                            delete subItem.isFirstFound;
+                        }
+                    } else {
+                        delete subItem.isFirstFound;
+                    }
+                });
+            }
+        })
+    }
+}, { 
+    immediate: true,
+    deep: true  // 添加深度监听
+});
+
 </script>
 
 <style lang="less" scoped>
@@ -639,8 +665,6 @@ onLoad(async (options) => {
 			}
 
 			.form-btn {
-				height: 90rpx;
-				line-height: 90rpx;
 				height: 90rpx;
 				line-height: 90rpx;
 				border-radius: 40rpx;

views/My.vue

@@ -870,8 +870,8 @@ const handleIntegralClick = () => {
     buttonName: '积分明细',
   });
   //TODO: 切换环境 需要切换url 
-  // const urlStr = 'https://momuat.feihe.com/member/mine/newPointDetail?crmId={crmid}&appCode=XMH';
-  const urlStr = 'https://mom.feihe.com/member/mine/newPointDetail?crmId={crmid}&appCode=XMH';
+  const urlStr = 'https://momuat.feihe.com/member/mine/newPointDetail?crmId={crmid}&appCode=XMH';
+  // const urlStr = 'https://mom.feihe.com/member/mine/newPointDetail?crmId={crmid}&appCode=XMH';
   const url = urlStr.replace('{crmid}', userStore.babyInfo?.memberId);
   console.log('积分明细链接：==', url);