From 0d80ca8f4dad325bf697de5892eda88e79492893 Mon Sep 17 00:00:00 2001
From: ZhaoYang <565837861@qq.com>
Date: Thu, 5 Feb 2026 18:51:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81=EF=BC=8C?=
 =?UTF-8?q?=E9=97=AE=E8=AF=8A=E5=8D=95=EF=BC=8C=E9=A6=96=E9=A1=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.js                        |  189 ++-
 pages/home/home.wxml                      |   43 +-
 pages/home/home.wxss                      |  155 +-
 pagesA/images/duig.png                    |  Bin 0 -> 2599 bytes
 pagesA/images/name.png                    |  Bin 0 -> 4280 bytes
 pagesA/images/sfz.png                     |  Bin 0 -> 3509 bytes
 pagesA/pages/askingSy/askingSy.js         |   56 +-
 pagesA/pages/askingSyAdd/askingSyAdd.js   |   96 +-
 pagesA/pages/askingSyAdd/askingSyAdd.wxml |  174 +-
 pagesA/pages/askingSyAdd/askingSyAdd.wxss |   57 +
 pagesA/pages/attestation/attestation.js   |  420 +++--
 pagesA/pages/attestation/attestation.wxml |  342 ++--
 pagesA/pages/attestation/attestation.wxss | 1741 +++++++++++++++------
 utils/baseUrl.js                          |    4 +-
 utils/http.js                             |   46 +-
 15 files changed, 2255 insertions(+), 1068 deletions(-)
 create mode 100644 pagesA/images/duig.png
 create mode 100644 pagesA/images/name.png
 create mode 100644 pagesA/images/sfz.png

diff --git a/pages/home/home.js b/pages/home/home.js
index e15bac2..0cb937e 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -9,53 +9,54 @@ Page({
     // 通知公告数据
     currentNotice: 0,
     noticeList: [],
-    forum:[]
+    forum: [],
+    suffer: [],
+    // 添加用户数据
+    user: {},
+    county: ''
   },
 
-
   // 查询用户信息
-  getUserInfo(){
-       http.UserInfo({
-         data:{},
-         success:res=>{
-           this.setData({
-             user:res.data.area
-           })
-         }
-       })
+  getUserInfo() {
+    http.UserInfo({
+      data: {},
+      success: res => {
+        this.setData({
+          user: res.data.area
+        })
+      }
+    })
   },
 
   // 在线问答列表
-  getforumList(){
+  getforumList() {
     http.forumList({
-      data:{},
-      success:res=>{
+      data: {},
+      success: res => {
         const zxwd = []
         zxwd.push(res.rows[0])
         this.setData({
-          forum:zxwd
+          forum: zxwd
         })
       }
     })
   },
 
   // 经验分享列表
-  getexperience(){
-      http.experience({
-        data:{},
-        success:res=>{
-            console.log(111,res);
-            const zyfx = []
-            zyfx.push(res.rows[0])
-            this.setData({
-              suffer:zyfx
-            })
-        }
-      })
+  getexperience() {
+    http.experience({
+      data: {},
+      success: res => {
+        console.log(111, res);
+        const zyfx = []
+        zyfx.push(res.rows[0])
+        this.setData({
+          suffer: zyfx
+        })
+      }
+    })
   },
 
-
-
   // 轮播
   getCarousel() {
     http.carousel({
@@ -68,18 +69,34 @@ Page({
     })
   },
 
-  // 灾害
+  // 灾害/通知公告
   getDisaster() {
     http.disaster({
       data: {},
       success: res => {
+        // 处理通知数据，添加时间戳
+        const notices = res.rows.map(item => {
+          return {
+            ...item,
+            // // 判断是否是24小时内的通知
+            // isNew: this.isNewNotification(item.createdTime)
+          }
+        })
         this.setData({
-          noticeList: res.rows
+          noticeList: notices
         })
       }
     })
   },
 
+  // // 判断通知是否在24小时内
+  // isNewNotification(createdTime) {
+  //   if (!createdTime) return false
+  //   const noticeTime = new Date(createdTime.replace(/-/g, '/')).getTime()
+  //   const now = new Date().getTime()
+  //   const twentyFourHours = 24 * 60 * 60 * 1000
+  //   return now - noticeTime < twentyFourHours
+  // },
 
   // 区域划分跳转
   bindXzqh() {
@@ -137,11 +154,11 @@ Page({
     })
   },
 
-  //问答列表
-  bindwdlist(){
-      wx.navigateTo({
-        url: '/pagesB/pages/forumlist/forumlist',
-      })  
+  // 问答列表
+  bindwdlist() {
+    wx.navigateTo({
+      url: '/pagesB/pages/forumlist/forumlist',
+    })  
   },
 
   // 问答详情
@@ -154,22 +171,33 @@ Page({
   },
 
   // 经验分享列表
-  viewexperience(){
+  viewexperience() {
     wx.navigateTo({
       url: '/pagesB/pages/experienceList/experienceList',
     })
   },
 
   // 经验分享详情
-  bindfx(e){
+  bindfx(e) {
     const id = e.currentTarget.dataset.id
-      wx.navigateTo({
-        url: `/pagesB/pages/experienceDetails/experienceDetails?id=${id}`,
-      })
+    wx.navigateTo({
+      url: `/pagesB/pages/experienceDetails/experienceDetails?id=${id}`,
+    })
+  },
+
+  // 查看所有通知
+  viewAllNotices() {
+    wx.navigateTo({
+      url: '/pagesB/pages/noticeList/noticeList',
+    })
   },
 
+  // 查看所有问题
+  viewAllQuestions() {
+    this.bindwdlist()
+  },
 
-  //获取当前位置信息
+  // 获取当前位置信息
   getLocation() {
     let that = this;
     // 腾讯获取的密钥
@@ -202,25 +230,44 @@ Page({
   },
 
   onShow() {
-
+    // 页面显示时重置轮播图（解决某些手机上的轮播问题）
+    this.resetSwiper()
   },
 
-
+  // 重置轮播图（解决轮播不自动播放的问题）
+  resetSwiper() {
+    setTimeout(() => {
+      if (this.data.swiperList.length > 0) {
+        this.setData({
+          currentSwiper: this.data.currentSwiper
+        })
+      }
+    }, 300)
+  },
 
   // 轮播图变化事件
   onSwiperChange(e) {
     const current = e.detail.current;
-    const swiperList = this.data.swiperList.map((item, index) => ({
-      ...item,
-    }));
-
     this.setData({
-      currentSwiper: current,
-      swiperList
+      currentSwiper: current
     });
   },
 
+  // 轮播图指示器点击
+  onIndicatorTap(e) {
+    const index = e.currentTarget.dataset.index;
+    this.setData({
+      currentSwiper: index
+    });
+  },
 
+  // 通知轮播变化事件
+  onNoticeSwiperChange(e) {
+    const current = e.detail.current;
+    this.setData({
+      currentNotice: current
+    });
+  },
 
   // 轮播图点击 
   onSwiperTap(e) {
@@ -231,11 +278,9 @@ Page({
       icon: 'none',
       duration: 1000
     });
-
   },
 
-
-  // 通知点击 - 使用catchtap防止事件冒泡
+  // 通知点击
   onNoticeTap(e) {
     const id = e.currentTarget.dataset.id;
     console.log('通知点击:', id);
@@ -244,15 +289,15 @@ Page({
     const notice = this.data.noticeList.find(item => item.id === id);
     if (notice) {
       wx.showModal({
-        title: notice.typeName,
-        content: notice.content,
+        title: notice.warningLevel || '通知详情',
+        content: notice.title,
         showCancel: true,
         cancelText: '关闭',
         confirmText: '查看详情',
         success: (res) => {
           if (res.confirm) {
             wx.navigateTo({
-              url: '/pages/notice/detail?id=' + id
+              url: '/pagesB/pages/noticeDetail/noticeDetail?id=' + id
             });
           }
         }
@@ -260,18 +305,12 @@ Page({
     }
   },
 
-  // 更多通知
-  gotoNotices() {
-    wx.navigateTo({
-      url: ''
-    });
-  },
-
-
   onReady() {
-    //当前网络状态
+    // 当前网络状态
     wx.getNetworkType({
-      success: function (res) { // 返回网络类型, 有效值：// wifi/2g/3g/4g/unknown(Android下不常见的网络类型)/none(无网络)
+      success: function (res) { 
+        // 返回网络类型, 有效值：
+        // wifi/2g/3g/4g/unknown(Android下不常见的网络类型)/none(无网络)
         console.log(res);
         var networkType = res.networkType
         if (networkType !== 'unknown') {
@@ -285,11 +324,18 @@ Page({
     })
   },
 
-
   // 下拉刷新
   onPullDownRefresh() {
     wx.showNavigationBarLoading()
-    setTimeout(function () {
+    
+    // 重新加载所有数据
+    Promise.all([
+      new Promise(resolve => this.getUserInfo(resolve)),
+      new Promise(resolve => this.getDisaster(resolve)),
+      new Promise(resolve => this.getCarousel(resolve)),
+      new Promise(resolve => this.getforumList(resolve)),
+      new Promise(resolve => this.getexperience(resolve))
+    ]).then(() => {
       wx.showToast({
         title: '刷新成功',
         icon: 'none',
@@ -297,11 +343,14 @@ Page({
       })
       wx.hideNavigationBarLoading()
       wx.stopPullDownRefresh()
-    }, 1000)
+    }).catch(() => {
+      wx.hideNavigationBarLoading()
+      wx.stopPullDownRefresh()
+    })
   },
 
   // 页面滚动
   onPageScroll(e) {
-
+    // 可以根据需要添加滚动效果
   }
 });
\ No newline at end of file
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 84db7a7..96d85d5 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -22,9 +22,19 @@
       <image src="/pages/images/aiwz.png" mode="" />
     </view>
 
-    <!-- 轮播图区域 -->
+    <!-- 轮播图区域-->
     <view class="swiper-container">
-      <swiper class="custom-swiper" indicator-dots="{{false}}" indicator-color="rgba(255,255,255,0.4)" indicator-active-color="#4CAF50" autoplay="{{true}}" interval="5000" duration="500" circular="{{true}}" current="{{currentSwiper}}" bindchange="onSwiperChange" style="height: 360rpx;">
+      <swiper class="custom-swiper" 
+              indicator-dots="{{false}}" 
+              indicator-color="rgba(255,255,255,0.4)" 
+              indicator-active-color="#4CAF50" 
+              autoplay="{{true}}" 
+              interval="5000" 
+              duration="500" 
+              circular="{{true}}" 
+              current="{{currentSwiper}}" 
+              bindchange="onSwiperChange" 
+              style="height: 360rpx;">
         <block wx:for="{{swiperList}}" wx:key="id">
           <swiper-item>
             <view class="swiper-item {{item.isActive ? 'active' : ''}}" data-value="{{item}}" catchtap="onSwiperTap">
@@ -87,20 +97,43 @@
 
     <!-- 通知公告区域 -->
     <view class="notice-section">
+      <view class="notice-header">
+        <view class="notice-title">
+          <text class="notice-icon">📢</text>
+          <text class="notice-title-text">通知公告</text>
+        </view>
+        <view class="notice-more" bindtap="viewAllNotices">
+          更多 >
+        </view>
+      </view>
       <view class="notice-content">
-        <swiper class="notice-swiper" vertical="{{true}}" autoplay="{{true}}" interval="4000" duration="800" circular="{{true}}" style="height: 200rpx;">
+        <swiper class="notice-swiper" 
+                vertical="{{true}}" 
+                autoplay="{{true}}" 
+                interval="4000" 
+                duration="800" 
+                circular="{{true}}" 
+                style="height: 160rpx;"
+                bindchange="onNoticeSwiperChange">
           <block wx:for="{{noticeList}}" wx:key="id">
             <swiper-item>
               <view class="notice-item {{index === currentNotice ? 'highlight' : ''}}" data-id="{{item.id}}" catchtap="onNoticeTap">
                 <view class="notice-item-header">
-                  <text class="notice-type {{tool.type(item.warningLevel)}}">{{item.warningLevel}}</text>
+                  <view class="notice-type-container">
+                    <text class="notice-type {{tool.type(item.warningLevel)}}">{{item.warningLevel}}</text>
+                    <text class="notice-badge" wx:if="{{item.isNew}}">NEW</text>
+                  </view>
                   <text class="notice-time">{{item.createdTime}}</text>
                 </view>
-                <text class="notice-text">{{item.title}}</text>
+                <view class="notice-text-container">
+                  <text class="notice-text">{{item.title}}</text>
+                  <text class="notice-arrow">→</text>
+                </view>
               </view>
             </swiper-item>
           </block>
         </swiper>
+
       </view>
     </view>
 
diff --git a/pages/home/home.wxss b/pages/home/home.wxss
index 499d7fd..f136757 100644
--- a/pages/home/home.wxss
+++ b/pages/home/home.wxss
@@ -6,7 +6,6 @@
   padding-top: env(safe-area-inset-top);
 }
 
-
 /* 主要内容区域 */
 .box {
   width: 93%;
@@ -29,7 +28,6 @@
   border-radius: 50%;
 }
 
-
 .orientation{
   display: flex;
   align-items: center;
@@ -59,7 +57,7 @@
   color: #fff;
 }
 
-/* 轮播图区域 */
+/* 轮播图区域 - 已修复 */
 .swiper-container {
   position: relative;
   border-radius: 20rpx;
@@ -175,13 +173,12 @@
 }
 
 .indicator-dot.active {
-  width: 30rpx;
+  width: 40rpx;
   background: #96DBD4;
   border-radius: 6rpx;
 }
 
 /* 卡片类型 */
-
 .kap {
   animation: kapIn 0.5s ease-out 0.5s both;
 }
@@ -196,8 +193,6 @@
   }
 }
 
-
-
 .card {
   width: 100%;
   display: grid;
@@ -299,7 +294,7 @@
   background-color: #FD8140;
 }
 
-/* 通知公告区域 */
+/* 通知公告区域  */
 .notice-section {
   background: #FFFFFF;
   border-radius: 20rpx;
@@ -307,39 +302,99 @@
   margin: 20rpx 0;
   box-shadow: 0 8rpx 30rpx rgba(0, 0, 0, 0.05);
   animation: fadeIn 0.6s ease-out 0.6s both;
+  position: relative;
+  overflow: hidden;
 }
 
 @keyframes fadeIn {
   from {
     opacity: 0;
+    transform: translateY(30rpx);
   }
 
   to {
     opacity: 1;
+    transform: translateY(0);
   }
 }
 
+/* 通知标题区域 */
+.notice-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20rpx;
+  padding-bottom: 20rpx;
+  border-bottom: 1px solid rgba(150, 219, 212, 0.2);
+}
+
+.notice-title {
+  display: flex;
+  align-items: center;
+  gap: 12rpx;
+}
+
+.notice-icon {
+  font-size: 32rpx;
+}
+
+.notice-title-text {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #333;
+  position: relative;
+  padding-left: 16rpx;
+}
+
+.notice-title-text::before {
+  content: '';
+  position: absolute;
+  left: 0;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 6rpx;
+  height: 28rpx;
+  background: linear-gradient(135deg, #FF9800, #F44336);
+  border-radius: 3rpx;
+}
+
+.notice-more {
+  font-size: 24rpx;
+  color: #96DBD4;
+  padding: 8rpx 16rpx;
+  background: rgba(150, 219, 212, 0.1);
+  border-radius: 20rpx;
+  transition: all 0.3s ease;
+}
+
+.notice-more:active {
+  background: rgba(150, 219, 212, 0.2);
+  transform: scale(0.95);
+}
+
+/* 通知内容区域 */
 .notice-content {
   position: relative;
 }
 
 .notice-swiper {
-  height: 150rpx;
+  height: 160rpx;
 }
 
 .notice-item {
-  padding: 20rpx 0;
   transition: all 0.3s ease;
   display: flex;
   flex-direction: column;
+  justify-content: center;
   position: relative;
+  cursor: pointer;
 }
 
 .notice-item.highlight {
-  background: rgba(76, 175, 80, 0.05);
-  border-radius: 12rpx;
+  background: rgba(150, 219, 212, 0.08);
+  border-radius: 16rpx;
   padding: 20rpx;
-  margin: -10rpx -10rpx 0;
+  margin: 0 -10rpx;
 }
 
 .notice-item-header {
@@ -349,47 +404,90 @@
   margin-bottom: 16rpx;
 }
 
+.notice-type-container {
+  display: flex;
+  align-items: center;
+  gap: 10rpx;
+}
+
 .notice-type {
-  padding: 4rpx 16rpx;
+  padding: 6rpx 16rpx;
   border-radius: 20rpx;
   font-size: 22rpx;
   font-weight: 500;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 80rpx;
 }
 
+/* 优化通知类型样式 */
 .notice-type.urgent {
-  background: rgba(244, 67, 54, 0.1);
-  color: #F44336;
+  background: linear-gradient(135deg, #FF5252, #FF1744);
+  color: white;
+  box-shadow: 0 4rpx 12rpx rgba(244, 67, 54, 0.2);
 }
 
 .notice-type.important {
-  background: rgba(255, 152, 0, 0.1);
-  color: #FF9800;
+  background: linear-gradient(135deg, #FF9800, #FF9100);
+  color: white;
+  box-shadow: 0 4rpx 12rpx rgba(255, 152, 0, 0.2);
 }
 
 .notice-type.normal {
-  background: rgba(33, 150, 243, 0.1);
-  color: #2196F3;
+  background: linear-gradient(135deg, #96DBD4, #60C0B9);
+  color: white;
+  box-shadow: 0 4rpx 12rpx rgba(33, 150, 243, 0.2);
+}
+
+.notice-badge {
+  background: #FF4081;
+  color: white;
+  font-size: 18rpx;
+  padding: 2rpx 8rpx;
+  border-radius: 10rpx;
+  margin-left: 4rpx;
 }
 
 .notice-time {
   font-size: 22rpx;
-  color: #999999;
+  color: #888;
+  font-family: 'Arial', sans-serif;
+}
+
+.notice-text-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
 
 .notice-text {
   font-size: 28rpx;
-  color: #333333;
+  color: #333;
   line-height: 1.5;
   flex: 1;
   display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
   overflow: hidden;
+  font-weight: 500;
+  padding-right: 20rpx;
+}
+
+.notice-arrow {
+  font-size: 24rpx;
+  color: #96DBD4;
+  opacity: 0.7;
+  transition: all 0.3s ease;
 }
 
+.notice-item.highlight .notice-arrow {
+  opacity: 1;
+  transform: translateX(4rpx);
+}
 
 
-/* 用户提问板块 - 优化样式 */
+/* 用户提问板块 */
 .user-question-section {
   background: #FFFFFF;
   border-radius: 24rpx;
@@ -447,7 +545,6 @@
   border-radius: 4rpx;
 }
 
-
 .title-text1_1 {
   font-size: 38rpx;
   font-weight: bold;
@@ -457,7 +554,6 @@
   padding-left: 20rpx;
 }
 
-
 .title-text1_1::before {
   content: '';
   position: absolute;
@@ -476,8 +572,6 @@
   padding-left: 20rpx;
 }
 
-
-
 .view-all {
   display: flex;
   align-items: center;
@@ -494,7 +588,6 @@
   transform: scale(0.98);
 }
 
-
 .view-all1_1{
   display: flex;
   align-items: center;
@@ -511,9 +604,6 @@
   transform: scale(0.98);
 }
 
-
-
-
 /* 问题元信息 */
 .question-meta {
   display: flex;
@@ -540,7 +630,6 @@
   overflow: hidden;
 }
 
-
 /* 用户信息 */
 .question-info {
   display: flex;
@@ -577,7 +666,6 @@
   margin-bottom: 6rpx;
 }
 
-
 .time-info {
   font-size: 22rpx;
   color: #999;
@@ -586,7 +674,6 @@
   border-radius: 16rpx;
 }
 
-
 .post-footer {
   display: flex;
   align-items: center;
diff --git a/pagesA/images/duig.png b/pagesA/images/duig.png
new file mode 100644
index 0000000000000000000000000000000000000000..41de07fc214b05f1aa9886e9cd563dc9c7b498e5
GIT binary patch
literal 2599
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

literal 0
HcmV?d00001

diff --git a/pagesA/images/name.png b/pagesA/images/name.png
new file mode 100644
index 0000000000000000000000000000000000000000..265e3d16bca354c47b184efa9c2c064fd95b8d40
GIT binary patch
literal 4280
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
I+U-aG1IlvG^8f$<

literal 0
HcmV?d00001

diff --git a/pagesA/images/sfz.png b/pagesA/images/sfz.png
new file mode 100644
index 0000000000000000000000000000000000000000..c946203362e52ba7e4cd6f230a79be39efe4272f
GIT binary patch
literal 3509
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
KGp#l8Ncu1Ed^q(0

literal 0
HcmV?d00001

diff --git a/pagesA/pages/askingSy/askingSy.js b/pagesA/pages/askingSy/askingSy.js
index 41b2732..4b40826 100644
--- a/pagesA/pages/askingSy/askingSy.js
+++ b/pagesA/pages/askingSy/askingSy.js
@@ -4,35 +4,39 @@ Page({
     diagnosisList: []
   },
 
-  onLoad: function() {
-      this.getwzd()
+  onLoad: function () {
+    
+  },
+
+  onShow:function(){
+    this.getwzd()
   },
 
-  
+
   // 问诊单
-  getwzd(){
-     http.wzd({
-       data:{},
-       success:res=>{
-            console.log(1111,res);
-            this.setData({
-              diagnosisList:res.rows
-            })
-       }
-     })
+  getwzd() {
+    http.wzd({
+      data: {},
+      success: res => {
+        console.log(1111, res);
+        this.setData({
+          diagnosisList: res.rows
+        })
+      }
+    })
   },
 
 
 
   // 格式化日期显示
-  formatDate: function(dateString) {
+  formatDate: function (dateString) {
     const date = new Date(dateString);
     const now = new Date();
     const diff = now - date;
     const diffDays = Math.floor(diff / (1000 * 60 * 60 * 24));
     const diffHours = Math.floor(diff / (1000 * 60 * 60));
     const diffMinutes = Math.floor(diff / (1000 * 60));
-    
+
     if (diffMinutes < 60) {
       return `${diffMinutes}分钟前`;
     } else if (diffHours < 24) {
@@ -51,30 +55,18 @@ Page({
   },
 
   // 新增问诊单
-  showCreateModal: function() {
+  showCreateModal: function () {
     wx.navigateTo({
       url: '/pagesA/pages/askingSyAdd/askingSyAdd',
     });
   },
 
   // 查看详情 
-  viewDetail: function(e) {
-    console.log(1111,e);
-    const status  = e.currentTarget.dataset.value.status
+  viewDetail: function (e) {
     const data = e.currentTarget.dataset.value
-   console.log(data);
-
-     if(status=='已回复'){
-      wx.navigateTo({
-        url: `/pagesA/pages/askingSyDetails/askingSyDetails?data=${encodeURIComponent(JSON.stringify(data))}`,
-      });
-     }else{
-      wx.showToast({
-        title: `无回复内容`,
-        icon: 'none',
-        duration: 1000
-      });
-     }
+    wx.navigateTo({
+      url: `/pagesA/pages/askingSyDetails/askingSyDetails?data=${encodeURIComponent(JSON.stringify(data))}`,
+    });
 
   },
 
diff --git a/pagesA/pages/askingSyAdd/askingSyAdd.js b/pagesA/pages/askingSyAdd/askingSyAdd.js
index a4f7f7d..09ae4f2 100644
--- a/pagesA/pages/askingSyAdd/askingSyAdd.js
+++ b/pagesA/pages/askingSyAdd/askingSyAdd.js
@@ -1,5 +1,6 @@
 import http from '../../../utils/api'
 const baseUrl = require('../../../utils/baseUrl')
+
 Page({
   /**
    * 页面的初始数据
@@ -16,7 +17,9 @@ Page({
     isSubmitting: false,
     isFormValid: false,
     tempImages: [], // 新增：临时存储本地图片路径
-    isUploading: false // 新增：防止重复上传
+    isUploading: false, // 新增：防止重复上传
+    showLoadingMask: false, // 新增：显示加载遮罩层
+    loadingText: '提交中...' // 新增：加载提示文字
   },
 
   /**
@@ -234,8 +237,11 @@ Page({
       return;
     }
 
+    // 显示加载遮罩层
     this.setData({
-      isSubmitting: true
+      isSubmitting: true,
+      showLoadingMask: true,
+      loadingText: '提交中...'
     });
 
     // 准备提交数据
@@ -248,29 +254,77 @@ Page({
       data: submitData,
       success: (res) => {
         console.log('提交成功', res);
-        this.setData({
-          isSubmitting: false
-        });
+        
         if(res.code==200){
-        // 提交成功后的处理
-        wx.showToast({
-          title: '提交成功',
-          icon: 'success',
-          duration: 1500,
-          success: () => {
-            setTimeout(() => {
-              // 返回上一页
-              // wx.navigateBack();
-            }, 1500);
-          }
-        });
-        }else{
-          wx.showToast({
-            title: '提交失败，请重试',
-            icon: 'none'
+          // 提交成功后的处理
+          this.setData({
+            loadingText: '提交成功'
           });
+          
+          setTimeout(() => {
+            this.setData({
+              isSubmitting: false,
+              showLoadingMask: false
+            });
+            
+            wx.showToast({
+              title: '提交成功',
+              icon: 'success',
+              duration: 1500,
+              success: () => {
+               // 返回上一页
+               wx.navigateBack();
+              }
+            });
+          }, 1000);
+        } else {
+          this.setData({
+            loadingText: '提交失败'
+          });
+          
+          setTimeout(() => {
+            this.setData({
+              isSubmitting: false,
+              showLoadingMask: false
+            });
+            
+            wx.showToast({
+              title: res.msg || '提交失败，请重试',
+              icon: 'none',
+              duration: 2000
+            });
+          }, 1000);
         }
       },
+      fail: (err) => {
+        this.setData({
+          loadingText: '网络错误'
+        });
+        
+        setTimeout(() => {
+          this.setData({
+            isSubmitting: false,
+            showLoadingMask: false
+          });
+          
+          wx.showToast({
+            title: '网络异常，请检查网络后重试',
+            icon: 'none',
+            duration: 2000
+          });
+        }, 1000);
+      }
+    });
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+    // 页面卸载时重置状态
+    this.setData({
+      isSubmitting: false,
+      showLoadingMask: false
     });
   }
 });
\ No newline at end of file
diff --git a/pagesA/pages/askingSyAdd/askingSyAdd.wxml b/pagesA/pages/askingSyAdd/askingSyAdd.wxml
index 4ce9bda..98db029 100644
--- a/pagesA/pages/askingSyAdd/askingSyAdd.wxml
+++ b/pagesA/pages/askingSyAdd/askingSyAdd.wxml
@@ -1,114 +1,122 @@
 <view class="xqbox">
 
-  <!-- 表单内容 -->
-  <scroll-view class="page-content" scroll-y>
-    <form bindsubmit="submitForm">
+<!-- 表单内容 -->
+<scroll-view class="page-content" scroll-y>
+  <form bindsubmit="submitForm">
 
-      <!-- 牲畜类型 -->
-      <view class="form-section">
-        <view class="section-header">
-          <view class="section-title">
-            <text>牲畜类型</text>
-          </view>
-          <text class="section-required">必填</text>
+    <!-- 牲畜类型 -->
+    <view class="form-section">
+      <view class="section-header">
+        <view class="section-title">
+          <text>牲畜类型</text>
         </view>
-        <input class="form-input" name="petType" placeholder="请输入牲畜品种（如：山羊、奶牛）" value="{{formData.animalType}}" bindinput="onPetTypeInput" maxlength="20" />
+        <text class="section-required">必填</text>
       </view>
+      <input class="form-input" name="petType" placeholder="请输入牲畜品种（如：山羊、奶牛）" value="{{formData.animalType}}" bindinput="onPetTypeInput" maxlength="20" />
+    </view>
 
-      <!-- 牲畜信息 -->
-      <view class="form-section">
-        <view class="section-header">
-          <view class="section-title">
-            <text>牲畜信息</text>
-          </view>
-          <text class="section-required">必填</text>
+    <!-- 牲畜信息 -->
+    <view class="form-section">
+      <view class="section-header">
+        <view class="section-title">
+          <text>牲畜信息</text>
         </view>
+        <text class="section-required">必填</text>
+      </view>
 
-        <view class="info-grid">
-          <!-- 年龄 -->
-          <view class="info-item">
-            <view class="item-label">
-              <text>年龄</text>
-            </view>
-            <view class="item-input-wrapper">
-              <input class="item-input" name="petAge" type="digit" placeholder="例如：3岁或者3个月" value="{{formData.animalAge}}" bindinput="onPetAgeInput" />
-            </view>
+      <view class="info-grid">
+        <!-- 年龄 -->
+        <view class="info-item">
+          <view class="item-label">
+            <text>年龄</text>
           </view>
+          <view class="item-input-wrapper">
+            <input class="item-input" name="petAge" type="digit" placeholder="例如：3岁或者3个月" value="{{formData.animalAge}}" bindinput="onPetAgeInput" />
+          </view>
+        </view>
 
-          <!-- 性别 -->
-          <view class="info-item">
-            <view class="item-label">
-              <text>性别</text>
+        <!-- 性别 -->
+        <view class="info-item">
+          <view class="item-label">
+            <text>性别</text>
+          </view>
+          <view class="gender-buttons">
+            <view class="gender-btn {{formData.animalGender === '公' ? 'active' : ''}}" data-value="公" bindtap="selectGender">
+              <text>公</text>
             </view>
-            <view class="gender-buttons">
-              <view class="gender-btn {{formData.animalGender === '公' ? 'active' : ''}}" data-value="公" bindtap="selectGender">
-                <text>公</text>
-              </view>
-              <view class="gender-btn {{formData.animalGender === '母' ? 'active' : ''}}" data-value="母" bindtap="selectGender">
-                <text>母</text>
-              </view>
+            <view class="gender-btn {{formData.animalGender === '母' ? 'active' : ''}}" data-value="母" bindtap="selectGender">
+              <text>母</text>
             </view>
           </view>
         </view>
       </view>
+    </view>
 
-      <!-- 症状描述 -->
-      <view class="form-section">
-        <view class="section-header">
-          <view class="section-title">
-            <text>症状描述</text>
-          </view>
-          <text class="section-required">必填</text>
+    <!-- 症状描述 -->
+    <view class="form-section">
+      <view class="section-header">
+        <view class="section-title">
+          <text>症状描述</text>
         </view>
-        <view class="symptom-box">
-          <textarea class="symptom-textarea" name="symptoms" placeholder="请详细描述宠物的症状，包括持续时间、频率、具体表现等..." value="{{formData.description}}" bindinput="onSymptomsInput" maxlength="500" auto-height />
-          <view class="textarea-counter">
-            <text>{{symptomsLength}}/500</text>
-          </view>
+        <text class="section-required">必填</text>
+      </view>
+      <view class="symptom-box">
+        <textarea class="symptom-textarea" name="symptoms" placeholder="请详细描述宠物的症状，包括持续时间、频率、具体表现等..." value="{{formData.description}}" bindinput="onSymptomsInput" maxlength="500" auto-height />
+        <view class="textarea-counter">
+          <text>{{symptomsLength}}/500</text>
         </view>
       </view>
+    </view>
 
-      <!-- 图片上传 -->
-      <view class="form-section">
-        <view class="section-header">
-          <view class="section-title">
-            <text>上传图片</text>
-          </view>
-          <text class="section-optional">可选</text>
+    <!-- 图片上传 -->
+    <view class="form-section">
+      <view class="section-header">
+        <view class="section-title">
+          <text>上传图片</text>
         </view>
+        <text class="section-optional">可选</text>
+      </view>
 
-        <view class="upload-tips">
-          <text>最多可上传3张图片，用于帮助医生更直观了解病情</text>
-        </view>
+      <view class="upload-tips">
+        <text>最多可上传3张图片，用于帮助医生更直观了解病情</text>
+      </view>
 
-        <view class="image-upload-grid">
-          <!-- 已上传图片 - 使用tempImages预览 -->
-          <block wx:for="{{tempImages}}" wx:key="*this">
-            <view class="image-preview">
-              <image class="preview-image" src="{{item}}" mode="aspectFill" bindtap="previewImage" data-index="{{index}}"></image>
-              <view class="remove-overlay" data-index="{{index}}" bindtap="removeImage">
-                <image class="remove-icon" src="/pagesA/images/ch.png"></image>
-              </view>
+      <view class="image-upload-grid">
+        <!-- 已上传图片 - 使用tempImages预览 -->
+        <block wx:for="{{tempImages}}" wx:key="*this">
+          <view class="image-preview">
+            <image class="preview-image" src="{{item}}" mode="aspectFill" bindtap="previewImage" data-index="{{index}}"></image>
+            <view class="remove-overlay" data-index="{{index}}" bindtap="removeImage">
+              <image class="remove-icon" src="/pagesA/images/ch.png"></image>
             </view>
-          </block>
+          </view>
+        </block>
 
-          <!-- 上传按钮 -->
-          <view class="upload-btn" wx:if="{{tempImages.length < 3}}" bindtap="chooseImage">
-            <view class="upload-icon-wrapper">
-              <image class="upload-icon" src="/pagesA/images/jh.png"></image>
-            </view>
-            <text class="upload-text">上传图片</text>
+        <!-- 上传按钮 -->
+        <view class="upload-btn" wx:if="{{tempImages.length < 3}}" bindtap="chooseImage">
+          <view class="upload-icon-wrapper">
+            <image class="upload-icon" src="/pagesA/images/jh.png"></image>
           </view>
+          <text class="upload-text">上传图片</text>
         </view>
       </view>
+    </view>
 
-      <!-- 提交按钮 -->
-      <view class="submit-section">
-        <button class="submit-btn" type="primary" formType="submit" loading="{{isSubmitting}}" disabled="{{isSubmitting || !isFormValid}}">
-          {{isSubmitting ? '提交中...' : '提交问诊单'}}
-        </button>
-      </view>
+    <!-- 提交按钮 -->
+    <view class="submit-section">
+      <button class="submit-btn" type="primary" formType="submit" loading="{{isSubmitting}}" disabled="{{isSubmitting || !isFormValid || isUploading}}">
+        {{isSubmitting ? '提交中...' : '提交问诊单'}}
+      </button>
+    </view>
+
+  </form>
+</scroll-view>
 
-    </form>
-  </scroll-view>
+<!-- 加载遮罩层 -->
+<view wx:if="{{showLoadingMask}}" class="loading-mask">
+  <view class="loading-content">
+    <view class="loading-spinner"></view>
+    <text class="loading-text">{{loadingText}}</text>
+  </view>
+</view>
 </view>
\ No newline at end of file
diff --git a/pagesA/pages/askingSyAdd/askingSyAdd.wxss b/pagesA/pages/askingSyAdd/askingSyAdd.wxss
index 5e619eb..c4d4bcd 100644
--- a/pagesA/pages/askingSyAdd/askingSyAdd.wxss
+++ b/pagesA/pages/askingSyAdd/askingSyAdd.wxss
@@ -318,6 +318,47 @@
   box-shadow: none;
 }
 
+/* 加载遮罩层 */
+.loading-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 9999;
+}
+
+.loading-content {
+  background: #FFFFFF;
+  border-radius: 24rpx;
+  padding: 60rpx 80rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  animation: scaleIn 0.3s ease-out;
+}
+
+.loading-spinner {
+  width: 80rpx;
+  height: 80rpx;
+  border: 6rpx solid #F0F7FF;
+  border-top: 6rpx solid #4A90E2;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+  margin-bottom: 32rpx;
+}
+
+.loading-text {
+  font-size: 28rpx;
+  color: #333;
+  font-weight: 500;
+}
+
 /* 动画效果 */
 @keyframes fadeIn {
   from {
@@ -330,6 +371,22 @@
   }
 }
 
+@keyframes scaleIn {
+  from {
+    opacity: 0;
+    transform: scale(0.9);
+  }
+  to {
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
 .form-section {
   animation: fadeIn 0.4s ease-out forwards;
   opacity: 0;
diff --git a/pagesA/pages/attestation/attestation.js b/pagesA/pages/attestation/attestation.js
index 9dfe01f..9730423 100644
--- a/pagesA/pages/attestation/attestation.js
+++ b/pagesA/pages/attestation/attestation.js
@@ -1,25 +1,26 @@
-// pages/real-name-auth/real-name-auth.js
+import http from '../../../utils/api'
+const baseUrl = require('../../../utils/baseUrl')
 Page({
   data: {
     // 表单数据
     name: '',
-    phone: '',
-    smsCode: '',
+    idNumber: '',
     
     // 焦点状态
     nameFocus: false,
-    phoneFocus: false,
-    codeFocus: false,
+    idNumberFocus: false,
     
     // 错误提示
     nameError: '',
-    phoneError: '',
-    smsCodeError: '',
+    idNumberError: '',
     
-    // 验证码相关
-    canSendCode: false,
-    countdown: 0,
-    countdownTimer: null,
+    // 提示显示控制 - 修复：初始为false
+    showNameHint: false,
+    showIdNumberHint: false,
+    
+    // 验证状态
+    isNameValid: false,
+    isIdNumberValid: false,
     
     // 协议状态
     agreed: false,
@@ -28,211 +29,262 @@ Page({
     canSubmit: false,
     isSubmitting: false,
     
-    // 弹窗
-    showSuccessModal: false
+    // 进度条
+    currentStep: 1,
+    lineProgress1: 0,
+    lineProgress2: 0,
+    
+    // 弹窗数据
+    showModal: false,
+    modalTitle: '',
+    modalContent: '',
+    
+    // 成功弹窗数据
+    showSuccessModal: false,
+    maskedIdNumber: ''
   },
 
   onLoad() {
-    this.checkForm();
+    // 页面加载时启动进度条动画
+    setTimeout(() => {
+      this.setData({ lineProgress1: 50 });
+    }, 600);
   },
 
-  onUnload() {
-    // 清除定时器
-    if (this.data.countdownTimer) {
-      clearInterval(this.data.countdownTimer);
-    }
-  },
-
-  // 姓名输入处理
+  // 姓名输入处理 - 修复：简化逻辑
   onNameInput(e) {
-    const name = e.detail.value.trim();
-    let nameError = '';
+    const value = e.detail.value.trim();
+    let error = '';
+    let showHint = true;
+    let isValid = false;
     
-    if (name && !/^[\u4e00-\u9fa5]{2,10}$/.test(name)) {
-      nameError = '姓名应为2-10个汉字';
+    if (value) {
+      if (!/^[\u4e00-\u9fa5]{2,10}$/.test(value)) {
+        error = '姓名应为2-10个汉字';
+      } else {
+        isValid = true;
+        // 验证通过时保持提示显示，但无错误
+      }
+    } else {
+      // 内容为空时显示正常提示
+      error = '';
     }
     
     this.setData({
-      name: name,
-      nameError: nameError
+      name: value,
+      nameError: error,
+      showNameHint: showHint,
+      isNameValid: isValid
     }, () => {
       this.checkForm();
-      this.checkCanSendCode();
     });
   },
 
   onNameFocus() {
-    this.setData({ nameFocus: true });
+    this.setData({ 
+      nameFocus: true,
+      showNameHint: true // 获得焦点时显示提示
+    });
   },
 
   onNameBlur() {
-    this.setData({ nameFocus: false });
+    const { name } = this.data;
+    
+    this.setData({ 
+      nameFocus: false,
+      // 失去焦点时，如果内容为空或验证失败，保持提示显示
+      showNameHint: !!(name && !this.data.isNameValid)
+    });
   },
 
-  // 手机号输入处理
-  onPhoneInput(e) {
-    const phone = e.detail.value.trim();
-    let phoneError = '';
-    
-    if (phone && !/^1[3-9]\d{9}$/.test(phone)) {
-      phoneError = '请输入正确的手机号码';
-    }
-    
+  // 清除姓名
+  clearName() {
     this.setData({
-      phone: phone,
-      phoneError: phoneError
+      name: '',
+      nameError: '',
+      showNameHint: false,
+      isNameValid: false
     }, () => {
       this.checkForm();
-      this.checkCanSendCode();
     });
   },
 
-  onPhoneFocus() {
-    this.setData({ phoneFocus: true });
-  },
-
-  onPhoneBlur() {
-    this.setData({ phoneFocus: false });
-  },
-
-  // 验证码输入处理
-  onSmsCodeInput(e) {
-    const smsCode = e.detail.value.trim();
-    let smsCodeError = '';
+  // 身份证号输入处理 - 修复：简化逻辑
+  onIdNumberInput(e) {
+    const value = e.detail.value.trim().toUpperCase();
+    let error = '';
+    let showHint = true;
+    let isValid = false;
     
-    if (smsCode && !/^\d{6}$/.test(smsCode)) {
-      smsCodeError = '请输入6位数字验证码';
+    if (value) {
+      if (value.length < 18) {
+        error = '还需输入' + (18 - value.length) + '位';
+      } else if (value.length === 18) {
+        if (this.validateIdNumber(value)) {
+          isValid = true;
+          // 验证通过时保持提示显示，但无错误
+        } else {
+          error = '身份证号格式不正确';
+        }
+      }
+    } else {
+      // 内容为空时显示正常提示
+      error = '';
     }
     
     this.setData({
-      smsCode: smsCode,
-      smsCodeError: smsCodeError
+      idNumber: value,
+      idNumberError: error,
+      showIdNumberHint: showHint,
+      isIdNumberValid: isValid
     }, () => {
       this.checkForm();
     });
   },
 
-  onCodeFocus() {
-    this.setData({ codeFocus: true });
+  onIdNumberFocus() {
+    this.setData({ 
+      idNumberFocus: true,
+      showIdNumberHint: true // 获得焦点时显示提示
+    });
   },
 
-  onCodeBlur() {
-    this.setData({ codeFocus: false });
+  onIdNumberBlur() {
+    const { idNumber } = this.data;
+    let error = '';
+    let isValid = false;
+    
+    // 最终验证
+    if (idNumber) {
+      if (idNumber.length < 18) {
+        error = '还需输入' + (18 - idNumber.length) + '位';
+      } else if (idNumber.length === 18) {
+        if (this.validateIdNumber(idNumber)) {
+          isValid = true;
+        } else {
+          error = '身份证号格式不正确';
+        }
+      }
+    }
+    
+    this.setData({
+      idNumberFocus: false,
+      idNumberError: error,
+      isIdNumberValid: isValid,
+      // 失去焦点时，如果内容为空或验证失败，保持提示显示
+      showIdNumberHint: !!(idNumber && !isValid)
+    });
   },
 
-  // 检查是否可以发送验证码
-  checkCanSendCode() {
-    const { name, phone, nameError, phoneError } = this.data;
-    const canSendCode = name && phone && !nameError && !phoneError;
-    this.setData({ canSendCode });
+  // 清除身份证号
+  clearIdNumber() {
+    this.setData({
+      idNumber: '',
+      idNumberError: '',
+      showIdNumberHint: false,
+      isIdNumberValid: false
+    }, () => {
+      this.checkForm();
+    });
   },
 
-  // 发送验证码
-  async sendSmsCode() {
-    const { name, phone, countdown } = this.data;
+  // 身份证验证函数
+  validateIdNumber(idNumber) {
+    // 基础格式验证
+    if (!/^\d{17}[\dXx]$/.test(idNumber)) {
+      return false;
+    }
     
-    if (countdown > 0) return;
+    // 地区码验证（简化的验证，实际应该更严谨）
+    const areaCode = idNumber.substring(0, 2);
+    const validAreaCodes = ['11', '12', '13', '14', '15', '21', '22', '23', 
+                          '31', '32', '33', '34', '35', '36', '37', '41',
+                          '42', '43', '44', '45', '46', '50', '51', '52',
+                          '53', '54', '61', '62', '63', '64', '65'];
     
-    // 验证手机号格式
-    if (!/^1[3-9]\d{9}$/.test(phone)) {
-      this.setData({ phoneError: '请输入正确的手机号码' });
-      return;
+    if (!validAreaCodes.includes(areaCode)) {
+      return false;
     }
     
-    // 显示加载
-    wx.showLoading({
-      title: '发送中...',
-      mask: true
-    });
-
-    try {
-      // 模拟发送验证码请求
-      await new Promise(resolve => setTimeout(resolve, 1500));
-      
-      wx.hideLoading();
-      
-      // 发送成功
-      wx.showToast({
-        title: '验证码已发送',
-        icon: 'success',
-        duration: 2000
-      });
-      
-      // 开始倒计时
-      this.startCountdown();
-      
-    } catch (error) {
-      wx.hideLoading();
-      wx.showToast({
-        title: '发送失败，请重试',
-        icon: 'error',
-        duration: 2000
-      });
+    // 出生日期验证
+    const year = parseInt(idNumber.substring(6, 10));
+    const month = parseInt(idNumber.substring(10, 12));
+    const day = parseInt(idNumber.substring(12, 14));
+    
+    const currentYear = new Date().getFullYear();
+    if (year < 1900 || year > currentYear) return false;
+    if (month < 1 || month > 12) return false;
+    if (day < 1 || day > 31) return false;
+    
+    // 校验码验证
+    const checkCode = idNumber.charAt(17).toUpperCase();
+    const weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
+    const checkCodes = ['1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2'];
+    
+    let sum = 0;
+    for (let i = 0; i < 17; i++) {
+      sum += parseInt(idNumber.charAt(i)) * weights[i];
     }
-  },
-
-  // 开始倒计时
-  startCountdown() {
-    this.setData({ countdown: 60 });
     
-    const timer = setInterval(() => {
-      let { countdown } = this.data;
-      countdown--;
-      
-      if (countdown <= 0) {
-        clearInterval(timer);
-        this.setData({
-          countdown: 0,
-          countdownTimer: null
-        });
-      } else {
-        this.setData({
-          countdown: countdown,
-          countdownTimer: timer
-        });
-      }
-    }, 1000);
+    const mod = sum % 11;
+    return checkCode === checkCodes[mod];
   },
 
   // 协议处理
   toggleAgreement() {
+    const newAgreed = !this.data.agreed;
     this.setData({
-      agreed: !this.data.agreed
+      agreed: newAgreed
     }, () => {
       this.checkForm();
     });
   },
 
-  viewAgreement() {
-    wx.navigateTo({
-      url: '/pages/web-view/web-view?url=' + encodeURIComponent('https://your-domain.com/agreement')
-    });
+  // 显示协议弹窗
+  showAgreementModal() {
+    const title = '用户服务协议';
+    const content = `欢迎您使用"与牧同行"服务！\n\n在使用我们的服务前，请您仔细阅读并同意以下协议：\n\n1. 服务条款\n您在使用与牧同行提供的各项服务时，应当遵守相关法律法规，不得从事任何非法行为。\n\n2. 用户责任\n您需要保证所提供信息的真实性、准确性和完整性。\n\n3. 服务变更\n我们保留随时修改、暂停或终止服务的权利。\n\n4. 免责声明\n在法律法规允许的最大范围内，我们对因使用服务而产生的任何间接损失不承担责任。\n\n5. 法律适用\n本协议的订立、执行和解释及争议的解决均适用中华人民共和国法律。\n\n请您确保已阅读并理解以上条款。`;
+    
+    this.showModal(title, content);
   },
 
-  viewPrivacy() {
-    wx.navigateTo({
-      url: '/pages/web-view/web-view?url=' + encodeURIComponent('https://your-domain.com/privacy')
+  // 显示隐私弹窗
+  showPrivacyModal() {
+    const title = '隐私保护协议';
+    const content = `我们非常重视您的隐私保护，请您仔细阅读以下隐私政策：\n\n1. 信息收集\n我们仅收集为您提供服务所必需的信息，包括姓名、身份证号等实名信息。\n\n2. 信息使用\n您的信息仅用于身份验证和服务提供，不会用于其他商业用途。\n\n3. 信息保护\n我们采用先进的安全技术保护您的信息，防止未经授权的访问、使用或泄露。\n\n4. 信息共享\n除非获得您的明确同意，我们不会向第三方共享您的个人信息。\n\n5. 您的权利\n您可以随时查看、更正或删除您的个人信息。\n\n6. 政策更新\n我们可能会不时更新本隐私政策，更新后的政策将在本页面公布。\n\n我们承诺严格遵守相关法律法规，保护您的个人信息安全。`;
+    
+    this.showModal(title, content);
+  },
+
+  // 显示弹窗
+  showModal(title, content) {
+    this.setData({
+      modalTitle: title,
+      modalContent: content,
+      showModal: true
     });
   },
 
+  // 关闭弹窗
+  closeModal() {
+    this.setData({ showModal: false });
+  },
+
+  // 阻止事件冒泡
+  stopPropagation(e) {
+    // 阻止冒泡
+  },
+
   // 检查表单
   checkForm() {
     const {
-      name,
-      phone,
-      smsCode,
-      nameError,
-      phoneError,
-      smsCodeError,
+      isNameValid,
+      isIdNumberValid,
       agreed
     } = this.data;
 
-    const isValid = name && 
-                   phone && 
-                   smsCode && 
-                   !nameError && 
-                   !phoneError && 
-                   !smsCodeError && 
+    const isValid = isNameValid && 
+                   isIdNumberValid && 
                    agreed;
 
     this.setData({
@@ -244,56 +296,70 @@ Page({
   async submitAuth() {
     if (!this.data.canSubmit || this.data.isSubmitting) return;
     
-    this.setData({ isSubmitting: true });
-    
-    // 验证数据
-    const { name, phone, smsCode } = this.data;
-    
     // 最终验证
+    const { name, idNumber } = this.data;
+    
     if (!/^[\u4e00-\u9fa5]{2,10}$/.test(name)) {
       this.setData({
         nameError: '姓名应为2-10个汉字',
-        isSubmitting: false
+        showNameHint: true,
+        canSubmit: false
       });
       return;
     }
     
-    if (!/^1[3-9]\d{9}$/.test(phone)) {
+    if (!this.validateIdNumber(idNumber)) {
       this.setData({
-        phoneError: '请输入正确的手机号码',
-        isSubmitting: false
+        idNumberError: '身份证号格式不正确',
+        showIdNumberHint: true,
+        canSubmit: false
       });
       return;
     }
+
+    this.setData({ 
+      isSubmitting: true,
+      currentStep: 2,
+      lineProgress1: 100,
+      lineProgress2: 50
+    });
     
-    if (!/^\d{6}$/.test(smsCode)) {
-      this.setData({
-        smsCodeError: '请输入6位数字验证码',
-        isSubmitting: false
-      });
-      return;
-    }
+    // 显示加载动画
+    wx.showLoading({
+      title: '正在验证...',
+      mask: true
+    });
 
     try {
       // 模拟API请求
-      await new Promise(resolve => setTimeout(resolve, 2000));
+      await new Promise(resolve => setTimeout(resolve, 1500));
       
-      // 提交成功
-      this.setData({
-        isSubmitting: false,
-        showSuccessModal: true
-      });
+      wx.hideLoading();
+      
+      // 处理身份证号脱敏显示
+      const maskedId = idNumber.substring(0, 4) + '**********' + idNumber.substring(14);
+      
+      // 显示成功弹窗
+      this.showSuccessModal(maskedId);
       
-      // 保存认证信息到本地
+      // 保存认证信息
       wx.setStorageSync('realNameAuth', {
         name: name,
-        phone: phone,
+        idNumber: idNumber,
         certified: true,
         certifiedTime: new Date().getTime()
       });
       
+      this.setData({ 
+        isSubmitting: false,
+        currentStep: 3,
+        lineProgress2: 100
+      });
+      
     } catch (error) {
+      wx.hideLoading();
       this.setData({ isSubmitting: false });
+      
       wx.showToast({
         title: '认证失败，请重试',
         icon: 'error',
@@ -302,7 +368,15 @@ Page({
     }
   },
 
-  // 成功弹窗处理
+  // 显示成功弹窗
+  showSuccessModal(maskedId) {
+    this.setData({
+      maskedIdNumber: maskedId,
+      showSuccessModal: true
+    });
+  },
+
+  // 关闭成功弹窗
   closeSuccessModal() {
     this.setData({ showSuccessModal: false });
   },
@@ -311,7 +385,7 @@ Page({
   goToHome() {
     this.closeSuccessModal();
     wx.switchTab({
-      url: '/pages/index/index'
+      url: '/pages/personal/personal'
     });
   }
 });
\ No newline at end of file
diff --git a/pagesA/pages/attestation/attestation.wxml b/pagesA/pages/attestation/attestation.wxml
index b86f3a7..574a145 100644
--- a/pagesA/pages/attestation/attestation.wxml
+++ b/pagesA/pages/attestation/attestation.wxml
@@ -1,185 +1,261 @@
-<!-- pages/real-name-auth/real-name-auth.wxml -->
 <view class="auth-container">
-  <!-- 顶部装饰 -->
-  <view class="top-decoration">
-    <view class="decoration-circle circle-1"></view>
-    <view class="decoration-circle circle-2"></view>
-    <view class="decoration-circle circle-3"></view>
+  <!-- 背景装饰 -->
+  <view class="background-design">
+    <view class="bg-circle circle-1"></view>
+    <view class="bg-circle circle-2"></view>
+    <view class="bg-wave"></view>
   </view>
 
-  <!-- 头部 -->
-  <view class="header">
-    <image class="logo" src="/assets/icons/sheep-logo.svg" mode="aspectFit"></image>
-    <view class="brand-name">与牧同行</view>
-    <view class="page-title">实名认证</view>
-    <view class="page-subtitle">开启您的牧业伙伴之旅</view>
+  <!-- 头部区域 -->
+  <view class="header-section">
+    <view class="brand-header">
+      <view class="brand-text">
+        <view class="brand-name">与牧同行</view>
+        <view class="brand-slogan">专业牧业，贴心同行</view>
+      </view>
+    </view>
+    
+    <view class="auth-header">
+      <view class="auth-title">
+        <text class="title-text">实名认证</text>
+        <view class="title-badge">必填</view>
+      </view>
+      <view class="auth-description">
+        为了更好的服务体验，请完成实名认证
+      </view>
+    </view>
   </view>
 
-  <!-- 表单卡片 -->
-  <view class="form-card">
-    <!-- 表单标题 -->
-    <view class="card-header">
-      <view class="card-title">
-        <image class="title-icon" src="/assets/icons/id-card.svg" mode="aspectFit"></image>
-        <text>身份信息</text>
-      </view>
-      <view class="card-hint">请填写您的真实信息</view>
+  <!-- 进度指示 -->
+  <view class="progress-indicator">
+    <view class="progress-step active">
+      <view class="step-bubble">
+        <view class="step-number">1</view>
+      </view>
+      <view class="step-label">填写信息</view>
     </view>
+    
+    <view class="progress-line">
+      <view class="line-progress" style="width: {{lineProgress1}}%;"></view>
+    </view>
+    
+    <view class="progress-step {{currentStep >= 2 ? 'active' : ''}}">
+      <view class="step-bubble">
+        <view class="step-number">2</view>
+      </view>
+      <view class="step-label">信息验证</view>
+    </view>
+    
+    <view class="progress-line">
+      <view class="line-progress" style="width: {{lineProgress2}}%;"></view>
+    </view>
+    
+    <view class="progress-step {{currentStep >= 3 ? 'active' : ''}}">
+      <view class="step-bubble">
+        <view class="step-number">3</view>
+      </view>
+      <view class="step-label">完成认证</view>
+    </view>
+  </view>
 
+  <!-- 表单区域 -->
+  <view class="form-section">
     <!-- 姓名输入 -->
-    <view class="input-group">
+    <view class="input-card">
       <view class="input-label">
-        <image class="label-icon" src="/assets/icons/user.svg" mode="aspectFit"></image>
-        <text>真实姓名</text>
+        <image class="label-icon" src="/pagesA/images/name.png" mode="aspectFit"></image>
+        <text class="label-text">真实姓名</text>
+        <text class="required-star">*</text>
       </view>
-      <view class="input-wrapper">
+      
+      <view class="input-container">
         <input 
-          class="name-input" 
+          class="input-field {{nameFocus ? 'focused' : ''}} {{nameError ? 'error' : ''}} {{name ? 'has-value' : ''}} {{isNameValid ? 'valid' : ''}}" 
           placeholder="请输入您的真实姓名" 
           placeholder-class="placeholder"
           value="{{name}}"
           bindinput="onNameInput"
-          focus="{{nameFocus}}"
           bindfocus="onNameFocus"
           bindblur="onNameBlur"
+          maxlength="10"
         />
-        <view class="input-border"></view>
-        <view class="input-focus-border {{nameFocus ? 'active' : ''}}"></view>
+        
+        <!-- 删除按钮 -->
+        <view class="clear-wrapper" wx:if="{{name}}">
+          <button class="clear-btn" bindtap="clearName" hover-class="btn-hover">
+            <image class="clear-icon" src="/pagesA/images/ch.png" mode="aspectFit"></image>
+          </button>
+        </view>
+        
+        <!-- 输入框下划线 -->
+        <view class="input-underline">
+          <view class="underline-bg"></view>
+          <view class="underline-progress {{nameFocus ? 'active' : ''}}"></view>
+        </view>
+        
+        <!-- 字符计数 -->
+        <view class="char-count {{name.length > 8 ? 'warning' : ''}}">
+          {{name.length}}/10
+        </view>
       </view>
-      <view class="input-hint {{nameError ? 'error' : ''}}">
-        {{nameError || '请务必使用真实姓名'}}
+      
+      <!-- 提示信息  -->
+      <view class="hint-container" wx:if="{{showNameHint || nameError}}">
+        <text class="hint-text {{nameError ? 'error' : 'normal'}}">
+          {{nameError || '请输入与身份证一致的姓名（2-10个汉字）'}}
+        </text>
       </view>
     </view>
 
-    <!-- 手机号输入 -->
-    <view class="input-group">
+    <!-- 身份证号输入 -->
+    <view class="input-card">
       <view class="input-label">
-        <image class="label-icon" src="/assets/icons/phone.svg" mode="aspectFit"></image>
-        <text>手机号码</text>
+        <image class="label-icon" src="/pagesA/images/sfz.png" mode="aspectFit"></image>
+        <text class="label-text">身份证号</text>
+        <text class="required-star">*</text>
       </view>
-      <view class="input-wrapper">
+      
+      <view class="input-container">
         <input 
-          class="phone-input" 
-          placeholder="请输入您的手机号码" 
+          class="input-field {{idNumberError ? 'error' : ''}} {{isIdNumberValid ? 'valid' : ''}} {{idNumber ? 'has-value' : ''}}" 
+          placeholder="请输入18位身份证号码" 
           placeholder-class="placeholder"
-          value="{{phone}}"
-          bindinput="onPhoneInput"
-          type="number"
-          maxlength="11"
-          focus="{{phoneFocus}}"
-          bindfocus="onPhoneFocus"
-          bindblur="onPhoneBlur"
+          value="{{idNumber}}"
+          bindinput="onIdNumberInput"
+          bindfocus="onIdNumberFocus"
+          bindblur="onIdNumberBlur"
+          maxlength="18"
+          type="idcard"
         />
-        <view class="input-border"></view>
-        <view class="input-focus-border {{phoneFocus ? 'active' : ''}}"></view>
-      </view>
-      <view class="input-hint {{phoneError ? 'error' : ''}}">
-        {{phoneError || '用于接收重要通知'}}
-      </view>
-    </view>
+        
+        <!-- 删除按钮 -->
+        <view class="clear-wrapper" wx:if="{{idNumber}}">
+          <button class="clear-btn" bindtap="clearIdNumber" hover-class="btn-hover">
+            <image class="clear-icon" src="/pagesA/images/ch.png" mode="aspectFit"></image>
+          </button>
+        </view>
 
-    <!-- 验证码 -->
-    <view class="input-group">
-      <view class="input-label">
-        <image class="label-icon" src="/assets/icons/sms.svg" mode="aspectFit"></image>
-        <text>验证码</text>
-      </view>
-      <view class="code-input-wrapper">
-        <view class="code-input-container">
-          <input 
-            class="code-input" 
-            placeholder="请输入验证码" 
-            placeholder-class="placeholder"
-            value="{{smsCode}}"
-            bindinput="onSmsCodeInput"
-            type="number"
-            maxlength="6"
-            focus="{{codeFocus}}"
-            bindfocus="onCodeFocus"
-            bindblur="onCodeBlur"
-          />
-          <view class="input-border"></view>
-          <view class="input-focus-border {{codeFocus ? 'active' : ''}}"></view>
+        <!-- 输入框下划线 -->
+        <view class="input-underline">
+          <view class="underline-bg"></view>
+          <view class="underline-progress {{idNumberFocus ? 'active' : ''}}"></view>
+        </view>
+        
+        <!-- 分段显示 -->
+        <view class="id-segments {{idNumberFocus || idNumber ? 'show' : ''}}">
+          <view class="id-segment {{idNumber.length >= 6 ? 'filled' : ''}}">{{idNumber.substring(0, 6) || '地区'}}</view>
+          <view class="id-segment {{idNumber.length >= 14 ? 'filled' : ''}}">{{idNumber.substring(6, 14) || '出生'}}</view>
+          <view class="id-segment {{idNumber.length >= 17 ? 'filled' : ''}}">{{idNumber.substring(14, 17) || '顺序'}}</view>
+          <view class="id-segment last {{idNumber.length === 18 ? 'filled' : ''}}">{{idNumber.substring(17) || '校验'}}</view>
         </view>
-        <button 
-          class="send-code-btn {{!canSendCode ? 'disabled' : ''}} {{countdown > 0 ? 'counting' : ''}}" 
-          bindtap="sendSmsCode"
-          disabled="{{!canSendCode || countdown > 0}}"
-          hover-class="btn-hover"
-        >
-          <view class="btn-content">
-            <image wx:if="{{countdown === 0}}" class="sms-icon" src="/assets/icons/send.svg" mode="aspectFit"></image>
-            <!-- <text>{{countdown > 0 ? `${countdown}s后重发` : '发送验证码'}}</text> -->
-          </view>
-        </button>
       </view>
-      <view class="input-hint {{smsCodeError ? 'error' : ''}}">
-        {{smsCodeError || '输入6位数字验证码'}}
+      
+      <!-- 提示信息  -->
+      <view class="hint-container" wx:if="{{showIdNumberHint || idNumberError}}">
+        <text class="hint-text {{idNumberError ? 'error' : 'normal'}}">
+          {{idNumberError || '请输入有效的18位身份证号码'}}
+        </text>
       </view>
     </view>
-  </view>
 
-  <!-- 协议 -->
-  <view class="agreement-card">
-    <label class="agreement-item" bindtap="toggleAgreement">
-      <view class="checkbox {{agreed ? 'checked' : ''}}">
-        <image wx:if="{{agreed}}" class="check-icon" src="/assets/icons/check.svg" mode="aspectFit"></image>
-      </view>
-      <view class="agreement-text">
-        我已阅读并同意
-        <text class="link" bindtap="viewAgreement">《用户服务协议》</text>
-        和
-        <text class="link" bindtap="viewPrivacy">《隐私政策》</text>
-      </view>
-    </label>
+    <!-- 协议条款 -->
+    <view class="agreement-card">
+      <label class="agreement-item" bindtap="toggleAgreement">
+        <view class="agreement-checkbox {{agreed ? 'checked' : ''}}">
+          <image 
+            wx:if="{{agreed}}" 
+            class="checkmark" 
+            src="/pagesA/images/duig.png" 
+            mode="aspectFit"
+          ></image>
+        </view>
+        <view class="agreement-content">
+          <text>我已阅读并同意</text>
+          <text class="link-text" bindtap="showAgreementModal">《用户服务协议》</text>
+          <text>和</text>
+          <text class="link-text" bindtap="showPrivacyModal">《隐私保护协议》</text>
+        </view>
+      </label>
+    </view>
   </view>
 
-  <!-- 提交按钮 -->
+  <!-- 提交区域 -->
   <view class="submit-section">
     <button 
-      class="submit-btn {{canSubmit ? 'active' : 'disabled'}}" 
+      class="submit-button {{canSubmit ? 'active' : 'disabled'}}" 
       bindtap="submitAuth"
       disabled="{{!canSubmit}}"
-      hover-class="submit-btn-hover"
+      hover-class="button-hover"
       loading="{{isSubmitting}}"
     >
-      <view class="btn-inner">
-        <text>{{isSubmitting ? '提交中...' : '完成认证'}}</text>
-        <image wx:if="{{!isSubmitting}}" class="arrow-icon" src="/assets/icons/arrow-right.svg" mode="aspectFit"></image>
-      </view>
+    验证
     </button>
-    
-    <view class="submit-hint">
-      认证成功后，您将享受与牧同行的专属服务
-    </view>
   </view>
 
-  <!-- 底部装饰 -->
-  <view class="bottom-decoration">
-    <image class="sheep-illustration" src="/assets/illustrations/sheep.svg" mode="aspectFit"></image>
-    <view class="decoration-text">
-      <text class="highlight">与牧同行</text>，伴您每一次成长
+  <!-- 协议弹窗 -->
+  <view class="modal-overlay {{showModal ? 'show' : ''}}" bindtap="closeModal">
+    <view class="modal-container" catchtap="stopPropagation">
+      <view class="modal-header">
+        <view class="modal-title">{{modalTitle}}</view>
+        <button class="modal-close" bindtap="closeModal">
+          <image class="close-icon" src="/pagesA/images/ch.png" mode="aspectFit"></image>
+        </button>
+      </view>
+      
+      <scroll-view class="modal-content" scroll-y>
+        <view class="modal-text">
+          {{modalContent}}
+        </view>
+      </scroll-view>
+      
+      <view class="modal-footer">
+        <button class="modal-confirm" bindtap="closeModal">
+          我已阅读并理解
+        </button>
+      </view>
     </view>
   </view>
 
   <!-- 成功弹窗 -->
   <view class="success-modal {{showSuccessModal ? 'show' : ''}}">
-    <view class="modal-mask" bindtap="closeSuccessModal"></view>
-    <view class="modal-content">
-      <view class="modal-icon">
-        <image class="success-icon" src="/assets/icons/success.svg" mode="aspectFit"></image>
-      </view>
-      <view class="modal-title">认证成功！</view>
-      <view class="modal-message">
-        欢迎加入<text class="brand-highlight">与牧同行</text>大家庭
-      </view>
-      <view class="modal-subtitle">
-        您已成功完成实名认证，开始享受专属服务吧！
-      </view>
-      <button class="modal-btn" bindtap="goToHome">
-        <image class="home-icon" src="/assets/icons/home.svg" mode="aspectFit"></image>
-        <text>前往首页</text>
-      </button>
+    <view class="success-overlay" bindtap="closeSuccessModal"></view>
+    <view class="success-container">
+      <view class="success-icon">
+        <image class="success-badge" src="/pagesA/images/duig.png" mode="aspectFit"></image>
+        <view class="success-ring ring-1"></view>
+        <view class="success-ring ring-2"></view>
+      </view>
+      
+      <view class="success-body">
+        <view class="success-title">认证成功！</view>
+        <view class="success-message">
+          欢迎加入<text class="brand">与牧同行</text>大家庭
+        </view>
+        
+        <view class="success-details">
+          <view class="detail-item">
+            <view class="detail-label">
+              <image class="detail-icon" src="/pagesA/images/name.png" mode="aspectFit"></image>
+              <text>姓名</text>
+            </view>
+            <view class="detail-value">{{name}}</view>
+          </view>
+          
+          <view class="detail-item">
+            <view class="detail-label">
+              <image class="detail-icon" src="/pagesA/images/sfz.png" mode="aspectFit"></image>
+              <text>身份证号</text>
+            </view>
+            <view class="detail-value">{{maskedIdNumber}}</view>
+          </view>
+        </view>
+      </view>
+      
+      <view class="success-footer">
+        <button class="success-button" bindtap="goToHome">
+          <text>开始使用</text>
+        </button>
+      </view>
     </view>
   </view>
 </view>
\ No newline at end of file
diff --git a/pagesA/pages/attestation/attestation.wxss b/pagesA/pages/attestation/attestation.wxss
index b0d69a0..e6c7a46 100644
--- a/pagesA/pages/attestation/attestation.wxss
+++ b/pagesA/pages/attestation/attestation.wxss
@@ -1,546 +1,1285 @@
-/* pages/real-name-auth/real-name-auth.wxss */
 /* 基础样式 */
+page {
+  background: #f8fafc;
+  overflow-x: hidden;
+}
+
 .auth-container {
-    min-height: 100vh;
-    background: linear-gradient(135deg, #f5f7fa 0%, #c3cfe2 100%);
-    position: relative;
-    overflow: hidden;
-    padding: 40rpx 0 100rpx;
-  }
-  
-  /* 顶部装饰 */
-  .top-decoration {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    height: 300rpx;
-    overflow: hidden;
-    z-index: 0;
-  }
-  
-  .decoration-circle {
-    position: absolute;
-    border-radius: 50%;
-    background: linear-gradient(135deg, rgba(255, 255, 255, 0.3) 0%, rgba(255, 255, 255, 0.1) 100%);
-  }
-  
-  .circle-1 {
-    width: 400rpx;
-    height: 400rpx;
-    top: -200rpx;
-    right: -100rpx;
-  }
-  
-  .circle-2 {
-    width: 300rpx;
-    height: 300rpx;
-    top: -150rpx;
-    left: -100rpx;
-  }
-  
-  .circle-3 {
-    width: 200rpx;
-    height: 200rpx;
-    top: 100rpx;
-    left: 50%;
-    margin-left: -100rpx;
-  }
-  
-  /* 头部 */
-  .header {
-    text-align: center;
-    padding: 40rpx 0 60rpx;
-    position: relative;
-    z-index: 1;
-  }
-  
-  .logo {
-    width: 120rpx;
-    height: 120rpx;
-    margin: 0 auto 24rpx;
-  }
-  
-  .brand-name {
-    font-size: 48rpx;
-    font-weight: bold;
-    color: #2c3e50;
-    margin-bottom: 16rpx;
-    letter-spacing: 4rpx;
-  }
-  
-  .page-title {
-    font-size: 36rpx;
-    color: #2c3e50;
-    font-weight: 600;
-    margin-bottom: 12rpx;
-  }
-  
-  .page-subtitle {
-    font-size: 28rpx;
-    color: #7f8c8d;
-  }
-  
-  /* 表单卡片 */
-  .form-card {
-    background: white;
-    border-radius: 32rpx;
-    padding: 48rpx 40rpx;
-    margin: 0 40rpx 30rpx;
-    box-shadow: 0 10rpx 40rpx rgba(0, 0, 0, 0.08);
-    position: relative;
-    z-index: 1;
-    animation: slideUp 0.6s ease-out;
-  }
-  
-  .card-header {
-    margin-bottom: 40rpx;
-  }
-  
-  .card-title {
-    display: flex;
-    align-items: center;
-    font-size: 32rpx;
-    font-weight: 600;
-    color: #2c3e50;
-    margin-bottom: 12rpx;
-  }
-  
-  .title-icon {
-    width: 36rpx;
-    height: 36rpx;
-    margin-right: 16rpx;
-  }
-  
-  .card-hint {
-    font-size: 26rpx;
-    color: #95a5a6;
-  }
-  
-  /* 输入组 */
-  .input-group {
-    margin-bottom: 48rpx;
-  }
-  
-  .input-label {
-    display: flex;
-    align-items: center;
-    margin-bottom: 20rpx;
-    font-size: 28rpx;
-    color: #2c3e50;
-    font-weight: 500;
-  }
-  
-  .label-icon {
-    width: 32rpx;
-    height: 32rpx;
-    margin-right: 16rpx;
-  }
-  
-  .input-wrapper,
-  .code-input-container {
-    position: relative;
-  }
-  
-  .name-input,
-  .phone-input,
-  .code-input {
-    width: 100%;
-    height: 88rpx;
-    font-size: 28rpx;
-    color: #2c3e50;
-    padding: 0 24rpx;
-    background: #f8f9fa;
-    border-radius: 16rpx;
-    transition: all 0.3s ease;
-  }
-  
-  .placeholder {
-    color: #bdc3c7;
-    font-size: 28rpx;
+  min-height: 100vh;
+  position: relative;
+  padding-bottom: 40rpx;
+}
+
+/* 背景装饰 */
+.background-design {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 0;
+  overflow: hidden;
+}
+
+.bg-circle {
+  position: absolute;
+  border-radius: 50%;
+  background: linear-gradient(135deg, rgba(20, 184, 166, 0.08) 0%, rgba(20, 184, 166, 0.03) 100%);
+  animation: float 20s infinite ease-in-out;
+}
+
+.circle-1 {
+  width: 600rpx;
+  height: 600rpx;
+  top: -200rpx;
+  right: -200rpx;
+  animation-delay: 0s;
+}
+
+.circle-2 {
+  width: 400rpx;
+  height: 400rpx;
+  top: 300rpx;
+  left: -100rpx;
+  animation-delay: 5s;
+}
+
+.bg-wave {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 300rpx;
+  background: linear-gradient(to top, rgba(20, 184, 166, 0.05) 0%, transparent 100%);
+  clip-path: polygon(0% 100%, 100% 100%, 100% 30%, 80% 20%, 60% 40%, 40% 20%, 20% 40%, 0% 20%);
+}
+
+@keyframes float {
+  0%, 100% { transform: translateY(0) scale(1); }
+  50% { transform: translateY(-20rpx) scale(1.05); }
+}
+
+/* 头部区域 */
+.header-section {
+  position: relative;
+  z-index: 1;
+  padding: 60rpx 40rpx 30rpx;
+  animation: slideInDown 0.6s ease-out;
+}
+
+.brand-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 40rpx;
+}
+
+.brand-text {
+  flex: 1;
+  animation: fadeInRight 0.8s ease-out 0.2s both;
+}
+
+.brand-name {
+  font-size: 44rpx;
+  font-weight: 800;
+  color: #0f766e;
+  letter-spacing: 2rpx;
+  margin-bottom: 6rpx;
+  background: linear-gradient(135deg, #0f766e 0%, #14b8a6 100%);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+  background-clip: text;
+}
+
+.brand-slogan {
+  font-size: 26rpx;
+  color: #64748b;
+}
+
+.auth-header {
+  text-align: center;
+  margin-bottom: 30rpx;
+  animation: fadeInUp 0.6s ease-out 0.4s both;
+}
+
+.auth-title {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 20rpx;
+  margin-bottom: 16rpx;
+}
+
+.title-text {
+  font-size: 40rpx;
+  font-weight: 700;
+  color: #0f172a;
+}
+
+.title-badge {
+  background: linear-gradient(135deg, #f97316 0%, #ea580c 100%);
+  color: white;
+  font-size: 22rpx;
+  padding: 4rpx 16rpx;
+  border-radius: 20rpx;
+  font-weight: 500;
+  animation: pulse 2s infinite;
+}
+
+@keyframes pulse {
+  0%, 100% { transform: scale(1); }
+  50% { transform: scale(1.05); }
+}
+
+.auth-description {
+  font-size: 28rpx;
+  color: #64748b;
+  line-height: 1.5;
+}
+
+/* 进度指示器 */
+.progress-indicator {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 40rpx 50rpx;
+  position: relative;
+  z-index: 1;
+  animation: fadeInUp 0.6s ease-out 0.6s both;
+}
+
+.progress-step {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+  flex: 1;
+  transition: all 0.3s ease;
+}
+
+.step-bubble {
+  width: 60rpx;
+  height: 60rpx;
+  background: #e2e8f0;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 12rpx;
+  transition: all 0.3s ease;
+  position: relative;
+  overflow: hidden;
+}
+
+.step-bubble::before {
+  content: '';
+  position: absolute;
+  top: -2rpx;
+  left: -2rpx;
+  right: -2rpx;
+  bottom: -2rpx;
+  background: linear-gradient(135deg, #0f766e 0%, #14b8a6 100%);
+  border-radius: 50%;
+  opacity: 0;
+  transition: opacity 0.3s ease;
+}
+
+.progress-step.active .step-bubble::before {
+  opacity: 1;
+}
+
+.step-number {
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #64748b;
+  position: relative;
+  z-index: 1;
+  transition: all 0.3s ease;
+}
+
+.progress-step.active .step-number {
+  color: white;
+}
+
+.step-label {
+  font-size: 26rpx;
+  color: #94a3b8;
+  font-weight: 500;
+  transition: all 0.3s ease;
+}
+
+.progress-step.active .step-label {
+  color: #0f766e;
+  font-weight: 600;
+}
+
+.progress-line {
+  flex: 1;
+  height: 4rpx;
+  background: #e2e8f0;
+  border-radius: 2rpx;
+  position: relative;
+  margin: 0 20rpx;
+  overflow: hidden;
+  transition: all 0.3s ease;
+}
+
+.line-progress {
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100%;
+  background: linear-gradient(90deg, #0f766e 0%, #14b8a6 100%);
+  border-radius: 2rpx;
+  transition: width 0.5s ease;
+}
+
+/* 表单区域 */
+.form-section {
+  position: relative;
+  z-index: 1;
+  padding: 0 40rpx;
+}
+
+.input-card {
+  background: white;
+  border-radius: 24rpx;
+  padding: 32rpx;
+  margin-bottom: 30rpx;
+  box-shadow: 0 8rpx 32rpx rgba(0, 0, 0, 0.08);
+  border: 1rpx solid #f1f5f9;
+  transition: all 0.3s ease;
+  overflow: hidden;
+  animation: fadeInUp 0.6s ease-out;
+  opacity: 0;
+  animation-fill-mode: forwards;
+  position: relative;
+}
+
+.input-card:nth-child(1) {
+  animation-delay: 0.7s;
+}
+
+.input-card:nth-child(2) {
+  animation-delay: 0.8s;
+}
+
+.input-card:focus-within::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 3rpx;
+  background: linear-gradient(90deg, #0f766e 0%, #14b8a6 100%);
+  animation: underlineProgress 0.3s ease forwards;
+}
+
+@keyframes underlineProgress {
+  from { transform: translateX(-100%); }
+  to { transform: translateX(0); }
+}
+
+.input-label {
+  display: flex;
+  align-items: center;
+  margin-bottom: 24rpx;
+  transition: all 0.3s ease;
+}
+
+.label-icon {
+  width: 28rpx;
+  height: 28rpx;
+  margin-right: 12rpx;
+  transition: all 0.3s ease;
+}
+
+.input-field:focus + .input-label .label-icon,
+.input-card:focus-within .label-icon {
+  transform: scale(1.1) rotate(5deg);
+  filter: brightness(1.2);
+}
+
+.label-text {
+  font-size: 30rpx;
+  font-weight: 600;
+  color: #0f172a;
+  flex: 1;
+}
+
+.required-star {
+  color: #ef4444;
+  font-size: 24rpx;
+  margin-left: 4rpx;
+}
+
+.input-container {
+  position: relative;
+  margin-bottom: 8rpx;
+}
+
+/* 输入框样式 */
+.input-field {
+  height: 88rpx;
+  font-size: 32rpx;
+  color: #0f172a;
+  padding: 0 80rpx 0 24rpx;
+  background: #f8fafc;
+  border-radius: 16rpx;
+  border: 2rpx solid #e2e8f0;
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  z-index: 2;
+  position: relative;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.input-field.error {
+  border-color: #ef4444;
+  background: rgba(239, 68, 68, 0.02);
+  animation: shake 0.5s cubic-bezier(0.36, 0.07, 0.19, 0.97) both;
+}
+
+.input-field.valid {
+  border-color: #22c55e;
+  background: rgba(34, 197, 94, 0.02);
+}
+
+.input-field.has-value {
+  border-color: #94a3b8;
+}
+
+.placeholder {
+  color: #94a3b8;
+  font-size: 28rpx;
+  transition: all 0.3s ease;
+}
+
+/* 清除按钮 */
+.clear-wrapper {
+  position: absolute;
+  right: 20rpx;
+  top: 50%;
+  transform: translateY(-50%);
+  z-index: 10;
+  animation: fadeIn 0.3s ease-out;
+}
+
+.clear-btn {
+  width: 44rpx;
+  height: 44rpx;
+  padding: 0;
+  margin: 0;
+  background: transparent;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  transition: all 0.2s ease;
+  position: relative;
+  overflow: hidden;
+  line-height: 1;
+}
+
+.clear-btn::after {
+  display: none;
+  border: none;
+}
+
+.clear-btn:active {
+  background-color: rgba(0, 0, 0, 0.1);
+  transform: scale(0.95);
+}
+
+.clear-icon {
+  width: 26rpx;
+  height: 26rpx;
+  opacity: 0.6;
+  filter: brightness(0%);
+  transition: all 0.2s ease;
+}
+
+.clear-btn:active .clear-icon {
+  opacity: 1;
+}
+
+/* 字符计数 */
+.char-count {
+  position: absolute;
+  right: 80rpx;
+  top: 50%;
+  transform: translateY(-50%);
+  font-size: 24rpx;
+  color: #94a3b8;
+  z-index: 1;
+  transition: all 0.3s ease;
+  opacity: 0.8;
+  background: transparent;
+  pointer-events: none;
+}
+
+.input-field.focused ~ .char-count {
+  opacity: 1;
+  transform: translateY(-50%) scale(1.1);
+}
+
+.char-count.warning {
+  color: #f59e0b;
+  animation: pulse 1.5s infinite;
+}
+
+/* 输入框下划线 */
+.input-underline {
+  position: relative;
+  height: 2rpx;
+  margin-top: -2rpx;
+  overflow: hidden;
+}
+
+.underline-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 100%;
+  background: #e2e8f0;
+}
+
+.underline-progress {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 0;
+  height: 100%;
+  background: #14b8a6;
+  transition: width 0.3s ease;
+}
+
+.underline-progress.active {
+  width: 100%;
+  animation: underlineExpand 0.3s ease forwards;
+}
+
+@keyframes underlineExpand {
+  from { width: 0; }
+  to { width: 100%; }
+}
+
+/* 身份证分段显示 */
+.id-segments {
+  position: absolute;
+  bottom: -40rpx;
+  left: 0;
+  right: 0;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 8rpx;
+  opacity: 0;
+  transform: translateY(10rpx);
+  transition: all 0.3s ease;
+  pointer-events: none;
+}
+
+.id-segments.show {
+  opacity: 0.7;
+  transform: translateY(0);
+}
+
+.id-segment {
+  font-size: 20rpx;
+  color: #94a3b8;
+  padding: 4rpx 8rpx;
+  background: #f1f5f9;
+  border-radius: 6rpx;
+  min-width: 60rpx;
+  text-align: center;
+  transition: all 0.3s ease;
+  transform: scale(0.9);
+}
+
+.id-segment.filled {
+  color: #0f766e;
+  background: rgba(20, 184, 166, 0.1);
+  font-weight: 500;
+  transform: scale(1);
+  animation: segmentFill 0.3s ease-out;
+}
+
+@keyframes segmentFill {
+  0% {
+    transform: scale(0.9);
+    opacity: 0.5;
+  }
+  50% {
+    transform: scale(1.05);
+  }
+  100% {
+    transform: scale(1);
+    opacity: 1;
   }
-  
-  .input-border {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    border: 2rpx solid transparent;
-    border-radius: 16rpx;
-    pointer-events: none;
+}
+
+.id-segment.last {
+  min-width: 40rpx;
+}
+
+/* 提示信息*/
+.hint-container {
+  display: flex;
+  align-items: center;
+  min-height: 36rpx;
+  padding-top: 8rpx;
+  opacity: 1;
+  transform: translateY(0);
+  transition: all 0.3s ease;
+  pointer-events: none;
+}
+
+.hint-text {
+  font-size: 24rpx;
+  line-height: 1.4;
+  flex: 1;
+  transition: all 0.3s ease;
+}
+
+.hint-text.normal {
+  color: #64748b;
+}
+
+.hint-text.error {
+  color: #ef4444;
+  animation: fadeInUp 0.3s ease-out;
+}
+
+/* 协议卡片 */
+.agreement-card {
+  background: white;
+  border-radius: 24rpx;
+  padding: 32rpx;
+  margin-top: 40rpx;
+  box-shadow: 0 8rpx 32rpx rgba(0, 0, 0, 0.08);
+  transition: all 0.3s ease;
+  animation: fadeInUp 0.6s ease-out 0.9s both;
+}
+
+.agreement-item {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+}
+
+.agreement-checkbox {
+  width: 40rpx;
+  height: 40rpx;
+  border: 2rpx solid #cbd5e1;
+  border-radius: 10rpx;
+  margin-right: 20rpx;
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  position: relative;
+  overflow: hidden;
+}
+
+.agreement-checkbox::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: linear-gradient(135deg, #0f766e 0%, #14b8a6 100%);
+  opacity: 0;
+  transition: opacity 0.3s ease;
+}
+
+.agreement-checkbox.checked {
+  border-color: #14b8a6;
+  animation: checkboxCheck 0.4s ease-out;
+}
+
+.agreement-checkbox.checked::before {
+  opacity: 1;
+}
+
+@keyframes checkboxCheck {
+  0% {
+    transform: scale(0.8);
+    opacity: 0.5;
+  }
+  50% {
+    transform: scale(1.1);
+  }
+  100% {
+    transform: scale(1);
+    opacity: 1;
   }
-  
-  .input-focus-border {
-    position: absolute;
-    top: -2rpx;
-    left: -2rpx;
-    right: -2rpx;
-    bottom: -2rpx;
-    border: 4rpx solid transparent;
-    border-radius: 18rpx;
+}
+
+.checkmark {
+  width: 26rpx;
+  height: 26rpx;
+  position: relative;
+  z-index: 1;
+  animation: checkmarkAppear 0.3s ease-out 0.1s both;
+}
+
+@keyframes checkmarkAppear {
+  0% {
+    transform: scale(0);
     opacity: 0;
-    transition: all 0.3s ease;
-    pointer-events: none;
   }
-  
-  .input-focus-border.active {
+  100% {
+    transform: scale(1);
     opacity: 1;
-    border-color: rgba(52, 152, 219, 0.3);
-  }
-  
-  .input-hint {
-    font-size: 24rpx;
-    color: #95a5a6;
-    margin-top: 12rpx;
-    min-height: 36rpx;
-    transition: all 0.3s ease;
-  }
-  
-  .input-hint.error {
-    color: #e74c3c;
-  }
-  
-  /* 验证码区域 */
-  .code-input-wrapper {
-    display: flex;
-    align-items: center;
-    gap: 20rpx;
-  }
-  
-  .code-input-container {
-    flex: 1;
-  }
-  
-  .send-code-btn {
-    min-width: 200rpx;
-    height: 88rpx;
-    background: linear-gradient(135deg, #3498db 0%, #2980b9 100%);
-    border-radius: 16rpx;
-    font-size: 26rpx;
-    color: white;
-    padding: 0;
-    margin: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    transition: all 0.3s ease;
-    box-shadow: 0 4rpx 20rpx rgba(52, 152, 219, 0.3);
-  }
-  
-  .send-code-btn::after {
-    border: none;
-  }
-  
-  .btn-content {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  
-  .sms-icon {
-    width: 24rpx;
-    height: 24rpx;
-    margin-right: 8rpx;
-  }
-  
-  .send-code-btn.disabled {
-    background: #bdc3c7;
-    box-shadow: none;
-    opacity: 0.6;
-  }
-  
-  .send-code-btn.counting {
-    background: #95a5a6;
-  }
-  
-  .btn-hover {
-    opacity: 0.9;
-    transform: translateY(-2rpx);
-  }
-  
-  /* 协议 */
-  .agreement-card {
-    background: white;
-    border-radius: 24rpx;
-    padding: 32rpx 40rpx;
-    margin: 0 40rpx 40rpx;
-    box-shadow: 0 8rpx 32rpx rgba(0, 0, 0, 0.06);
   }
-  
-  .agreement-item {
-    display: flex;
-    align-items: flex-start;
-  }
-  
-  .checkbox {
-    width: 36rpx;
-    height: 36rpx;
-    border: 2rpx solid #bdc3c7;
-    border-radius: 8rpx;
-    margin-right: 20rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-shrink: 0;
-    transition: all 0.3s ease;
+}
+
+.agreement-content {
+  font-size: 28rpx;
+  color: #475569;
+  line-height: 1.5;
+  flex: 1;
+  transition: color 0.3s ease;
+}
+
+.link-text {
+  color: #0f766e;
+  font-weight: 600;
+  margin: 0 4rpx;
+  position: relative;
+  display: inline-block;
+  transition: all 0.3s ease;
+}
+
+.link-text::after {
+  content: '';
+  position: absolute;
+  bottom: -2rpx;
+  left: 0;
+  right: 0;
+  height: 2rpx;
+  background: #0f766e;
+  transform: scaleX(0);
+  transform-origin: right;
+  transition: transform 0.3s ease;
+}
+
+.link-text:active::after {
+  transform: scaleX(1);
+  transform-origin: left;
+}
+
+/* 提交区域*/
+.submit-section {
+  position: relative;
+  z-index: 1;
+  padding: 40rpx 40rpx 30rpx;
+  animation: fadeInUp 0.6s ease-out 1s both;
+}
+
+.submit-button {
+  width: 100%;
+  padding: 10rpx 0;
+  border-radius: 50rpx;
+  font-size: 32rpx;
+  font-weight: 600;
+  margin: 0;
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  position: relative;
+  overflow: hidden;
+  border: none;
+  outline: none;
+  display: block; 
+}
+
+.submit-button::after {
+  border: none;
+}
+
+.submit-button.disabled {
+  background: #cbd5e1 !important;
+  color: #94a3b8 !important;
+  box-shadow: none !important;
+  transform: none !important;
+  cursor: not-allowed;
+}
+
+.submit-button.active {
+  background: linear-gradient(135deg, #0f766e 0%, #14b8a6 100%);
+  color: white;
+  box-shadow: 0 12rpx 40rpx rgba(20, 184, 166, 0.4);
+}
+
+.submit-button.active::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: linear-gradient(
+    90deg,
+    transparent 0%,
+    rgba(255, 255, 255, 0.2) 50%,
+    transparent 100%
+  );
+  transform: translateX(-100%);
+  animation: shimmer 2s infinite;
+}
+
+.button-hover {
+  opacity: 0.95;
+  transform: translateY(-2rpx) scale(1.01) !important;
+}
+
+
+
+/* 协议弹窗 */
+.modal-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(15, 23, 42, 0.5);
+  backdrop-filter: blur(10rpx);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1000;
+  opacity: 0;
+  visibility: hidden;
+  transition: all 0.3s ease;
+}
+
+.modal-overlay.show {
+  opacity: 1;
+  visibility: visible;
+}
+
+.modal-overlay.show .modal-container {
+  animation: modalSlideUp 0.4s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+@keyframes modalSlideUp {
+  0% {
+    transform: translateY(50rpx);
+    opacity: 0;
   }
-  
-  .checkbox.checked {
-    background: linear-gradient(135deg, #2ecc71 0%, #27ae60 100%);
-    border-color: transparent;
+  100% {
+    transform: translateY(0);
+    opacity: 1;
   }
-  
-  .check-icon {
-    width: 20rpx;
-    height: 20rpx;
+}
+
+.modal-container {
+  width: 680rpx;
+  background: white;
+  border-radius: 32rpx;
+  overflow: hidden;
+  box-shadow: 0 20rpx 60rpx rgba(0, 0, 0, 0.3);
+  max-height: 80vh;
+  display: flex;
+  flex-direction: column;
+}
+
+.modal-header {
+  padding: 40rpx 48rpx 24rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 1rpx solid #f1f5f9;
+}
+
+.modal-title {
+  font-size: 36rpx;
+  font-weight: 700;
+  color: #0f172a;
+}
+
+.modal-close {
+  width: 44rpx;
+  height: 44rpx;
+  padding: 0;
+  margin: 0;
+  background: #f1f5f9;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: all 0.2s ease;
+  border: none;
+  outline: none;
+}
+
+.modal-close::after {
+  border: none;
+}
+
+.modal-close:active {
+  background: #e2e8f0;
+  transform: scale(0.95);
+}
+
+.close-icon {
+  width: 26rpx;
+  height: 26rpx;
+  opacity: 0.6;
+}
+
+.modal-content {
+  flex: 1;
+  padding: 32rpx 48rpx;
+  max-height: 60vh;
+  box-sizing: border-box;
+}
+
+.modal-text {
+  font-size: 28rpx;
+  color: #475569;
+  line-height: 1.6;
+  white-space: pre-line;
+  animation: fadeIn 0.5s ease-out 0.2s both;
+}
+
+.modal-footer {
+  padding: 32rpx 48rpx 30rpx;
+  margin-top: 20rpx;
+}
+
+.modal-confirm {
+  width: 100%;
+  background: linear-gradient(135deg, #0f766e 0%, #14b8a6 100%);
+  border-radius: 24rpx;
+  font-size: 30rpx;
+  font-weight: 600;
+  color: white;
+  padding: 0;
+  margin: 0;
+  transition: all 0.2s ease;
+  border: none;
+  outline: none;
+  height: 88rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.modal-confirm::after {
+  border: none;
+}
+
+.modal-confirm:active {
+  opacity: 0.9;
+  transform: scale(0.98);
+}
+
+/* 成功弹窗 */
+.success-modal {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  opacity: 0;
+  visibility: hidden;
+  transition: all 0.3s ease;
+}
+
+.success-modal.show {
+  opacity: 1;
+  visibility: visible;
+}
+
+.success-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(15, 23, 42, 0.5);
+  backdrop-filter: blur(10rpx);
+}
+
+.success-modal.show .success-container {
+  animation: successZoomIn 0.6s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+@keyframes successZoomIn {
+  0% {
+    transform: scale(0.9);
+    opacity: 0;
   }
-  
-  .agreement-text {
-    font-size: 26rpx;
-    color: #2c3e50;
-    line-height: 1.4;
-    flex: 1;
+  50% {
+    transform: scale(1.05);
   }
-  
-  .link {
-    color: #3498db;
-    text-decoration: none;
+  100% {
+    transform: scale(1);
+    opacity: 1;
   }
-  
-  /* 提交按钮 */
-  .submit-section {
-    padding: 0 40rpx;
-    position: relative;
-    z-index: 1;
+}
+
+.success-container {
+  position: relative;
+  width: 680rpx;
+  background: white;
+  border-radius: 32rpx;
+  overflow: hidden;
+  box-shadow: 0 20rpx 60rpx rgba(0, 0, 0, 0.3);
+}
+
+.success-icon {
+  padding: 60rpx 0 40rpx;
+  text-align: center;
+  position: relative;
+}
+
+.success-badge {
+  width: 120rpx;
+  height: 120rpx;
+  margin: 0 auto;
+  position: relative;
+  z-index: 1;
+  filter: brightness(0);
+  animation: successBadge 0.8s ease-out;
+}
+
+@keyframes successBadge {
+  0% {
+    transform: scale(0);
+    opacity: 0;
   }
-  
-  .submit-btn {
-    width: 100%;
-    height: 100rpx;
-    background: linear-gradient(135deg, #2ecc71 0%, #27ae60 100%);
-    border-radius: 50rpx;
-    font-size: 32rpx;
-    color: white;
-    font-weight: 600;
-    padding: 0;
-    margin: 0;
-    transition: all 0.3s ease;
-    box-shadow: 0 10rpx 40rpx rgba(46, 204, 113, 0.4);
+  50% {
+    transform: scale(1.2);
   }
-  
-  .submit-btn::after {
-    border: none;
+  100% {
+    transform: scale(1);
+    opacity: 1;
   }
-  
-  .submit-btn.disabled {
-    background: #bdc3c7;
-    box-shadow: none;
-    opacity: 0.7;
+}
+
+.success-ring {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  border: 2rpx solid rgba(20, 184, 166, 0.3);
+  border-radius: 50%;
+}
+
+.ring-1 {
+  width: 160rpx;
+  height: 160rpx;
+  animation: ringPulse 2s ease-out infinite;
+}
+
+.ring-2 {
+  width: 200rpx;
+  height: 200rpx;
+  animation: ringPulse 2s ease-out 0.5s infinite;
+}
+
+@keyframes ringPulse {
+  0% {
+    transform: translate(-50%, -50%) scale(0.8);
+    opacity: 0;
   }
-  
-  .btn-inner {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
+  50% {
+    opacity: 1;
   }
-  
-  .arrow-icon {
-    width: 32rpx;
-    height: 32rpx;
-    margin-left: 12rpx;
-    opacity: 0.9;
+  100% {
+    transform: translate(-50%, -50%) scale(1.2);
+    opacity: 0;
   }
-  
-  .submit-btn-hover {
-    opacity: 0.9;
-    transform: translateY(-2rpx);
+}
+
+.success-body {
+  padding: 0 48rpx 40rpx;
+  animation: fadeInUp 0.6s ease-out 0.3s both;
+}
+
+.success-title {
+  font-size: 44rpx;
+  font-weight: 700;
+  color: #0f172a;
+  text-align: center;
+  margin-bottom: 16rpx;
+}
+
+.success-message {
+  font-size: 32rpx;
+  color: #475569;
+  text-align: center;
+  margin-bottom: 40rpx;
+}
+
+.brand {
+  color: #0f766e;
+  font-weight: 700;
+  margin: 0 4rpx;
+}
+
+.success-details {
+  background: #f8fafc;
+  border-radius: 20rpx;
+  padding: 32rpx;
+  animation: fadeInUp 0.6s ease-out 0.5s both;
+}
+
+.detail-item {
+  display: flex;
+  flex-direction: column;
+  gap: 12rpx;
+}
+
+.detail-item:not(:last-child) {
+  margin-bottom: 24rpx;
+}
+
+.detail-label {
+  display: flex;
+  align-items: center;
+  gap: 12rpx;
+}
+
+.detail-icon {
+  width: 24rpx;
+  height: 24rpx;
+  animation: iconBounce 0.6s ease-out;
+}
+
+@keyframes iconBounce {
+  0%, 100% {
+    transform: translateY(0);
+  }
+  50% {
+    transform: translateY(-4rpx);
+  }
+}
+
+.detail-label text {
+  font-size: 26rpx;
+  color: #64748b;
+}
+
+.detail-value {
+  font-size: 30rpx;
+  font-weight: 600;
+  color: #0f172a;
+  padding-left: 36rpx;
+}
+
+.success-footer {
+  padding: 0 48rpx 40rpx;
+  animation: fadeInUp 0.6s ease-out 0.7s both;
+}
+
+.success-button {
+  width: 100%;
+  height: 88rpx;
+  background: linear-gradient(135deg, #0f766e 0%, #14b8a6 100%);
+  border-radius: 24rpx;
+  font-size: 30rpx;
+  font-weight: 600;
+  color: white;
+  padding: 0;
+  margin: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 12rpx;
+  transition: all 0.2s ease;
+  border: none;
+  outline: none;
+}
+
+.success-button::after {
+  border: none;
+}
+
+.success-button:active {
+  opacity: 0.9;
+  transform: scale(0.98);
+}
+
+
+@keyframes homeFloat {
+  0%, 100% {
+    transform: translateY(0);
+  }
+  50% {
+    transform: translateY(-4rpx);
+  }
+}
+
+/* 通用动画 */
+@keyframes fadeIn {
+  from {
+    opacity: 0;
   }
-  
-  .submit-hint {
-    text-align: center;
-    font-size: 26rpx;
-    color: #7f8c8d;
-    margin-top: 24rpx;
+  to {
+    opacity: 1;
   }
-  
-  /* 底部装饰 */
-  .bottom-decoration {
-    text-align: center;
-    margin-top: 60rpx;
-    position: relative;
-    z-index: 1;
-    animation: fadeInUp 0.8s ease-out 0.3s both;
+}
+
+@keyframes fadeInUp {
+  from {
+    opacity: 0;
+    transform: translateY(20rpx);
   }
-  
-  .sheep-illustration {
-    width: 200rpx;
-    height: 150rpx;
-    margin-bottom: 20rpx;
-    opacity: 0.8;
+  to {
+    opacity: 1;
+    transform: translateY(0);
   }
-  
-  .decoration-text {
-    font-size: 28rpx;
-    color: #7f8c8d;
+}
+
+@keyframes fadeInRight {
+  from {
+    opacity: 0;
+    transform: translateX(-20rpx);
   }
-  
-  .highlight {
-    color: #3498db;
-    font-weight: 600;
+  to {
+    opacity: 1;
+    transform: translateX(0);
   }
-  
-  /* 成功弹窗 */
-  .success-modal {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: 1000;
+}
+
+@keyframes fadeInDown {
+  from {
     opacity: 0;
-    visibility: hidden;
-    transition: all 0.3s ease;
+    transform: translateY(-20rpx);
   }
-  
-  .success-modal.show {
+  to {
     opacity: 1;
-    visibility: visible;
+    transform: translateY(0);
   }
-  
-  .modal-mask {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: rgba(0, 0, 0, 0.5);
-    backdrop-filter: blur(10rpx);
-  }
-  
-  .modal-content {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%) scale(0.9);
-    width: 600rpx;
-    background: white;
-    border-radius: 32rpx;
-    padding: 60rpx 40rpx;
-    text-align: center;
+}
+
+@keyframes slideInDown {
+  from {
+    transform: translateY(-50rpx);
     opacity: 0;
-    transition: all 0.3s ease;
   }
-  
-  .success-modal.show .modal-content {
+  to {
+    transform: translateY(0);
     opacity: 1;
-    transform: translate(-50%, -50%) scale(1);
   }
-  
-  .modal-icon {
-    width: 120rpx;
-    height: 120rpx;
-    background: linear-gradient(135deg, #2ecc71 0%, #27ae60 100%);
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin: 0 auto 32rpx;
+}
+
+@keyframes bounceIn {
+  0%, 20%, 40%, 60%, 80%, 100% {
+    animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
   }
-  
-  .success-icon {
-    width: 60rpx;
-    height: 60rpx;
+  0% {
+    opacity: 0;
+    transform: scale3d(0.3, 0.3, 0.3);
   }
-  
-  .modal-title {
-    font-size: 40rpx;
-    font-weight: bold;
-    color: #2c3e50;
-    margin-bottom: 20rpx;
+  20% {
+    transform: scale3d(1.1, 1.1, 1.1);
   }
-  
-  .modal-message {
-    font-size: 32rpx;
-    color: #2c3e50;
-    margin-bottom: 16rpx;
+  40% {
+    transform: scale3d(0.9, 0.9, 0.9);
   }
-  
-  .brand-highlight {
-    color: #3498db;
-    font-weight: 600;
+  60% {
+    opacity: 1;
+    transform: scale3d(1.03, 1.03, 1.03);
   }
-  
-  .modal-subtitle {
-    font-size: 26rpx;
-    color: #7f8c8d;
-    margin-bottom: 40rpx;
-    line-height: 1.5;
+  80% {
+    transform: scale3d(0.97, 0.97, 0.97);
   }
-  
-  .modal-btn {
-    background: linear-gradient(135deg, #3498db 0%, #2980b9 100%);
-    border-radius: 50rpx;
-    height: 88rpx;
-    font-size: 30rpx;
-    color: white;
-    font-weight: 600;
-    padding: 0 60rpx;
-    margin: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 12rpx;
+  100% {
+    opacity: 1;
+    transform: scale3d(1, 1, 1);
   }
-  
-  .modal-btn::after {
-    border: none;
+}
+
+@keyframes shake {
+  10%, 90% {
+    transform: translateX(-1rpx);
   }
-  
-  .home-icon {
-    width: 32rpx;
-    height: 32rpx;
+  20%, 80% {
+    transform: translateX(2rpx);
   }
-  
-  /* 动画 */
-  @keyframes slideUp {
-    from {
-      opacity: 0;
-      transform: translateY(50rpx);
-    }
-    to {
-      opacity: 1;
-      transform: translateY(0);
-    }
+  30%, 50%, 70% {
+    transform: translateX(-4rpx);
   }
-  
-  @keyframes fadeInUp {
-    from {
-      opacity: 0;
-      transform: translateY(30rpx);
-    }
-    to {
-      opacity: 1;
-      transform: translateY(0);
-    }
+  40%, 60% {
+    transform: translateX(4rpx);
+  }
+}
+
+/* 响应式适配 */
+@media (max-width: 480px) {
+  .header-section,
+  .form-section,
+  .submit-section,
+  .progress-indicator {
+    padding-left: 30rpx;
+    padding-right: 30rpx;
   }
   
-  /* 响应式 */
-  @media (max-width: 480px) {
-    .form-card,
-    .agreement-card,
-    .submit-section {
-      margin-left: 30rpx;
-      margin-right: 30rpx;
-    }
-    
-    .code-input-wrapper {
-      flex-direction: column;
-      gap: 20rpx;
-    }
-    
-    .send-code-btn {
-      min-width: 100%;
-    }
-  }
\ No newline at end of file
+  .input-card,
+  .agreement-card {
+    padding: 24rpx;
+  }
+  
+  .modal-container,
+  .success-container {
+    width: 90%;
+    margin: 0 5%;
+  }
+  
+  .modal-header,
+  .modal-content,
+  .modal-footer,
+  .success-body,
+  .success-footer {
+    padding-left: 32rpx;
+    padding-right: 32rpx;
+  }
+  
+  .id-segments {
+    display: none;
+  }
+}
+
+/* 加载状态 */
+.loading-indicator {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(255, 255, 255, 0.9);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 9999;
+  opacity: 0;
+  visibility: hidden;
+  transition: all 0.3s ease;
+}
+
+.loading-indicator.show {
+  opacity: 1;
+  visibility: visible;
+}
+
+.loading-spinner {
+  width: 60rpx;
+  height: 60rpx;
+  border: 4rpx solid #f3f3f3;
+  border-top: 4rpx solid #14b8a6;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
\ No newline at end of file
diff --git a/utils/baseUrl.js b/utils/baseUrl.js
index 776c06a..79483b5 100644
--- a/utils/baseUrl.js
+++ b/utils/baseUrl.js
@@ -1,5 +1,5 @@
-// var baseUrl = 'https://wx.chenhaitech.com/ymtx-prod-api'
+var baseUrl = 'https://wx.chenhaitech.com/ymtx-prod-api'
 // var baseUrl = 'http://192.168.101.109:8080'
-var baseUrl = 'http://192.168.101.105:8082'
+// var baseUrl = 'http://192.168.101.105:8082'
 // var baseUrl = 'http://192.168.101.111:8081'
 module.exports = baseUrl
diff --git a/utils/http.js b/utils/http.js
index ce485a7..fd7798e 100644
--- a/utils/http.js
+++ b/utils/http.js
@@ -1,9 +1,11 @@
 var baseUrl = require('../utils/baseUrl')
 var ajaxtimes = 0
+var isShowingTokenExpiredModal = false // 新增：标记是否正在显示token过期弹窗
+
 module.exports = {
   http(url, method, params) {
     //发送一次请求就加1
-     ajaxtimes++
+    ajaxtimes++
     let token = 'token' // 获取token，自行获取token和签名，token和签名表示每个接口都要发送的数据
     let sign = 'sign' // 获取签名 (后台怎么定义的，就传什么)
     let data = {
@@ -52,22 +54,38 @@ module.exports = {
       success(res) {
         // console.log(res);
         if(res.data.code == 401){
-          wx.showModal({
-            title: '提示',
-            content: '登录已过期,请重新登录',
-            success (res) {
-              if (res.confirm) {
+          // 只在没有显示弹窗时才显示
+          if (!isShowingTokenExpiredModal) {
+            isShowingTokenExpiredModal = true
+            wx.showModal({
+              title: '提示',
+              content: '登录已过期,请重新登录',
+              success (res) {
+                if (res.confirm) {
+                  // 重置标记
+                  isShowingTokenExpiredModal = false
                   wx.reLaunch({
                     url: '/pages/login/login',
                   })
-              } else if (res.cancel) {
-                
+                } else if (res.cancel) {
+                  // 重置标记
+                  isShowingTokenExpiredModal = false
+                }
+              },
+              // 确保在模态框关闭时重置标记
+              complete: function() {
+                // 如果success回调没有执行（例如直接点击蒙层关闭），在这里重置标记
+                setTimeout(() => {
+                  isShowingTokenExpiredModal = false
+                }, 300)
               }
-            }
-          })
-        }else{
-         params.success && params.success(res.data)
-      }
+            })
+          }
+          // 401错误时，不调用params.success，直接返回
+          return
+        } else {
+          params.success && params.success(res.data)
+        }
       },
       fail(err) {
         params.fail && params.fail(err)
@@ -81,4 +99,4 @@ module.exports = {
       },
     })
   }
-}
+}
\ No newline at end of file