From f8ac363bcd48dc08f5f6904ecec748fd3c15ec50 Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Sun, 12 Apr 2026 15:04:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bundle/combo/combo-list.vue |  2 +-
 bundle/combo/details.vue    | 26 +++++++++++++++++++++++---
 bundle/combo/face-list.vue  |  1 +
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/bundle/combo/combo-list.vue b/bundle/combo/combo-list.vue
index db296f2..06e05ae 100644
--- a/bundle/combo/combo-list.vue
+++ b/bundle/combo/combo-list.vue
@@ -30,7 +30,7 @@ export default {
             list: [],
         }
     },
-    onLoad() {
+    onShow() {
         this.handleGetList();
     },
     methods: {
diff --git a/bundle/combo/details.vue b/bundle/combo/details.vue
index cff4c4a..a361f5a 100644
--- a/bundle/combo/details.vue
+++ b/bundle/combo/details.vue
@@ -83,8 +83,8 @@
         <view class="bottom-bar">
             <!-- 两个按钮并排显示的情况 -->
             <view class="btn-group" v-if="result && result.status == 1 && id == result.group_id && info.order && info.order.id">
-                <view class="btn-submit btn-half btn-secondary" @click="hanldeTakePhoto">人脸信息</view>
                 <view class="btn-submit btn-half" @click="handleSubmit">立即续费</view>
+                <view class="btn-submit btn-half btn-secondary" @click="hanldeTakePhoto">人脸信息</view>
             </view>
             
             <!-- 单个按钮显示的情况 -->
@@ -121,7 +121,7 @@
                             <text style="font-size: 24rpx; margin-right: 4rpx;">￥</text>
                             <text>{{ info.month_price }}</text>
                         </view>
-                        <view class="plan-desc">指导价{{ info.m_price }}元/月</view>
+                        <view class="plan-desc" v-if="info.m_price && info.m_price > 0">指导价{{ info.m_price }}元/月</view>
                         <view class="check-mark"></view>
                     </view>
                     <view class="plan-item" :class="{ active: selectedPlan === 2 }" @click="selectPlan(2)">
@@ -130,7 +130,7 @@
                             <text style="font-size: 24rpx; margin-right: 4rpx;">￥</text>
                             <text>{{ info.seasonal_price }}</text>
                         </view>
-                        <view class="plan-desc">指导价{{ info.s_price }}元/季</view>
+                        <view class="plan-desc" v-if="info.s_price && info.s_price > 0">指导价{{ info.s_price }}元/季</view>
                         <view class="check-mark"></view>
                     </view>
                 </view>
@@ -247,6 +247,26 @@ export default {
                 return false;
             }
 
+            const birthDate = new Date(self.result.both);
+            const today = new Date();
+            let age = today.getFullYear() - birthDate.getFullYear();
+            const m = today.getMonth() - birthDate.getMonth();
+            if (m < 0 || (m === 0 && today.getDate() < birthDate.getDate())) {
+                age--;
+            }
+
+            if (self.result && self.result.group_id == 1 && age >= 18) {
+                // 没有填写过信息，弹出完善信息提示弹窗
+                self.showInfoModal = true;
+                return false;
+            }          
+            
+            if (self.result && (self.result.group_id == 3 || self.result.group_id == 4) && age >= 18) {
+                // 没有填写过信息，弹出完善信息提示弹窗
+                self.showInfoModal = true;
+                return false;
+            }
+
             if (self.result.status == 0) {
                 setTimeout(() => {
                     uni.showToast({ title: '信息审核中，请耐心等待', icon: 'none' });
diff --git a/bundle/combo/face-list.vue b/bundle/combo/face-list.vue
index 545fea8..d848223 100644
--- a/bundle/combo/face-list.vue
+++ b/bundle/combo/face-list.vue
@@ -200,6 +200,7 @@
                                     app_id: self.getAppId(),
                                     face_url: result.data.file_path,
                                     order_id: self.order_id,
+                                    group_id: self.id,
                                 },
                                 function(res) {
                                     console.log("🚀 ~ res:", res)