From 72fcef675d38d59d43166731352de0a0241a2557 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Wed, 28 May 2025 15:29:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(ticket):=20=E8=B4=AD=E7=A5=A8bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E7=A7=BB=E9=99=A4=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json              | 13 ++---------
 pages/ticket/buy.vue    | 28 +++++------------------
 pages/ticket/detail.vue | 50 -----------------------------------------
 pages/ticket/index.vue  | 21 ++++++-----------
 4 files changed, 15 insertions(+), 97 deletions(-)

diff --git a/pages.json b/pages.json
index 45e9f2b..90206cf 100644
--- a/pages.json
+++ b/pages.json
@@ -832,28 +832,19 @@
       "path": "pages/ticket/index",
       "style": {
         "navigationBarTitleText": "门票活动",
-        "navigationBarBackgroundColor": "#fff",
-        "navigationBarHidden": true,
-        "navigationStyle": "custom",
         "enablePullDownRefresh": true
       }
     },
     {
       "path": "pages/ticket/buy",
       "style": {
-        "navigationBarTitleText": "自助购票",
-        "navigationBarBackgroundColor": "#fff",
-        "navigationBarHidden": true,
-        "navigationStyle": "custom"
+        "navigationBarTitleText": "自助购票"
       }
     },
     {
       "path": "pages/ticket/detail",
       "style": {
-        "navigationBarTitleText": "我的门票",
-        "navigationBarBackgroundColor": "#fff",
-        "navigationBarHidden": true,
-        "navigationStyle": "custom"
+        "navigationBarTitleText": "我的门票"
       }
     },
     {
diff --git a/pages/ticket/buy.vue b/pages/ticket/buy.vue
index 9ebb5ee..e44be3c 100644
--- a/pages/ticket/buy.vue
+++ b/pages/ticket/buy.vue
@@ -6,17 +6,6 @@
 -->
 <template>
   <view class="buy-ticket-container">
-    <!-- 自定义导航栏 -->
-    <view class="custom-navbar">
-      <view class="navbar-content">
-        <view class="back-btn" @click="goBack">
-          <u-icon name="arrow-left" size="20" color="#333"></u-icon>
-        </view>
-        <view class="navbar-title">自助购票</view>
-        <view class="placeholder"></view>
-      </view>
-    </view>
-
     <!-- 内容区域 -->
     <view class="content-area">
       <!-- 提示信息 -->
@@ -342,17 +331,12 @@ export default {
           return false
         }
 
-        if (!/^1[3-9]\d{9}$/.test(buyer.phone)) {
-          uni.$u.toast(`购票人${i + 1}的联系方式格式不正确`)
-          return false
-        }
-
         if (!buyer.idCard.trim()) {
           uni.$u.toast(`购票人${i + 1}的证件号码不能为空`)
           return false
         }
 
-        if (buyer.sexIndex === -1 || !buyer.sex) {
+        if (buyer.sexIndex === -1 || (!buyer.sex && buyer.sex !== 0)) {
           uni.$u.toast(`请选择购票人${i + 1}的性别`)
           return false
         }
@@ -367,8 +351,8 @@ export default {
           return false
         }
 
-        if (!/^1[3-9]\d{9}$/.test(buyer.emergencyPhone)) {
-          uni.$u.toast(`购票人${i + 1}的紧急联系方式格式不正确`)
+        if (buyer.emergencyPhone === buyer.phone) {
+          uni.$u.toast(`购票人${i + 1}的紧急联系方式不能与联系方式相同`)
           return false
         }
       }
@@ -518,9 +502,9 @@ export default {
 }
 
 .content-area {
-  margin-top: calc(var(--status-bar-height) + 44px);
-  padding: 16px;
-  padding-bottom: 100px;
+  margin-top: 10rpx;
+  padding: 24rpx;
+  padding-bottom: 200rpx;
 }
 
 .tip-banner {
diff --git a/pages/ticket/detail.vue b/pages/ticket/detail.vue
index 18babcc..b1bad17 100644
--- a/pages/ticket/detail.vue
+++ b/pages/ticket/detail.vue
@@ -6,17 +6,6 @@
 -->
 <template>
   <view class="ticket-detail-container">
-    <!-- 自定义导航栏 -->
-    <view class="custom-navbar">
-      <view class="navbar-content">
-        <view class="back-btn" @click="goBack">
-          <u-icon name="arrow-left" size="20" color="#333"></u-icon>
-        </view>
-        <view class="navbar-title">我的门票</view>
-        <view class="placeholder"></view>
-      </view>
-    </view>
-
     <!-- 内容区域 -->
     <view class="content-area">
       <view v-if="ticketDetail" class="ticket-detail-card">
@@ -209,46 +198,7 @@ export default {
   background: #f8f8f8;
 }
 
-.custom-navbar {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 999;
-  background: #fff;
-  padding-top: var(--status-bar-height);
-  border-bottom: 1px solid #eee;
-
-  .navbar-content {
-    display: flex;
-    align-items: center;
-    height: 44px;
-    padding: 0 16px;
-
-    .back-btn {
-      width: 40px;
-      height: 40px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-
-    .navbar-title {
-      flex: 1;
-      text-align: center;
-      font-size: 18px;
-      font-weight: 600;
-      color: #333;
-    }
-
-    .placeholder {
-      width: 40px;
-    }
-  }
-}
-
 .content-area {
-  margin-top: calc(var(--status-bar-height) + 44px);
   padding: 16px;
 }
 
diff --git a/pages/ticket/index.vue b/pages/ticket/index.vue
index a637d41..013d7de 100644
--- a/pages/ticket/index.vue
+++ b/pages/ticket/index.vue
@@ -6,17 +6,6 @@
 -->
 <template>
   <view class="ticket-container">
-    <!-- 自定义导航栏 -->
-    <view class="custom-navbar">
-      <view class="navbar-content">
-        <view class="back-btn" @click="goBack">
-          <u-icon name="arrow-left" size="20" color="#333"></u-icon>
-        </view>
-        <view class="navbar-title">门票活动</view>
-        <view class="placeholder"></view>
-      </view>
-    </view>
-
     <!-- Tab切换 -->
     <view class="tab-container">
       <view class="tab-wrapper">
@@ -583,7 +572,7 @@ export default {
         uni.$u.toast('请输入身份证号')
         return
       }
-      if (!this.editForm.sex) {
+      if (!this.editForm.sex && this.editForm.sex !== 0) {
         uni.$u.toast('请选择性别')
         return
       }
@@ -591,6 +580,10 @@ export default {
         uni.$u.toast('请输入尺码')
         return
       }
+      if (this.editForm.emergencyPhone === this.editForm.phone) {
+        uni.$u.toast('紧急联系方式不能与联系方式相同')
+        return
+      }
 
       // 设置性别值
       this.editForm.sexVal = this.editForm.sex === '1' ? '男' : '女'
@@ -711,9 +704,9 @@ export default {
 }
 
 .content-area {
-  margin-top: calc(var(--status-bar-height) + 88rpx + 120rpx);
+  margin-top: calc(100rpx);
   padding: 24rpx;
-  min-height: calc(100vh - var(--status-bar-height) - 88rpx - 120rpx);
+  min-height: calc(100vh - 100rpx);
 }
 
 .activity-card {