diff --git a/App.vue b/App.vue
index 9b0e1a3..6b499f3 100644
--- a/App.vue
+++ b/App.vue
@@ -6,12 +6,14 @@
 					login_status:true,
 					phone:null,
 					bannerList: [],
-					pricePreviewList: []
+					pricePreviewList: [],
+					configData: [],
 		},
 		onLaunch: function() {
 			routerInterception()
 			this.getBannerList()
 			this.getPricePreviewList()
+			this.getConfigData()
 			// console.log(this.$utils)
 			console.log('App Launch')
 		},
@@ -40,7 +42,17 @@
 						uni.$emit('pricePreviewListUpdated')
 					}
 				})
-			}
+			},
+			getConfigData() {
+            this.$api('getConfig', {}, res => {
+        // console.log('Config data response:', JSON.parse(JSON.stringify(res)) )
+        if (res && res.success && Array.isArray(res.result)) {
+		  getApp().globalData.configData = res.result
+        //   console.log('Config data set:',  JSON.parse(JSON.stringify(this.configData)) )
+        }
+      })
+    },
+
 		}
 	}
 </script>
diff --git a/api/model/index.js b/api/model/index.js
index b6934e3..8e200da 100644
--- a/api/model/index.js
+++ b/api/model/index.js
@@ -8,151 +8,150 @@ const api = {
 		auth : false,
 	},
 
-	getRiceIconList: {
-		url: '/index_common/getRiceIconList',
+	getHanHaiMemberUser: {
+		url: '/recycle-admin/applet/promotion/getHanHaiMemberUser',
 		method: 'GET',
+		auth: true,
 	},
-	// 获取首页新闻详情
-	getRiceNewsDetail: {
-		url: '/index_common/getCommonNewsDetail',
-		method: 'GET',
+	// 升级用户为推广官
+	upgrade: {
+		url: '/recycle-admin/applet/info_team/upgrade',
+		method: 'POST',
+		auth: true,
 	},
-	// 获取首页新闻列表
-	getRiceNewsList: {
-		url: '/index_common/getRiceNewsList',
-		method: 'GET',
+	// 拉黑用户
+	blackUser: {
+		url: '/recycle-admin/applet/info_team/blackUser',
+		method: 'POST',
+		auth: true,
 	},
-	// 获取首页公告列表
-	getRiceNoticeList: {
-		url: '/index_common/getRiceNoticeList',
-		method: 'GET',
+	// 订单驳回
+	rejectOrder: {
+		url: '/recycle-admin/applet/info_team_order/rejectOrder',
+		method: 'POST',
+		auth: true,
 	},
-	// 获取首页商品详情
-	getRiceProductDetail: {
-		url: '/index_common/getRiceProductDetail',
-		method: 'GET',
+	// 订单通过
+	passOrder: {
+		url: '/recycle-admin/applet/info_team_order/passOrder',
+		method: 'POST',
+		auth: true,
 	},
-	// 获取首页体验产品
-	getRiceProductList: {
-		url: '/index_common/getRiceProductList',
-		method: 'GET',
+	// 解除员工
+	removeMember: {
+		url: '/recycle-admin/applet/member/removeMember',
+		method: 'POST',
+		auth: true,
 	},
-	// 查询分类接口
-	getCategoryList: {
-		url: '/index_common/getCategoryList',
+	// 查询员工列表
+	getMyTeamList: {
+		url: '/recycle-admin/applet/member/getMyTeamList',
 		method: 'GET',
+		auth: true,
 	},
-	// 新查询分类以及商品数据接口
-	getCategoryPidList: {
-		url: '/index_common/getCategoryPidList',
+	// 查询员工详情
+	getMemberInfo: {
+		url: '/recycle-admin/applet/member/getMemberInfo',
 		method: 'GET',
-		debounce : 250,
+		auth: true,
 	},
-	// 查询一级分类接口
-	getPidList: {
-		url: '/index_common/getCategoryPidList',
-		method: 'GET',
+	// 拒绝推广官申请
+	rejectPromotionApply: {
+		url: '/recycle-admin/applet/promotion/rejectPromotionApply',
+		method: 'POST',
+		auth: true,
 	},
-	// 获取分类分页商品列表接口
-	getClassShopPageList: {
-		url: '/index_common/getClassShopPageList',
-		method: 'GET',
+	// 同意推广官申请
+	passPromotionApply: {
+		url: '/recycle-admin/applet/promotion/passPromotionApply',
+		method: 'POST',
+		auth: true,
 	},
-	// 加入购物车
-	addCart: {
-		url: '/index_common/addCart',
+	// 获取推广表单申请列表带分页
+	getPromotionApplyListPage: {
+		url: '/recycle-admin/applet/promotion/getPromotionApplyListPage',
 		method: 'GET',
 		auth: true,
-		showLoading: true,
-		limit : 500,
 	},
-	// 删除购物车信息
-	deleteCart: {
-		url: '/index_common/deleteCart',
-		method: 'DELETE',
+	// 获取推广员列表
+	getPromotionList: {
+		url: '/recycle-admin/applet/promotion/getPromotionList',
+		method: 'GET',
 		auth: true,
-		showLoading: true,
 	},
 	// 修改购物车信息数量
-	updateCartNum: {
-		url: '/index_common/updateCartNum',
-		method: 'POST',
+	getUserOrderNum: {
+		url: '/recycle-admin/applet/info_team_order/getUserOrderNum',
+		method: 'GET',
 		auth: true,
-		debounce: 300,
 	},
-	// 创建订单
-	createOrder: {
-		url: '/index_common/createOrder',
+	// 获取管理员订单详情
+	getOrderDetail: {
+		url: '/recycle-admin/applet/info_team_order/getOrderDetail',
 		method: 'GET',
 		auth: true,
-		limit: 1000,
-		showLoading: true,
 	},
-	// 创建订单-再次支付
-	createOrderTwo: {
-		url: '/index_common/createOrderTwo',
+	// 获取管理员订单列表
+	getOrderList: {
+		url: '/recycle-admin/applet/info_team_order/getOrderList',
 		method: 'GET',
-		auth: true,
-		limit: 1000,
-		showLoading: true,
+		auth: true
 	},
-	// 多商品创建订单
-	createSumOrder: {
-		url: '/index_common/createSumOrder',
+	// 创建预约订单
+	createOrder: {
+		url: '/recycle-admin/applet/order/createOrder',
 		method: 'POST',
 		auth: true,
-		limit: 1000,
-		showLoading: true,
 	},
-	// 多商品订单再次支付
-	createSumOrderAgain: {
-		url: '/index_common/createSumOrderAgain',
-		method: 'POST',
+	// 流水列表带分页
+	getMyMoneyLogPage: {
+		url: '/recycle-admin/applet/money/getMyMoneyLogPage',
+		method: 'GET',
 		auth: true,
-		limit: 1000,
-		showLoading: true,
 	},
 	// 确认收货
-	confirmOrder: {
-		url: '/index_common/confirmOrder',
-		method: 'GET',
+	apply: {
+		url: '/recycle-admin/applet/promotion/apply',
+		method: 'POST',
 		auth: true,
-		limit: 1000,
-		showLoading: true,
 	},
-	// 取消订单
-	cancelOrder: {
-		url: '/index_common/cancelOrder',
+	// 获取推广官信息
+	getMyPromotionInfo: {
+		url: '/recycle-admin/applet/promotion/getMyPromotionInfo',
 		method: 'GET',
 		auth: true,
-		limit: 1000,
-		showLoading: true,
 	},
 	// 获取首页广告列表
-	getRiceProductList: {
-		url: '/index_common/getRiceAdList',
+	getRankList: {
+		url: '/recycle-admin/applet/promotion/getRankList',
 		method: 'GET',
+		auth : true
 	},
-	// 获取首页广告列表
-	getRiceAdDetail: {
-		url: '/index_common/getRiceAdDetail',
+	// 获取品牌列表
+	getGoodsBrandList: {
+		url: '/recycle-admin/applet/class/getGoodsBrandList',
 		method: 'GET',
+		auth : false
 	},
-	//获取优惠券信息
-	getRiceCouponList: {
-		url: '/info_common/getRiceCouponList',
+	//联系客服页面
+	getQuestionList: {
+		url: '/recycle-admin/applet/order/getQuestionList',
 		method: 'GET',
+		auth : false
 	},
-	//增加或者修改合伙人申请信息
-	addOrUpdateCommonUser: {
-		url: '/index_common/addOrUpdateCommonUser',
-		method: 'POST',
+	//获取用户信息
+	getInfoTeamListPage: {
+		url: '/recycle-admin/applet/info_team/getInfoTeamListPage',
+		method: 'GET',
+		auth : true
 	},
-	//根据用户查询渠合伙人申请信息表单
-	getCommonUser: {
-		url: '/index_common/getCommonUser',
-		method: 'GET'
+	//查看订单详情
+	getOrderDetail: {
+		url: '/recycle-admin/applet/order/getOrderDetail',
+		method: 'GET',
+		auth : true
 	},
+	
 	//查看最近回收质检报告
 	getQualityReport: {
 		url: '/recycle-admin/applet/index/getQualityReport',
diff --git a/pages.json b/pages.json
index 44b9b8b..f3fffc4 100644
--- a/pages.json
+++ b/pages.json
@@ -215,6 +215,27 @@
 						"navigationStyle": "custom",
 						"enablePullDownRefresh": true
 					}
+				},
+				{
+					"path": "promotion-withdraw-record",
+					"style": {
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "promotion-profit-detail",
+					"style": {
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "promotion-team",
+					"style": {
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
+					}
 				}
 			]
 		},
@@ -279,7 +300,7 @@
 					"path": "staff",
 					"style": {
 						"navigationStyle": "custom",
-						"enablePullDownRefresh": false
+						"enablePullDownRefresh": true
 					}
 				},
 				{
@@ -293,7 +314,7 @@
 					"path": "tui",
 					"style": {
 						"navigationStyle": "custom",
-						"enablePullDownRefresh": false
+						"enablePullDownRefresh": true
 					}
 				},
 				{
diff --git a/pages/component/home.vue b/pages/component/home.vue
index 11265fe..ce969d1 100644
--- a/pages/component/home.vue
+++ b/pages/component/home.vue
@@ -44,7 +44,7 @@
 		    <text>已开通包邮服务城市有哪些？</text>
 		    <uni-icons type="right" size="16" color="#999"></uni-icons>
 		  </view>
-		  <text class="city-list">武汉市、北京市、上海市、武汉市、北京市、上海市...</text>
+		  <text class="city-list">{{ cityListStr }}</text>
 		</view>
 		
 
@@ -178,22 +178,8 @@ export default {
     return {
 		value:0,
       processes: [
-        // { icon: '/static/home/① 在线预约.png', text: '在线预约' },
-        // { icon: '/static/home/② 快递上门.png', text: '快递上门' },
-        // { icon: '/static/home/③ 透明质检.png', text: '透明质检' },
-        // { icon: '/static/home/④ 现金打款.png', text: '现金打款' }
       ],
       priceList: [],
-      priceListStatic: [
-        { icon: '/static/home/羽绒服.png', name: '羽绒服', price: '3-10', unit: '件' },
-        { icon: '/static/home/鞋子.png', name: '鞋子', price: '3-10', unit: '件' },
-        { icon: '/static/home/包包.png', name: '包包', price: '3-10', unit: '件' },
-        { icon: '/static/home/床被.png', name: '床被', price: '3-10', unit: '件' },
-        { icon: '/static/home/品牌服饰.png', name: '品牌服饰', price: '3-10', unit: '件' },
-        { icon: '/static/home/T 恤衬衣.png', name: 'T恤衬衫', price: '3-10', unit: '件' },
-        { icon: '/static/home/羽绒裤.png', name: '羽绒裤', price: '3-10', unit: '件' },
-        { icon: '/static/home/儿童羽绒服.png', name: '儿童羽绒服', price: '3-10', unit: '件' }
-      ],
       records: [],
       destinations: [
         { 
@@ -218,9 +204,21 @@ export default {
         }
       ],
       bannerList: [],
-      pricePreviewList: []
+      pricePreviewList: [],
+      cityList: []
     }
   },
+  computed: {
+    cityListStr() {
+      // 只取前8个城市，超出用...结尾
+      const names = this.cityList.map(c => c.name)
+      const max = 8
+      if (names.length > max) {
+        return names.slice(0, max).join('、') + '...'
+      }
+      return names.join('、')
+    },
+  },
   methods: {
 	  changeTo(e){
 	  		    this.value = e
@@ -282,20 +280,22 @@ export default {
     getPricePreview() {
       const resList = this.pricePreviewList || []
       if (Array.isArray(resList)) {
-        // 只取一级分类，按sort升序
+          // 只取一级分类，按sort升序
         const firstLevel = resList.filter(item => item.pid === '0').sort((a, b) => a.sort - b.sort)
-        this.priceList = firstLevel.map(item => {
-          // 从静态表中找图片和价格
-          const staticItem = this.priceListStatic.find(s => s.name.replace(/\s/g, '') === item.title.replace(/\s/g, ''))
-          return {
-            id: item.id, // 保证有id
-            icon: staticItem ? staticItem.icon : '',
-            name: item.title,
-            price: staticItem ? staticItem.price : '',
-            unit: '件'
-          }
-        })
-      }
+        // console.log(firstLevel,'firstLevel');
+          this.priceList = firstLevel.map(item => {
+            // 从静态表中找图片和价格
+            // const staticItem = this.priceListStatic.find(s => s.name.replace(/\s/g, '') === item.title.replace(/\s/g, ''))
+            // console.log(item,'item');
+            return {
+              id: item.id, // 保证有id
+              icon: item.icon ? item.icon : '',
+              name: item.title,
+              price: item.priceNo ? item.priceNo : '',
+              unit: item.unit ? item.unit : ''
+            }
+          })
+        }
     },
     getRecentGoods() {
       this.$api('getRecentGoodsList', {}, res => {
@@ -316,6 +316,16 @@ export default {
       uni.navigateTo({
         url: `/pages/subcomponent/inspection-report?id=${item.id}`
       })
+    },
+    getFreeCityList() {
+      this.$api('getFreeCityList', {}, res => {
+        if (res && res.code === 200 && Array.isArray(res.result)) {
+          // 只取一级城市（有children的name）
+          this.cityList = res.result.map(item => ({ name: item.name })).filter(item => item.name)
+        } else {
+          this.cityList = []
+        }
+      })
     }
   },
   onLoad() {
@@ -324,6 +334,7 @@ export default {
       this.getRecentGoods();
       this.pricePreviewList = getApp().globalData.pricePreviewList || []
       this.bannerList = getApp().globalData.bannerList || []
+      this.getFreeCityList();
       uni.$on('pricePreviewListUpdated', () => {
         this.pricePreviewList = getApp().globalData.pricePreviewList || []
         this.getPricePreview()
@@ -339,6 +350,7 @@ export default {
   onShow() {
     // 移除自动下拉刷新
     // uni.startPullDownRefresh()
+    this.getPricePreview();
   }
 }
 </script>
@@ -495,7 +507,7 @@ export default {
       color: #999;
     }
   }
-  
+
   .submit-btn {
     background: linear-gradient(to right, #ffd01e, #ff8917);
     border-radius: 70rpx;
@@ -647,10 +659,10 @@ export default {
     border-radius: 16rpx;
     padding: 10rpx;
     background-color: #fff8ea;
-    image{
-      width: 60rpx;
-      height: 60rpx;
-    }
+	image{
+		width: 60rpx;
+		height: 60rpx;
+	}
     .location {
       font-size: 28rpx;
       color: #333;
@@ -665,23 +677,23 @@ export default {
     }
 
     .user-id {
-      font-family: PingFang SC;
+     font-family: PingFang SC;
       font-weight: 500;
       font-size: 24rpx;
-      line-height: 140%;
-      letter-spacing: 0%;
-      text-align: center;
-      color: #183c5c;
+     line-height: 140%;
+     letter-spacing: 0%;
+     text-align: center;
+	 color: #183c5c;
     }
-    .user-id-f{
-      font-family: PingFang SC;
-      font-weight: 400;
+	.user-id-f{
+			  font-family: PingFang SC;
+			  font-weight: 400;
       font-size: 22rpx;
-      line-height: 140%;
-      letter-spacing: 0%;
-      text-align: center;
-      color: #9b9b9b;
-    }
+			  line-height: 140%;
+			  letter-spacing: 0%;
+			  text-align: center;
+			  color: #9b9b9b;
+	}
   }
 }
 
diff --git a/pages/component/my.vue b/pages/component/my.vue
index 1d15e14..047ee73 100644
--- a/pages/component/my.vue
+++ b/pages/component/my.vue
@@ -43,7 +43,7 @@
         <image class="avatar" :src="userInfo.headImage" mode="aspectFill"></image>
         <view class="info">
           <text class="name">{{userInfo.nickName}}</text>
-          <text class="id">{{userInfo.id}}</text>
+          <text class="id">ID: {{userInfo.intentioCode}}</text>
         </view>
       </view>
       <view class="wallet-info">
@@ -61,7 +61,7 @@
         <view class="recycle-count">
           <text class="label">累计回收</text>
           <view class="count">
-            <text class="value">341</text>
+            <text class="value">{{totalOrders}}</text>
             <text class="unit">单</text>
           </view>
         </view>
@@ -74,24 +74,24 @@
     </view>
 
     <!-- 订单区域 -->
-    <view class="order-section" v-if="login_status">
+    <view class="order-section" v-if="login_status" @tap="viewAllOrders">
       <view class="section-header">
         <text class="title">我的订单</text>
-        <view class="view-all" @tap="viewAllOrders">
+        <view class="view-all">
           <text>查看全部</text>
           <text class="arrow">></text>
         </view>
       </view>
-      <view class="order-tabs">
+      <view class="order-tabs" @tap.stop>
         <view 
           v-for="(tab, index) in orderTabs" 
           :key="index"
           class="tab-item"
           :class="{ active: currentTab === index }"
-          @tap="switchTab(index)"
+          @tap.stop="switchTab(index)"
         >
           <text>{{tab.name}}</text>
-          <text class="badge" v-if="tab.badge">{{tab.badge}}</text>
+          <!-- <text class="badge" v-if="tab.badge">{{tab.badge}}</text> -->
         </view>
       </view>
       <!-- 订单列表 -->
@@ -240,7 +240,8 @@ export default {
         { name: '修改信息', icon: '/static/my/修改信息.png' },
         { name: '退出登录', icon: '/static/my/退出登录.png' }
       ],
-      orderList: []
+      orderList: [],
+      totalOrders: 0  // 添加累计回收单数字段
     }
   },	
   methods: {
@@ -286,7 +287,7 @@ export default {
       const pages = [
         // '/pages/subcomponent/promotion',
         '/pages/subcomponent/select',
-        '/pages/subcomponent/customer',
+        '/pages/subcomponent/admin_faq',
         '/pages/subcomponent/edit_profile',
         'logout'
       ]
@@ -345,18 +346,29 @@ export default {
     },
     fetchOrderList() {
       let status = ''
-      if (this.currentTab === 1) status = 0 // 进行中
+      if (this.currentTab === 1) status = 1 // 进行中
       if (this.currentTab === 2) status = 3 // 已完成
       const params = { pageSize: 1, current: 1 }
       if (status !== '') params.status = status
       this.$api && this.$api('getOrderListPage', params, res => {
         if (res && res.code === 200 && res.result && Array.isArray(res.result.records)) {
           this.orderList = res.result.records
+          // 更新累计回收单数
         } else {
           this.orderList = []
         }
       })
     },
+    getTotalOrders(){
+      this.$api && this.$api('getOrderListPage', {}, res => {
+        if (res && res.code === 200 && res.result && Array.isArray(res.result.records)) {
+          // 更新累计回收单数
+          this.totalOrders = res.result.total || 0
+        } else {
+          this.totalOrders = 0
+        }
+      })
+    }
   },
   computed: {
 			customStyle() {
@@ -377,6 +389,7 @@ export default {
     })
     this.fetchUserInfo()
     this.fetchOrderList()
+    this.getTotalOrders()
     uni.$on('bannerListUpdated', () => {
       this.$forceUpdate && this.$forceUpdate()
     })
@@ -386,9 +399,11 @@ export default {
   },
   onShow() {
     this.fetchUserInfo()
+    this.getTotalOrders()
   },
   onPullDownRefresh() {
     this.fetchUserInfo()
+    this.getTotalOrders()
     setTimeout(() => {
       uni.stopPullDownRefresh()
       uni.showToast({
@@ -634,21 +649,6 @@ export default {
         background: #fff;
         box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.05);
       }
-
-      .badge {
-        position: absolute;
-        top: 4rpx;
-        right: 50%;
-        transform: translateX(24rpx);
-        background: #ff6b35;
-        color: #fff;
-        font-size: 20rpx;
-        padding: 0 8rpx;
-        border-radius: 20rpx;
-        min-width: 28rpx;
-        height: 28rpx;
-        line-height: 28rpx;
-      }
     }
   }
 
diff --git a/pages/component/recycle.vue b/pages/component/recycle.vue
index 1bffb55..368f6d5 100644
--- a/pages/component/recycle.vue
+++ b/pages/component/recycle.vue
@@ -19,7 +19,7 @@
     <!-- 商品列表 -->
     <view class="goods-list">
       <!-- 左侧分类导航 -->
-      <scroll-view class="category-nav" scroll-y>
+      <view class="category-nav">
         <view 
           v-for="(category, index) in categories" 
           :key="category.id || index"
@@ -30,10 +30,10 @@
           <view class="category-dot" v-if="getCategoryItemCount(index) > 0"></view>
           {{ category.title }}
         </view>
-      </scroll-view>
+      </view>
 
       <!-- 右侧商品列表 -->
-      <scroll-view class="goods-content" scroll-y @scrolltolower="loadMoreGoods" style="height: 70vh">
+      <scroll-view class="goods-content" scroll-y @scrolltolower="loadMoreGoods">
         <view class="goods-section">
           <view class="goods-item" v-for="(item, index) in recycleList" :key="index">
             <image v-if="item.image" :src="item.image" class="goods-item-img" mode="aspectFit" />
@@ -47,7 +47,7 @@
                   </view>
                 </view>
               </view>
-              <text class="goods-desc">{{item.desc}}</text>
+              <text class="goods-desc">{{item.service}}</text>
               <view class="goods-info">
                 <view class="price-info">
                   <text class="price-symbol">¥</text>
@@ -60,7 +60,7 @@
                   <button class="btn-plus" @tap="updateQuantity(index, 1)">+</button>
                 </view>
               </view>
-              <view class="brand-check" v-if="item.shopCion" @tap="showBrandPopup = true">
+              <view class="brand-check" v-if="item.shopCion" @tap="checkBrand(index)">
                 <text>查看品牌</text>
                 <uni-icons type="right" size="14" color="#ff7a0e"></uni-icons>
               </view>
@@ -123,7 +123,7 @@
             <image v-if="item.image" :src="item.image" class="panel-item-img" mode="aspectFit" />
             <view class="panel-item-info">
               <text class="panel-item-name">{{item.name}}</text>
-              <text class="panel-item-desc">{{item.desc}}</text>
+              <text class="panel-item-desc">{{2222}}</text>
               <text class="panel-item-price">¥{{item.price}}/件</text>
             </view>
             <view class="panel-quantity-control">
@@ -184,7 +184,7 @@
     </uv-tabbar>
 
     <!-- 品牌索引弹窗 -->
-    <view v-if="showBrandPopup" class="brand-popup-mask" @tap.self="closeBrandPopup">
+    <view v-if="showBrandPopup" class="brand-popup-mask">
       <view class="brand-popup">
         <view class="brand-popup-header">
           <text class="brand-popup-close" @tap="closeBrandPopup">关闭</text>
@@ -259,6 +259,7 @@
 
 <script>
   import tabBarMixin from '../mixins/tabBarMixin.js'
+  import { pinyin } from '../../utils/pinyin.js'
 export default {
   mixins: [tabBarMixin],
   data() {
@@ -282,11 +283,7 @@ export default {
         logo: '',
         name: ''
       },
-      brandList: [
-        { logo: '/static/brand/alexander.png', name: 'Alexander McQueen/亚历山大麦昆', letter: 'A' },
-        { logo: '/static/brand/alexander.png', name: 'Alexander McQueen/亚历山大麦昆', letter: 'A' },
-        // ... 可补充更多品牌 ...
-      ],
+      brandList: [],
       brandIndexList: ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'],
       currentLetter: 'A',
       scrollToView: '',
@@ -330,8 +327,8 @@ export default {
       return { min, max }
     },
     selectedProducts() {
-      // 返回所有已选商品
-      return this.recycleList.filter(item => item.quantity > 0)
+      // 返回所有分类下所有已选商品
+      return Object.values(this.allProducts).flat().filter(item => item.quantity > 0)
     },
     filteredBrandList() {
       if (!this.brandSearch) return this.brandList
@@ -388,10 +385,10 @@ export default {
       this.loadingMore = false
       this.finished = false
       const categoryId = this.categories[index]?.id
-      console.log(categoryId,'switchCategory')
+      // console.log(categoryId,'switchCategory')
       if (!this.allProducts[categoryId]) {
         this.fetchGoodsList(categoryId, 1)
-      }
+          }
     },
     // 更新商品数量
     updateQuantity(index, delta) {
@@ -401,12 +398,14 @@ export default {
       // 品牌商品且数量为0且加一时弹出品牌索引弹窗
       if (item.shopCion && (item.quantity || 0) === 0 && delta > 0) {
         this.pendingBrandIndex = index
+        // console.log(item.shopCion,'item.shopCion')
+        this.getGoodsBrandList(item.shopCion)
         this.showBrandPopup = true // 打开品牌索引弹窗
         return
       }
       let newQuantity = (item.quantity || 0) + delta
       if (newQuantity < 0) newQuantity = 0
-      this.$set(item, 'quantity', newQuantity)
+        this.$set(item, 'quantity', newQuantity)
     },
     // 显示回收规则
     showRules(item) {
@@ -417,7 +416,7 @@ export default {
         } else {
           this.ruleHtml = '<p>暂无回收规则</p>'
         }
-        this.showRulePopup = true
+      this.showRulePopup = true
       })
     },
     showMore() {
@@ -454,25 +453,28 @@ export default {
       }, 1500)
     },
     goToPickup() {
-      // 获取所有选中的衣物
-      const selectedItems = this.recycleList.filter(item => item.quantity > 0).map(item => ({
+      // 获取所有选中的衣物（所有分类）
+      const selectedItems = this.selectedProducts.map(item => ({
+        id: item.id,
         name: item.name,
         icon: item.image,
         quantity: item.quantity,
         unitPrice: item.price,
         desc: '允许脏破烂，160码以上'
       }))
-
-      // 将选中的衣物信息转换为字符串
       const itemsStr = encodeURIComponent(JSON.stringify(selectedItems))
-      
-      // 跳转到预约页面
       uni.navigateTo({
         url: `/pages/subcomponent/pickup?fromRecycle=true&items=${itemsStr}`
       })
     },
     checkBrand(index) {
+      const categoryId = this.categories[this.currentCategory]?.id
+      const item = this.allProducts[categoryId]?.[index]
+      if (item?.shopCion) {
+        this.pendingBrandIndex = index
+        this.getGoodsBrandList(item.shopCion)
       this.showBrandPopup = true
+      }
     },
     closeBrandPopup() {
       this.showBrandPopup = false
@@ -568,6 +570,36 @@ export default {
         this.pendingBrandIndex = null
       }
     },
+    getGoodsBrandList(iconId) {
+      this.$api('getGoodsBrandList', { iconId }, res => {
+        // console.log(res,'res')
+        if (res && res.success && res.result && res.result.records) {
+          this.brandList = res.result.records.map(item => {
+            // 获取品牌名称的拼音首字母
+            const firstChar = this.getPinyinFirstLetter(item.name)
+            return {
+              logo: item.image || '/static/brand/alexander.png',
+              name: item.name,
+              letter: firstChar
+            }
+          })
+          // console.log(this.brandList,'this.brandList')
+        }
+      })
+    },
+    // 获取中文拼音首字母
+    getPinyinFirstLetter(str) {
+      if (!str) return '#'
+      const firstChar = str.charAt(0)
+      // 遍历pinyin对象，查找包含该汉字的拼音
+      for (let key in pinyin) {
+        const chars = pinyin[key]
+        if (chars && chars.indexOf(firstChar) !== -1) {
+          return key.charAt(0).toUpperCase()
+        }
+      }
+      return '#'
+    },
   },
   created() {
     this.currentCategory = 0
@@ -589,7 +621,7 @@ export default {
         } else {
           this.tabbarHeight = uni.upx2px ? uni.upx2px(95) : 45
         }
-        console.log(this.tabbarHeight,'tabbarHeight')
+        // console.log(this.tabbarHeight,'tabbarHeight')
       }).exec()
     })
   },
@@ -605,9 +637,22 @@ export default {
     if (getApp().globalData.bannerList && getApp().globalData.bannerList.length > 0) {
       this.$forceUpdate && this.$forceUpdate()
     }
+    // 检查全局清空标志（兼容 reLaunch）
+    if (getApp().globalData.shouldClearRecycle) {
+      Object.values(this.allProducts).forEach(categoryItems => {
+        categoryItems.forEach(item => {
+          this.$set(item, 'quantity', 0)
+        })
+      })
+      this.showDetailPanel = false
+      this.$forceUpdate()
+      getApp().globalData.shouldClearRecycle = false
+    }
   },
   onUnload() {
     uni.$off('bannerListUpdated')
+    // 移除事件监听
+    uni.$off('clearRecycleOrderData')
   },
   onShow() {
     const id = getApp().globalData.targetRecycleCategoryId
@@ -631,14 +676,34 @@ export default {
       }
       trySwitch()
     }
+    // 检查全局清空标志
+    if (getApp().globalData.shouldClearRecycle) {
+      Object.values(this.allProducts).forEach(categoryItems => {
+        categoryItems.forEach(item => {
+          this.$set(item, 'quantity', 0)
+        })
+      })
+      this.showDetailPanel = false
+      this.$forceUpdate()
+      getApp().globalData.shouldClearRecycle = false
+    }
+    // 监听清除订单数据的事件
+    uni.$on('clearRecycleOrderData', () => {
+      // 清除所有商品的选中数量，保证响应式
+      Object.values(this.allProducts).forEach(categoryItems => {
+        categoryItems.forEach(item => {
+          this.$set(item, 'quantity', 0)
+        })
+      })
+      // 重置其他相关数据
+      this.showDetailPanel = false
+      this.$forceUpdate()
+    })
   },
   watch: {
     categories(newVal) {
       const id = getApp().globalData.targetRecycleCategoryId
-      console.log('targetRecycleCategoryId', id)
-      console.log('categories:', newVal.map(c => c.id))
       const idx = newVal.findIndex(c => String(c.id) === String(id))
-      console.log('findIndex result:', idx)
       if (id && newVal.length > 0 && idx !== -1) {
         this.currentCategory = idx
         getApp().globalData.targetRecycleCategoryId = null
@@ -659,28 +724,27 @@ export default {
 .container {
   display: flex;
   flex-direction: column;
-  min-height: 100vh;
-  padding-bottom: calc(100rpx + env(safe-area-inset-bottom)); /* 底部导航栏高度 + 安全区域 */
+  height: 100vh;
   background-color: #f5f5f5;
+  overflow: hidden;
 }
 
 .banner {
   background: linear-gradient(135deg, #ff9500,#ff5e00);
   position: relative;
-  height: 240rpx;
-  z-index: 1;
   height: 400rpx;
-    image {
-      width: 100%;
-      height: 100%;
-    }
+  z-index: 1;
+  image {
+    width: 100%;
+    height: 100%;
+  }
 }
 
 .goods-list {
-  flex: 1;
+  // flex: 1;
   display: flex;
   position: relative;
-  height: calc(100vh - 200rpx - 100rpx - env(safe-area-inset-bottom)); /* 减去banner和底部栏的高度 */
+  height: calc(100vh - 400rpx - 120rpx - env(safe-area-inset-bottom)); /* 减去banner和底部栏的高度 */
   margin-top: -10rpx;
   z-index: 2;
   border-radius: 20rpx 20rpx 0 0;
@@ -691,11 +755,12 @@ export default {
   .category-nav {
     width: 20%;
     background: #ffffff;
-    height: calc(100vh - 240rpx - 120rpx);
+    height: 100%;
     border-right: 1rpx solid rgba(255, 126, 14, 0.1);
     margin: 1rpx;
     border-radius: 20rpx 0 0 0;
-	margin-right: 20rpx;
+    margin-right: 20rpx;
+    overflow-y: auto;
     scrollbar-width: none; /* Firefox */
     -ms-overflow-style: none; /* IE and Edge */
     &::-webkit-scrollbar {
@@ -746,13 +811,14 @@ export default {
 
   .goods-content {
     flex: 1;
-    height: calc(100vh - 140rpx - 120rpx);
+    height: 100%;
     padding: 0 30rpx;
     background: #ffffff;
-	width: 70%;
+    width: 70%;
     margin: 1rpx;
     margin-left: 0;
     border-radius: 0 20rpx 0 0;
+    overflow-y: auto;
     scrollbar-width: none; /* Firefox */
     -ms-overflow-style: none; /* IE and Edge */
     &::-webkit-scrollbar {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a0a5f90..7ae1a4b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -92,7 +92,7 @@ export default {
         // console.log('Config data response:', JSON.parse(JSON.stringify(res)) )
         if (res && res.success && Array.isArray(res.result)) {
           this.configData = res.result
-          console.log('Config data set:',  JSON.parse(JSON.stringify(this.configData)) )
+          // console.log('Config data set:',  JSON.parse(JSON.stringify(this.configData)) )
         }
       })
     },
@@ -189,7 +189,8 @@ export default {
 								getApp().globalData.login_status = true;
 								if (res.result.userInfo) {
 									const userInfo = res.result.userInfo;
-									if (!userInfo.avatarUrl || !userInfo.nickName) {
+                  console.log(userInfo,'userInfo')
+									if (!userInfo.headImage || !userInfo.nickName) {
 										uni.navigateTo({
 											url: '/pages/wxUserInfo'
 										});
diff --git a/pages/manager/inspect-result.vue b/pages/manager/inspect-result.vue
index 159b510..1f2a082 100644
--- a/pages/manager/inspect-result.vue
+++ b/pages/manager/inspect-result.vue
@@ -2,7 +2,9 @@
   <view class="inspect-result-container">
     <!-- 顶部导航栏 -->
     <view class="nav-bar">
-      <uni-icons type="left" @tap="goBack" size="24" color="#222" />
+      <view class="back" @tap="goBack">
+        <uni-icons type="left" size="20" color="#222" />
+      </view>
       <text class="nav-title">步骤二：合格质检</text>
       <view class="nav-icons">
         <uni-icons type="more" size="24" color="#222" />
@@ -216,16 +218,26 @@ export default {
 .nav-bar {
   display: flex;
   align-items: center;
-  justify-content: space-between;
-  height: 56px;
+  height: calc(150rpx + var(--status-bar-height));
+  padding: 0 32rpx;
+  padding-top: var(--status-bar-height);
   background: #fff;
-  padding: 0 16px;
-  box-shadow: 0 2px 8px rgba(0,0,0,0.03);
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 999;
+  box-sizing: border-box;
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
+  .back {
+    padding: 20rpx;
+    margin-left: -20rpx;
+  }
   .nav-title {
-    font-size: 18px;
-    font-weight: bold;
     flex: 1;
     text-align: center;
+    font-size: 32rpx;
+    font-weight: 500;
     color: #222;
   }
   .nav-icons {
@@ -235,9 +247,11 @@ export default {
   }
 }
 .main-content {
-  flex: 1;
-  padding: 24px 0 120px 0;
-  overflow-y: auto;
+  margin-top: calc(150rpx + var(--status-bar-height));
+  display: flex;
+  flex-direction: column;
+  background: none;
+  padding-bottom: 120px;
 }
 .result-card {
   background: #fff;
@@ -374,30 +388,30 @@ export default {
   bottom: 0;
   background: #fff;
   display: flex;
-  gap: 24px;
-  padding: 16px 24px 32px 24px;
+  gap: 16px;
+  padding: 12px 16px 24px 16px;
   z-index: 101;
   .btn-outline {
     flex: 1;
-    height: 48px;
-    border-radius: 24px;
-    border: 2px solid #ffd01e;
+    height: 40px;
+    border-radius: 16px;
+    border: 1px solid #ffe09a;
     color: #ffb400;
-    background: #fff;
-    font-size: 18px;
-    font-weight: bold;
+    background: #fff0d2;
+    font-size: 15px;
+    font-weight: 500;
     box-shadow: none;
     padding: 0 18px;
   }
   .btn-main {
     flex: 1;
-    height: 48px;
-    border-radius: 24px;
+    height: 40px;
+    border-radius: 16px;
     background: linear-gradient(90deg, #ffd01e 0%, #ffac04 100%);
     color: #fff;
     border: none;
-    font-size: 18px;
-    font-weight: bold;
+    font-size: 15px;
+    font-weight: 500;
     box-shadow: none;
     padding: 0 18px;
   }
diff --git a/pages/manager/inspect.vue b/pages/manager/inspect.vue
index 218adfe..65a9d8e 100644
--- a/pages/manager/inspect.vue
+++ b/pages/manager/inspect.vue
@@ -2,7 +2,9 @@
     <view class="inspect-container">
       <!-- 顶部导航栏 -->
       <view class="nav-bar">
-        <uni-icons type="left" @tap="goBack" size="24" color="#222" />
+        <view class="back" @tap="goBack">
+          <uni-icons type="left" size="20" color="#222" />
+        </view>
         <text class="nav-title">步骤一：数量确认</text>
         <view class="nav-icons">
           <uni-icons type="scan" size="24" color="#222" />
@@ -11,8 +13,8 @@
       <view class="main-content">
         <!-- 左侧分类导航 -->
         <view class="category-nav">
-          <view v-for="(cat, idx) in categories" :key="cat.name" :class="['category-item', {active: idx === currentCategory}]" @tap="switchCategory(idx)">
-            <text>{{cat.name}}</text>
+          <view v-for="(cat, idx) in categories" :key="cat.title" :class="['category-item', {active: idx === currentCategory}]" @tap="switchCategory(idx)">
+            <text>{{cat.title}}</text>
             <view v-if="cat.badge" class="category-badge">{{cat.badge}}</view>
           </view>
         </view>
@@ -20,7 +22,7 @@
         <view class="goods-list">
           <view v-for="(item, idx) in currentGoods" :key="item.id" class="goods-card">
             <view class="goods-header">
-              <image :src="item.img" class="goods-img" />
+              <image :src="item.image" class="goods-img" />
               <view class="goods-info">
                 <view class="goods-title-row">
                   <text class="goods-name">{{item.name}}</text>
@@ -66,32 +68,57 @@
     mixins: [pullRefreshMixin],
     data() {
       return {
-        categories: [
-          { name: '羽绒服', badge: 1 },
-          { name: '鞋子' },
-          { name: '包包' },
-          { name: '床被' },
-          { name: '品牌服饰' },
-          { name: '不可回收' }
-        ],
+        statusBarHeight: 0,
         currentCategory: 0,
-        goodsData: [
-          // 示例数据结构
-          [
-            { id: 1, name: '羽绒服', img: '/static/coat1.png', price: 8, desc: '允许脏破烂，160码以上', qualified: 8, unqualified: 2, amount: '' },
-            { id: 2, name: '羽绒裤', img: '/static/coat2.png', price: 8, desc: '允许脏破烂，160码以上', qualified: 0, unqualified: 0, amount: '' },
-            { id: 3, name: '儿童羽绒服', img: '/static/coat3.png', price: 8, desc: '允许脏破烂，160码以上', qualified: 0, unqualified: 0, amount: '' }
-          ],
-          // 其他分类...（可补充）
-        ]
+        allProducts: {},      // { [categoryId]: [商品数组] }
+        allProductsPage: {},  // { [categoryId]: 当前已加载页码 }
+        allProductsTotal: {}, // { [categoryId]: 总数 }
+        pageSize: 10,
+        loadingMore: false,
+        finished: false,
       }
     },
     computed: {
+      categories() {
+        const list = getApp().globalData.pricePreviewList || []
+        // 新增不可回收分类
+        const extra = [{ id: 'unrecyclable', title: '不可回收' }]
+        return [...list.filter(item => item.pid === '0').sort((a, b) => a.sort - b.sort), ...extra]
+      },
       currentGoods() {
-        return this.goodsData[this.currentCategory] || []
+        const currentCategoryId = this.categories[this.currentCategory]?.id
+        // 不可回收分类内容
+        if (currentCategoryId === 'unrecyclable') {
+          return [{
+            id: 'unrecyclable-1',
+            image: '/static/回收/衣物.png',
+            name: '不可回收品类',
+            price: '—',
+            desc: '允许脏破烂，160码以上',
+            quantity: 2,
+            amount: ''
+          }]
+        }
+        return this.allProducts[currentCategoryId] || []
       }
     },
     methods: {
+      fetchGoodsList(categoryId, page = 1, callback) {
+        this.$api('getClassGoodsList', {
+          classId: categoryId,
+          pageNo: page,
+          pageSize: this.pageSize
+        }, res => {
+          if (res.code === 200 && res.result && Array.isArray(res.result.records)) {
+            const oldList = this.allProducts[categoryId] || []
+            const newList = page === 1 ? res.result.records : oldList.concat(res.result.records)
+            this.$set(this.allProducts, categoryId, newList)
+            this.$set(this.allProductsPage, categoryId, page)
+            this.$set(this.allProductsTotal, categoryId, res.result.total)
+          }
+          if (callback) callback()
+        })
+      },
       goBack() {
         uni.navigateBack()
       },
@@ -103,6 +130,26 @@
       },
       switchCategory(idx) {
         this.currentCategory = idx
+        this.loadingMore = false
+        this.finished = false
+        const categoryId = this.categories[idx]?.id
+        if (categoryId === 'unrecyclable') {
+          // 切换到不可回收时重置默认数据
+          this.$set(this.allProducts, 'unrecyclable', [{
+            id: 'unrecyclable-1',
+            image: '/static/回收/衣物.png',
+            name: '不可回收品类',
+            price: '—',
+            desc: '允许脏破烂，160码以上',
+            quantity: 2,
+            amount: ''
+          }])
+          this.$forceUpdate && this.$forceUpdate()
+          return
+        }
+        if (!this.allProducts[categoryId]) {
+          this.fetchGoodsList(categoryId, 1)
+        }
       },
       changeNum(item, key, delta) {
         if (key === 'qualified') {
@@ -119,6 +166,20 @@
         await this.refreshData && this.refreshData()
       }
     },
+    created() {
+      this.currentCategory = 0
+      this.$nextTick(() => {
+        if (this.categories.length > 0) {
+          const firstCategoryId = this.categories[0]?.id
+          if (firstCategoryId) {
+            this.fetchGoodsList(firstCategoryId, 1)
+          }
+        }
+      })
+    },
+    onLoad() {
+      this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
+    },
     onPullDownRefresh() {
       this.refreshData && this.refreshData()
       uni.stopPullDownRefresh()
@@ -136,16 +197,26 @@
   .nav-bar {
     display: flex;
     align-items: center;
-    justify-content: space-between;
-    height: 56px;
+    height: calc(150rpx + var(--status-bar-height));
+    padding: 0 32rpx;
+    padding-top: var(--status-bar-height);
     background: #fff;
-    padding: 0 16px;
-    box-shadow: 0 2px 8px rgba(0,0,0,0.03);
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 999;
+    box-sizing: border-box;
+    box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
+    .back {
+      padding: 20rpx;
+      margin-left: -20rpx;
+    }
     .nav-title {
-      font-size: 18px;
-      font-weight: bold;
       flex: 1;
       text-align: center;
+      font-size: 32rpx;
+      font-weight: 500;
       color: #222;
     }
     .nav-icons {
@@ -155,35 +226,52 @@
     }
   }
   .main-content {
+    margin-top: calc(150rpx + var(--status-bar-height));
     display: flex;
-    flex: 1;
-    min-height: 0;
-    padding: 0 0 100px 0;
+    background: none;
   }
   .category-nav {
-    width: 90px;
-    background: #f6f6f6;
+    width: 80px;
+    background: #fff;
     border-radius: 24px 0 0 24px;
     padding: 24px 0;
     display: flex;
     flex-direction: column;
     align-items: center;
+    box-shadow: 0 2px 8px rgba(0,0,0,0.03);
+    height: 100%;
+    overflow-y: auto;
+    position: relative;
+    z-index: 2;
     .category-item {
-      width: 72px;
-      height: 48px;
+      width: 64px;
+      height: 44px;
       border-radius: 16px 0 0 16px;
       display: flex;
       align-items: center;
-      justify-content: center;
+      justify-content: flex-start;
       font-size: 16px;
       color: #222;
       margin-bottom: 12px;
       background: #fff;
       position: relative;
+      transition: background 0.2s, color 0.2s, font-weight 0.2s;
+      padding-left: 12px;
       &.active {
-        background: #fff7e6;
+        background: linear-gradient(90deg, #fff7e6 80%, #fff 100%);
         color: #ffb400;
         font-weight: bold;
+        &::before {
+          content: '';
+          position: absolute;
+          left: 0;
+          top: 30%;
+          height: 40%;
+          width: 2px;
+          border-radius: 4px;
+          background: #ffb400;
+          bottom: auto;
+        }
       }
       .category-badge {
         position: absolute;
@@ -203,25 +291,123 @@
   }
   .goods-list {
     flex: 1;
-    padding: 24px 24px 0 24px;
+    height: calc(100vh - 110rpx - var(--status-bar-height) - 80px);
+    padding: 0 0 0 16px;
     overflow-y: auto;
+    background: none;
   }
   .goods-card {
-    background: linear-gradient(180deg, #fff7e6 0%, #fff 100%);
+    background: #fff;
     border-radius: 24px;
     box-shadow: 0 4px 24px rgba(0,0,0,0.06);
-    margin-bottom: 24px;
-    padding: 24px 24px 0 24px;
+    margin-bottom: 18px;
+    padding: 18px 18px 0 18px;
+    &.unrecycle-card {
+      background: #fff;
+      border-radius: 24px;
+      box-shadow: 0 4px 24px rgba(0,0,0,0.06);
+      margin-bottom: 18px;
+      padding: 18px 18px 0 18px;
+      .goods-header {
+        display: flex;
+        align-items: center;
+        margin-bottom: 12px;
+        .goods-img {
+          width: 56px;
+          height: 56px;
+          border-radius: 16px;
+          margin-right: 12px;
+          background: #f8f8f8;
+          object-fit: contain;
+        }
+        .goods-info {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          min-width: 0;
+          .goods-title-row {
+            display: flex;
+            align-items: baseline;
+            .goods-name {
+              font-size: 16px;
+              font-weight: bold;
+              color: #222;
+              margin-right: 8px;
+            }
+            .goods-price {
+              font-size: 15px;
+              color: #ffb400;
+              font-weight: bold;
+              .goods-unit {
+                font-size: 13px;
+                color: #bbb;
+              }
+            }
+          }
+          .goods-desc {
+            font-size: 13px;
+            color: #999;
+            margin-top: 4px;
+          }
+        }
+      }
+      .goods-row {
+        display: flex;
+        align-items: center;
+        margin-bottom: 12px;
+        .row-label {
+          font-size: 14px;
+          color: #888;
+          width: 80px;
+          flex-shrink: 0;
+        }
+        .num-ctrl {
+          display: flex;
+          align-items: center;
+          .num-btn {
+            width: 32px;
+            height: 32px;
+            border-radius: 50%;
+            background: #f6f6f6;
+            color: #bbb;
+            font-size: 20px;
+            border: none;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin: 0 6px;
+          }
+          .num {
+            font-size: 16px;
+            color: #222;
+            width: 28px;
+            text-align: center;
+          }
+        }
+        .amount-input {
+          flex: 1;
+          height: 32px;
+          border-radius: 12px;
+          background: #f6f6f6;
+          border: none;
+          font-size: 15px;
+          color: #222;
+          padding-left: 10px;
+          margin-left: 8px;
+        }
+      }
+    }
   }
   .goods-header {
     display: flex;
     align-items: center;
     margin-bottom: 12px;
     .goods-img {
-      width: 72px;
-      height: 72px;
+      width: 56px;
+      height: 56px;
       border-radius: 16px;
-      margin-right: 18px;
+      margin-right: 12px;
       background: #f8f8f8;
       object-fit: contain;
     }
@@ -235,23 +421,23 @@
         display: flex;
         align-items: baseline;
         .goods-name {
-          font-size: 18px;
+          font-size: 16px;
           font-weight: bold;
           color: #222;
           margin-right: 8px;
         }
         .goods-price {
-          font-size: 16px;
+          font-size: 15px;
           color: #ffb400;
           font-weight: bold;
           .goods-unit {
-            font-size: 14px;
+            font-size: 13px;
             color: #bbb;
           }
         }
       }
       .goods-desc {
-        font-size: 14px;
+        font-size: 13px;
         color: #999;
         margin-top: 4px;
       }
@@ -260,45 +446,45 @@
   .goods-row {
     display: flex;
     align-items: center;
-    margin-bottom: 18px;
+    margin-bottom: 12px;
     .row-label {
-      font-size: 15px;
+      font-size: 14px;
       color: #888;
-      width: 90px;
+      width: 80px;
       flex-shrink: 0;
     }
     .num-ctrl {
       display: flex;
       align-items: center;
       .num-btn {
-        width: 40px;
-        height: 40px;
+        width: 32px;
+        height: 32px;
         border-radius: 50%;
         background: #f6f6f6;
         color: #bbb;
-        font-size: 24px;
+        font-size: 20px;
         border: none;
         display: flex;
         align-items: center;
         justify-content: center;
-        margin: 0 8px;
+        margin: 0 6px;
       }
       .num {
-        font-size: 18px;
+        font-size: 16px;
         color: #222;
-        width: 32px;
+        width: 28px;
         text-align: center;
       }
     }
     .amount-input {
       flex: 1;
-      height: 40px;
+      height: 32px;
       border-radius: 12px;
       background: #f6f6f6;
       border: none;
-      font-size: 16px;
+      font-size: 15px;
       color: #222;
-      padding-left: 12px;
+      padding-left: 10px;
       margin-left: 8px;
     }
   }
@@ -309,30 +495,30 @@
     bottom: 0;
     background: #fff;
     display: flex;
-    gap: 24px;
-    padding: 16px 24px 32px 24px;
+    gap: 16px;
+    padding: 12px 16px 24px 16px;
     z-index: 101;
     .btn-outline {
       flex: 1;
-      height: 48px;
-      border-radius: 24px;
-      border: 2px solid #ffd01e;
+      height: 40px;
+      border-radius: 16px;
+      border: 1px solid #ffe09a;
       color: #ffb400;
-      background: #fff;
-      font-size: 18px;
-      font-weight: bold;
+      background: #fff0d2;
+      font-size: 15px;
+      font-weight: 500;
       box-shadow: none;
       padding: 0 18px;
     }
     .btn-main {
       flex: 1;
-      height: 48px;
-      border-radius: 24px;
+      height: 40px;
+      border-radius: 16px;
       background: linear-gradient(90deg, #ffd01e 0%, #ffac04 100%);
       color: #fff;
       border: none;
-      font-size: 18px;
-      font-weight: bold;
+      font-size: 15px;
+      font-weight: 500;
       box-shadow: none;
       padding: 0 18px;
     }
diff --git a/pages/manager/order-detail.vue b/pages/manager/order-detail.vue
index 440b079..b0a04fc 100644
--- a/pages/manager/order-detail.vue
+++ b/pages/manager/order-detail.vue
@@ -1,15 +1,17 @@
 <template>
   <view class="order-detail-container">
     <!-- 顶部导航栏 -->
-    <view class="nav-bar" :style="{paddingTop: statusBarHeight + 'px', height: (statusBarHeight + 44) + 'px'}">
-      <uni-icons type="left" @tap="goBack" size="24" color="#222" />
+    <view class="nav-bar">
+      <view class="back" @tap="goBack">
+        <uni-icons type="left" size="20" color="#222" />
+      </view>
       <text class="nav-title">订单详情</text>
       <view class="nav-icons">
         <!-- <uni-icons type="more" size="24" color="#222" /> -->
       </view>
     </view>
 
-    <view class="main-content" :style="{ paddingTop: (statusBarHeight + 44 + 30) + 'px' }">
+    <view class="main-content" >
       <!-- 回收信息卡片（高保真，参考流程卡片） -->
       <view class="info-card process-card">
         <view v-if="order.cancelReason" class="cancel-reason">{{ order.cancelReason }}</view>
@@ -25,14 +27,13 @@
           <view v-for="(step, idx) in steps" :key="step.text" :class="['step-item', {active: idx === currentStep}]">
             <image :src="step.icon" class="step-icon" />
             <view class="step-label" :class="{active: idx === currentStep}">
-              <text class="step-num">{{ ['①','②','③','④'][idx] }}</text>
             <text class="step-text">{{ step.text }}</text>
             </view>
           </view>
         </view>
         <!-- 订单基础信息（左对齐，分隔线，按钮、箭头、标签等细节） -->
         <view class="base-info">
-          <view v-for="(item, i) in baseInfo" :key="item.label" class="base-info-row">
+          <view v-for="(item, i) in baseInfo" :key="item.label" class="base-info-row" :class="{'user-stat-trigger': item.label === '用户名'}" @tap="item.label === '用户名' ? onUserStatClick() : null">
             <view class="base-label-wrap">
             <text class="base-label">{{ item.label }}</text>
             </view>
@@ -46,48 +47,91 @@
         </view>
       </view>
 
-      <!-- 订单明细卡片 -->
-      <view class="info-card detail-card">
-        <view class="card-header-bg">
-          <view class="card-title">订单详情</view>
+      <!-- 用户统计弹窗 -->
+      <view v-if="showUserStatModal" class="user-stat-modal-mask">
+        <view class="user-stat-modal-box">
+          <view class="user-stat-modal-title">{{ userStatData.name }}</view>
+          <view class="user-stat-modal-row">
+            <text class="user-stat-label">回收总次数</text>
+            <text class="user-stat-value">{{ userStatData.unit_num }}</text>
+          </view>
+          <view class="user-stat-modal-divider"></view>
+          <view class="user-stat-modal-row">
+            <text class="user-stat-label">总件数</text>
+            <text class="user-stat-value">{{ userStatData.sum }}</text>
+          </view>
+          <view class="user-stat-modal-divider"></view>
+          <view class="user-stat-modal-row">
+            <text class="user-stat-label">回收总额</text>
+            <text class="user-stat-value">{{ userStatData.order_money }}元</text>
+          </view>
+          <button class="user-stat-modal-btn" @tap="showUserStatModal = false">我了解了</button>
+        </view>
+      </view>
+
+      <!-- 订单明细卡片：开始质检状态 -->
+      <view v-if="order.status === 2 && order.state === 1" class="info-card detail-card custom-inspect-card">
+        <view class="custom-header-bg">
+          <view class="custom-card-title">订单详情</view>
         </view>
-        <view class="detail-content">
-          <template v-if="order.status === 2">
-            <view class="detail-row">
-              <text class="detail-label">订单编号</text>
-              <text class="detail-value">{{ order.orderNo }}</text>
+        <view class="custom-detail-content">
+          <!-- 只显示商品明细 -->
+          <view v-for="item in order.commonOrderList" :key="item.id" class="custom-goods-row">
+            <image :src="item.image" class="custom-goods-img" />
+            <view class="custom-goods-info">
+              <text class="custom-goods-name">{{ item.title }}</text>
+              <text class="custom-goods-desc">{{ item.details }}</text>
+              <view class="custom-goods-meta">
+                <text class="custom-goods-price">¥{{ item.onePrice }}<text class="custom-goods-unit"> /件</text></text>
+                <text class="custom-goods-count">x{{ item.num }}</text>
+              </view>
             </view>
-            <view class="detail-row">
-              <text class="detail-label">合格结算</text>
-              <text class="detail-value orange">¥ {{ order.settleAmount || order.estimate }}</text>
+            <text class="custom-goods-total">¥{{ item.price }}</text>
+          </view>
+        </view>
+      </view>
+      
+      <!-- 现金打款时展示完整订单详情卡片 -->
+      <view v-else-if="order.status === 3" class="info-card detail-card custom-inspect-card">
+        <view class="custom-header-bg">
+          <view class="custom-card-title">订单详情</view>
             </view>
-            <view class="detail-row">
-              <text class="detail-label">运费扣除</text>
-              <text class="detail-value">¥ {{ order.freight || 0 }}</text>
+        <view class="custom-detail-content">
+          <view class="custom-detail-row">
+            <text class="custom-detail-label" >订单编号</text>
+            <text class="custom-detail-value">{{ order.ordeNo }}</text>
             </view>
-            <view class="detail-row total-row">
-              <text class="detail-label">结算金额</text>
-              <text class="detail-value total">¥ {{ order.settleAmount || order.estimate }}</text>
+          <view class="custom-detail-row">
+            <text class="custom-detail-label">合格结算</text>
+            <text class="custom-detail-value highlight">¥ {{ order.price || order.estimate }}</text>
             </view>
-            <view class="divider"></view>
-          </template>
-        <view v-for="item in order.items" :key="item.name" class="goods-row">
-          <image :src="item.img" class="goods-img" />
-          <view class="goods-info">
-            <text class="goods-name">{{ item.name }}</text>
-            <text class="goods-desc">{{ item.desc }}</text>
-            <view class="goods-price-row">
-              <text class="goods-price">¥ {{ item.price }} <text class="goods-unit">/件</text></text>
-              <text class="goods-count">x{{ item.count }}</text>
-              <text class="goods-total">¥{{ item.total }}</text>
+          <view class="custom-detail-row">
+            <text class="custom-detail-label">运费扣除</text>
+            <text class="custom-detail-value">¥ 0</text>
             </view>
+          <view class="custom-detail-row total-row">
+            <text class="custom-detail-label">结算金额</text>
+            <text class="custom-detail-value total highlight">¥ {{ order.price || order.estimate }}</text>
           </view>
+          <view class="custom-divider"></view>
+          <!-- 商品明细 -->
+          <view v-for="item in order.commonOrderList" :key="item.id" class="custom-goods-row">
+            <image :src="item.image" class="custom-goods-img" />
+            <view class="custom-goods-info">
+              <text class="custom-goods-name">{{ item.title }}</text>
+              <text class="custom-goods-desc">{{ item.details }}</text>
+              <view class="custom-goods-meta">
+                <text class="custom-goods-price">¥{{ item.onePrice }}<text class="custom-goods-unit"> /件</text></text>
+                <text class="custom-goods-count">x{{ item.num }}</text>
+              </view>
+            </view>
+            <text class="custom-goods-total">¥{{ item.price }}</text>
           </view>
         </view>
       </view>
 
       <!-- 质检结果卡片 -->
-      <view v-if="order.status === 2" class="inspect-card">
+      <view v-if="order.status === 3" class="inspect-card">
         <view class="inspect-header">
           <text class="inspect-title">质检结果</text>
         </view>
@@ -100,14 +144,41 @@
           <view class="inspect-btn" @tap="goToInspection">点此查看质检报告详情</view>
         </view>
       </view>
+
+      <!-- 已预约状态下订单详情卡片 -->
+      <view v-else-if="order.status === 1||order.status === 0" class="info-card detail-card custom-inspect-card">
+        <view class="custom-header-bg">
+          <view class="custom-card-title">订单详情</view>
+        </view>
+        <view class="custom-detail-content">
+          <view class="custom-detail-row">
+            <text class="custom-detail-label">预估回收</text>
+            <text class="custom-detail-value highlight">¥ {{ order.price || order.estimate }}</text>
+          </view>
+          <view class="custom-divider"></view>
+          <!-- 商品明细 -->
+          <view v-for="item in order.commonOrderList" :key="item.id" class="custom-goods-row">
+            <image :src="item.image" class="custom-goods-img" />
+            <view class="custom-goods-info">
+              <text class="custom-goods-name">{{ item.title }}</text>
+              <text class="custom-goods-desc">{{ item.details }}</text>
+              <view class="custom-goods-meta">
+                <text class="custom-goods-price">¥{{ item.onePrice }}<text class="custom-goods-unit"> /件</text></text>
+                <text class="custom-goods-count">x{{ item.num }}</text>
+              </view>
+            </view>
+            <text class="custom-goods-total">¥{{ item.price }}</text>
+          </view>
+        </view>
+      </view>
     </view>
 
     <!-- 底部操作按钮 -->
-    <view v-if="order.status === 0" class="footer-btns">
-      <button class="btn-outline">驳回</button>
-      <button class="btn-main">通过</button>
+    <view v-if="order.status === 1||order.status === 0" class="footer-btns">
+      <button class="btn-outline" @tap="rejectOrderAction">驳回</button>
+      <button class="btn-main" @tap="passOrderAction">通过</button>
     </view>
-    <view v-else-if="order.status === 1" class="footer-btns">
+    <view v-else-if="order.status === 2&&order.state === 1" class="footer-btns">
       <button class="btn-main" @tap="goToInspect">开始质检</button>
     </view>
   </view>
@@ -120,57 +191,65 @@ export default {
   data() {
     return {
       statusBarHeight: 0,
-      order: {
-        status: 3, // 0:已预约, 1:待质检, 2:已结款, 3:已驳回, 4:已取消
-        statusText: '已结款',
-        statusLabel: '已结款',
-        statusClass: 'settled',
-        cancelReason: '', // 如有取消原因
-        estimate: '73.6~75.8',
-        qualityTime: '2025-03-20 11:00',
-        orderNo: 'RE82738127861525',
-        userName: '周小艺',
-        userPhone: '13877881234',
-        address: '海南省海口市秀英区秀英街道5单元183室',
-        items: [
-          { name: '羽绒服', desc: '允许脏破烂，160码以上', price: 8, count: 8, total: 64, img: '/static/coat1.png' },
-          { name: '品牌羽绒服', desc: '允许脏破烂，160码以上', price: 10, count: 8, total: 8, img: '/static/coat2.png' }
-        ]
-      },
+      order: {},
+      // 固定4步流程
       steps: [],
-      currentStep: 3, // 第4步高亮
-      baseInfo: [
-        // { label: '取消原因', value: this.order.cancelReason, show: !!this.order.cancelReason },
-        { label: '订单编号', value: 'RE82738127861525', copy: true },
-        { label: '用户名', value: '周小艺', arrow: true },
-        { label: '用户电话', value: this.maskPhone('13877881234'), copy: true },
-        { label: '取件地址', value: '海南省海口市秀英区秀英街道5单元183室' },
-        { label: '质检完成时间', value: '2025-03-20 11:00' }
-      ],
-      qcInfo: [
-        { label: '质检数量', value: '9 件' },
-        { label: '质检合格', value: '7 件' },
-        { label: '质量问题', value: '2 件' },
-        { label: '不可回收', value: '0 件' },
-        { label: '订单重量', value: '2.85 kg' }
-      ]
+      currentStep: 0,
+      baseInfo: [],
+      qcInfo: [],
+      showUserStatModal: false,
+      userStatData: { name: '', unit_num: '', sum: '', order_money: '' }
     }
   },
-  onLoad() {
+  onLoad(options) {
     this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
-    // 接收从订单列表页面传递过来的订单详情数据
-    const eventChannel = this.getOpenerEventChannel()
-    eventChannel.on('orderDetail', (data) => {
-      this.order = data
-      this.currentStep = this.getCurrentStep(data.status)
-      console.log(this.order);
-    })
     this.getAreaList();
+    if (options && options.id) {
+      this.fetchOrderDetail(options.id)
+    }
+  },
+  onShow() {
+    this.getAreaList()
   },
   methods: {
+    async fetchOrderDetail(orderId) {
+      this.$api('getOrderDetail', { orderId }, res => {
+        if (res && res.code === 200 && res.result) {
+          const data = res.result
+          this.order = data
+          // 步骤条高亮
+          this.currentStep = this.getCurrentStep(data.status, data.state)
+          // 基础信息
+          this.baseInfo = [
+            { label: '订单编号', value: data.ordeNo, copy: true },
+            ...(data.status === 2 ? [{ label: '快递单号', value: data.wliuNo, copy: true }] : []),
+            { label: '用户名', value: data.name, arrow: true },
+            { label: '取件地址', value: data.address + (data.addressDetail || '') },
+            { label: '预约时间', value: data.goTime }
+          ]
+          // 质检信息（如有）
+          this.qcInfo = [
+            { label: '质检数量', value: data.qcNum ? data.qcNum + ' 件' : '' },
+            { label: '质检合格', value: data.qcOkNum ? data.qcOkNum + ' 件' : '' },
+            { label: '质量问题', value: data.qcBadNum ? data.qcBadNum + ' 件' : '' },
+            { label: '不可回收', value: data.qcUnNum ? data.qcUnNum + ' 件' : '' },
+            { label: '订单重量', value: data.weight ? data.weight + ' kg' : '' }
+          ]
+        }
+      })
+    },
+    getCurrentStep(status, state) {
+      // status: 0=在线预约, 1=快递上门, 2=透明质检, 3=现金打款
+      // state: 0=待取件, 1=已取件, 2=已完成, 3=已取消
+      if (state == 3) return -1; // 已取消，不高亮任何步骤
+      if (status == 0) return 0; // 在线预约
+      if (status == 1) return 1; // 快递上门
+      if (status == 2) return 2; // 透明质检
+      if (status == 3) return 3; // 现金打款
+      return 0;
+    },
     async onRefresh() {
-      await this.getAreaList()
-      // 如有订单详情接口，也可在此处await
+      if (this.order.id) await this.fetchOrderDetail(this.order.id)
     },
     goBack() {
       uni.navigateBack()
@@ -182,36 +261,59 @@ export default {
       if (!phone) return '';
       return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
     },
-    getCurrentStep(status) {
-      // 0:已预约, 1:待质检, 2:已结款, 3:已驳回, 4:已取消
-      switch (status) {
-        case 0: // 已预约
-          return 0;
-        case 1: // 待质检
-        case 3: // 已驳回
-          return 2;
-        case 2: // 已结款
-          return 3;
-        case 4: // 已取消
-          return 1;
-        default:
-          return 0;
-      }
-    },
     goToInspect() {
-      uni.navigateTo({
-        url: '/pages/manager/inspect'
+      uni.navigateTo({ url: '/pages/manager/inspect' })
+    },
+    async onUserStatClick() {
+      if (!this.order || !this.order.userId) return;
+      this.$api('getUserOrderNum', { userId: this.order.userId }, res => {
+        if (res && res.code === 200 && res.result) {
+          this.userStatData = {
+            name: this.order.name,
+            unit_num: res.result.unit_num,
+            sum: res.result.sum,
+            order_money: res.result.order_money
+          }
+          this.showUserStatModal = true
+        }
       })
     },
     getAreaList() {
       this.$api('getAreaList', {}, (res) => {
+        console.log(res,'getAreaList');
         if (res.code == 200 && Array.isArray(res.result)) {
           // 按sort升序排序
           const sorted = res.result.slice().sort((a, b) => a.sort - b.sort)
-          this.steps = sorted.map(item => ({ text: item.title, icon: item.image }))
+          this.steps = sorted.map(item => ({
+            // id: item.id,
+            icon: item.image,
+            text: item.title
+          }))
         }
       })
-    }
+    },
+    passOrderAction() {
+      if (!this.order.id) return;
+      this.$api('passOrder', { orderId: this.order.id }, res => {
+        if (res && res.code === 200) {
+          uni.showToast({ title: '操作成功', icon: 'success' })
+          this.fetchOrderDetail(this.order.id)
+        } else {
+          uni.showToast({ title: res.msg || '操作失败', icon: 'none' })
+        }
+      })
+    },
+    rejectOrderAction() {
+      if (!this.order.id) return;
+      this.$api('rejectOrder', { orderId: this.order.id }, res => {
+        if (res && res.code === 200) {
+          uni.showToast({ title: '操作成功', icon: 'success' })
+          this.fetchOrderDetail(this.order.id)
+        } else {
+          uni.showToast({ title: res.msg || '操作失败', icon: 'none' })
+        }
+      })
+    },
   }
 }
 </script>
@@ -226,313 +328,577 @@ $order-card-padding: 40px 28px;
   display: flex;
   flex-direction: column;
   align-items: center;
-  .nav-bar {
-    position: fixed;
-    top: 0; left: 0; right: 0;
-    z-index: 100;
-    background: #fff;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    .nav-title { flex: 1; text-align: center; font-size: 18px; font-weight: bold; }
-    .nav-icons { display: flex; align-items: center; gap: 16px; }
+}
+.nav-bar {
+  display: flex;
+  align-items: center;
+  height: calc(150rpx + var(--status-bar-height));
+  padding: 0 32rpx;
+  padding-top: var(--status-bar-height);
+  background: #fff;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 999;
+  box-sizing: border-box;
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
+  .back {
+    padding: 20rpx;
+    margin-left: -20rpx;
+  }
+  .nav-title {
+    flex: 1;
+    text-align: center;
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #222;
   }
-  .main-content {
-    width: 100vw;
-    min-width: 0;
-    box-sizing: border-box;
-    padding: 0 16px 60px 16px;
+  .nav-icons {
     display: flex;
-    flex-direction: column;
     align-items: center;
+    gap: 12px;
   }
-  .info-card {
-    width: 100%;
-    max-width: 375px;
-    min-width: 0;
-    box-sizing: border-box;
-    margin: 0 auto 28px auto;
-    padding: 16px 8px;
-    background: #fff;
-    border-radius: 20px;
-    box-shadow: 0 2px 12px rgba(0,0,0,0.04);
-    // color: blue;
-    &.process-card {
-      position: relative;
-      .status-tag {
-        position: absolute;
-        right: 18px;
-        top: 18px;
-        font-size: 13px;
+}
+.main-content {
+  margin-top: calc(150rpx + var(--status-bar-height));
+  width: 100vw;
+  min-width: 0;
+  box-sizing: border-box;
+  padding: 0 16px 60px 16px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.info-card {
+  width: 100%;
+  max-width: 375px;
+  min-width: 0;
+  box-sizing: border-box;
+  margin: 0 auto 28px auto;
+  padding: 16px 8px;
+  background: #fff;
+  border-radius: 20px;
+  box-shadow: 0 2px 12px rgba(0,0,0,0.04);
+  // color: blue;
+  &.process-card {
+    position: relative;
+    .status-tag {
+      position: absolute;
+      right: 18px;
+      top: 18px;
+      font-size: 13px;
+      border-radius: 12px;
+      padding: 2px 10px;
+      font-weight: 500;
+      background: #e6f9e6;
+      color: #1ecb1e;
+      height: 22px;
+      line-height: 18px;
+      display: flex;
+      align-items: center;
+      &.orange {
+        background: #fff7e6;
+        color: #ffb400;
+        font-size: 14px;
         border-radius: 12px;
-        padding: 2px 10px;
-        font-weight: 500;
-        background: #e6f9e6;
-        color: #1ecb1e;
+        padding: 2px 14px;
+        font-weight: 400;
         height: 22px;
-        line-height: 18px;
         display: flex;
         align-items: center;
-        &.orange {
-          background: #fff7e6;
-          color: #ffb400;
-          font-size: 14px;
-          border-radius: 12px;
-          padding: 2px 14px;
-          font-weight: 400;
-          height: 22px;
-          display: flex;
-          align-items: center;
-        }
-        &.gray {
-          background: #f5f5f5;
-          color: #444;
-          font-size: 14px;
-          border-radius: 12px;
-          padding: 2px 14px;
-          font-weight: 400;
-          height: 22px;
-          display: flex;
-          align-items: center;
-        }
-        &.blue {
-          background: #eaf6ff;
-          color: #2a9cfb;
-          font-size: 14px;
-          border-radius: 12px;
-          padding: 2px 14px;
-          font-weight: 400;
-          height: 22px;
-          display: flex;
-          align-items: center;
-        }
-      }
-      .status-tag.red {
-        background: #fff0f0;
-        color: #ff4d4f;
       }
-    }
-    .info-card-header {
-      display: flex; align-items: center; justify-content: flex-start;
-      .info-title-wrap {
+      &.gray {
+        background: #f5f5f5;
+        color: #444;
+        font-size: 14px;
+        border-radius: 12px;
+        padding: 2px 14px;
+        font-weight: 400;
+        height: 22px;
         display: flex;
         align-items: center;
-        .info-title { font-size: 18px; font-weight: bold; color: #222; }
-        .tag-nobaoyou {
-          margin-left: 8px;
-          background: #fff0f0;
-          color: #ff4d4f;
-          font-size: 14px;
-          border-radius: 12px;
-          padding: 2px 14px;
-          font-weight: 400;
-          height: 22px;
-          display: flex;
-          align-items: center;
-        }
       }
-      .status-tag { margin-left: auto; }
-    }
-    .steps-bar {
-      display: flex;
-      justify-content: flex-start;
-      align-items: flex-start;
-      margin: 24px 0 24px 0;
-      gap: 14px;
-      .step-item {
-        background: #fff8ea;
-        border-radius: 16px;
-        width: 76px;
-        height: 76px;
+      &.blue {
+        background: #eaf6ff;
+        color: #2a9cfb;
+        font-size: 14px;
+        border-radius: 12px;
+        padding: 2px 14px;
+        font-weight: 400;
+        height: 22px;
         display: flex;
-        flex-direction: column;
         align-items: center;
-        box-shadow: 0 2px 8px rgba(255, 156, 0, 0.04);
-        overflow: hidden;
-        position: relative;
-        .step-icon { width: 44px; height: 44px; margin: 6px 0 0 0; }
-        .step-label {
-          width: 100%; height: 28px; background: transparent; position: absolute; left: 0; bottom: 0; border-radius: 0 0 12px 12px; display: flex; align-items: center; justify-content: center; transition: background 0.2s; overflow: hidden;
-          line-height: 1;
-          .step-num, .step-text {
-            font-size: 11px;
-            color: #9b9b9b;
-            font-weight: 600;
-            line-height: 1;
-            vertical-align: middle;
-          }
-          .step-num { margin-right: 2px; }
-        }
-        &.active .step-label { background: linear-gradient(90deg, #ffd01e 0%, #ff8917 100%); }
-        &.active .step-num, &.active .step-text { color: #fff; font-weight: bold; }
       }
     }
-    .base-info {
-      margin-top: 18px;
-      .base-info-row {
+    .status-tag.red {
+      background: #fff0f0;
+      color: #ff4d4f;
+    }
+  }
+  .info-card-header {
+    display: flex; align-items: center; justify-content: flex-start;
+    .info-title-wrap {
+      display: flex;
+      align-items: center;
+      .info-title { font-size: 18px; font-weight: bold; color: #222; }
+      .tag-nobaoyou {
+        margin-left: 8px;
+        background: #fff0f0;
+        color: #ff4d4f;
+        font-size: 14px;
+        border-radius: 12px;
+        padding: 2px 14px;
+        font-weight: 400;
+        height: 22px;
         display: flex;
-        align-items: flex-start;
-        padding: 0 0 0 0;
-        position: relative;
-        min-height: 36px;
-        justify-content: space-between;
-        .base-label-wrap { min-width: 80px; text-align: left;  color: #8b8b8b; font-size: 13px;}
-        .base-value-wrap { display: flex; align-items: center; flex: 1; justify-content: flex-end; }
-        .base-value { color: #222; font-size: 15px; font-weight: 600; word-break: break-all; text-align: right; }
-        .copy-btn { color: #ffb400; font-size: 13px; margin-left: 6px; font-weight: 400; padding: 1px 6px; border-radius: 6px; transition: background 0.2s; }
-        .copy-btn:active { background: #fff7e6; }
-        .divider { position: absolute; left: 16px; right: 16px; bottom: -1px; height: 1px; background: #f0f0f0; }
-        uni-icons { margin-left: 6px; }
+        align-items: center;
       }
-      .base-info-row .base-value-wrap { flex-wrap: wrap; }
-      .base-info-row .base-value { white-space: pre-line; line-height: 1.5; }
     }
-    &.detail-card {
+    .status-tag { margin-left: auto; }
+  }
+  .steps-bar {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    margin: 24px 0 24px 0;
+    gap: 14px;
+    .step-item {
+      background: #fff8ea;
+      border-radius: 16px;
+      width: 76px;
+      height: 76px;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      box-shadow: 0 2px 8px rgba(255, 156, 0, 0.04);
+      overflow: hidden;
       position: relative;
-      padding: 0;
-      background: transparent;
-      .card-header-bg {
-        height: 56px;
-        background: linear-gradient(180deg, #fff7e6 0%, #fff 100%);
-        border-radius: 20px 20px 0 0;
-        display: flex;
-        align-items: flex-end;
-        padding-left: 20px;
-        padding-top: 12px;
+      transition: all 0.3s ease;
+      
+      .step-icon { 
+        width: 44px; 
+        height: 44px; 
+        margin: 6px 0 0 0;
+        transition: transform 0.3s ease;
       }
-      .detail-content {
-        background: #fff;
-        border-radius: 0 0 20px 20px;
-        padding: 20px 16px 16px 16px;
+      
+      .step-label {
+        width: 100%; 
+        height: 28px; 
+        background: transparent; 
+        position: absolute; 
+        left: 0; 
+        bottom: 0; 
+        border-radius: 0 0 12px 12px; 
+        display: flex; 
+        align-items: center; 
+        justify-content: center; 
+        transition: all 0.3s ease; 
+        overflow: hidden;
+        line-height: 1;
+        
+        .step-num, .step-text {
+          font-size: 11px;
+          color: #9b9b9b;
+          font-weight: 600;
+          line-height: 1;
+          vertical-align: middle;
+          transition: color 0.3s ease;
+        }
+        
+        .step-num { 
+          margin-right: 2px; 
+        }
       }
-      .detail-row {
-        display: flex;
-        align-items: center;
-        min-height: 32px;
-        .detail-label {
-          color: #bcbcbc;
-          font-size: 14px;
-          width: 90px;
-          flex-shrink: 0;
+      
+      &.active { 
+        transform: translateY(-2px);
+        box-shadow: 0 4px 12px rgba(255, 156, 0, 0.08);
+        
+        .step-icon {
+          transform: scale(1.05);
         }
-        .detail-value {
-          color: #222;
-          font-size: 15px;
-          font-weight: 500;
-          text-align: left;
-          margin-left: 0;
-          flex: 1;
+        
+        .step-label { 
+          background: linear-gradient(90deg, #ffd01e 0%, #ff8917 100%); 
         }
-        &.total-row .detail-value.total {
-          color: #ffb400;
-          font-size: 20px;
-          font-weight: bold;
-          text-align: right;
-          flex: unset;
-          margin-left: auto;
-          min-width: 100px;
+        
+        .step-num, .step-text { 
+          color: #fff; 
+          font-weight: bold; 
         }
-        .orange { color: #ffb400; }
       }
-      .divider { height: 1px; background: #f0f0f0; margin: 16px 0; }
-      .goods-row { display: flex; align-items: flex-start; margin-bottom: 18px; }
-      .goods-img { width: 48px; height: 48px; border-radius: 12px; margin-right: 12px; }
-      .goods-info { flex: 1; }
-      .goods-name { font-size: 15px; font-weight: bold; color: #222; margin-bottom: 2px; }
-      .goods-desc { font-size: 13px; color: #bbb; margin-bottom: 8px; }
-      .goods-price-row { display: flex; align-items: center; }
-      .goods-price { color: #ffb400; font-size: 15px; font-weight: bold; margin-right: 8px; }
-      .goods-unit { font-size: 13px; color: #bbb; }
-      .goods-count { color: #bbb; font-size: 13px; margin-left: 8px; }
-      .goods-total { color: #222; font-size: 15px; font-weight: bold; margin-left: auto; }
+      
+      &:not(.active):hover {
+        transform: translateY(-1px);
+        box-shadow: 0 2px 12px rgba(255, 156, 0, 0.06);
+      }
     }
   }
-  .footer-btns {
-    position: fixed; left: 0; right: 0; bottom: 0; background: #fff; display: flex; gap: 16px; padding: 16px 24px 32px 24px; z-index: 101;
-    .btn-outline {
-      flex: 1;
-      height: 40px;
-      border-radius: 16px;
-      border: 1px solid #ffe09a;
-      color: #ffb400;
-      background: #fff0d2;
-      font-size: 15px;
-      font-weight: 500;
-      box-shadow: none;
-      padding: 0 18px;
-    }
-    .btn-main {
-      flex: 1;
-      height: 40px;
-      border-radius: 16px;
-      background: linear-gradient(90deg, #ffbe3d 0%, #ffac04 100%);
-      color: #fff;
-      border: none;
-      font-size: 15px;
-      font-weight: 500;
-      box-shadow: none;
-      padding: 0 18px;
+  .base-info {
+    margin-top: 18px;
+    .base-info-row {
+      display: flex;
+      align-items: flex-start;
+      padding: 0 0 0 0;
+      position: relative;
+      min-height: 36px;
+      justify-content: space-between;
+      .base-label-wrap { min-width: 80px; text-align: left;  color: #8b8b8b; font-size: 13px;}
+      .base-value-wrap { display: flex; align-items: center; flex: 1; justify-content: flex-end; }
+      .base-value { color: #222; font-size: 15px; font-weight: 600; word-break: break-all; text-align: right; }
+      .copy-btn { color: #ffb400; font-size: 13px; margin-left: 6px; font-weight: 400; padding: 1px 6px; border-radius: 6px; transition: background 0.2s; }
+      .copy-btn:active { background: #fff7e6; }
+      .divider { position: absolute; left: 16px; right: 16px; bottom: -1px; height: 1px; background: #f0f0f0; }
+      uni-icons { margin-left: 6px; }
     }
+    .base-info-row .base-value-wrap { flex-wrap: wrap; }
+    .base-info-row .base-value { white-space: pre-line; line-height: 1.5; }
   }
-  .cancel-reason {
-    color: #bbb;
-    font-size: 13px;
-    margin-bottom: 10px;
-    padding-left: 2px;
-  }
-  .inspect-card {
-    max-width: 335px;
-    width: 100%;
-    margin: 0 auto 28px auto;
-    border-radius: 24px;
-    overflow: hidden;
-    .inspect-header {
-      height: 60px;
-      background: linear-gradient(180deg, #fff7e6 0%, #fffbe6 100%);
-      border-radius: 24px 24px 0 0;
+  &.detail-card {
+    position: relative;
+    padding: 0;
+    background: transparent;
+    .card-header-bg {
+      height: 56px;
+      background: linear-gradient(180deg, #fff7e6 0%, #fff 100%);
+      border-radius: 20px 20px 0 0;
       display: flex;
       align-items: flex-end;
-      padding-left: 24px;
+      padding-left: 20px;
+      padding-top: 12px;
     }
-    .inspect-title {
-      font-size: 20px;
-      font-weight: bold;
-      color: #222;
-      line-height: 60px;
-    }
-    .inspect-content {
+    .detail-content {
       background: #fff;
-      border-radius: 0 0 24px 24px;
-      padding: 24px 24px 20px 24px;
-    }
-    .inspect-row {
-      display: flex; align-items: center; justify-content: space-between;
-      min-height: 40px;
-      .inspect-label { color: #bcbcbc; font-size: 16px; }
-      .inspect-value { color: #222; font-size: 16px; font-weight: 500; }
-      .inspect-divider { height: 1px; background: #f0f0f0; margin: 0; width: 100%; position: absolute; left: 0; bottom: 0; }
-      position: relative;
+      border-radius: 0 0 20px 20px;
+      padding: 20px 16px 16px 16px;
     }
-    .inspect-btn {
-      width: 100%;
-      margin: 24px 0 0 0;
-      height: 48px;
-      border-radius: 24px;
-      border: 1.5px solid #ffb400;
-      color: #ffb400;
-      background: #fff0d2;
-      font-size: 18px;
-      font-weight: 500;
-      box-shadow: none;
-      text-align: center;
-      line-height: 48px;
+    .detail-row {
+      display: flex;
+      align-items: center;
+      min-height: 32px;
+      .detail-label {
+        color: #bcbcbc;
+        font-size: 14px;
+        width: 90px;
+        flex-shrink: 0;
+      }
+      .detail-value {
+        color: #222;
+        font-size: 15px;
+        font-weight: 500;
+        text-align: left;
+        margin-left: 0;
+        flex: 1;
+      }
+      &.total-row .detail-value.total {
+        color: #ffb400;
+        font-size: 20px;
+        font-weight: bold;
+        text-align: right;
+        flex: unset;
+        margin-left: auto;
+        min-width: 100px;
+      }
+      .orange { color: #ffb400; }
     }
+    .divider { height: 1px; background: #f0f0f0; margin: 16px 0; }
+    .goods-row { display: flex; align-items: flex-start; margin-bottom: 18px; }
+    .goods-img { width: 48px; height: 48px; border-radius: 12px; margin-right: 12px; }
+    .goods-info { flex: 1; }
+    .goods-name { font-size: 15px; font-weight: bold; color: #222; margin-bottom: 2px; }
+    .goods-desc { font-size: 13px; color: #bbb; margin-bottom: 8px; }
+    .goods-price-row { display: flex; align-items: center; }
+    .goods-price { color: #ffb400; font-size: 15px; font-weight: bold; margin-right: 8px; }
+    .goods-unit { font-size: 13px; color: #bbb; }
+    .goods-count { color: #bbb; font-size: 13px; margin-left: 8px; }
+    .goods-total { color: #222; font-size: 15px; font-weight: bold; margin-left: auto; }
+  }
+}
+.footer-btns {
+  position: fixed; left: 0; right: 0; bottom: 0; background: #fff; display: flex; gap: 16px; padding: 16px 24px 32px 24px; z-index: 101;
+  .btn-outline {
+    flex: 1;
+    height: 40px;
+    border-radius: 16px;
+    border: 1px solid #ffe09a;
+    color: #ffb400;
+    background: #fff0d2;
+    font-size: 15px;
+    font-weight: 500;
+    box-shadow: none;
+    padding: 0 18px;
+  }
+  .btn-main {
+    flex: 1;
+    height: 40px;
+    border-radius: 16px;
+    background: linear-gradient(90deg, #ffbe3d 0%, #ffac04 100%);
+    color: #fff;
+    border: none;
+    font-size: 15px;
+    font-weight: 500;
+    box-shadow: none;
+    padding: 0 18px;
+  }
+}
+.cancel-reason {
+  color: #bbb;
+  font-size: 13px;
+  margin-bottom: 10px;
+  padding-left: 2px;
+}
+.inspect-card {
+  max-width: 335px;
+  width: 100%;
+  margin: 0 auto 28px auto;
+  border-radius: 24px;
+  overflow: hidden;
+  .inspect-header {
+    height: 60px;
+    background: linear-gradient(180deg, #fff7e6 0%, #fffbe6 100%);
+    border-radius: 24px 24px 0 0;
+    display: flex;
+    align-items: flex-end;
+    padding-left: 24px;
   }
-  .card-title {
+  .inspect-title {
     font-size: 20px;
     font-weight: bold;
     color: #222;
-    margin-bottom: 12px;
+    line-height: 60px;
+  }
+  .inspect-content {
+    background: #fff;
+    border-radius: 0 0 24px 24px;
+    padding: 24px 24px 20px 24px;
+  }
+  .inspect-row {
+    display: flex; align-items: center; justify-content: space-between;
+    min-height: 40px;
+    .inspect-label { color: #bcbcbc; font-size: 16px; }
+    .inspect-value { color: #222; font-size: 16px; font-weight: 500; }
+    .inspect-divider { height: 1px; background: #f0f0f0; margin: 0; width: 100%; position: absolute; left: 0; bottom: 0; }
+    position: relative;
+  }
+  .inspect-btn {
+    width: 100%;
+    margin: 24px 0 0 0;
+    height: 48px;
+    border-radius: 24px;
+    border: 1.5px solid #ffb400;
+    color: #ffb400;
+    background: #fff0d2;
+    font-size: 18px;
+    font-weight: 500;
+    box-shadow: none;
+    text-align: center;
+    line-height: 48px;
+  }
+}
+.card-title {
+  font-size: 20px;
+  font-weight: bold;
+  color: #222;
+  margin-bottom: 12px;
+}
+.custom-inspect-card {
+  background: linear-gradient(180deg, #fffbe6 0%, #fff 90%);
+  border-radius: 20px;
+  box-shadow: 0 8px 24px rgba(255, 156, 0, 0.03);
+  padding: 0;
+  margin: 24rpx 0 0 0;
+  overflow: hidden;
+}
+.custom-header-bg {
+  height: 56px;
+  background: linear-gradient(180deg, #fff7e6 0%, #fff 100%);
+  border-radius: 20px 20px 0 0;
+  display: flex;
+  align-items: flex-end;
+  padding-left: 24px;
+  padding-top: 12px;
+}
+.custom-card-title {
+  font-size: 20px;
+  font-weight: bold;
+  color: #222;
+  margin-bottom: 12px;
+}
+.custom-detail-content {
+  background: #fff;
+  border-radius: 0 0 20px 20px;
+  padding: 20px 16px 16px 16px;
+}
+.custom-detail-row {
+  display: flex;
+  align-items: center;
+  min-height: 32px;
+  font-size: 15px;
+  .custom-detail-label {
+    color: #bcbcbc;
+    font-size: 14px;
+    width: 90px;
+    flex-shrink: 0;
+  }
+  .custom-detail-value {
+    color: #222;
+    font-size: 15px;
+    font-weight: 500;
+    text-align: left;
+    margin-left: 0;
+    flex: 1;
+  }
+  &.total-row .custom-detail-value.total {
+    color: #ffb400;
+    font-size: 20px;
+    font-weight: bold;
+    text-align: right;
+    flex: unset;
+    margin-left: auto;
+    min-width: 100px;
+  }
+  .highlight {
+    color: #ffb400;
+    font-size: 18px;
+    font-weight: bold;
   }
 }
+.custom-divider {
+  width: 100%;
+  height: 1px;
+  background: #f0f0f0;
+  margin: 16px 0;
+}
+.custom-goods-row {
+  background: #fff;
+  border-radius: 24px;
+  display: flex;
+  align-items: center;
+  padding: 24px 20px;
+  box-shadow: 0 2px 8px rgba(255, 156, 0, 0.04);
+  position: relative;
+  margin-bottom: 18px;
+}
+.custom-goods-img {
+  width: 48px;
+  height: 48px;
+  border-radius: 12px;
+  margin-right: 12px;
+  flex-shrink: 0;
+}
+.custom-goods-info {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+.custom-goods-name {
+  font-size: 15px;
+  color: #222;
+  font-weight: bold;
+  margin-bottom: 2px;
+}
+.custom-goods-desc {
+  font-size: 13px;
+  color: #bcbcbc;
+  margin-bottom: 10px;
+}
+.custom-goods-meta {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+.custom-goods-price {
+  color: #ffb400;
+  font-size: 15px;
+  font-weight: bold;
+}
+.custom-goods-unit {
+  color: #bcbcbc;
+  font-size: 13px;
+  font-weight: normal;
+}
+.custom-goods-count {
+  color: #bcbcbc;
+  font-size: 13px;
+  margin-left: 8px;
+}
+.custom-goods-total {
+  color: #222;
+  font-size: 15px;
+  font-weight: bold;
+  margin-left: 18px;
+  flex-shrink: 0;
+}
+.user-stat-modal-mask {
+  position: fixed;
+  left: 0; right: 0; top: 0; bottom: 0;
+  background: rgba(0,0,0,0.45);
+  z-index: 9999;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.user-stat-modal-box {
+  width: 80vw;
+  max-width: 420px;
+  background: linear-gradient(180deg, #fff7f2 0%, #fff 100%);
+  border-radius: 32px;
+  box-shadow: 0 8px 32px rgba(0,0,0,0.08);
+  padding: 38px 0 32px 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.user-stat-modal-title {
+  font-size: 24px;
+  font-weight: bold;
+  color: #222;
+  text-align: center;
+  margin-bottom: 32px;
+}
+.user-stat-modal-row {
+  width: 80%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 18px;
+  margin: 0 auto;
+  padding: 12px 0;
+}
+.user-stat-label {
+  color: #999;
+  font-size: 16px;
+}
+.user-stat-value {
+  color: #222;
+  font-size: 18px;
+  font-weight: 500;
+}
+.user-stat-modal-divider {
+  width: 80%;
+  height: 1px;
+  background: #f0f0f0;
+  margin: 0 auto;
+}
+.user-stat-modal-btn {
+  width: 80%;
+  margin: 32px auto 0 auto;
+  height: 48px;
+  border-radius: 24px;
+  background: #fffbe6;
+  color: #ffb400;
+  font-size: 20px;
+  font-weight: bold;
+  border: 2px solid #ffd01e;
+  text-align: center;
+  line-height: 48px;
+}
+.user-stat-trigger {
+  color: #222;
+  font-weight: 500;
+  cursor: pointer;
+}
 </style> 
\ No newline at end of file
diff --git a/pages/manager/order.vue b/pages/manager/order.vue
index 8d284a4..59b01f6 100644
--- a/pages/manager/order.vue
+++ b/pages/manager/order.vue
@@ -34,7 +34,7 @@
           v-for="(tab, idx) in tabs"
           :key="tab.value"
           :class="['tab-item', {active: currentTab === idx}]"
-          @tap="switchTab(idx)"
+          @tap="onTabChange(idx)"
         >
           {{ tab.label }}
         </view>
@@ -57,7 +57,7 @@
       <view class="search-bar-inner">
         <template v-if="!searchMode">
           <uni-icons class="search-icon" type="search" size="22" color="#999" @tap="onSearchIconClick" />
-          <uni-icons class="scan-icon" type="scan" size="22" color="#999" />
+          <uni-icons class="scan-icon" type="scan" size="22" color="#999" @tap="scanCode" />
         </template>
         <template v-else>
           <view class="search-input-wrap">
@@ -99,10 +99,6 @@
               <text class="info-label">预约时间：</text>
               <text class="info-value">{{ order.appointTime }}</text>
             </view>
-            <view v-if="order.pickupTime">
-              <text class="info-label">取件时间：</text>
-              <text class="info-value">{{ order.pickupTime }}</text>
-            </view>
             <view v-if="order.cancelTime">
               <text class="info-label">取消时间：</text>
               <text class="info-value">{{ order.cancelTime }}</text>
@@ -116,7 +112,7 @@
         </view>
         <view class="order-card-footer" v-if="order.actions && order.actions.length && !historyOrderMode">
           <view class="order-actions-bar">
-            <view class="action-btn-bar" v-for="action in order.actions" :key="action.text">
+            <view class="action-btn-bar" v-for="action in order.actions" :key="action.text" @tap="action.text === '审批' ? goToOrderDetail(order) : null">
               <uni-icons :type="action.icon" size="28" color="#666" />
               <text>{{ action.text }}</text>
             </view>
@@ -134,99 +130,27 @@ export default {
   data() {
     return {
       statusBarHeight: 0,
-      navBarContentHeight: 44, // px
-      tabBarHeight: 48, // px
-      navBarHeight: 44, // 默认值，后续动态获取
-      navBarRealHeight: 44, // 实际高度
+      navBarContentHeight: 44,
+      tabBarHeight: 48,
+      navBarHeight: 44,
+      navBarRealHeight: 44,
       tabs: [
         { label: '全部', value: -1 },
         { label: '已预约', value: 0 },
         { label: '待质检', value: 1 },
         { label: '已结款', value: 2 },
-        { label: '已驳回', value: 3 },
-        { label: '已取消', value: 4 }
+        { label: '已驳回', value: 3 }
       ],
       currentTab: 0,
-      orderList: [
-        {
-          id: 1,
-          orderNo: 'RE82738127861524',
-          userName: '周小艺',
-          phone: '138****1234',
-          appointTime: '周四 11:00~13:00',
-          statusText: '已预约',
-          statusClass: 'green',
-          statusLabel: '已预约',
-          actions: [],
-          status: 0
-        },
-        {
-          id: 2,
-          orderNo: 'RE82738127861524',
-          userName: '周小艺',
-          phone: '138****1234',
-          appointTime: '周四 11:00~13:00',
-          statusText: '不包邮',
-          statusClass: 'green',
-          statusLabel: '已预约',
-          actions: [],
-          status: 0
-        },
-        {
-          id: 3,
-          orderNo: 'RE82738127861526',
-          userName: '周小艺',
-          phone: '138****1234',
-          pickupTime: '2025-03-20 11:00',
-          statusText: '待质检',
-          statusClass: 'orange',
-          statusLabel: '待质检',
-          actions: [
-            { icon: 'undo', text: '驳回' },
-            { icon: 'person', text: '审批' }
-          ],
-          status: 1
-        },
-        {
-          id: 4,
-          orderNo: 'RE82738127861525',
-          userName: '周小艺',
-          phone: '138****1234',
-          pickupTime: '2025-03-20 12:00',
-          statusText: '已驳回',
-          statusClass: 'red',
-          statusLabel: '已驳回',
-          actions: [],
-          status: 3
-        },
-        {
-          id: 5,
-          orderNo: 'RE82738127861525',
-          userName: '周小艺',
-          phone: '138****1234',
-          cancelTime: '2025-03-20 12:00',
-          statusText: '已取消',
-          statusClass: 'gray',
-          statusLabel: '已取消',
-          actions: [],
-          status: 4
-        },
-        {
-          id: 6,
-          orderNo: 'RE82738127861526',
-          userName: '周小艺',
-          phone: '138****1234',
-          qualityTime: '2025-03-20 12:00',
-          statusText: '已结款',
-          statusClass: 'blue',
-          statusLabel: '已结款',
-          actions: [],
-          status: 2
-        }
-      ],
+      orderList: [],
       searchMode: false,
       searchText: '',
       historyOrderMode: false,
+      pageNum: 1,
+      pageSize: 10,
+      hasMore: true,
+      isLoading: false,
+      userId: ''
     }
   },
   onLoad(options) {
@@ -242,6 +166,10 @@ export default {
     if (options && options.historyOrder) {
       this.historyOrderMode = true;
     }
+    if (options && options.userId) {
+      this.userId = options.userId;
+    }
+    this.fetchOrderList()
   },
   computed: {
     filteredOrders() {
@@ -254,16 +182,35 @@ export default {
         );
       }
       const tabValue = this.tabs[this.currentTab].value;
+      // console.log('当前tab:', tabValue, 'orderList:', this.orderList);
       if (tabValue === -1) return this.orderList;
-      return this.orderList.filter(order => order.status === tabValue);
+      if (tabValue === 0) {
+        // 已预约：status == 1
+        // console.log(this.orderList.filter(order => order.status == 1),'this.orderList')
+        return this.orderList.filter(order => order.status == 1);
+      } else if (tabValue === 1) {
+        // 待质检：state == 1
+        return this.orderList.filter(order => order.status == 2);
+      } else if (tabValue === 2) {
+        // 已结款：status == 3
+        return this.orderList.filter(order => order.status == 3);
+      } else if (tabValue === 3) {
+        // 已驳回：status == 1 && state == 3
+        return this.orderList.filter(order => order.status == 4);
+      }
+      return this.orderList;
     }
   },
   methods: {
     goBack() {
       uni.navigateBack()
     },
-    switchTab(idx) {
+    onTabChange(idx) {
       this.currentTab = idx
+      this.pageNum = 1
+      this.hasMore = true
+      this.orderList = []
+      this.fetchOrderList()
     },
     onSearchIconClick() {
       this.searchMode = true;
@@ -279,24 +226,8 @@ export default {
       this.searchMode = false;
     },
     goToOrderDetail(order) {
-      // 根据订单状态动态设置订单详情页的显示内容
-      const orderDetail = {
-        status: order.status,
-        statusText: order.statusText,
-        statusLabel: order.statusLabel,
-        statusClass: order.statusClass,
-        estimate: '73.6~75.8',
-        items: [
-          { name: '羽绒服', desc: '允许脏破烂，160码以上', price: 8, count: 8, total: 64, img: '/static/coat1.png' },
-          { name: '品牌羽绒服', desc: '允许脏破烂，160码以上', price: 10, count: 8, total: 8, img: '/static/coat2.png' }
-        ]
-      }
-      // 跳转到订单详情页
       uni.navigateTo({
-        url: '/pages/manager/order-detail',
-        success: (res) => {
-          res.eventChannel.emit('orderDetail', orderDetail)
-        }
+        url: '/pages/manager/order-detail?id=' + order.id
       })
     },
     refreshData() {
@@ -305,10 +236,125 @@ export default {
     async onRefresh() {
       await this.refreshData && this.refreshData()
     },
+    fetchOrderList(isLoadMore = false) {
+      if (this.isLoading || (!isLoadMore && !this.hasMore)) return
+      this.isLoading = true
+      const params = {
+        pageNum: this.pageNum,
+        pageSize: this.pageSize
+      }
+      if (this.userId) {
+        params.userId = this.userId;
+      }
+      this.$api && this.$api('getOrderList', params, res => {
+        if (res && res.code === 200 && res.result && res.result.records) {
+          const newOrders = res.result.records.map(order => {
+            const statusInfo = this.getOrderStatusInfo(order.status, order.state)
+            return {
+              id: order.id,
+              orderNo: order.ordeNo,
+              userName: order.name,
+              phone: order.phone,
+              appointTime: order.goTime,
+              cancelTime: order.state === 3 ? order.updateTime : '',
+              qualityTime: order.status === 2 && order.state === 1 ? order.updateTime : '',
+              statusText: order.isBy === 'Y' ? statusInfo.label : '不包邮',
+              statusClass: statusInfo.class,
+              statusLabel: statusInfo.label,
+              actions: this.getOrderActions(order.status, order.state),
+              status: this.getOrderStatus(order.status, order.state)
+            }
+          })
+          if (isLoadMore) {
+            this.orderList = [...this.orderList, ...newOrders]
+          } else {
+            this.orderList = newOrders
+          }
+          this.hasMore = newOrders.length === this.pageSize
+          this.pageNum = isLoadMore ? this.pageNum + 1 : 1
+        }
+        this.isLoading = false
+      })
+    },
+    getOrderStatusInfo(status, state) {
+      // if (state === 3) {
+      //   return { label: '已取消', class: 'gray' }
+      // }
+      if (status === 1 ) {
+        return { label: '已预约', class: 'green' }
+      } else if (state === 1) {
+        return { label: '待质检', class: 'orange' }
+      } else if (status === 3) {
+        return { label: '已结款', class: 'blue' }
+      } else if (status === 1 && state === 3) {
+        return { label: '已驳回', class: 'red' }
+      }
+      return { label: '未知状态', class: 'gray' }
+    },
+    getOrderStatus(status, state) {
+      // // 已取消状态
+      // if (state === 3) return 4
+      
+      // 已预约状态 - 快递上门
+      if (status === 1 ) return 1
+      
+      // 待质检状态 - 已取件
+      if (state === 1) return 2
+      
+      // 已结款状态 - 现金打款
+      if (status === 3 ) return 3
+      
+      // 已驳回状态 - 快递上门终止
+      if (status === 1 && state === 3) return 4
+      
+      return -1
+    },
+    getOrderActions(status, state) {
+      const actions = []
+      // 只有待质检状态显示操作按钮
+      if (status === 2 && state === 1) {
+        actions.push({ icon: 'undo', text: '驳回' })
+        actions.push({ icon: 'person', text: '审批' })
+      }
+      return actions
+    },
+    onLoadMore() {
+      if (this.hasMore && !this.isLoading) {
+        this.fetchOrderList(true)
+      }
+    },
+    scanCode() {
+      uni.scanCode({
+        scanType: ['qrCode'],
+        success: (res) => {
+          console.log('扫码结果：', res);
+          // 这里可以根据扫码结果进行相应处理
+          // 比如跳转到订单详情页
+          if(res.result) {
+            uni.navigateTo({
+              url: '/pages/manager/order-detail?id=' + res.result
+            })
+          }
+        },
+        fail: (err) => {
+          console.error('扫码失败：', err);
+          uni.showToast({
+            title: '扫码失败',
+            icon: 'none'
+          })
+        }
+      })
+    },
   },
   onPullDownRefresh() {
-    this.refreshData && this.refreshData()
-    uni.stopPullDownRefresh()
+    this.pageNum = 1;
+    this.hasMore = true;
+    this.orderList = [];
+    this.fetchOrderList();
+    uni.stopPullDownRefresh();
+  },
+  onReachBottom() {
+    this.onLoadMore()
   }
 }
 </script>
diff --git a/pages/manager/staff-detail.vue b/pages/manager/staff-detail.vue
index e64ad59..e3d6140 100644
--- a/pages/manager/staff-detail.vue
+++ b/pages/manager/staff-detail.vue
@@ -74,7 +74,21 @@ export default {
       uni.navigateBack();
     },
     removeStaff() {
+      if (!this.staff.id) {
+        uni.showToast({ title: '缺少员工ID', icon: 'none' });
+        return;
+      }
+      this.$api && this.$api('removeMember', { id: this.staff.id }, res => {
+        if (res && res.code === 200) {
       uni.showToast({ title: '已解除员工', icon: 'none' });
+          setTimeout(() => {
+            uni.$emit('refreshStaffList');
+            uni.navigateBack();
+          }, 500);
+        } else {
+          uni.showToast({ title: '操作失败', icon: 'none' });
+        }
+      });
     },
     refreshData() {
       // TODO: 实现员工详情刷新逻辑，如重新请求接口
@@ -132,7 +146,7 @@ export default {
   }
 }
 .main-content {
-  margin-top: 120rpx;
+  margin-top: calc(120rpx + var(--status-bar-height));
   margin-bottom: 40rpx;
 }
 .info-card {
diff --git a/pages/manager/staff.vue b/pages/manager/staff.vue
index 2c6c096..f820e85 100644
--- a/pages/manager/staff.vue
+++ b/pages/manager/staff.vue
@@ -1,5 +1,10 @@
 <template>
   <view class="staff-manage-container">
+    <!-- 下拉刷新提示 -->
+    <view v-if="refreshing" class="refresh-tip-bar">
+      <uni-icons type="loading" size="22" color="#ffb400" class="refresh-loading-icon" />
+      <text class="refresh-tip-text">正在刷新...</text>
+    </view>
     <!-- 顶部导航栏 -->
     <view class="navbar" :style="navbarStyle">
       <view class="nav-left" @tap="goBack">
@@ -43,6 +48,7 @@ export default {
       ],
       statusBarHeight: 0,
       navBarRealHeight: 0,
+      refreshing: false
     }
   },
   computed: {
@@ -63,6 +69,13 @@ export default {
         }
       }).exec();
     });
+    // 获取员工列表
+    this.fetchStaffList();
+    // 监听刷新事件
+    uni.$on('refreshStaffList', this.fetchStaffList);
+  },
+  onUnload() {
+    uni.$off('refreshStaffList', this.fetchStaffList);
   },
   methods: {
     goBack() {
@@ -82,10 +95,29 @@ export default {
     async onRefresh() {
       await this.refreshData && this.refreshData()
     },
+    async fetchStaffList() {
+      try {
+        const res = await this.$api('getMyTeamList', { pageSize: 1000, current: 1 });
+        if (res && res.code === 200 && res.result && Array.isArray(res.result.records)) {
+          this.staffList = res.result.records
+            .filter(user => user.role == 1 || user.role == 0 || user.role == 2)
+            .map(user => ({
+              id: user.id,
+              name: user.nickName || '-',
+              role: user.role == 1 ? '质检员' : user.role == 2 ? '管理员' : '用户'
+            }));
+        }
+      } catch (e) {
+        uni.showToast({ title: '获取员工列表失败', icon: 'none' });
+      }
+    },
   },
   onPullDownRefresh() {
-    this.refreshData && this.refreshData()
-    uni.stopPullDownRefresh()
+    this.refreshing = true;
+    Promise.resolve(this.fetchStaffList()).finally(() => {
+      this.refreshing = false;
+      uni.stopPullDownRefresh();
+    });
   }
 }
 </script>
@@ -96,6 +128,31 @@ export default {
   background: #f7f7f7;
   padding-bottom: 40rpx;
 }
+.refresh-tip-bar {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 80rpx;
+  background: #fffbe6;
+  color: #ffb400;
+  font-size: 30rpx;
+  font-weight: 500;
+  text-align: center;
+  line-height: 80rpx;
+  z-index: 9999;
+  box-shadow: 0 2rpx 8rpx rgba(255, 156, 0, 0.03);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.refresh-loading-icon {
+  margin-right: 16rpx;
+}
+.refresh-tip-text {
+  font-size: 30rpx;
+  color: #ffb400;
+}
 .navbar {
   position: fixed;
   top: 0;
diff --git a/pages/manager/tui-apply-detail.vue b/pages/manager/tui-apply-detail.vue
index c0ef6b4..72ac338 100644
--- a/pages/manager/tui-apply-detail.vue
+++ b/pages/manager/tui-apply-detail.vue
@@ -40,7 +40,7 @@
         </view>
       </view>
     </view>
-    <view class="bottom-bar">
+    <view class="bottom-bar" v-if="apply.status === '待审批'">
       <button class="action-btn danger" @tap="reject">驳回</button>
       <button class="action-btn primary" @tap="approve">通过</button>
     </view>
@@ -95,10 +95,33 @@ export default {
       uni.navigateBack();
     },
     reject() {
-      uni.showToast({ title: '已驳回', icon: 'none' });
+      if (!this.apply.id) {
+        uni.showToast({ title: '缺少申请ID', icon: 'none' });
+        return;
+      }
+      this.$api && this.$api('rejectPromotionApply', { id: this.apply.id }, res => {
+        if (res && res.code === 200) {
+          uni.showToast({ title: '已驳回', icon: 'none' });
+          this.apply.status = '已驳回';
+        } else {
+          uni.showToast({ title: '操作失败', icon: 'none' });
+        }
+      });
     },
     approve() {
-      uni.showToast({ title: '已通过', icon: 'none' });
+      if (!this.apply.id) {
+        uni.showToast({ title: '缺少申请ID', icon: 'none' });
+        return;
+      }
+      console.log(this.apply)
+      this.$api && this.$api('passPromotionApply', { id: this.apply.id }, res => {
+        if (res && res.code === 200) {
+          uni.showToast({ title: '已通过', icon: 'none' });
+          this.apply.status = '已确认';
+        } else {
+          uni.showToast({ title: '操作失败', icon: 'none' });
+        }
+      });
     },
     refreshData() {
       // TODO: 实现推广官申请详情刷新逻辑，如重新请求接口
diff --git a/pages/manager/tui-detail.vue b/pages/manager/tui-detail.vue
index 0cc8803..ca6943d 100644
--- a/pages/manager/tui-detail.vue
+++ b/pages/manager/tui-detail.vue
@@ -154,8 +154,8 @@ export default {
   }
 }
 .main-content {
-  margin-top: 120rpx;
   margin-bottom: 40rpx;
+  margin-top: calc(120rpx + var(--status-bar-height));
 }
 .info-card {
   background: #fff;
diff --git a/pages/manager/tui.vue b/pages/manager/tui.vue
index 0ec3cd3..c7a9473 100644
--- a/pages/manager/tui.vue
+++ b/pages/manager/tui.vue
@@ -13,16 +13,32 @@
     </view>
     <!-- Tab栏 -->
     <view class="tab-bar-fixed" :style="{top: navBarRealHeight + 'px'}">
-      <view class="tab-tabs">
-        <view :class="['tab-item', {active: currentTab === 0}]" @tap="switchTab(0)">全部</view>
-        <view :class="['tab-item', {active: currentTab === 1}]" @tap="switchTab(1)">推广官申请列表</view>
-      </view>
-      <uni-icons type="search" size="28" color="#222" class="tab-search" />
+      <template v-if="!searchMode">
+        <view class="tab-tabs">
+          <view :class="['tab-item', {active: currentTab === 0}]" @tap="switchTab(0)">全部</view>
+          <view :class="['tab-item', {active: currentTab === 1}]" @tap="switchTab(1)">推广官申请列表</view>
+        </view>
+        <uni-icons type="search" size="28" color="#222" class="tab-search" @tap="onSearchIconClick" />
+      </template>
+      <template v-else>
+        <view class="search-input-wrap">
+          <uni-icons type="search" size="22" color="#999" />
+          <input
+            ref="searchInput"
+            class="search-input"
+            v-model="searchText"
+            placeholder="请输入要查询的内容"
+            placeholder-style="color:#ccc"
+          />
+          <uni-icons v-if="searchText" type="close" size="22" color="#ccc" @tap="onClearSearch" />
+        </view>
+        <text class="search-cancel" @tap="onCancelSearch">取消</text>
+      </template>
     </view>
     <view class="tab-content" :style="{paddingTop: (navBarRealHeight + tabBarHeight) + 'px'}">
       <!-- 全部 -->
       <view v-if="currentTab === 0">
-        <view v-for="(item, idx) in tuiList" :key="idx" class="tui-card" @tap="goTuiDetail(item)">
+        <view v-for="(item, idx) in filteredTuiList" :key="idx" class="tui-card" @tap="goTuiDetail(item)">
           <view class="tui-info-row"><text class="tui-label">姓名：</text><text class="tui-value">{{ item.name }}</text></view>
           <view class="tui-info-row"><text class="tui-label">一级推广数：</text><text class="tui-value">{{ item.level1 }}人</text></view>
           <view class="tui-info-row"><text class="tui-label">二级推广数：</text><text class="tui-value">{{ item.level2 }}人</text></view>
@@ -32,7 +48,7 @@
       </view>
       <!-- 推广官申请列表 -->
       <view v-if="currentTab === 1">
-        <view v-for="(item, idx) in applyList" :key="idx" class="tui-card">
+        <view v-for="(item, idx) in filteredApplyList" :key="idx" class="tui-card" @tap.stop="goApplyDetail(item)">
           <view class="tui-info-row"><text class="tui-value">{{ item.name }} 的推广官申请</text></view>
           <view class="tui-info-row"><text class="tui-label">电话：</text><text class="tui-value">{{ item.phone }}</text></view>
           <view class="tui-info-row"><text class="tui-label">每日可花推广时间：</text><text class="tui-value">{{ item.time }}</text></view>
@@ -44,7 +60,7 @@
           </view>
           <view class="tui-action-bar">
             <view class="tui-action" v-if="item.status==='待审批'"><uni-icons type="undo" size="32" color="#999" /><text>驳回</text></view>
-            <view class="tui-action" v-if="item.status==='待审批'" @tap.stop="goApplyDetail(item)"><uni-icons type="person" size="32" color="#999" /><text>审批</text></view>
+            <view class="tui-action" v-if="item.status==='待审批'" ><uni-icons type="person" size="32" color="#999" /><text>审批</text></view>
           </view>
         </view>
       </view>
@@ -59,12 +75,7 @@ export default {
   data() {
     return {
       currentTab: 0,
-      tuiList: [
-        { name: '周小艺', level1: 67, level2: 67, totalAmount: '8273.99', commission: '278.99' },
-        { name: '李世海', level1: 67, level2: 67, totalAmount: '8273.99', commission: '278.99' },
-        { name: '何炜', level1: 67, level2: 67, totalAmount: '8273.99', commission: '278.99' },
-        { name: '李梓发', level1: 67, level2: 67, totalAmount: '8273.99', commission: '278.99' },
-      ],
+      tuiList: [],
       applyList: [
         { name: '周小艺', phone: '18899102278', time: '6小时', applyTime: '2025-03-20 11:00', status: '待审批' },
         { name: '周小艺', phone: '18899102278', time: '6小时', applyTime: '2025-03-20 11:00', status: '已驳回' },
@@ -74,11 +85,29 @@ export default {
       statusBarHeight: 0,
       navBarRealHeight: 0,
       tabBarHeight: 80, // px
+      searchMode: false,
+      searchText: '',
     }
   },
   computed: {
     navbarStyle() {
       return `padding-top: ${this.statusBarHeight}px;`;
+    },
+    filteredTuiList() {
+      if (!this.searchText) return this.tuiList;
+      const text = this.searchText.toLowerCase();
+      return this.tuiList.filter(item =>
+        (item.name && item.name.toLowerCase().includes(text)) ||
+        (item.phone && item.phone.toLowerCase().includes(text))
+      );
+    },
+    filteredApplyList() {
+      if (!this.searchText) return this.applyList;
+      const text = this.searchText.toLowerCase();
+      return this.applyList.filter(item =>
+        (item.name && item.name.toLowerCase().includes(text)) ||
+        (item.phone && item.phone.toLowerCase().includes(text))
+      );
     }
   },
   onLoad() {
@@ -94,6 +123,14 @@ export default {
         }
       }).exec();
     });
+    // 获取推广官列表
+    this.fetchPromotionList();
+    // 获取推广官申请列表
+    this.fetchPromotionApplyList();
+  },
+  onShow() {
+    this.fetchPromotionList();
+    this.fetchPromotionApplyList();
   },
   methods: {
     goBack() {
@@ -123,11 +160,62 @@ export default {
     },
     async onRefresh() {
       await this.refreshData && this.refreshData()
-    }
+    },
+    async fetchPromotionList() {
+      try {
+        const res = await this.$api('getPromotionList', { pageSize: 1000, current: 1 });
+        if (res && res.code === 200 && res.result && Array.isArray(res.result.records)) {
+          this.tuiList = res.result.records.map(user => ({
+            name: user.name || user.nickName || '-',
+            level1: 0, // 一级推广数，暂定
+            level2: 0, // 二级推广数，暂定
+            totalAmount: user.money || 0,
+            commission: user.price || 0,
+            phone: user.phone || ''
+          }));
+        }
+      } catch (e) {
+        uni.showToast({ title: '获取推广官列表失败', icon: 'none' });
+      }
+    },
+    async fetchPromotionApplyList() {
+      try {
+        const res = await this.$api('getPromotionApplyListPage', { pageSize: 1000, current: 1 });
+        if (res && res.code === 200 && res.result && Array.isArray(res.result.records)) {
+          this.applyList = res.result.records.map(user => ({
+            id: user.id,
+            name: user.name || user.nickName || '-',
+            phone: user.phone || '',
+            time: user.userTime || '',
+            applyTime: user.createTime || '',
+            status: user.status === 0 ? '待审批' : user.status === 1 ? '已确认' : user.status === 2 ? '已驳回' : ''
+          }));
+        }
+      } catch (e) {
+        uni.showToast({ title: '获取申请列表失败', icon: 'none' });
+      }
+    },
+    onSearchIconClick() {
+      this.searchMode = true;
+      this.$nextTick(() => {
+        this.$refs.searchInput && this.$refs.searchInput.focus();
+      });
+    },
+    onClearSearch() {
+      this.searchText = '';
+    },
+    onCancelSearch() {
+      this.searchText = '';
+      this.searchMode = false;
+    },
   },
   onPullDownRefresh() {
-    this.refreshData && this.refreshData()
-    uni.stopPullDownRefresh()
+    Promise.all([
+      this.fetchPromotionList(),
+      this.fetchPromotionApplyList()
+    ]).finally(() => {
+      uni.stopPullDownRefresh();
+    });
   }
 }
 </script>
@@ -181,7 +269,7 @@ export default {
   background: #fff;
   display: flex;
   align-items: center;
-  justify-content: space-between;
+  justify-content: space-around;
   height: 80rpx;
   border-bottom: 2rpx solid #f3f3f3;
   margin: 0;
@@ -291,4 +379,19 @@ export default {
     margin-bottom: 4rpx;
   }
 }
+.search-input-wrap {
+  display: flex;
+  align-items: center;
+  padding: 2rpx;
+  border: 1rpx solid #ccc;
+  border-radius: 10rpx;
+  .search-input {
+    flex: 1;
+    // padding: 8rpx;
+  }
+}
+.search-cancel {
+  margin-left: 16rpx;
+  color: #999;
+}
 </style> 
\ No newline at end of file
diff --git a/pages/manager/user-detail.vue b/pages/manager/user-detail.vue
index 8d2b2f7..135089c 100644
--- a/pages/manager/user-detail.vue
+++ b/pages/manager/user-detail.vue
@@ -1,15 +1,11 @@
 <template>
   <view class="user-detail-container">
     <!-- 顶部导航栏 -->
-    <view class="navbar" :style="navbarStyle">
-      <view class="nav-left" @tap="goBack">
-        <uni-icons type="back" size="24" color="#222" />
-      </view>
-      <view class="nav-title">用户管理详情</view>
-      <view class="nav-right">
-        <!-- <uni-icons type="more-filled" size="24" color="#222" style="margin-right: 16rpx;" />
-        <uni-icons type="scan" size="24" color="#222" /> -->
+    <view class="nav-bar">
+      <view class="back" @tap="goBack">
+        <uni-icons type="left" size="20"></uni-icons>
       </view>
+      <text class="title">用户管理详情</text>
     </view>
     <view class="main-content">
       <!-- 个人信息卡片 -->
@@ -109,6 +105,25 @@ export default {
     if (eventChannel) {
       eventChannel.on('userDetail', (user) => {
         this.user = Object.assign({}, this.user, user);
+        // 获取平台统计信息
+        if (user.id) {
+          this.$api && this.$api('getUserOrderNum', { userId: user.id }, res => {
+            if (res && res.code === 200 && res.result) {
+              this.user.recycleCount = res.result.unit_num;
+              this.user.totalItems = res.result.sum;
+              this.user.totalAmount = res.result.order_money;
+            }
+          });
+          // 获取默认地址
+          this.$api && this.$api('getAddressList', { userId: user.id }, res => {
+            if (res && res.code === 200 && Array.isArray(res.result)) {
+              const defaultAddr = res.result.find(addr => addr.defaultFlag === 'Y');
+              if (defaultAddr) {
+                this.user.address = defaultAddr.address;
+              }
+            }
+          });
+        }
       });
     }
   },
@@ -117,14 +132,31 @@ export default {
       uni.navigateBack();
     },
     blockUser() {
-      uni.showToast({ title: '已拉黑', icon: 'none' });
+      if (!this.user.id) return;
+      this.$api('blackUser', { userId: this.user.id }, res => {
+        if (res && res.code === 200) {
+          uni.showToast({ title: '已拉黑', icon: 'success' });
+          this.user.blocked = true;
+        } else {
+          uni.showToast({ title: res.msg || '拉黑失败', icon: 'none' });
+        }
+      })
     },
     upgradeUser() {
-      uni.showToast({ title: '已升级为推广官', icon: 'none' });
+      if (!this.user.id) return;
+      this.$api('upgrade', { userId: this.user.id }, res => {
+        if (res && res.code === 200) {
+          uni.showToast({ title: '已升级为推广官', icon: 'success' });
+          this.user.role = '推广官';
+        } else {
+          uni.showToast({ title: res.msg || '升级失败', icon: 'none' });
+        }
+      })
     },
+    
     viewOrders() {
       uni.navigateTo({
-        url: '/pages/manager/order?historyOrder=true'
+        url: '/pages/manager/order?historyOrder=true&userId=' + this.user.id
       });
     },
     unblockUser() {
@@ -151,43 +183,37 @@ export default {
   background: #f7f7f7;
   padding-bottom: 160rpx;
 }
-.navbar {
+
+// 新增主流小程序风格导航栏
+.nav-bar {
+  display: flex;
+  align-items: center;
+  height: calc(150rpx + var(--status-bar-height));
+  padding: 0 32rpx;
+  padding-top: var(--status-bar-height);
+  background: #fff;
   position: fixed;
   top: 0;
   left: 0;
-  width: 100vw;
-  height: 100rpx;
-  background: #fff;
-  z-index: 10;
-  display: flex;
-  align-items: flex-end;
-  justify-content: space-between;
+  right: 0;
+  z-index: 999;
+  box-sizing: border-box;
   box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
-  padding: 0 32rpx;
-  .nav-left {
-    flex: 0 0 48rpx;
-    display: flex;
-    align-items: center;
-    height: 100%;
+  .back {
+    padding: 20rpx;
+    margin-left: -20rpx;
   }
-  .nav-title {
+  .title {
     flex: 1;
     text-align: center;
-    font-size: 36rpx;
-    font-weight: bold;
+    font-size: 34rpx;
+    font-weight: 500;
     color: #222;
-    line-height: 100rpx;
-  }
-  .nav-right {
-    flex: 0 0 80rpx;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    height: 100%;
   }
 }
+
 .main-content {
-  margin-top: 120rpx;
+  margin-top: calc(150rpx + var(--status-bar-height));
   margin-bottom: 40rpx;
 }
 .info-card {
@@ -196,18 +222,60 @@ export default {
   margin: 0 32rpx 32rpx 32rpx;
   padding: 40rpx 36rpx 36rpx 36rpx;
   box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
+  .card-title {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #222;
+    margin-bottom: 32rpx;
+  }
+  .info-row {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    min-height: 60rpx;
+    margin-bottom: 0;
+    padding: 18rpx 0 10rpx 0;
+    .label {
+      font-size: 26rpx;
+      color: #b3b3b3;
+      font-weight: 400;
+      margin-bottom: 6rpx;
+    }
+    .value {
+      font-size: 32rpx;
+      color: #222;
+      font-weight: 500;
+      flex: 1;
+      word-break: break-all;
+      margin-bottom: 0;
+    }
+    .address {
+      font-size: 30rpx;
+      color: #222;
+      font-weight: 400;
+      margin-top: 0;
+      line-height: 1.5;
+    }
+    .link {
+      color: #ff8917;
+      font-size: 32rpx;
+      font-weight: 500;
+      text-decoration: underline;
+      margin-left: 0;
+    }
+  }
+  .divider {
+    height: 2rpx;
+    background: #f3f3f3;
+    margin: 10rpx 0 10rpx 0;
+    border: none;
+  }
 }
 .card-title-row {
   display: flex;
   align-items: center;
   margin-bottom: 32rpx;
 }
-.card-title {
-  font-size: 32rpx;
-  font-weight: bold;
-  color: #222;
-  margin-right: 18rpx;
-}
 .role-tag {
   font-size: 26rpx;
   color: #ff8917;
@@ -219,32 +287,6 @@ export default {
   display: inline-block;
   vertical-align: middle;
 }
-.info-row {
-  display: flex;
-  align-items: center;
-  min-height: 60rpx;
-  margin-bottom: 0;
-  .label {
-    font-size: 26rpx;
-    color: #b3b3b3;
-    width: 180rpx;
-    font-weight: 400;
-  }
-  .value {
-    font-size: 30rpx;
-    color: #222;
-    font-weight: 500;
-    flex: 1;
-    word-break: break-all;
-  }
-  .link {
-    color: #ff8917;
-    font-size: 30rpx;
-    font-weight: 500;
-    text-decoration: underline;
-    margin-left: 0;
-  }
-}
 .avatar-row {
   align-items: flex-start;
   .avatar {
@@ -256,16 +298,6 @@ export default {
     object-fit: cover;
   }
 }
-.address-row {
-  align-items: flex-start;
-  .address {
-    font-size: 28rpx;
-    color: #222;
-    font-weight: 400;
-    margin-top: 0;
-    line-height: 1.5;
-  }
-}
 .order-row {
   .link {
     color: #ff8917;
@@ -275,12 +307,6 @@ export default {
     margin-left: 0;
   }
 }
-.divider {
-  height: 2rpx;
-  background: #f3f3f3;
-  margin: 18rpx 0 18rpx 0;
-  border: none;
-}
 .bottom-bar {
   position: fixed;
   left: 0;
@@ -319,6 +345,55 @@ export default {
 }
 .info-card-personal {
   position: relative;
+  .card-title-row {
+    margin-bottom: 32rpx;
+    .card-title {
+      font-size: 36rpx;
+      font-weight: bold;
+      color: #222;
+      margin-right: 18rpx;
+    }
+  }
+  .info-row {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    min-height: 60rpx;
+    margin-bottom: 0;
+    padding: 18rpx 0 10rpx 0;
+    .label {
+      font-size: 26rpx;
+      color: #b3b3b3;
+      font-weight: 400;
+      margin-bottom: 6rpx;
+    }
+    .value {
+      font-size: 32rpx;
+      color: #222;
+      font-weight: 500;
+      flex: 1;
+      word-break: break-all;
+      margin-bottom: 0;
+    }
+  }
+  .avatar-row {
+    align-items: flex-start;
+    .avatar {
+      width: 120rpx;
+      height: 120rpx;
+      border-radius: 24rpx;
+      margin-top: 8rpx;
+      margin-left: 0;
+      object-fit: cover;
+      display: block;
+    }
+  }
+  .divider {
+    height: 2rpx;
+    background: #f3f3f3;
+    margin: 10rpx 0 10rpx 0;
+    border: none;
+  }
 }
 .blocked-tag {
   position: absolute;
diff --git a/pages/manager/user.vue b/pages/manager/user.vue
index e72db1d..a05ebae 100644
--- a/pages/manager/user.vue
+++ b/pages/manager/user.vue
@@ -61,15 +61,7 @@ export default {
   data() {
     return {
       searchText: '',
-      users: [
-        { name: '周海', phone: '18899102278', role: '', blocked: true },
-        { name: '郑文锦', phone: '18827381111', role: '推广官', blocked: true },
-        { name: '钱若霖', phone: '18827381112', role: '推广官', blocked: false },
-        { name: '吴彦琛', phone: '18827381113', role: '推广官', blocked: false },
-        { name: '赵莫艳', phone: '18827381116', role: '', blocked: false },
-        { name: '李晓明', phone: '18827381119', role: '', blocked: false },
-        { name: '王小刚', phone: '18827381110', role: '', blocked: false },
-      ],
+      users: [], // 改为空数组，由接口获取
       statusBarHeight: 0,
       showSuggestList: false,
       suggestList: [],
@@ -108,6 +100,8 @@ export default {
         }
       }).exec();
     });
+    // 初始加载数据
+    this.refreshData();
   },
   methods: {
     goBack() {
@@ -148,15 +142,38 @@ export default {
       ];
     },
     goUserDetail(user) {
+      // 兼容头像字段
+      const avatar = user.avatar || user.avatarUrl || '';
       uni.navigateTo({
         url: '/pages/manager/user-detail',
         success: (res) => {
-          res.eventChannel.emit('userDetail', user);
+          res.eventChannel.emit('userDetail', { ...user, avatar });
         }
       });
     },
-    refreshData() {
-      // TODO: 实现用户列表刷新逻辑，如重新请求接口
+    async refreshData() {
+      try {
+        const res = await this.$api('getInfoTeamListPage', {
+          pageSize: 1000,
+          current: 1
+        });
+        if (res && res.code === 200 && res.result && Array.isArray(res.result.records)) {
+          this.users = res.result.records.map(user => ({
+            id: user.id,
+            name: user.name || user.nickName || '-',
+            phone: user.phone || '-',
+            role: user.isTuiRole === 'Y' ? '推广官' : '',
+            blocked: user.isBlack === 'Y',
+            avatar: user.headImage || user.avatar || user.avatarUrl || ''
+          }));
+        }
+      } catch (error) {
+        console.error('获取用户列表失败:', error);
+        uni.showToast({
+          title: '获取用户列表失败',
+          icon: 'none'
+        });
+      }
     },
     async onRefresh() {
       await this.refreshData && this.refreshData()
diff --git a/pages/subcomponent/admin_faq.vue b/pages/subcomponent/admin_faq.vue
index 12b0107..9a20537 100644
--- a/pages/subcomponent/admin_faq.vue
+++ b/pages/subcomponent/admin_faq.vue
@@ -1,33 +1,29 @@
 <template>
-  <view class="faq-page" :style="{paddingTop: navBarHeightRpx + 'rpx'}">
+  <view class="faq-page">
     <!-- 顶部导航栏 -->
-    <view class="nav-bar" :style="{height: navBarHeightRpx + 'rpx', paddingTop: statusBarHeight + 'px'}">
-      <view class="nav-bar-inner">
-        <view class="back-icon" @tap="navigateBack">
-          <uni-icons type="left" size="22" color="#222"></uni-icons>
-        </view>
-        <view class="title">联系客服</view>
-        <view class="nav-bar-right"></view>
+    <view class="nav-bar">
+      <view class="back" @tap="navigateBack">
+        <uni-icons type="left" size="20"></uni-icons>
       </view>
+      <text class="title">联系客服</text>
     </view>
-
-    <!-- 主要内容区域 -->
-    <view class="content-card">
-      <view class="qa-list">
-        <view class="qa-item" v-for="(item, idx) in faqList" :key="idx">
-          <view class="question-row">
-            <text class="q-icon">Q</text>
-            <text class="question">{{item.q}}</text>
+    <view class="main-content">
+      <view class="content-card">
+        <view class="qa-list">
+          <view class="qa-item" v-for="(item, idx) in faqList" :key="idx">
+            <view class="question-row">
+              <text class="q-icon">Q</text>
+              <text class="question">{{item.q}}</text>
+            </view>
+            <view class="answer">{{item.a}}</view>
           </view>
-          <view class="answer">{{item.a}}</view>
         </view>
-      </view>
-      <view class="dashed-line"></view>
-      <view class="bottom-tip">
-        如有任何问题或建议，请随时与我们联系，我们将竭诚为您服务！
+        <view class="dashed-line"></view>
+        <view class="bottom-tip">
+          如有任何问题或建议，请随时与我们联系，我们将竭诚为您服务！
+        </view>
       </view>
     </view>
-
     <!-- 底部按钮 -->
     <view class="bottom-btns">
       <button class="btn-outline" @tap="callService">客服电话</button>
@@ -36,6 +32,7 @@
     <email-popup 
       :show="showEmailPopup" 
       @close="handleCloseEmailPopup"
+      @copyEmail="copyEmail"
     />
     <!-- 客服电话底部弹窗 -->
     <view v-if="showPhonePopup" class="phone-popup">
@@ -45,10 +42,10 @@
           <text class="close-btn" @tap="closePhonePopup">关闭</text>
           <text class="popup-title">客服电话</text>
         </view>
-        <view class="popup-phone-row" @tap="makePhoneCall">
-          <text class="popup-phone">0731-599327-8899</text>
+        <view class="popup-phone-row">
+          <text class="popup-phone">{{phone}}</text>
           <view class="popup-phone-icon">
-            <uni-icons type="phone-filled" size="28" color="#222" />
+            <uni-icons type="phone-filled" size="28" color="#222"  @tap="makePhoneCall"/>
           </view>
         </view>
       </view>
@@ -70,14 +67,7 @@ export default {
       navBarHeightRpx: 0, // rpx
       showEmailPopup: false,
       showPhonePopup: false,
-      faqList: [
-        {q: '如何申请成为推广官？', a: '您好！如需帮助，请优先选择以下方式联系我们。'},
-        {q: '推广官的佣金如何计算？', a: '您好！如需帮助，请优先选择以下方式联系我们。'},
-        {q: '为什么我的订单显示"回收失败"？', a: '您好！如需帮助，请优先选择以下方式联系我们。'},
-        {q: '如果我的订单出现问题怎么办？', a: '您好！如需帮助，请优先选择以下方式联系我们。'},
-        {q: '回收的旧衣如何处理？', a: '您好！如需帮助，请优先选择以下方式联系我们。'},
-        {q: '哪些衣物可以回收？', a: '您好！如需帮助，请优先选择以下方式联系我们。'},
-      ]
+      faqList: []
     }
   },
   onLoad() {
@@ -91,6 +81,14 @@ export default {
     this.navBarHeight = navBarHeight
     // px转rpx（750设计稿）
     this.navBarHeightRpx = Math.round(navBarHeight * 750 / sysInfo.windowWidth)
+    this.getQuestionList()
+  },
+  computed: {
+    phone() {
+			console.log(getApp().globalData.configData,'getApp().globalData.configData')
+      const item =  getApp().globalData.configData.find(i => i.keyName === 'phone')
+      return item ? item.keyContent : ''
+    },
   },
   methods: {
     async onRefresh() {
@@ -109,7 +107,33 @@ export default {
       this.showPhonePopup = false
     },
     makePhoneCall() {
-      uni.makePhoneCall({ phoneNumber: '0731-599327-8899' })
+      // uni.makePhoneCall({ phoneNumber: '0731-599327-8899' })
+      if (this.phone) {
+        uni.makePhoneCall({
+          phoneNumber: this.phone //仅为示例
+        });
+      }else{
+        uni.showToast({ title: '暂无客服电话', icon: 'none' });
+      }
+    },
+    copyEmail(){
+      if (this.phone) {
+        uni.makePhoneCall({
+          phoneNumber: this.phone //仅为示例
+        });
+      }else{
+        uni.showToast({ title: '暂无微信客服', icon: 'none' });
+      }
+    },
+    getQuestionList() {
+      this.$api('getQuestionList', {}, res => {
+        if (res && res.success && res.result && res.result.records) {
+          this.faqList = res.result.records.map(item => ({
+            q: item.title,
+            a: item.titleText
+          }))
+        }
+      })
     }
   }
 }
@@ -123,61 +147,44 @@ export default {
 }
 
 .nav-bar {
+  display: flex;
+  align-items: center;
+  height: calc(150rpx + var(--status-bar-height));
+  padding: 0 32rpx;
+  padding-top: var(--status-bar-height);
+  background: linear-gradient(180deg, #fff3db 100%, #ffffff 0%);
   position: fixed;
   top: 0;
   left: 0;
   right: 0;
-  z-index: 100;
-  width: 100vw;
-  background: #fef4df;
-  box-shadow: 0 2rpx 12rpx rgba(0,0,0,0.03);
-  .nav-bar-inner {
-    display: flex;
-    align-items: center;
-    height: 44px;
-    width: 100vw;
-    position: relative;
-  }
-  .back-icon {
-    width: 44px;
-    height: 44px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    position: absolute;
-    left: 0;
-    top: 0;
+  z-index: 999;
+  box-sizing: border-box;
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
+  .back {
+    padding: 20rpx;
+    margin-left: -20rpx;
   }
   .title {
     flex: 1;
     text-align: center;
-    font-size: 18px;
-    font-weight: bold;
+    font-size: 34rpx;
+    font-weight: 500;
     color: #222;
-    letter-spacing: 0.5px;
-    line-height: 44px;
-  }
-  .nav-bar-right {
-    width: 44px;
-    height: 44px;
-    position: absolute;
-    right: 0;
-    top: 0;
   }
 }
 
+.main-content {
+  margin-top: calc(150rpx + var(--status-bar-height));
+  margin-bottom: 40rpx;
+  padding-bottom: calc(88rpx + env(safe-area-inset-bottom));
+}
+
 .content-card {
-  margin: 88px 0 0 0;
-  padding: 0 0 32rpx 0;
-  width: 92vw;
-  max-width: 700rpx;
+  margin: 0 32rpx;
+  padding: 32rpx;
   background: #fff;
   border-radius: 32rpx;
   box-shadow: 0 8rpx 32rpx rgba(60, 167, 250, 0.08);
-  margin-left: auto;
-  margin-right: auto;
-  padding-top: 32rpx;
-  padding-bottom: 0;
 }
 
 .qa-list {
@@ -238,7 +245,7 @@ export default {
   flex: 1;
   height: 88rpx;
   line-height: 88rpx;
-  background: #fff;
+  background: #fff0d2;
   color: #ffb300;
   font-size: 32rpx;
   border-radius: 44rpx;
diff --git a/pages/subcomponent/detail.vue b/pages/subcomponent/detail.vue
index 554ee8a..611c66f 100644
--- a/pages/subcomponent/detail.vue
+++ b/pages/subcomponent/detail.vue
@@ -1,11 +1,11 @@
 <template>
   <view class="container">
     <!-- 顶部导航 -->
-    <view class="nav-bar" :style="{height: (statusBarHeight + 88) + 'rpx', paddingTop: statusBarHeight + 'px'}">
+    <view class="nav-bar" >
       <view class="back" @tap="goBack">
         <uni-icons type="left" size="20"></uni-icons>
       </view>
-      <text class="title">{{ orderId }}</text>
+      <text class="title">{{ orderDetail && orderDetail.ordeNo ? orderDetail.ordeNo : orderId }}</text>
     </view>
 
     <!-- 内容区域 -->
@@ -29,7 +29,7 @@
               }"
             >
               <view class="step-label-inner">
-                <text class="step-num">{{ ['①','②','③','④'][index] }}</text>
+                <!-- <text class="step-num">{{ ['①','②','③','④'][index] }}</text> -->
                 <text class="step-text">{{ step.text }}</text>
               </view>
             </view>
@@ -83,7 +83,7 @@
         <text class="order-title">订单详情</text>
         <view class="order-row">
           <text class="order-label">订单编号</text>
-          <text class="order-value">{{ orderId }}</text>
+          <text class="order-value">{{ orderDetail && orderDetail.ordeNo ? orderDetail.ordeNo : orderId }}</text>
         </view>
         <view class="order-divider"></view>
         <template v-if="currentStep < 3">
@@ -112,13 +112,13 @@
             <image class="goods-img" :src="item.image" mode="aspectFit"></image>
             <view class="goods-info">
               <text class="goods-name">{{ item.name }}</text>
-              <text class="goods-desc">{{ item.description }}</text>
+              <text class="goods-desc">{{ item.details }}</text>
               <view class="goods-meta">
-                <text class="goods-price">¥ {{ item.price }}<text class="goods-unit"> /件</text></text>
-                <text class="goods-count">x{{ item.count }}</text>
+                <text class="goods-price">¥ {{ item.onePrice }}<text class="goods-unit"> /件</text></text>
+                <text class="goods-count">x{{ item.num }}</text>
               </view>
             </view>
-            <text class="goods-total">¥{{ item.total }}</text>
+            <text class="goods-total">¥{{ item.price }}</text>
           </view>
         </view>
       </view>
@@ -176,48 +176,29 @@ export default {
   mixins: [pullRefreshMixin],
   data() {
     return {
-      orderId: 'RE82738127861525',
-      currentStep: 2, // 当前进行到第几步
+      orderId: '',
+      currentStep: 1, // 当前进行到第几步
       processSteps: [
-        { text: '在线预约', icon: '/static/home/① 在线预约.png' },
-        { text: '快递上门', icon: '/static/home/② 快递上门.png' },
-        { text: '透明质检', icon: '/static/home/③ 透明质检.png' },
-        { text: '现金打款', icon: '/static/home/④ 现金打款.png' }
-      ],
-      address: '海南省海口市秀英区秀英街道5单元',
-      appointmentTime: '周四 11:00~13:00',
-      estimatePrice: '73.6-75.8',
-      finalPrice: '73.6',
-      clothesList: [
-        {
-          name: '羽绒服',
-          description: '允许脏破烂，160码以上',
-          price: 8,
-          count: 8,
-          total: 64,
-          image: '/static/home/羽绒服.png'
-        },
-        {
-          name: '品牌羽绒服',
-          description: '允许脏破烂，160码以上',
-          price: 10,
-          count: 1,
-          total: 10,
-          image: '/static/home/品牌羽绒服.png'
-        }
       ],
+      address: '',
+      appointmentTime: '',
+      estimatePrice: '',
+      finalPrice: '',
+      clothesList: [],
       currentStatus: {
-        text: '【待取件】快递员正在赶来',
-        time: '2025-04-20 11:00~13:00',
-        icon: '/static/delivery-person.png'
+        text: '',
+        time: '',
+        icon: ''
       },
+      phone: '',
       hasReport: false,
       reportTime: '',
       showEditButton: true,
-      expressCompany: '德邦物流',
-      expressNo: 'DPK202534653715',
+      expressCompany: '',
+      expressNo: '',
       showCancelModal: false,
       statusBarHeight: 0,
+      orderDetail: null
     }
   },
   computed: {
@@ -242,6 +223,7 @@ export default {
       uni.stopPullRefresh()
     },
     goBack() {
+      getApp().globalData.shouldClearRecycle = true
       uni.navigateBack()
     },
     showMore() {
@@ -278,7 +260,7 @@ export default {
           this.currentStatus = {
             text: '已取消',
             time: '',
-            icon: '/static/cancelled.png'
+            icon: '/static/my/【待取件】快递员正在赶来.png'
           }
           this.showEditButton = false
           break
@@ -287,7 +269,7 @@ export default {
           this.currentStatus = {
             text: '【待取件】快递员正在赶来',
             time: '2025-04-20 11:00~13:00',
-            icon: '/static/delivery-person.png'
+            icon: '/static/my/【待取件】快递员正在赶来.png'
           }
           break
         case 'collected':
@@ -295,7 +277,7 @@ export default {
           this.currentStatus = {
             text: '【已取件】快递员正在送至质检',
             time: '2025-04-30 11:42',
-            icon: '/static/collected-truck.png'
+            icon: '/static/my/【上门中】快递员正在赶来.png'
           }
           this.showEditButton = false
           break
@@ -304,7 +286,7 @@ export default {
           this.currentStatus = {
             text: '【质检中】质检员正在质检',
             time: '2025-04-20 11:00',
-            icon: '/static/inspector.png'
+            icon: '/static/my/逐件验-配图.png'
           }
           this.showEditButton = false
           break
@@ -313,7 +295,7 @@ export default {
           this.currentStatus = {
             text: '【待结款】待平台确认结款项',
             time: '2025-04-20 12:00',
-            icon: '/static/payment.png'
+            icon: '/static/my/【已结款】平台已结款至账户.png'
           }
           this.hasReport = true
           this.reportTime = '2025-03-20 11:40'
@@ -324,7 +306,7 @@ export default {
           this.currentStatus = {
             text: '【已结款】平台已结款至账户',
             time: '2025-04-20 12:01',
-            icon: '/static/completed.png'
+            icon: '/static/my/【已结款】平台已结款至账户.png'
           }
           this.hasReport = true
           this.reportTime = '2025-03-20 11:40'
@@ -347,7 +329,7 @@ export default {
       this.currentStatus = {
         text: '已取消',
         time: this.getNowTime(),
-        icon: '/static/cancelled.png'
+        icon: '/static/【待取件】快递员正在赶来.png'
       };
       // uni.showToast({ title: '订单已取消', icon: 'none' });
     },
@@ -362,16 +344,117 @@ export default {
     },
     contactCourier() {
       // 联系快递员逻辑
-      uni.showToast({ title: '已联系快递员', icon: 'none' });
-    }
+      if (this.phone) {
+        uni.makePhoneCall({
+          phoneNumber: this.phone //仅为示例
+        });
+      }else{
+        uni.showToast({ title: '暂无快递员电话', icon: 'none' });
+      }
+    },
+    fetchOrderDetail(orderId) {
+      this.$api && this.$api('getOrderDetail', { orderId }, res => {
+        if (res && res.code === 200 && res.result) {
+          this.orderDetail = res.result
+          // 赋值页面字段
+          this.address = res.result.address + (res.result.addressDetail || '')
+          this.appointmentTime = res.result.goTime || ''
+          this.estimatePrice = res.result.price || ''
+          this.finalPrice = res.result.price || ''
+          this.clothesList = res.result.commonOrderList || []
+          this.expressCompany = res.result.wliu || ''
+          this.expressNo = res.result.expressNo || ''
+          this.phone = res.result.phone || ''
+          // 状态判断
+          this.setOrderStatus(res.result.status, res.result.state, res.result)
+        }
+      })
+    },
+    setOrderStatus(status, state, data) {
+      // 0:在线预约 1:快递上门 2:透明质检 3:现金打款
+      // state:0待取件 1已取件 2已完成 3已取消
+      if (state == 3) {
+        this.currentStep = 0
+        this.currentStatus = {
+          text: '已取消',
+          time: '',
+          icon: '/static/【待取件】快递员正在赶来.png'
+        }
+        this.showEditButton = false
+        return
+      }
+      if (status == 0) {
+        this.currentStep = 1
+        this.currentStatus = {
+          text: '【在线预约】',
+          time: data.goTime || '',
+          icon: '/static/home/① 在线预约.png'
+        }
+      } else if (status == 1 && state == 0) {
+        this.currentStep = 2
+        this.currentStatus = {
+          text: '【待取件】快递员正在赶来',
+          time: data.goTime || '',
+          icon: '/static/my/【待取件】快递员正在赶来.png'
+        }
+      } else if (status == 1 && state == 1) {
+        this.currentStep = 2
+        this.currentStatus = {
+          text: '【已取件】快递员正在送至质检',
+          time: data.goTime || '',
+          icon: '/static/my/【上门中】快递员正在赶来.png'
+        }
+      } else if (status == 2 && state == 1) {
+        this.currentStep = 3
+        this.currentStatus = {
+          text: '【质检中】质检员正在质检',
+          time: data.goTime || '',
+          icon: '/static/my/逐件验-配图.png'
+        }
+      } else if (status == 3 && state == 1) {
+        this.currentStep = 4
+        this.currentStatus = {
+          text: '【待结款】待平台确认结款项',
+          time: data.goTime || '',
+          icon: '/static/my/【已结款】平台已结款至账户.png'
+        }
+        this.hasReport = true
+        this.reportTime = data.updateTime || ''
+      } else if (status == 3 && state == 2) {
+        this.currentStep = 4
+        this.currentStatus = {
+          text: '【已结款】平台已结款至账户',
+          time: data.goTime || '',
+          icon: '/static/my/【已结款】平台已结款至账户.png'
+        }
+        this.hasReport = true
+        this.reportTime = data.updateTime || ''
+      }
+    },getAreaList() {
+      this.$api('getAreaList', {}, (res) => {
+        console.log(res,'getAreaList');
+        if (res.code == 200 && Array.isArray(res.result)) {
+          // 按sort升序排序
+          const sorted = res.result.slice().sort((a, b) => a.sort - b.sort)
+          this.processSteps = sorted.map(item => ({
+            // id: item.id,
+            icon: item.image,
+            text: item.title
+          }))
+        }
+      })
+    },
   },
   onLoad(options) {
-    // 接收上一页传来的订单状态
-    if (options.status) {
-      this.updateOrderStatus(options.status)
-    }
+    if (options.id) {
 	this.orderId = options.id
+      this.fetchOrderDetail(options.id)
+    }
     this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
+	this.getAreaList()
+  },
+  onShow() {
+    this.getAreaList()
   }
 }
 </script>
@@ -392,9 +475,17 @@ export default {
 .nav-bar {
   display: flex;
   align-items: center;
-  height: 88rpx;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 999;
+  height: calc(150rpx + var(--status-bar-height));
   background: #fff;
-  padding: 0 30rpx;
+  padding: 0 32rpx;
+  padding-top: var(--status-bar-height);
+  box-sizing: border-box;
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
 
   .back {
     padding: 20rpx;
@@ -845,4 +936,7 @@ letter-spacing: 0%;
 .detail-info-card {
   margin-bottom: 48rpx;
 }
+.content {
+  margin-top: calc(150rpx + var(--status-bar-height));
+}
 </style> 
\ No newline at end of file
diff --git a/pages/subcomponent/edit_profile.vue b/pages/subcomponent/edit_profile.vue
index ad0000e..d3f47af 100644
--- a/pages/subcomponent/edit_profile.vue
+++ b/pages/subcomponent/edit_profile.vue
@@ -39,10 +39,10 @@
         <view class="info-item avatar-section">
           <text class="label">头像</text>
           <view class="avatar-container">
-            <view class="avatar-box" @tap="chooseImage">
+            <button class="avatar-box"  open-type="chooseAvatar" @chooseavatar="chooseImage"> 
               <uni-icons v-if="!userInfo.avatar" type="reload" size="24" color="#999"></uni-icons>
               <image v-else :src="userInfo.avatar" mode="aspectFill"></image>
-            </view>
+            </button>
             <image v-if="userInfo.newAvatar" :src="userInfo.newAvatar" mode="aspectFill" class="new-avatar"></image>
           </view>
         </view>
@@ -143,21 +143,12 @@ export default {
     goBack() {
       uni.navigateBack()
     },
-    async chooseImage() {
+    async chooseImage(res) {
       try {
-        const res = await new Promise((resolve, reject) => {
-          uni.chooseImage({
-            count: 1,
-            sizeType: ['compressed'],
-            sourceType: ['album', 'camera'],
-            success: resolve,
-            fail: reject
-          })
-        })
-        const tempFile = res.tempFilePaths[0]
         this.uploadStatus = { show: true, type: 'loading' }
         // 上传到OSS
-        const url = await OSS.ossUpload(tempFile)
+        const url = await OSS.ossUpload(res.target.avatarUrl)
+        console.log(url,'url');
         this.userInfo.avatar = url
         this.uploadStatus.type = 'success'
         setTimeout(() => { this.uploadStatus.show = false }, 1000)
@@ -179,9 +170,9 @@ export default {
         phone: this.userInfo.phone
       }, res => {
         if (res.code === 200) {
-          this.uploadStatus.type = 'success'
+          // this.uploadStatus.type = 'success'
           setTimeout(() => {
-            this.uploadStatus.show = false
+            // this.uploadStatus.show = false
             uni.$emit('refreshUserInfo')
             uni.showToast({ title: '保存成功', icon: 'success' })
             setTimeout(() => { uni.navigateBack() }, 1000)
@@ -327,15 +318,17 @@ export default {
     box-sizing: border-box;
   }
   .avatar-box, .new-avatar {
-    max-width: 120rpx;
-    width: 120rpx;
+    // max-width: 120rpx;
+    padding: 0;
+    margin: 0;
+    width: 150rpx;
     height: 120rpx;
     border-radius: 18rpx;
     background: #f5f5f5;
     display: flex;
     align-items: center;
     justify-content: center;
-    overflow: hidden;
+    // overflow: hidden;
   }
   .avatar-box image, .new-avatar {
     width: 100%;
diff --git a/pages/subcomponent/inspection-report.vue b/pages/subcomponent/inspection-report.vue
index 258cadb..c7daabc 100644
--- a/pages/subcomponent/inspection-report.vue
+++ b/pages/subcomponent/inspection-report.vue
@@ -340,7 +340,7 @@ export default {
 
 .main-content {
   margin-top: 20rpx;
-  padding-top: 88rpx;
+//   padding-top: 88rpx;
   background: linear-gradient(180deg, #fef7e6 0%, #fff 50%);
   height: calc(100vh - 88rpx);
   width: 100vw;
diff --git a/pages/subcomponent/order.vue b/pages/subcomponent/order.vue
index ec946ff..3ad4f02 100644
--- a/pages/subcomponent/order.vue
+++ b/pages/subcomponent/order.vue
@@ -45,34 +45,41 @@
           <view class="order-header">
             <text class="order-id">
 				订单编号 
-				<text class="order-ids">{{order.id }} </text> 
+				<text class="order-ids">{{order.ordeNo || order.id}}</text> 
 				</text>
           </view>
 
           <!-- 订单内容 -->
           <view class="order-content">
-            <image class="order-image" :src="order.image" mode="aspectFill"></image>
+            <image class="order-image" :src="order.image || '/static/回收/衣物.png'" mode="aspectFill"></image>
             <view class="order-arrow">
               <text class="iconfont">⇄</text>
             </view>
             <view class="order-info">
-              <text class="order-count">{{ order.count }} 件</text>
-              <text class="order-price">¥ {{ order.priceRange }} /件</text>
+              <text class="order-count">{{ order.num || order.count || 1 }} 件</text>
+              <text class="order-price">¥ {{ order.onePrice || order.priceRange || 0 }} /件</text>
               <view class="order-estimate">
-                <text>预估 ¥{{ order.estimatePrice }}</text>
+                <text>预估 ¥{{ order.price || order.estimatePrice }}</text>
               </view>
             </view>
           </view>
 
           <!-- 订单状态 -->
           <view class="order-status">
-            <image class="status-icon" :src="order.statusIcon" mode="aspectFill"></image>
+            <image class="status-icon" :src="order.statusIcon || '/static/my/【待取件】快递员正在赶来.png'" mode="aspectFill"></image>
             <view class="status-info">
-              <text class="status-text">{{ order.statusText }}</text>
-              <text class="status-time">{{ order.statusTime }}</text>
+              <text class="status-text">{{ getOrderStatusText(order) }}</text>
+              <text class="status-time">{{ order.goTime || order.statusTime }}</text>
             </view>
           </view>
         </view>
+        <view class="order-loading" v-if="loading">
+          <uni-loading color="#ffac07" :size="40" />
+          <text class="loading-text">加载中...</text>
+        </view>
+        <view class="order-nomore" v-else-if="!hasMore && orderList.length">
+          <text class="nomore-text">没有更多订单了</text>
+        </view>
       </scroll-view>
     </view>
   </view>
@@ -87,87 +94,91 @@ export default {
     return {
       tabs: [
         { name: '全部', count: 0 },
-        { name: '进行中', count: 2 },
+        { name: '进行中', count: 0 },
         { name: '已完成', count: 0 }
       ],
       currentTab: 0,
-      // 所有订单数据
-      allOrders: [
-        {
-          id: 'RE82738127861526',
-          image: '/static/回收/衣物.png',
-          count: 8,
-          priceRange: '3-10',
-          estimatePrice: '76-80',
-          statusIcon: '/static/.png',
-          statusText: '【已取件】快递员正在送至质检',
-          statusTime: '周四 11:00~13:00',
-          status: 'collected'
-        },
-        {
-          id: 'RE82738127861525',
-          image: '/static/回收/衣物.png',
-          count: 8,
-          priceRange: '3-10',
-          estimatePrice: '76-80',
-          statusIcon: '/static/my/【待取件】快递员正在赶来.png',
-          statusText: '【待取件】快递员正在赶来',
-          statusTime: '2025-04-20 11:00~13:00',
-          status: 'processing'
-        },{
-          id: 'RE82738127861525',
-          image: '/static/回收/衣物.png',
-          count: 8,
-          priceRange: '3-10',
-          estimatePrice: '76-80',
-          statusIcon: '/static/my/【质检中】质检员正在质检.png',
-          statusText: '【质检中】质检员正在质检',
-          statusTime: '2025-04-20 11:00~13:00',
-          status: 'inspecting'
-        },
-        {
-          id: 'RE82738127861524',
-          image: '/static/回收/衣物.png',
-          count: 8,
-          priceRange: '3-10',
-          estimatePrice: '76-80',
-          statusText: '已取消',
-          cancelled: true,
-          status: 'cancelled'
-        },
-        {
-          id: 'RE82738127861523',
-          image: '/static/回收/衣物.png',
-          count: 8,
-          priceRange: '3-10',
-          estimatePrice: '76-80',
-          statusIcon: '/static/completed-icon.png',
-          statusText: '【待结款】待平台确认结款项',
-          statusTime: '2025-03-20 11:00',
-          status: 'pending_payment'
-        },
-        {
-          id: 'RE82738127861523',
-          image: '/static/回收/衣物.png',
-          count: 8,
-          priceRange: '3-10',
-          estimatePrice: '76-80',
-          statusIcon: '/static/my/【已结款】平台已结款至账户.png',
-          statusText: '【已结款】平台已结款至账户',
-          statusTime: '2025-03-20 11:00',
-          status: 'completed'
-        }
-      ],
       orderList: [], // 当前显示的订单列表
       loading: false,
       page: 1,
-      pageSize: 10
+      pageSize: 10,
+      hasMore: true
     }
   },
   created() {
-    this.initOrderData()
+    this.fetchOrderList()
   },
   methods: {
+    async fetchOrderList(isLoadMore = false) {
+      this.loading = true
+      let statusArr = []
+      if (this.currentTab === 1) statusArr = [0, 1, 2] // 进行中
+      else if (this.currentTab === 2) statusArr = [3] // 已完成
+      else statusArr = [] // 全部
+      let allOrders = []
+      if (statusArr.length === 0) {
+        // 全部
+        await new Promise(resolve => {
+          this.$api('getOrderListPage', { pageSize: this.pageSize, current: this.page }, res => {
+            if (res && res.code === 200 && res.result && Array.isArray(res.result.records)) {
+              allOrders = res.result.records
+              if (isLoadMore) {
+                this.orderList = this.orderList.concat(allOrders)
+              } else {
+                this.orderList = allOrders
+              }
+              this.hasMore = allOrders.length === this.pageSize
+            }
+            resolve()
+          })
+        })
+      } else {
+        // 多状态合并
+        for (let status of statusArr) {
+          await new Promise(resolve => {
+            this.$api('getOrderListPage', { status, pageSize: this.pageSize, current: this.page }, res => {
+              if (res && res.code === 200 && res.result && Array.isArray(res.result.records)) {
+                allOrders = allOrders.concat(res.result.records)
+              }
+              resolve()
+            })
+          })
+        }
+        // 去重
+        const map = {}
+        allOrders = allOrders.filter(item => {
+          if (map[item.id]) return false
+          map[item.id] = 1
+          return true
+        })
+        if (isLoadMore) {
+          this.orderList = this.orderList.concat(allOrders)
+        } else {
+          this.orderList = allOrders
+        }
+        this.hasMore = allOrders.length === this.pageSize
+      }
+      this.loading = false
+    },
+    switchTab(index) {
+      if (this.currentTab === index) return
+      this.currentTab = index
+      this.page = 1 // 重置页码
+      this.hasMore = true
+      this.orderList = []
+      this.fetchOrderList()
+    },
+    getOrderStatusText(order) {
+      const { status, state } = order
+      if (state == 3) return '已取消'
+      if (status == 0) return '【在线预约】'
+      if (status == 1 && state == 0) return '【待取件】快递员正在赶来'
+      if (status == 1 && state == 1) return '【已取件】快递员正在送至质检'
+      if (status == 2 && state == 1) return '【质检中】质检员正在质检'
+      if (status == 3 && state == 1) return '【待结款】待平台确认结款项'
+      if (status == 3 && state == 2) return '【已结款】平台已结款至账户'
+      return ''
+    },
     async onRefresh() {
       // 模拟刷新数据
       await new Promise(resolve => setTimeout(resolve, 1000))
@@ -185,66 +196,15 @@ export default {
     viewAll() {
       this.switchTab(0) // 切换到全部标签
     },
-    // 初始化订单数据和计数
-    initOrderData() {
-      // 计算各状态订单数量
-      const processingOrders = this.allOrders.filter(order => order.status === 'processing')
-      const completedOrders = this.allOrders.filter(order => order.status === 'completed')
-      
-      // 更新标签计数
-      this.tabs[0].count = this.allOrders.length
-      this.tabs[1].count = processingOrders.length
-      this.tabs[2].count = completedOrders.length
-      
-      // 初始加载全部订单
-      this.loadOrdersByTab(0)
-    },
-    // 切换标签
-    switchTab(index) {
-      if (this.currentTab === index) return
-      this.currentTab = index
-      this.page = 1 // 重置页码
-      this.loadOrdersByTab(index)
-    },
-    // 根据标签加载对应订单
-    loadOrdersByTab(tabIndex) {
-      this.loading = true
-      let filteredOrders = []
-      
-      switch(tabIndex) {
-        case 0: // 全部
-          filteredOrders = this.allOrders
-          break
-        case 1: // 进行中
-          filteredOrders = this.allOrders.filter(order => order.status === 'processing'||  order.status === 'pending_payment')
-          break
-        case 2: // 已完成
-          filteredOrders = this.allOrders.filter(order => order.status === 'completed')
-          break
-      }
-      
-      // 模拟分页
-      const start = (this.page - 1) * this.pageSize
-      const end = start + this.pageSize
-      const pageOrders = filteredOrders.slice(start, end)
-      
-      if (this.page === 1) {
-        this.orderList = pageOrders
-      } else {
-        this.orderList = [...this.orderList, ...pageOrders]
-      }
-      
-      this.loading = false
-    },
     // 加载更多
     loadMore() {
-      if (this.loading) return
+      if (this.loading || !this.hasMore) return
       this.page++
-      this.loadOrdersByTab(this.currentTab)
+      this.fetchOrderList(true)
     },
 	  goToDetail(order) {
 	      uni.navigateTo({
-	        url: `/pages/subcomponent/detail?id=${order.id}&status=${order.status}`
+	        url: `/pages/subcomponent/detail?id=${order.id}`
 	      })
 	    }
   }
@@ -485,4 +445,29 @@ export default {
     }
   }
 }
+
+.order-loading {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 30rpx 0;
+  color: #ffac07;
+  font-size: 28rpx;
+}
+.loading-text {
+  margin-top: 10rpx;
+  color: #ffac07;
+  font-size: 26rpx;
+}
+.order-nomore {
+  text-align: center;
+  color: #bbb;
+  font-size: 24rpx;
+  padding: 20rpx 0 40rpx 0;
+}
+.nomore-text {
+  color: #bbb;
+  font-size: 24rpx;
+}
 </style> 
\ No newline at end of file
diff --git a/pages/subcomponent/pickup.vue b/pages/subcomponent/pickup.vue
index 47cb00a..819c0cd 100644
--- a/pages/subcomponent/pickup.vue
+++ b/pages/subcomponent/pickup.vue
@@ -22,11 +22,11 @@
             <image :src="step.icon" class="step-icon" mode="aspectFit" />
             <view v-if="i === 0" class="step-bottom-bar">
               <view class="step-num-bar">
-                <text class="text-main">{{ step.num }}{{ step.text }}</text>
+                <text class="text-main">{{ step.text }}</text>
               </view>
             </view>
             <view v-else class="step-label-gray">
-              <text class="text-gray">{{ step.num }}{{ step.text }}</text>
+              <text class="text-gray">{{ step.text }}</text>
             </view>
           </view>
         </view>
@@ -117,7 +117,7 @@
               :class="['date-btn', {active: currentDateTab === index}]"
               @tap="selectDateTab(index)"
             >
-              {{ tab }}
+              {{ tab.label }}
             </view>
           </view>
         </view>
@@ -158,16 +158,12 @@ export default {
       selectedItems: [],
       showTimePicker: false,
       currentDateTab: 0,
-      dateTabs: ['今天 04-20', '明天 04-21', '后天 04-22', '周一 04-23', '周二 04-24', '周三 04-25'],
+      dateTabs: [], // 动态生成
       timeSlots: ['11:00~13:00', '13:00~15:00', '15:00~17:00'],
       selectedTimeSlot: 0,
-      steps: [
-        { icon: '/static/home/① 在线预约.png', num: '①', text: '在线预约' },
-        { icon: '/static/home/② 快递上门.png', num: '②', text: '快递上门' },
-        { icon: '/static/home/③ 透明质检.png', num: '③', text: '透明质检' },
-        { icon: '/static/home/④ 现金打款.png', num: '④', text: '现金打款' }
-      ],
-      showAllItems: false
+      steps: [], // 改为空数组，由接口获取
+      showAllItems: false,
+      addressId: ''
     }
   },
   onShow() {
@@ -176,6 +172,7 @@ export default {
     if (this.selectedAddress) {
       // 确保地址信息被正确更新
       this.address = this.selectedAddress.address
+      this.addressId = this.selectedAddress.id
       // 强制更新视图
       this.$forceUpdate()
     }
@@ -197,11 +194,18 @@ export default {
     uni.$on('addressSelected', (address) => {
       this.selectedAddress = address
       this.address = address.address
+      this.addressId = address.id
       // 兼容 addressDetails
       if (address.addressDetails) this.selectedAddress.addressDetails = address.addressDetails
       this.$forceUpdate()
     })
 
+    // 监听从订单详情页面返回的事件
+    uni.$on('clearRecycleData', () => {
+      // 清除回收页面的订单数据
+      uni.$emit('clearRecycleOrderData')
+    })
+
     const sysInfo = uni.getSystemInfoSync()
     this.statusBarHeight = sysInfo.statusBarHeight
     let navBarHeight = 44
@@ -213,10 +217,16 @@ export default {
     this.navBarHeightRpx = Math.round(navBarHeight * 750 / sysInfo.windowWidth)
 
     this.getAddressList();
+
+    // 动态生成时间tab
+    this.dateTabs = this.generateDateTabs();
+    // 获取步骤条数据
+    this.getAreaList();
   },
   onUnload() {
     // 页面卸载时移除事件监听
     uni.$off('addressSelected')
+    uni.$off('clearRecycleData')
   },
   computed: {
     totalCount() {
@@ -269,7 +279,14 @@ export default {
       this.selectedTimeSlot = index
     },
     confirmTime() {
-      this.selectedTime = `${this.dateTabs[this.currentDateTab]} ${this.timeSlots[this.selectedTimeSlot]}`
+      const tab = this.dateTabs[this.currentDateTab]
+      const dateObj = tab.date
+      const timeStr = this.timeSlots[this.selectedTimeSlot] // 例如 '11:00~13:00'
+      const startTime = timeStr.split('~')[0] // '11:00'
+      const yyyy = dateObj.getFullYear()
+      const mm = (dateObj.getMonth() + 1).toString().padStart(2, '0')
+      const dd = dateObj.getDate().toString().padStart(2, '0')
+      this.selectedTime = `${yyyy}-${mm}-${dd} ${startTime}:00`
       this.closeTimePicker()
     },
     resetPicker() {
@@ -302,15 +319,39 @@ export default {
        uni.showToast({ title: '请选择回收物品', icon: 'none' })
        return
      }
+     const list = this.selectedItems.map(item => ({
+      shopId: item.id,
+      num: item.quantity
+     }))
+     console.log({
+      addressId: this.addressId,
+      strTime: this.selectedTime,
+      list: list
+     },'createOrder');
+
      // 校验通过，提交
      uni.showLoading({ title: '提交中...' })
-     setTimeout(() => {
-       uni.hideLoading()
-       uni.showToast({ title: '预约成功', icon: 'success' })
-       setTimeout(() => {
-         uni.navigateBack()
-       }, 1500)
-     }, 1000)
+     this.$api('createOrder', {
+      addressId: this.addressId,
+      strTime: this.selectedTime,
+      list: JSON.stringify(list)
+     }, (res) => {
+      if (res && res.success) {
+        console.log(res,'createOrder-res');
+        uni.showToast({ title: '预约成功', icon: 'success' })
+        uni.redirectTo({
+          url: `/pages/subcomponent/detail?id=${res.result.id}`
+        })
+      }
+     })
+
+    //  setTimeout(() => {
+    //    uni.hideLoading()
+    //    uni.showToast({ title: '预约成功', icon: 'success' })
+    //    setTimeout(() => {
+    //      uni.navigateBack()
+    //    }, 1500)
+    //  }, 1000)
    },
     toggleExpandOrder() {
       this.showAllItems = !this.showAllItems
@@ -322,6 +363,7 @@ export default {
         if (defaultAddr) {
           this.selectedAddress = defaultAddr;
           this.address = defaultAddr.address;
+          this.addressId = defaultAddr.id;
           // 兼容 addressDetails
           if (defaultAddr.addressDetails) this.selectedAddress.addressDetails = defaultAddr.addressDetails
         } else {
@@ -329,6 +371,36 @@ export default {
           this.address = '';
         }
       }
+    },
+    generateDateTabs() {
+      const weekMap = ['日', '一', '二', '三', '四', '五', '六']
+      const result = []
+      const today = new Date()
+      for (let i = 0; i < 6; i++) {
+        const d = new Date(today)
+        d.setDate(today.getDate() + i)
+        const mm = (d.getMonth() + 1).toString().padStart(2, '0')
+        const dd = d.getDate().toString().padStart(2, '0')
+        let label = ''
+        if (i === 0) label = `今天 ${mm}-${dd}`
+        else if (i === 1) label = `明天 ${mm}-${dd}`
+        else if (i === 2) label = `后天 ${mm}-${dd}`
+        else label = `周${weekMap[d.getDay()]} ${mm}-${dd}`
+        result.push({ label, date: new Date(d) })
+      }
+      return result
+    },
+    getAreaList() {
+      this.$api('getAreaList', {}, (res) => {
+        if (res.code == 200 && Array.isArray(res.result)) {
+          // 按sort升序排序
+          const sorted = res.result.slice().sort((a, b) => a.sort - b.sort)
+          this.steps = sorted.map(item => ({
+            icon: item.image,
+            text: item.title
+          }))
+        }
+      })
     }
   }
 }
diff --git a/pages/subcomponent/promotion-profit-detail.vue b/pages/subcomponent/promotion-profit-detail.vue
new file mode 100644
index 0000000..2dc0720
--- /dev/null
+++ b/pages/subcomponent/promotion-profit-detail.vue
@@ -0,0 +1,155 @@
+<template>
+  <view class="profit-detail-container">
+    <!-- 顶部导航栏 -->
+    <view class="nav-bar">
+      <view class="back" @tap="goBack">
+        <uni-icons type="left" size="20"></uni-icons>
+      </view>
+      <text class="title">收益明细</text>
+    </view>
+    <view class="main-content">
+      <view class="profit-list-card">
+        <view class="profit-item" v-for="(item, idx) in profits" :key="idx">
+          <image class="avatar" :src="item.avatar" mode="aspectFill" />
+          <view class="profit-info">
+            <view class="profit-name-date">
+              <view class="profit-name">{{ item.name }}</view>
+              <view class="profit-date">{{ item.date }}</view>
+            </view>
+          </view>
+          <view class="profit-type">{{ item.type }}</view>
+          <text class="profit-amount">+¥{{ item.amount }}</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      profits: [
+        { avatar: 'https://randomuser.me/api/portraits/men/1.jpg', name: '李世海', date: '04-27', type: '用户下单', amount: 10 },
+        { avatar: 'https://randomuser.me/api/portraits/women/2.jpg', name: '周静', date: '04-27', type: '拉新', amount: 10 },
+        { avatar: 'https://randomuser.me/api/portraits/women/3.jpg', name: '周海', date: '04-27', type: '拉新', amount: 10 },
+        { avatar: 'https://randomuser.me/api/portraits/men/4.jpg', name: '冯启彬', date: '04-27', type: '拉新', amount: 10 },
+        { avatar: 'https://randomuser.me/api/portraits/men/5.jpg', name: '李娟', date: '04-27', type: '用户下单', amount: 10 },
+        { avatar: 'https://randomuser.me/api/portraits/men/6.jpg', name: '李书琪', date: '04-27', type: '用户下单', amount: 10 },
+        { avatar: 'https://randomuser.me/api/portraits/men/7.jpg', name: '赵香光', date: '04-27', type: '用户下单', amount: 10 },
+        { avatar: 'https://randomuser.me/api/portraits/men/4.jpg', name: '冯启彬', date: '04-27', type: '拉新', amount: 10 },
+        { avatar: 'https://randomuser.me/api/portraits/men/5.jpg', name: '李娟', date: '04-27', type: '用户下单', amount: 10 },
+        { avatar: 'https://randomuser.me/api/portraits/men/6.jpg', name: '李书琪', date: '04-27', type: '用户下单', amount: 10 },
+        { avatar: 'https://randomuser.me/api/portraits/men/7.jpg', name: '赵香光', date: '04-27', type: '用户下单', amount: 10 },
+      ]
+    }
+  },
+  methods: {
+    goBack() {
+      uni.navigateBack();
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.profit-detail-container {
+  min-height: 100vh;
+  background: #f7f7f7;
+}
+.nav-bar {
+  display: flex;
+  align-items: center;
+  height: calc(150rpx + var(--status-bar-height));
+  padding: 0 32rpx;
+  padding-top: var(--status-bar-height);
+  background: #fff;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 999;
+  box-sizing: border-box;
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
+  .back {
+    padding: 20rpx;
+    margin-left: -20rpx;
+  }
+  .title {
+    flex: 1;
+    text-align: center;
+    font-size: 34rpx;
+    font-weight: 500;
+    color: #222;
+  }
+}
+.main-content {
+  margin-top: calc(150rpx + var(--status-bar-height));
+  margin-bottom: 40rpx;
+}
+.profit-list-card {
+  background: #fff;
+  border-radius: 40rpx;
+  margin: 0 32rpx 32rpx 32rpx;
+  padding: 0 0 0 0;
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
+}
+.profit-item {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  padding: 28rpx 36rpx 28rpx 36rpx;
+  border-bottom: 2rpx solid #f3f3f3;
+  &:last-child {
+    border-bottom: none;
+  }
+}
+.avatar {
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 50%;
+  margin-right: 24rpx;
+  object-fit: cover;
+  background: #f5f5f5;
+}
+.profit-info {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  min-width: 120rpx;
+}
+.profit-name-date {
+  display: flex;
+  flex-direction: column;
+}
+.profit-name {
+  font-size: 28rpx;
+  color: #222;
+  font-weight: 500;
+}
+.profit-date {
+  font-size: 22rpx;
+  color: #b3b3b3;
+  font-weight: 400;
+  margin-top: 2rpx;
+}
+.profit-type {
+  flex: 1;
+  text-align: center;
+  font-family: PingFang SC;
+font-weight: 400;
+font-size: 14px;
+line-height: 100%;
+letter-spacing: 0%;
+  color: #4c4c4c;
+  font-weight: 400;
+}
+.profit-amount {
+  font-size: 28rpx;
+  color: #ff8917;
+  font-weight: 500;
+  margin-left: 12rpx;
+  min-width: 80rpx;
+  text-align: right;
+}
+</style> 
\ No newline at end of file
diff --git a/pages/subcomponent/promotion-team.vue b/pages/subcomponent/promotion-team.vue
new file mode 100644
index 0000000..3745432
--- /dev/null
+++ b/pages/subcomponent/promotion-team.vue
@@ -0,0 +1,263 @@
+<template>
+  <view class="team-container">
+    <!-- 顶部导航栏 -->
+    <view class="nav-bar">
+      <view class="back" @tap="goBack">
+        <uni-icons type="left" size="20"></uni-icons>
+      </view>
+      <text class="title">我的团队</text>
+    </view>
+    <view class="main-content">
+      <!-- tab栏 -->
+      <view class="team-tabs">
+        <view :class="['tab', tabActive===0 ? 'active' : '']" @tap="tabActive=0">一级团队</view>
+        <view :class="['tab', tabActive===1 ? 'active' : '']" @tap="tabActive=1">二级团队</view>
+      </view>
+      <!-- 统计 -->
+      <view class="team-summary">
+        共邀请 <text class="highlight">{{ teamList.length }}</text> 人，
+        <text class="highlight">{{ orderedCount }}</text>人已下单，
+        <text class="highlight">{{ notOrderedCount }}</text>人未下单
+      </view>
+      <!-- 团队列表 -->
+      <view class="team-list-card">
+        <view class="team-item" v-for="(item, idx) in teamList" :key="idx">
+          <image class="avatar" :src="item.avatar" mode="aspectFill" />
+          <view class="team-info">
+            <view class="team-name">{{ item.name }}</view>
+            <view class="team-join">已加入平台{{ item.days }}天</view>
+          </view>
+          <view class="team-order">
+            <view class="order-count">{{ item.orders }}单</view>
+            <view class="order-label">下单量</view>
+          </view>
+          <view class="team-amount">
+            <view class="amount">¥{{ item.amount }}</view>
+            <view class="amount-label">佣金</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      tabActive: 0,
+      teamList: [],
+      teamList1: [], // 一级团队
+      teamList2: []  // 二级团队
+    }
+  },
+  computed: {
+    orderedCount() {
+      return this.teamList.filter(item => item.orders > 0).length;
+    },
+    notOrderedCount() {
+      return this.teamList.filter(item => item.orders == 0).length;
+    }
+  },
+  watch: {
+    tabActive(val) {
+      this.teamList = val === 0 ? this.teamList1 : this.teamList2;
+    }
+  },
+  mounted() {
+    this.fetchTeamList(0); // 一级
+    this.fetchTeamList(1); // 二级
+  },
+  methods: {
+    goBack() {
+      uni.navigateBack();
+    },
+    fetchTeamList(state) {
+      this.$api('getHanHaiMemberUser', { state }, res => {
+        if (res && res.code === 200 && res.result && Array.isArray(res.result.records)) {
+          const list = res.result.records.map(item => {
+            // 计算加入天数
+            let days = 0;
+            if (item.createTime) {
+              const joinDate = new Date(item.createTime.replace(/-/g, '/'));
+              const now = new Date();
+              days = Math.floor((now - joinDate) / (1000 * 60 * 60 * 24));
+            }
+            return {
+              avatar: item.headImage,
+              name: item.nickName,
+              days,
+              orders: item.orderNum,
+              amount: item.commission
+            }
+          });
+          if (state === 0) {
+            this.teamList1 = list;
+            if (this.tabActive === 0) this.teamList = list;
+          } else {
+            this.teamList2 = list;
+            if (this.tabActive === 1) this.teamList = list;
+          }
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.team-container {
+  min-height: 100vh;
+  background: #f7f7f7;
+}
+.nav-bar {
+  display: flex;
+  align-items: center;
+  height: calc(150rpx + var(--status-bar-height));
+  padding: 0 32rpx;
+  padding-top: var(--status-bar-height);
+  background: #fff;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 999;
+  box-sizing: border-box;
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
+  .back {
+    padding: 20rpx;
+    margin-left: -20rpx;
+  }
+  .title {
+    flex: 1;
+    text-align: center;
+    font-size: 34rpx;
+    font-weight: 500;
+    color: #222;
+  }
+}
+.main-content {
+  margin-top: calc(150rpx + var(--status-bar-height));
+  margin-bottom: 40rpx;
+}
+.team-tabs {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: #fff;
+  border-radius: 40rpx 40rpx 0 0;
+  margin: 0 32rpx;
+  padding: 0 0 0 0;
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
+  .tab {
+    flex: 1;
+    text-align: center;
+    font-size: 30rpx;
+    color: #b3b3b3;
+    font-weight: 500;
+    padding: 32rpx 0 24rpx 0;
+    border-bottom: 4rpx solid transparent;
+    transition: color 0.2s, border-color 0.2s;
+    &.active {
+      color: #ff8917;
+      border-bottom: 4rpx solid #ff8917;
+      font-weight: 600;
+    }
+  }
+}
+.team-summary {
+  background: #eeffe9;
+  color: #4cbb4c;
+  font-size: 26rpx;
+  text-align: center;
+  padding: 18rpx 0;
+  margin: 0 32rpx 0 32rpx;
+  border-radius: 0 0 20rpx 20rpx;
+  font-family: PingFang SC;
+  font-weight: 400;
+  .highlight {
+    color: #f79400;
+    font-weight: 600;
+  }
+}
+.team-list-card {
+  background: #fff;
+  border-radius: 40rpx;
+  margin: 24rpx 32rpx 32rpx 32rpx;
+  padding: 0 0 0 0;
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
+}
+.team-item {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  padding: 28rpx 36rpx 28rpx 36rpx;
+  border-bottom: 2rpx solid #f3f3f3;
+  &:last-child {
+    border-bottom: none;
+  }
+}
+.avatar {
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 50%;
+  margin-right: 24rpx;
+  object-fit: cover;
+  background: #f5f5f5;
+}
+.team-info {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  min-width: 120rpx;
+}
+.team-name {
+  font-size: 28rpx;
+  color: #222;
+  font-weight: 500;
+}
+.team-join {
+  font-size: 22rpx;
+  color: #b3b3b3;
+  font-weight: 400;
+  margin-top: 2rpx;
+}
+.team-order {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  min-width: 90rpx;
+  margin-left: 12rpx;
+  margin-right: 12rpx;
+  .order-count {
+    font-size: 26rpx;
+    color: #222;
+    font-weight: 500;
+  }
+  .order-label {
+    font-size: 22rpx;
+    color: #b3b3b3;
+    font-weight: 400;
+    margin-top: 2rpx;
+  }
+}
+.team-amount {
+  min-width: 80rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  margin-left: 12rpx;
+  .amount {
+    font-size: 26rpx;
+    color: #f79400;
+    font-weight: 500;
+  }
+  .amount-label {
+    font-size: 22rpx;
+    color: #b3b3b3;
+    font-weight: 400;
+    margin-top: 2rpx;
+  }
+}
+</style> 
\ No newline at end of file
diff --git a/pages/subcomponent/promotion-withdraw-record.vue b/pages/subcomponent/promotion-withdraw-record.vue
new file mode 100644
index 0000000..4bf6c94
--- /dev/null
+++ b/pages/subcomponent/promotion-withdraw-record.vue
@@ -0,0 +1,122 @@
+<template>
+  <view class="withdraw-record-container">
+    <!-- 顶部导航栏 -->
+    <view class="nav-bar">
+      <view class="back" @tap="goBack">
+        <uni-icons type="left" size="20"></uni-icons>
+      </view>
+      <text class="title">提现记录</text>
+    </view>
+    <view class="main-content">
+      <view class="record-list-card">
+        <view class="record-item" v-for="(item, idx) in records" :key="idx">
+          <view class="record-info">
+            <text class="record-title">提现记录</text>
+            <text class="record-date">{{ item.date }}</text>
+          </view>
+          <text class="record-amount">¥{{ item.amount }}</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      records: [
+        { date: '04-27', amount: 10 },
+        { date: '04-23', amount: 60 },
+        { date: '04-17', amount: 10 },
+        { date: '04-12', amount: 110 },
+        { date: '04-12', amount: 180 },
+        { date: '04-09', amount: 30 },
+        { date: '04-09', amount: 130 },
+        { date: '04-07', amount: 160 },
+        { date: '03-29', amount: 170 }
+      ]
+    }
+  },
+  methods: {
+    goBack() {
+      uni.navigateBack();
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.withdraw-record-container {
+  min-height: 100vh;
+  background: #f7f7f7;
+}
+.nav-bar {
+  display: flex;
+  align-items: center;
+  height: calc(150rpx + var(--status-bar-height));
+  padding: 0 32rpx;
+  padding-top: var(--status-bar-height);
+  background: #fff;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 999;
+  box-sizing: border-box;
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
+  .back {
+    padding: 20rpx;
+    margin-left: -20rpx;
+  }
+  .title {
+    flex: 1;
+    text-align: center;
+    font-size: 34rpx;
+    font-weight: 500;
+    color: #222;
+  }
+}
+.main-content {
+  margin-top: calc(150rpx + var(--status-bar-height));
+  margin-bottom: 40rpx;
+}
+.record-list-card {
+  background: #fff;
+  border-radius: 40rpx;
+  margin: 0 32rpx 32rpx 32rpx;
+  padding: 0 0 0 0;
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
+}
+.record-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 38rpx 36rpx 38rpx 36rpx;
+  border-bottom: 2rpx solid #f3f3f3;
+  &:last-child {
+    border-bottom: none;
+  }
+}
+.record-info {
+  display: flex;
+  flex-direction: column;
+}
+.record-title {
+  font-size: 30rpx;
+  color: #222;
+  font-weight: 500;
+  margin-bottom: 8rpx;
+}
+.record-date {
+  font-size: 26rpx;
+  color: #b3b3b3;
+  font-weight: 400;
+}
+.record-amount {
+  font-size: 32rpx;
+  color: #222;
+  font-weight: 500;
+}
+</style>
+ 
\ No newline at end of file
diff --git a/pages/subcomponent/promotion.vue b/pages/subcomponent/promotion.vue
index a29afd3..0a75add 100644
--- a/pages/subcomponent/promotion.vue
+++ b/pages/subcomponent/promotion.vue
@@ -32,31 +32,31 @@
           </view>
           <view class="user-meta">
             <view class="nickname">{{userInfo.name}}</view>
-            <view class="userid">ID: {{userInfo.id}}</view>
+            <view class="userid">ID: {{userInfo.intentioCode}}</view>
           </view>
           <view class="user-count">推广人数</view>
         </view>
         <view class="user-stats-row">
           <view class="stat-block">
             <view class="stat-label">可提现佣金(元)</view>
-            <view class="stat-value main">{{userInfo.balance}}</view>
-            <button class="withdraw-btn">提现</button>
+            <view class="stat-value main">{{userInfo.money}}</view>
+            <button class="withdraw-btn" @click="goWithdraw">提现</button>
           </view>
           <view class="stat-divider"></view>
           <view class="stat-block">
             <view class="stat-label">累计提现(元)</view>
-            <view class="stat-value">{{userInfo.totalWithdraw}}</view>
-            <button class="record-btn">提现记录</button>
+            <view class="stat-value">{{userInfo.integerPrice}}</view>
+            <button class="record-btn" @click="goWithdrawRecord">提现记录</button>
           </view>
         </view>
         <view class="bottom-menu-row">
-          <view class="menu-item">
+          <view class="menu-item" @tap="goProfitDetail">
             <view class="menu-icon red">
               <uni-icons type="wallet" size="32" color="#fff" />
             </view>
             <text class="menu-text">收益明细</text>
           </view>
-          <view class="menu-item">
+          <view class="menu-item" @tap="goTeam">
             <view class="menu-icon blue">
               <uni-icons type="person" size="32" color="#fff" />
             </view>
@@ -68,14 +68,14 @@
       <view class="rank-section">
         <view class="rank-title">推广排行榜</view>
         <view class="rank-list">
-          <view class="rank-item" v-for="(item, idx) in rankList" :key="idx">
+          <view class="rank-item" v-for="(item, idx) in rankList.slice(0, 5)" :key="idx">
             <view class="rank-icon">
               <image v-if="idx<3" :src="getRankIcon(idx+1)" class="crown" mode="aspectFit" />
               <image v-else :src="getRankIcon(idx+1)" class="num-icon" mode="aspectFit" />
             </view>
-            <image class="rank-avatar" :src="item.avatar" mode="aspectFill" />
-            <text class="rank-phone">{{item.phone}}</text>
-            <text class="rank-amount">¥{{item.amount}}</text>
+            <image class="rank-avatar" :src="item.headImage" mode="aspectFill" />
+            <text class="rank-phone">{{item.nickName}}</text>
+            <text class="rank-amount">¥{{item.price}}</text>
           </view>
         </view>
       </view>
@@ -104,7 +104,25 @@
     <!-- 底部按钮区 -->
     <view class="bottom-btns">
       <button class="btn gray" @tap="goQrcode">我的二维码</button>
-      <button class="btn green" @tap="goUpgrade">立即升级推广官</button>
+      <button class="btn green" @tap="goUpgrade" v-if="status===''">立即升级推广官</button>
+      <button class="btn gray"  v-if="status==0" @tap="showProgressModal = true">查看申请进度</button>
+    </view>
+    <!-- 申请进度弹窗 -->
+    <view v-if="showProgressModal" class="progress-modal-mask">
+      <view class="progress-modal-box">
+        <view class="progress-modal-title">联系运营商\n升级解锁更多权益</view>
+        <view class="progress-modal-list">
+          <view class="progress-modal-item" @tap="goToFaq">
+            <text>在线客服</text>
+            <uni-icons type="right" size="22" color="#bbb" />
+          </view>
+          <view class="progress-modal-item" @tap="goToFaq">
+            <text>客服电话</text>
+            <uni-icons type="right" size="22" color="#bbb" />
+          </view>
+        </view>
+        <button class="progress-modal-btn" @tap="showProgressModal = false">我知道了</button>
+      </view>
     </view>
   </view>
 </template>
@@ -130,11 +148,6 @@ export default {
       },
       tabActive: 0,
       rankList: [
-        { phone: '151****6712', amount: '8094.44', avatar: '/static/avatar1.png' },
-        { phone: '151****5283', amount: '7912.19', avatar: '/static/avatar2.png' },
-        { phone: '155****1691', amount: '6880.53', avatar: '/static/avatar3.png' },
-        { phone: '185****9149', amount: '6784.96', avatar: '/static/avatar4.png' },
-        { phone: '189****2462', amount: '5775.65', avatar: '/static/avatar5.png' },
       ],
       rightsHeader: ['推广锁粉权限', '用户', '推广官', '合伙人'],
       rightsRows: [
@@ -148,15 +161,28 @@ export default {
         ['收益模式', 'X', '5%', '主动收益'],
         ['线下沙龙', 'X', '✓', '主动收益'],
       ],
-      qrcodeUrl: '/static/qrcode.png',
+      status: 0,
+      showProgressModal: false
     }
   },
+  computed: {
+    qrcodeUrl() {
+			console.log(getApp().globalData.configData,'getApp().globalData.configData')
+      const item =  getApp().globalData.configData.find(i => i.keyName === 'kefu_code')
+      return item ? item.keyContent : ''
+    },
+  },
   onLoad() {
     const sysInfo = uni.getSystemInfoSync()
     this.statusBarHeight = sysInfo.statusBarHeight
     this.navBarHeight = 44
     this.navBarTotalHeight = this.statusBarHeight + this.navBarHeight
     this.getUserInfoByToken()
+    this.getRankList()
+    this.getMyPromotionInfo()
+  },
+  onShow(){
+    this.getMyPromotionInfo()
   },
   onPullDownRefresh() {
     this.getUserInfoByToken()
@@ -172,7 +198,7 @@ export default {
       uni.navigateBack()
     },
     getRankIcon(idx) {
-      return `/static/crown${idx}.png`
+      return `/static/tui/${idx}.png`
     },
     goQrcode() {
       uni.navigateTo({ url: '/pages/subcomponent/promo-qrcode' })
@@ -186,9 +212,43 @@ export default {
           this.userInfo.avatar = res.result.headImage || ''
           this.userInfo.name = res.result.nickName || ''
           this.userInfo.id = res.result.id || ''
+          this.userInfo.intentioCode = res.result.intentioCode || ''
+          this.userInfo.money = res.result.money || ''
+          this.userInfo.integerPrice = res.result.integerPrice || ''
           // 你可以根据实际接口补充type、balance、totalWithdraw等字段
         }
       })
+    },
+    goWithdrawRecord() {
+      uni.navigateTo({ url: '/pages/subcomponent/promotion-withdraw-record' })
+    },
+    goWithdraw() {
+      uni.navigateTo({ url: '/pages/subcomponent/withdraw?fromPromotion=true' })
+    },
+    goProfitDetail() {
+      uni.navigateTo({ url: '/pages/subcomponent/promotion-profit-detail' })
+    },
+    goTeam() {
+      uni.navigateTo({ url: '/pages/subcomponent/promotion-team' })
+    },
+    getRankList(){
+      this.$api('getRankList', {}, (res) => {
+        if (res && res.success && res.result) {
+          this.rankList = res.result.records || []
+        }
+      })
+    },
+    getMyPromotionInfo(){
+      this.$api('getMyPromotionInfo', {}, (res) => {
+        if (res && res.success && res.result) {
+          // console.log(res.result,'res.result')
+          this.status = res.result.status
+          console.log(this.status,'this.status')
+        }
+      })
+    },
+    goToFaq() {
+      uni.navigateTo({ url: '/pages/subcomponent/admin_faq' })
     }
   }
 }
@@ -431,6 +491,9 @@ export default {
         background: #fff;
         color: #13ac47;
         border: 2rpx solid #13ac47;
+        &:active, &:focus {
+          opacity: 0.8;
+        }
       }
     }
     .stat-divider {
@@ -672,4 +735,67 @@ export default {
     }
   }
 }
+
+.progress-modal-mask {
+  position: fixed;
+  left: 0; right: 0; top: 0; bottom: 0;
+  background: rgba(0,0,0,0.25);
+  z-index: 2000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.progress-modal-box {
+  width: 80vw;
+  max-width: 420px;
+  background: linear-gradient(180deg, #f3fff2 0%, #eafff6 100%);
+  border-radius: 32rpx;
+  box-shadow: 0 8rpx 32rpx rgba(60, 167, 250, 0.10);
+  padding: 56rpx 0 32rpx 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.progress-modal-title {
+  font-size: 34rpx;
+  color: #222;
+  font-weight: bold;
+  text-align: center;
+  margin-bottom: 48rpx;
+  white-space: pre-line;
+}
+.progress-modal-list {
+  width: 88%;
+  display: flex;
+  flex-direction: column;
+  gap: 18rpx;
+  margin-bottom: 48rpx;
+}
+.progress-modal-item {
+  // background: #fff;
+  border-radius: 18rpx;
+  height: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 30rpx;
+  color: #222;
+  padding: 0 32rpx;
+  box-shadow: 0 2rpx 8rpx rgba(60, 167, 250, 0.04);
+}
+.progress-modal-btn {
+  width: 88%;
+  height: 88rpx;
+  background: linear-gradient(90deg, #b2f08d, #39e9d2);
+  color: #222;
+  font-size: 32rpx;
+  font-weight: bold;
+  border-radius: 44rpx;
+  margin-top: 8rpx;
+  box-shadow: 0 4rpx 16rpx rgba(60, 167, 250, 0.08);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border: none;
+}
 </style>
\ No newline at end of file
diff --git a/pages/subcomponent/select.vue b/pages/subcomponent/select.vue
index 2b1d8fb..a30a807 100644
--- a/pages/subcomponent/select.vue
+++ b/pages/subcomponent/select.vue
@@ -279,6 +279,7 @@ export default {
     selectAddress(address) {
       if (this.mode === 'select') {
         uni.$emit('addressSelected', {
+          id: address.id,
           name: address.name,
           phone: address.phone,
           address: address.address,
@@ -347,9 +348,8 @@ export default {
       // 如果已经是默认地址，则取消默认
       const defaultFlag = address.defaultFlag === 'Y' ? 'N' : 'Y'
       
-      this.$api('saveOrUpdateAddress', {
-        id: id,
-        defaultFlag: defaultFlag
+      this.$api('updateDefaultAddress', {
+        id: id
       }, (res) => {
         if(res.code == 200) {
           uni.showToast({
@@ -464,7 +464,7 @@ export default {
 
 .address-list {
   padding: 32rpx;
-  margin-top: calc(88rpx + var(--status-bar-height));
+  margin-top: calc(38rpx + var(--status-bar-height));
   height: calc(100vh - 88rpx - var(--status-bar-height) - 140rpx - env(safe-area-inset-bottom));
   box-sizing: border-box;
   overflow-y: auto;
diff --git a/pages/subcomponent/upgrad.vue b/pages/subcomponent/upgrad.vue
index d15887e..4b66da0 100644
--- a/pages/subcomponent/upgrad.vue
+++ b/pages/subcomponent/upgrad.vue
@@ -38,10 +38,10 @@
           <text class="label">电话</text>
           <input class="input" type="number" placeholder="请输入" v-model="formData.phone" />
         </view>
-        <view class="form-item" @tap="showPicker('promotionTime')">
+        <view class="form-item" @tap="showPicker('userTime')">
           <text class="label">每日可花推广时间</text>
           <view class="picker-value">
-            <text :class="{'placeholder': !formData.promotionTime}">{{formData.promotionTime || '请选择'}}</text>
+            <text :class="{'placeholder': !formData.userTime}">{{formData.userTime || '请选择'}}</text>
             <uni-icons type="right" size="18" color="#bbb" />
           </view>
         </view>
@@ -88,7 +88,7 @@ export default {
       formData: {
         name: '',
         phone: '',
-        promotionTime: ''
+        userTime: ''
       },
       showPickerPopup: false,
       currentPickerIndex: 0,
@@ -101,6 +101,7 @@ export default {
     this.statusBarHeight = sysInfo.statusBarHeight
     this.navBarHeight = 44
     this.navBarTotalHeight = this.statusBarHeight + this.navBarHeight
+    this.getMyPromotionInfo()
   },
   methods: {
     async onRefresh() {
@@ -125,14 +126,26 @@ export default {
       this.currentPickerIndex = index
     },
     confirmPicker() {
-      this.formData.promotionTime = this.pickerOptions[this.currentPickerIndex]
+      this.formData.userTime = this.pickerOptions[this.currentPickerIndex]
       this.hidePicker()
     },
     resetPicker() {
       this.currentPickerIndex = 0
     },
     submitForm() {
-      uni.showToast({ title: '提交成功', icon: 'success' })
+      this.$api('apply', this.formData, (res) => {
+        if (res && res.success) {
+          uni.showToast({ title: '提交成功', icon: 'success' })
+          uni.navigateBack()
+        }
+      })
+    },
+    getMyPromotionInfo(){
+      this.$api('getMyPromotionInfo', {}, (res) => {
+        if (res && res.success && res.result) {
+          this.formData = res.result
+        }
+      })
     }
   }
 }
diff --git a/pages/subcomponent/wallet.vue b/pages/subcomponent/wallet.vue
index a15a6e9..9200308 100644
--- a/pages/subcomponent/wallet.vue
+++ b/pages/subcomponent/wallet.vue
@@ -9,7 +9,7 @@
     </view>
     <!-- banner -->
     <view class="banner" :style="{marginTop: (statusBarHeight + 88) + 'rpx', height: (bannerBaseHeight + statusBarHeight + 88) + 'rpx'}">
-      <image class="banner-bg" src="/static/my/钱包流水.png" mode="aspectFill"></image>
+      <image class="banner-bg" :src="image" mode="aspectFill"></image>
       <!-- <view class="banner-content">
         <image class="wallet-icon" src="/static/wallet/wallet-3d.png" mode="aspectFit"></image>
       </view> -->
@@ -103,6 +103,13 @@ export default {
       ]
     }
   },
+  computed: {
+    image() {
+			// console.log(getApp().globalData.bannerList,'getApp().globalData.bannerList')
+      const item =  getApp().globalData.bannerList.find(i => i.title === '我的-轮播图')
+      return item ? item.image : ''
+    },
+  },
   onLoad() {
     this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
   },
diff --git a/pages/subcomponent/withdraw.vue b/pages/subcomponent/withdraw.vue
index 802d5ba..96918c7 100644
--- a/pages/subcomponent/withdraw.vue
+++ b/pages/subcomponent/withdraw.vue
@@ -61,7 +61,7 @@
 
     <!-- 底部按钮 -->
     <view class="footer-btn-area">
-      <button class="main-btn" @tap="submitWithdraw">提现</button>
+      <button :class="['main-btn', fromPromotion ? 'promotion' : '']" @tap="submitWithdraw">提现</button>
     </view>
   </view>
 </template>
@@ -76,11 +76,15 @@ export default {
       statusBarHeight: 0,
       realName: '',
       amount: '',
-      showNoticePopup: false
+      showNoticePopup: false,
+      fromPromotion: false
     }
   },
-  onLoad() {
+  onLoad(options) {
     this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
+    if (options && options.fromPromotion === 'true') {
+      this.fromPromotion = true
+    }
   },
   methods: {
     async onRefresh() {
@@ -221,6 +225,10 @@ export default {
   box-shadow: 0 4rpx 16rpx rgba(255, 168, 0, 0.08);
   border: none;
 }
+.main-btn.promotion {
+  background: linear-gradient(90deg, #c2fdab 0%, #08eae0 100%);
+  color: #222;
+}
 
 .notice-popup {
   position: fixed;
diff --git a/pages/wxUserInfo.vue b/pages/wxUserInfo.vue
index 1e94e12..50b8dbd 100644
--- a/pages/wxUserInfo.vue
+++ b/pages/wxUserInfo.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="login">
-		<image src="/static/logo.png" mode="" class="img"></image>
+		<image :src='logoImage' mode="" class="img"></image>
 		<view class="title">
-			瀚海回收
+			{{logoName}}
 		</view>
 		<view class="title">
 			申请获取你的头像、昵称
@@ -37,60 +37,71 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				userInfo: {
-					avatarUrl: '',
-					nickName: '',
-				}
-			};
-		},
-		onShow() {},
-		computed: {},
-		methods: {
-			onChooseAvatar(res) {
-				let self = this
-				self.$Oss.ossUpload(res.target.avatarUrl)
-					.then(url => {
-						console.log(url);
-						self.userInfo.avatarUrl = url
-					})
+export default {
+	data() {
+		return {
+			userInfo: {
+				avatarUrl: '',
+				nickName: '',
 			},
-			submit() {
-				let self = this
-				console.log(self.userInfo.avatarUrl,'111');
-				uni.createSelectorQuery().in(this)
-					.select("#nickName")
-					.fields({
-						properties: ["value"],
-					})
-					.exec((res) => {
-						const nickName = res?.[0]?.value
-						self.userInfo.nickName = nickName
-						if(getApp().globalData.phone){
-							self.userInfo.phone = getApp().globalData.phone
-						}
-						if (self.$utils.verificationAll(self.userInfo, {
-							    avatarUrl: '请选择头像',
-								nickName: '请填写昵称',
-							})) {
-							return
+			configData: [],
+		};
+	},
+	onShow() { },
+	computed: {
+		logoImage() {
+			console.log(getApp().globalData.configData,'getApp().globalData.configData')
+      const item =  getApp().globalData.configData.find(i => i.keyName === 'logo_image')
+      return item ? item.keyContent : ''
+    },
+		logoName() {
+			const item =  getApp().globalData.configData.find(i => i.keyName === 'logo_name')
+			return item ? item.keyContent : ''
+		}
+	},
+	methods: {
+		onChooseAvatar(res) {
+			let self = this
+			self.$Oss.ossUpload(res.target.avatarUrl)
+				.then(url => {
+					console.log(url);
+					self.userInfo.avatarUrl = url
+				})
+		},
+		submit() {
+			let self = this
+			console.log(self.userInfo.avatarUrl, '111');
+			uni.createSelectorQuery().in(this)
+				.select("#nickName")
+				.fields({
+					properties: ["value"],
+				})
+				.exec((res) => {
+					const nickName = res?.[0]?.value
+					self.userInfo.nickName = nickName
+					if (getApp().globalData.phone) {
+						self.userInfo.phone = getApp().globalData.phone
+					}
+					if (self.$utils.verificationAll(self.userInfo, {
+						avatarUrl: '请选择头像',
+						nickName: '请填写昵称',
+					})) {
+						return
+					}
+
+					self.$api('updateInfo', self.userInfo, res => {
+						console.log(res, self.userInfo);
+						if (res.code == 200) {
+							uni.switchTab({
+								url: '/pages/component/home'
+							})
 						}
-						
-						self.$api('updateInfo', self.userInfo, res => {
-							console.log(res,self.userInfo);
-							if (res.code == 200) {
-								uni.switchTab({
-									url:'/pages/component/home'
-								})
-							}
-						})
 					})
-				
-			},
-		}
+				})
+
+		},
 	}
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/static/tui/1.png b/static/tui/1.png
new file mode 100644
index 0000000..5c016b6
Binary files /dev/null and b/static/tui/1.png differ
diff --git a/static/tui/2.png b/static/tui/2.png
new file mode 100644
index 0000000..ddee54c
Binary files /dev/null and b/static/tui/2.png differ
diff --git a/static/tui/3.png b/static/tui/3.png
new file mode 100644
index 0000000..eb4386f
Binary files /dev/null and b/static/tui/3.png differ
diff --git a/static/tui/4.png b/static/tui/4.png
new file mode 100644
index 0000000..2c7e266
Binary files /dev/null and b/static/tui/4.png differ
diff --git a/static/tui/5.png b/static/tui/5.png
new file mode 100644
index 0000000..cc19642
Binary files /dev/null and b/static/tui/5.png differ
diff --git a/utils/pinyin.js b/utils/pinyin.js
new file mode 100644
index 0000000..0e2cf62
--- /dev/null
+++ b/utils/pinyin.js
@@ -0,0 +1,403 @@
+export const pinyin = {
+    'a': '\u554a\u963f\u9515',
+    'ai': '\u57c3\u6328\u54ce\u5509\u54c0\u7691\u764c\u853c\u77ee\u827e\u788d\u7231\u9698\u8bf6\u6371\u55f3\u55cc\u5ad2\u7477\u66a7\u7839\u953f\u972d',
+    'an': '\u978d\u6c28\u5b89\u4ffa\u6309\u6697\u5cb8\u80fa\u6848\u8c19\u57ef\u63de\u72b4\u5eb5\u6849\u94f5\u9e4c\u9878\u9eef',
+    'ang': '\u80ae\u6602\u76ce',
+    'ao': '\u51f9\u6556\u71ac\u7ff1\u8884\u50b2\u5965\u61ca\u6fb3\u5773\u62d7\u55f7\u5662\u5c99\u5ed2\u9068\u5aaa\u9a9c\u8071\u87af\u93ca\u9ccc\u93d6',
+    'ba': '\u82ad\u634c\u6252\u53ed\u5427\u7b06\u516b\u75a4\u5df4\u62d4\u8dcb\u9776\u628a\u8019\u575d\u9738\u7f62\u7238\u8307\u83dd\u8406\u636d\u5c9c\u705e\u6777\u94af\u7c91\u9c85\u9b43',
+    'bai': '\u767d\u67cf\u767e\u6446\u4f70\u8d25\u62dc\u7a17\u859c\u63b0\u97b4',
+    'ban': '\u6591\u73ed\u642c\u6273\u822c\u9881\u677f\u7248\u626e\u62cc\u4f34\u74e3\u534a\u529e\u7eca\u962a\u5742\u8c73\u94a3\u7622\u764d\u8228',
+    'bang': '\u90a6\u5e2e\u6886\u699c\u8180\u7ed1\u68d2\u78c5\u868c\u9551\u508d\u8c24\u84a1\u8783',
+    'bao': '\u82de\u80de\u5305\u8912\u96f9\u4fdd\u5821\u9971\u5b9d\u62b1\u62a5\u66b4\u8c79\u9c8d\u7206\u52f9\u8446\u5b80\u5b62\u7172\u9e28\u8913\u8db5\u9f85',
+    'bo': '\u5265\u8584\u73bb\u83e0\u64ad\u62e8\u94b5\u6ce2\u535a\u52c3\u640f\u94c2\u7b94\u4f2f\u5e1b\u8236\u8116\u818a\u6e24\u6cca\u9a73\u4eb3\u8543\u5575\u997d\u6a97\u64d8\u7934\u94b9\u9e41\u7c38\u8ddb',
+    'bei': '\u676f\u7891\u60b2\u5351\u5317\u8f88\u80cc\u8d1d\u94a1\u500d\u72c8\u5907\u60eb\u7119\u88ab\u5b5b\u9642\u90b6\u57e4\u84d3\u5457\u602b\u6096\u789a\u9e4e\u8919\u943e',
+    'ben': '\u5954\u82ef\u672c\u7b28\u755a\u574c\u951b',
+    'beng': '\u5d29\u7ef7\u752d\u6cf5\u8e66\u8ff8\u552a\u5623\u750f',
+    'bi': '\u903c\u9f3b\u6bd4\u9119\u7b14\u5f7c\u78a7\u84d6\u853d\u6bd5\u6bd9\u6bd6\u5e01\u5e87\u75f9\u95ed\u655d\u5f0a\u5fc5\u8f9f\u58c1\u81c2\u907f\u965b\u5315\u4ef3\u4ffe\u8298\u835c\u8378\u5421\u54d4\u72f4\u5eb3\u610e\u6ed7\u6fde\u5f3c\u59a3\u5a62\u5b16\u74a7\u8d32\u7540\u94cb\u79d5\u88e8\u7b5a\u7b85\u7be6\u822d\u895e\u8df8\u9ac0',
+    'bian': '\u97ad\u8fb9\u7f16\u8d2c\u6241\u4fbf\u53d8\u535e\u8fa8\u8fa9\u8fab\u904d\u533e\u5f01\u82c4\u5fed\u6c74\u7f0f\u7178\u782d\u78a5\u7a39\u7a86\u8759\u7b3e\u9cca',
+    'biao': '\u6807\u5f6a\u8198\u8868\u5a4a\u9aa0\u98d1\u98d9\u98da\u706c\u9556\u9573\u762d\u88f1\u9cd4',
+    'bie': '\u9cd6\u618b\u522b\u762a\u8e69\u9cd8',
+    'bin': '\u5f6c\u658c\u6fd2\u6ee8\u5bbe\u6448\u50a7\u6d5c\u7f24\u73a2\u6ba1\u8191\u9554\u9acc\u9b13',
+    'bing': '\u5175\u51b0\u67c4\u4e19\u79c9\u997c\u70b3\u75c5\u5e76\u7980\u90b4\u6452\u7ee0\u678b\u69df\u71f9',
+    'bu': '\u6355\u535c\u54fa\u8865\u57e0\u4e0d\u5e03\u6b65\u7c3f\u90e8\u6016\u62ca\u535f\u900b\u74ff\u6661\u949a\u91ad',
+    'ca': '\u64e6\u5693\u7924',
+    'cai': '\u731c\u88c1\u6750\u624d\u8d22\u776c\u8e29\u91c7\u5f69\u83dc\u8521',
+    'can': '\u9910\u53c2\u8695\u6b8b\u60ed\u60e8\u707f\u9a96\u74a8\u7cb2\u9eea',
+    'cang': '\u82cd\u8231\u4ed3\u6ca7\u85cf\u4f27',
+    'cao': '\u64cd\u7cd9\u69fd\u66f9\u8349\u8279\u5608\u6f15\u87ac\u825a',
+    'ce': '\u5395\u7b56\u4fa7\u518c\u6d4b\u5202\u5e3b\u607b',
+    'ceng': '\u5c42\u8e6d\u564c',
+    'cha': '\u63d2\u53c9\u832c\u8336\u67e5\u78b4\u643d\u5bdf\u5c94\u5dee\u8be7\u7339\u9987\u6c4a\u59f9\u6748\u6942\u69ce\u6aab\u9497\u9538\u9572\u8869',
+    'chai': '\u62c6\u67f4\u8c7a\u4faa\u8308\u7625\u867f\u9f87',
+    'chan': '\u6400\u63ba\u8749\u998b\u8c17\u7f20\u94f2\u4ea7\u9610\u98a4\u5181\u8c04\u8c36\u8487\u5edb\u5fcf\u6f7a\u6fb6\u5b71\u7fbc\u5a75\u5b17\u9aa3\u89c7\u7985\u9561\u88e3\u87fe\u8e94',
+    'chang': '\u660c\u7316\u573a\u5c1d\u5e38\u957f\u507f\u80a0\u5382\u655e\u7545\u5531\u5021\u4f25\u9b2f\u82cc\u83d6\u5f9c\u6005\u60dd\u960a\u5a3c\u5ae6\u6636\u6c05\u9cb3',
+    'chao': '\u8d85\u6284\u949e\u671d\u5632\u6f6e\u5de2\u5435\u7092\u600a\u7ec9\u6641\u8016',
+    'che': '\u8f66\u626f\u64a4\u63a3\u5f7b\u6f88\u577c\u5c6e\u7817',
+    'chen': '\u90f4\u81e3\u8fb0\u5c18\u6668\u5ff1\u6c89\u9648\u8d81\u886c\u79f0\u8c0c\u62bb\u55d4\u5bb8\u741b\u6987\u809c\u80c2\u789c\u9f80',
+    'cheng': '\u6491\u57ce\u6a59\u6210\u5448\u4e58\u7a0b\u60e9\u6f84\u8bda\u627f\u901e\u9a8b\u79e4\u57d5\u5d4a\u5fb5\u6d48\u67a8\u67fd\u6a18\u665f\u584d\u77a0\u94d6\u88ce\u86cf\u9172',
+    'chi': '\u5403\u75f4\u6301\u5319\u6c60\u8fdf\u5f1b\u9a70\u803b\u9f7f\u4f88\u5c3a\u8d64\u7fc5\u65a5\u70bd\u50ba\u5880\u82aa\u830c\u640b\u53f1\u54e7\u557b\u55e4\u5f73\u996c\u6cb2\u5ab8\u6555\u80dd\u7719\u7735\u9e31\u761b\u892b\u86a9\u87ad\u7b1e\u7bea\u8c49\u8e05\u8e1f\u9b51',
+    'chong': '\u5145\u51b2\u866b\u5d07\u5ba0\u833a\u5fe1\u61a7\u94f3\u825f',
+    'chou': '\u62bd\u916c\u7574\u8e0c\u7a20\u6101\u7b79\u4ec7\u7ef8\u7785\u4e11\u4fe6\u5733\u5e31\u60c6\u6eb4\u59af\u7633\u96e0\u9c8b',
+    'chu': '\u81ed\u521d\u51fa\u6a71\u53a8\u8e87\u9504\u96cf\u6ec1\u9664\u695a\u7840\u50a8\u77d7\u6410\u89e6\u5904\u4e8d\u520d\u61b7\u7ecc\u6775\u696e\u6a17\u870d\u8e70\u9edc',
+    'chuan': '\u63e3\u5ddd\u7a7f\u693d\u4f20\u8239\u5598\u4e32\u63be\u821b\u60f4\u9044\u5ddb\u6c1a\u948f\u9569\u8221',
+    'chuang': '\u75ae\u7a97\u5e62\u5e8a\u95ef\u521b\u6006',
+    'chui': '\u5439\u708a\u6376\u9524\u5782\u9672\u68f0\u69cc',
+    'chun': '\u6625\u693f\u9187\u5507\u6df3\u7eaf\u8822\u4fc3\u83bc\u6c8c\u80ab\u6710\u9e51\u877d',
+    'chuo': '\u6233\u7ef0\u851f\u8fb6\u8f8d\u955e\u8e14\u9f8a',
+    'ci': '\u75b5\u8328\u78c1\u96cc\u8f9e\u6148\u74f7\u8bcd\u6b64\u523a\u8d50\u6b21\u8360\u5472\u5d6f\u9e5a\u8785\u7ccd\u8d91',
+    'cong': '\u806a\u8471\u56f1\u5306\u4ece\u4e1b\u506c\u82c1\u6dd9\u9aa2\u742e\u7481\u679e',
+    'cu': '\u51d1\u7c97\u918b\u7c07\u731d\u6b82\u8e59',
+    'cuan': '\u8e7f\u7be1\u7a9c\u6c46\u64ba\u6615\u7228',
+    'cui': '\u6467\u5d14\u50ac\u8106\u7601\u7cb9\u6dec\u7fe0\u8403\u60b4\u7480\u69b1\u96b9',
+    'cun': '\u6751\u5b58\u5bf8\u78cb\u5fd6\u76b4',
+    'cuo': '\u64ae\u6413\u63aa\u632b\u9519\u539d\u811e\u9509\u77ec\u75e4\u9e7e\u8e49\u8e9c',
+    'da': '\u642d\u8fbe\u7b54\u7629\u6253\u5927\u8037\u54d2\u55d2\u601b\u59b2\u75b8\u8921\u7b2a\u977c\u9791',
+    'dai': '\u5446\u6b79\u50a3\u6234\u5e26\u6b86\u4ee3\u8d37\u888b\u5f85\u902e\u6020\u57ed\u7519\u5454\u5cb1\u8fe8\u902f\u9a80\u7ed0\u73b3\u9edb',
+    'dan': '\u803d\u62c5\u4e39\u5355\u90f8\u63b8\u80c6\u65e6\u6c2e\u4f46\u60ee\u6de1\u8bde\u5f39\u86cb\u4ebb\u510b\u5369\u840f\u5556\u6fb9\u6a90\u6b9a\u8d55\u7708\u7605\u8043\u7baa',
+    'dang': '\u5f53\u6321\u515a\u8361\u6863\u8c20\u51fc\u83ea\u5b95\u7800\u94db\u88c6',
+    'dao': '\u5200\u6363\u8e48\u5012\u5c9b\u7977\u5bfc\u5230\u7a3b\u60bc\u9053\u76d7\u53e8\u5541\u5fc9\u6d2e\u6c18\u7118\u5fd1\u7e9b',
+    'de': '\u5fb7\u5f97\u7684\u951d',
+    'deng': '\u8e6c\u706f\u767b\u7b49\u77aa\u51f3\u9093\u5654\u5d9d\u6225\u78f4\u956b\u7c26',
+    'di': '\u5824\u4f4e\u6ef4\u8fea\u654c\u7b1b\u72c4\u6da4\u7fdf\u5ae1\u62b5\u5e95\u5730\u8482\u7b2c\u5e1d\u5f1f\u9012\u7f14\u6c10\u7c74\u8bcb\u8c1b\u90b8\u577b\u839c\u837b\u5600\u5a23\u67e2\u68e3\u89cc\u7825\u78b2\u7747\u955d\u7f9d\u9ab6',
+    'dian': '\u98a0\u6382\u6ec7\u7898\u70b9\u5178\u975b\u57ab\u7535\u4f43\u7538\u5e97\u60e6\u5960\u6dc0\u6bbf\u4e36\u963d\u576b\u57dd\u5dc5\u73b7\u765c\u766b\u7c1f\u8e2e',
+    'diao': '\u7889\u53fc\u96d5\u51cb\u5201\u6389\u540a\u9493\u8c03\u8f7a\u94de\u8729\u7c9c\u8c82',
+    'die': '\u8dcc\u7239\u789f\u8776\u8fed\u8c0d\u53e0\u4f5a\u57a4\u581e\u63f2\u558b\u6e2b\u8f76\u7252\u74de\u8936\u800b\u8e40\u9cbd\u9cce',
+    'ding': '\u4e01\u76ef\u53ee\u9489\u9876\u9f0e\u952d\u5b9a\u8ba2\u4e22\u4ec3\u5576\u738e\u815a\u7887\u753a\u94e4\u7594\u8035\u914a',
+    'dong': '\u4e1c\u51ac\u8463\u61c2\u52a8\u680b\u4f97\u606b\u51bb\u6d1e\u578c\u549a\u5cbd\u5cd2\u5902\u6c21\u80e8\u80f4\u7850\u9e2b',
+    'dou': '\u515c\u6296\u6597\u9661\u8c46\u9017\u75d8\u8538\u94ad\u7aa6\u7aac\u86aa\u7bfc\u9161',
+    'du': '\u90fd\u7763\u6bd2\u728a\u72ec\u8bfb\u5835\u7779\u8d4c\u675c\u9540\u809a\u5ea6\u6e21\u5992\u828f\u561f\u6e0e\u691f\u6a50\u724d\u8839\u7b03\u9ad1\u9ee9',
+    'duan': '\u7aef\u77ed\u953b\u6bb5\u65ad\u7f0e\u5f56\u6934\u7145\u7c16',
+    'dui': '\u5806\u5151\u961f\u5bf9\u603c\u619d\u7893',
+    'dun': '\u58a9\u5428\u8e72\u6566\u987f\u56e4\u949d\u76fe\u9041\u7096\u7818\u7905\u76f9\u9566\u8db8',
+    'duo': '\u6387\u54c6\u591a\u593a\u579b\u8eb2\u6735\u8dfa\u8235\u5241\u60f0\u5815\u5484\u54da\u7f0d\u67c1\u94ce\u88f0\u8e31',
+    'e': '\u86fe\u5ce8\u9e45\u4fc4\u989d\u8bb9\u5a25\u6076\u5384\u627c\u904f\u9102\u997f\u5669\u8c14\u57a9\u57ad\u82ca\u83aa\u843c\u5443\u6115\u5c59\u5a40\u8f6d\u66f7\u816d\u786a\u9507\u9537\u9e57\u989a\u9cc4',
+    'en': '\u6069\u84bd\u6441\u5514\u55ef',
+    'er': '\u800c\u513f\u8033\u5c14\u9975\u6d31\u4e8c\u8d30\u8fe9\u73e5\u94d2\u9e38\u9c95',
+    'fa': '\u53d1\u7f5a\u7b4f\u4f10\u4e4f\u9600\u6cd5\u73d0\u57a1\u781d',
+    'fan': '\u85e9\u5e06\u756a\u7ffb\u6a0a\u77fe\u9492\u7e41\u51e1\u70e6\u53cd\u8fd4\u8303\u8d29\u72af\u996d\u6cdb\u8629\u5e61\u72ad\u68b5\u6535\u71d4\u7548\u8e6f',
+    'fang': '\u574a\u82b3\u65b9\u80aa\u623f\u9632\u59a8\u4eff\u8bbf\u7eba\u653e\u531a\u90a1\u5f77\u94ab\u822b\u9c82',
+    'fei': '\u83f2\u975e\u5561\u98de\u80a5\u532a\u8bfd\u5420\u80ba\u5e9f\u6cb8\u8d39\u82be\u72d2\u60b1\u6ddd\u5983\u7ecb\u7eef\u69a7\u8153\u6590\u6249\u7953\u7829\u9544\u75f1\u871a\u7bda\u7fe1\u970f\u9cb1',
+    'fen': '\u82ac\u915a\u5429\u6c1b\u5206\u7eb7\u575f\u711a\u6c7e\u7c89\u594b\u4efd\u5fff\u6124\u7caa\u507e\u7035\u68fc\u610d\u9cbc\u9f22',
+    'feng': '\u4e30\u5c01\u67ab\u8702\u5cf0\u950b\u98ce\u75af\u70fd\u9022\u51af\u7f1d\u8bbd\u5949\u51e4\u4ff8\u9146\u8451\u6ca3\u781c',
+    'fu': '\u4f5b\u5426\u592b\u6577\u80a4\u5b75\u6276\u62c2\u8f90\u5e45\u6c1f\u7b26\u4f0f\u4fd8\u670d\u6d6e\u6daa\u798f\u88b1\u5f17\u752b\u629a\u8f85\u4fef\u91dc\u65a7\u812f\u8151\u5e9c\u8150\u8d74\u526f\u8986\u8d4b\u590d\u5085\u4ed8\u961c\u7236\u8179\u8d1f\u5bcc\u8ba3\u9644\u5987\u7f1a\u5490\u5310\u51eb\u90db\u8299\u82fb\u832f\u83a9\u83d4\u544b\u5e5e\u6ecf\u8274\u5b5a\u9a78\u7ec2\u6874\u8d59\u9efb\u9efc\u7f58\u7a03\u99a5\u864d\u86a8\u8709\u8760\u876e\u9eb8\u8dba\u8dd7\u9cc6',
+    'ga': '\u5676\u560e\u86e4\u5c2c\u5477\u5c15\u5c1c\u65ee\u9486',
+    'gai': '\u8be5\u6539\u6982\u9499\u76d6\u6e89\u4e10\u9654\u5793\u6224\u8d45\u80f2',
+    'gan': '\u5e72\u7518\u6746\u67d1\u7aff\u809d\u8d76\u611f\u79c6\u6562\u8d63\u5769\u82f7\u5c34\u64c0\u6cd4\u6de6\u6f89\u7ec0\u6a44\u65f0\u77f8\u75b3\u9150',
+    'gang': '\u5188\u521a\u94a2\u7f38\u809b\u7eb2\u5c97\u6e2f\u6206\u7f61\u9883\u7b7b',
+    'gong': '\u6760\u5de5\u653b\u529f\u606d\u9f9a\u4f9b\u8eac\u516c\u5bab\u5f13\u5de9\u6c5e\u62f1\u8d21\u5171\u857b\u5efe\u54a3\u73d9\u80b1\u86a3\u86e9\u89e5',
+    'gao': '\u7bd9\u768b\u9ad8\u818f\u7f94\u7cd5\u641e\u9550\u7a3f\u544a\u777e\u8bf0\u90dc\u84bf\u85c1\u7f1f\u69d4\u69c1\u6772\u9506',
+    'ge': '\u54e5\u6b4c\u6401\u6208\u9e3d\u80f3\u7599\u5272\u9769\u845b\u683c\u9601\u9694\u94ec\u4e2a\u5404\u9b32\u4ee1\u54ff\u5865\u55dd\u7ea5\u643f\u8188\u784c\u94ea\u9549\u88bc\u988c\u867c\u8238\u9abc\u9ac2',
+    'gei': '\u7ed9',
+    'gen': '\u6839\u8ddf\u4e98\u831b\u54cf\u826e',
+    'geng': '\u8015\u66f4\u5e9a\u7fb9\u57c2\u803f\u6897\u54fd\u8d53\u9ca0',
+    'gou': '\u94a9\u52fe\u6c9f\u82df\u72d7\u57a2\u6784\u8d2d\u591f\u4f5d\u8bdf\u5ca3\u9058\u5abe\u7f11\u89cf\u5f40\u9e32\u7b31\u7bdd\u97b2',
+    'gu': '\u8f9c\u83c7\u5495\u7b8d\u4f30\u6cbd\u5b64\u59d1\u9f13\u53e4\u86ca\u9aa8\u8c37\u80a1\u6545\u987e\u56fa\u96c7\u560f\u8bc2\u83f0\u54cc\u5d2e\u6c69\u688f\u8f71\u726f\u727f\u80cd\u81cc\u6bc2\u77bd\u7f5f\u94b4\u9522\u74e0\u9e2a\u9e44\u75fc\u86c4\u9164\u89da\u9cb4\u9ab0\u9e58',
+    'gua': '\u522e\u74dc\u5250\u5be1\u6302\u8902\u5366\u8bd6\u5471\u681d\u9e39',
+    'guai': '\u4e56\u62d0\u602a\u54d9',
+    'guan': '\u68fa\u5173\u5b98\u51a0\u89c2\u7ba1\u9986\u7f50\u60ef\u704c\u8d2f\u500c\u839e\u63bc\u6dab\u76e5\u9e73\u9ccf',
+    'guang': '\u5149\u5e7f\u901b\u72b7\u6844\u80f1\u7592',
+    'gui': '\u7470\u89c4\u572d\u7845\u5f52\u9f9f\u95fa\u8f68\u9b3c\u8be1\u7678\u6842\u67dc\u8dea\u8d35\u523d\u5326\u523f\u5e8b\u5b84\u59ab\u6867\u7085\u6677\u7688\u7c0b\u9c91\u9cdc',
+    'gun': '\u8f8a\u6eda\u68cd\u4e28\u886e\u7ef2\u78d9\u9ca7',
+    'guo': '\u9505\u90ed\u56fd\u679c\u88f9\u8fc7\u9998\u8803\u57da\u63b4\u5459\u56d7\u5e3c\u5d1e\u7313\u6901\u8662\u951e\u8052\u872e\u873e\u8748',
+    'ha': '\u54c8',
+    'hai': '\u9ab8\u5b69\u6d77\u6c26\u4ea5\u5bb3\u9a87\u54b4\u55e8\u988f\u91a2',
+    'han': '\u9163\u61a8\u90af\u97e9\u542b\u6db5\u5bd2\u51fd\u558a\u7f55\u7ff0\u64bc\u634d\u65f1\u61be\u608d\u710a\u6c57\u6c49\u9097\u83e1\u6496\u961a\u701a\u6657\u7113\u9894\u86b6\u9f3e',
+    'hen': '\u592f\u75d5\u5f88\u72e0\u6068',
+    'hang': '\u676d\u822a\u6c86\u7ed7\u73e9\u6841',
+    'hao': '\u58d5\u568e\u8c6a\u6beb\u90dd\u597d\u8017\u53f7\u6d69\u8585\u55e5\u5686\u6fe0\u704f\u660a\u7693\u98a2\u869d',
+    'he': '\u5475\u559d\u8377\u83cf\u6838\u79be\u548c\u4f55\u5408\u76d2\u8c89\u9602\u6cb3\u6db8\u8d6b\u8910\u9e64\u8d3a\u8bc3\u52be\u58d1\u85ff\u55d1\u55ec\u9616\u76cd\u86b5\u7fee',
+    'hei': '\u563f\u9ed1',
+    'heng': '\u54fc\u4ea8\u6a2a\u8861\u6052\u8a07\u8605',
+    'hong': '\u8f70\u54c4\u70d8\u8679\u9e3f\u6d2a\u5b8f\u5f18\u7ea2\u9ec9\u8ba7\u836d\u85a8\u95f3\u6cd3',
+    'hou': '\u5589\u4faf\u7334\u543c\u539a\u5019\u540e\u5820\u5f8c\u9005\u760a\u7bcc\u7cc7\u9c8e\u9aba',
+    'hu': '\u547c\u4e4e\u5ffd\u745a\u58f6\u846b\u80e1\u8774\u72d0\u7cca\u6e56\u5f27\u864e\u552c\u62a4\u4e92\u6caa\u6237\u51b1\u553f\u56eb\u5cb5\u7322\u6019\u60da\u6d52\u6ef9\u7425\u69f2\u8f77\u89f3\u70c0\u7173\u623d\u6248\u795c\u9e55\u9e71\u7b0f\u9190\u659b',
+    'hua': '\u82b1\u54d7\u534e\u733e\u6ed1\u753b\u5212\u5316\u8bdd\u5290\u6d4d\u9a85\u6866\u94e7\u7a1e',
+    'huai': '\u69d0\u5f8a\u6000\u6dee\u574f\u8fd8\u8e1d',
+    'huan': '\u6b22\u73af\u6853\u7f13\u6362\u60a3\u5524\u75ea\u8c62\u7115\u6da3\u5ba6\u5e7b\u90c7\u5942\u57b8\u64d0\u571c\u6d39\u6d63\u6f36\u5bf0\u902d\u7f33\u953e\u9ca9\u9b1f',
+    'huang': '\u8352\u614c\u9ec4\u78fa\u8757\u7c27\u7687\u51f0\u60f6\u714c\u6643\u5e4c\u604d\u8c0e\u968d\u5fa8\u6e5f\u6f62\u9051\u749c\u8093\u7640\u87e5\u7bc1\u9cc7',
+    'hui': '\u7070\u6325\u8f89\u5fbd\u6062\u86d4\u56de\u6bc1\u6094\u6167\u5349\u60e0\u6666\u8d3f\u79fd\u4f1a\u70e9\u6c47\u8bb3\u8bf2\u7ed8\u8bd9\u8334\u835f\u8559\u54d5\u5599\u96b3\u6d04\u5f57\u7f0b\u73f2\u6656\u605a\u867a\u87ea\u9ebe',
+    'hun': '\u8364\u660f\u5a5a\u9b42\u6d51\u6df7\u8be8\u9984\u960d\u6eb7\u7f17',
+    'huo': '\u8c41\u6d3b\u4f19\u706b\u83b7\u6216\u60d1\u970d\u8d27\u7978\u6509\u56af\u5925\u94ac\u952a\u956c\u8020\u8816',
+    'ji': '\u51fb\u573e\u57fa\u673a\u7578\u7a3d\u79ef\u7b95\u808c\u9965\u8ff9\u6fc0\u8ba5\u9e21\u59ec\u7ee9\u7f09\u5409\u6781\u68d8\u8f91\u7c4d\u96c6\u53ca\u6025\u75be\u6c72\u5373\u5ac9\u7ea7\u6324\u51e0\u810a\u5df1\u84df\u6280\u5180\u5b63\u4f0e\u796d\u5242\u60b8\u6d4e\u5bc4\u5bc2\u8ba1\u8bb0\u65e2\u5fcc\u9645\u5993\u7ee7\u7eaa\u5c45\u4e0c\u4e69\u525e\u4f76\u4f74\u8114\u58bc\u82a8\u82b0\u8401\u84ba\u857a\u638e\u53fd\u54ad\u54dc\u5527\u5c8c\u5d74\u6d0e\u5f50\u5c50\u9aa5\u757f\u7391\u696b\u6b9b\u621f\u6222\u8d4d\u89ca\u7284\u9f51\u77f6\u7f81\u5d47\u7a37\u7620\u7635\u866e\u7b08\u7b04\u66a8\u8dfb\u8dfd\u9701\u9c9a\u9cab\u9afb\u9e82',
+    'jia': '\u5609\u67b7\u5939\u4f73\u5bb6\u52a0\u835a\u988a\u8d3e\u7532\u94be\u5047\u7a3c\u4ef7\u67b6\u9a7e\u5ac1\u4f3d\u90cf\u62ee\u5cac\u6d43\u8fe6\u73c8\u621b\u80db\u605d\u94d7\u9553\u75c2\u86f1\u7b33\u8888\u8dcf',
+    'jian': '\u6b7c\u76d1\u575a\u5c16\u7b3a\u95f4\u714e\u517c\u80a9\u8270\u5978\u7f04\u8327\u68c0\u67ec\u78b1\u7877\u62e3\u6361\u7b80\u4fed\u526a\u51cf\u8350\u69db\u9274\u8df5\u8d31\u89c1\u952e\u7bad\u4ef6\u5065\u8230\u5251\u996f\u6e10\u6e85\u6da7\u5efa\u50ed\u8c0f\u8c2b\u83c5\u84b9\u641b\u56dd\u6e54\u8e47\u8b07\u7f23\u67a7\u67d9\u6957\u620b\u622c\u726e\u728d\u6bfd\u8171\u7751\u950f\u9e63\u88e5\u7b15\u7bb4\u7fe6\u8dbc\u8e3a\u9ca3\u97af',
+    'jiang': '\u50f5\u59dc\u5c06\u6d46\u6c5f\u7586\u848b\u6868\u5956\u8bb2\u5320\u9171\u964d\u8333\u6d1a\u7edb\u7f30\u729f\u7913\u8029\u7ce8\u8c47',
+    'jiao': '\u8549\u6912\u7901\u7126\u80f6\u4ea4\u90ca\u6d47\u9a84\u5a07\u56bc\u6405\u94f0\u77eb\u4fa5\u811a\u72e1\u89d2\u997a\u7f34\u7ede\u527f\u6559\u9175\u8f7f\u8f83\u53eb\u4f7c\u50ec\u832d\u6322\u564d\u5ce4\u5fbc\u59e3\u7e9f\u656b\u768e\u9e6a\u86df\u91ae\u8de4\u9c9b',
+    'jie': '\u7a96\u63ed\u63a5\u7686\u79f8\u8857\u9636\u622a\u52ab\u8282\u6854\u6770\u6377\u776b\u7aed\u6d01\u7ed3\u89e3\u59d0\u6212\u85c9\u82a5\u754c\u501f\u4ecb\u75a5\u8beb\u5c4a\u5048\u8ba6\u8bd8\u5588\u55df\u736c\u5a55\u5b51\u6840\u7352\u78a3\u9534\u7596\u88b7\u9889\u86a7\u7faf\u9c92\u9ab1\u9aeb',
+    'jin': '\u5dfe\u7b4b\u65a4\u91d1\u4eca\u6d25\u895f\u7d27\u9526\u4ec5\u8c28\u8fdb\u9773\u664b\u7981\u8fd1\u70ec\u6d78\u5c3d\u537a\u8369\u5807\u5664\u9991\u5ed1\u5997\u7f19\u747e\u69ff\u8d46\u89d0\u9485\u9513\u887f\u77dc',
+    'jing': '\u52b2\u8346\u5162\u830e\u775b\u6676\u9cb8\u4eac\u60ca\u7cbe\u7cb3\u7ecf\u4e95\u8b66\u666f\u9888\u9759\u5883\u656c\u955c\u5f84\u75c9\u9756\u7adf\u7ade\u51c0\u522d\u5106\u9631\u83c1\u734d\u61ac\u6cfe\u8ff3\u5f2a\u5a67\u80bc\u80eb\u8148\u65cc',
+    'jiong': '\u70af\u7a98\u5182\u8fe5\u6243',
+    'jiu': '\u63ea\u7a76\u7ea0\u7396\u97ed\u4e45\u7078\u4e5d\u9152\u53a9\u6551\u65e7\u81fc\u8205\u548e\u5c31\u759a\u50e6\u557e\u9604\u67e9\u6855\u9e6b\u8d73\u9b0f',
+    'ju': '\u97a0\u62d8\u72d9\u75bd\u9a79\u83ca\u5c40\u5480\u77e9\u4e3e\u6cae\u805a\u62d2\u636e\u5de8\u5177\u8ddd\u8e1e\u952f\u4ff1\u53e5\u60e7\u70ac\u5267\u5028\u8bb5\u82e3\u82f4\u8392\u63ac\u907d\u5c66\u741a\u67b8\u6910\u6998\u6989\u6a58\u728b\u98d3\u949c\u9514\u7aad\u88fe\u8d84\u91b5\u8e3d\u9f83\u96ce\u97ab',
+    'juan': '\u6350\u9e43\u5a1f\u5026\u7737\u5377\u7ee2\u9104\u72f7\u6d93\u684a\u8832\u9529\u954c\u96bd',
+    'jue': '\u6485\u652b\u6289\u6398\u5014\u7235\u89c9\u51b3\u8bc0\u7edd\u53a5\u5282\u8c32\u77cd\u8568\u5658\u5d1b\u7357\u5b53\u73cf\u6877\u6a5b\u721d\u9562\u8e76\u89d6',
+    'jun': '\u5747\u83cc\u94a7\u519b\u541b\u5cfb\u4fca\u7ae3\u6d5a\u90e1\u9a8f\u6343\u72fb\u76b2\u7b60\u9e87',
+    'ka': '\u5580\u5496\u5361\u4f67\u5494\u80e9',
+    'ke': '\u54af\u5777\u82db\u67ef\u68f5\u78d5\u9897\u79d1\u58f3\u54b3\u53ef\u6e34\u514b\u523b\u5ba2\u8bfe\u5ca2\u606a\u6e98\u9a92\u7f02\u73c2\u8f72\u6c2a\u778c\u94b6\u75b4\u7aa0\u874c\u9ac1',
+    'kai': '\u5f00\u63e9\u6977\u51ef\u6168\u5240\u57b2\u8488\u5ffe\u607a\u94e0\u950e',
+    'kan': '\u520a\u582a\u52d8\u574e\u780d\u770b\u4f83\u51f5\u83b0\u83b6\u6221\u9f9b\u77b0',
+    'kang': '\u5eb7\u6177\u7ce0\u625b\u6297\u4ea2\u7095\u5751\u4f09\u95f6\u94aa',
+    'kao': '\u8003\u62f7\u70e4\u9760\u5c3b\u6832\u7292\u94d0',
+    'ken': '\u80af\u5543\u57a6\u6073\u57a0\u88c9\u9880',
+    'keng': '\u542d\u5fd0\u94ff',
+    'kong': '\u7a7a\u6050\u5b54\u63a7\u5025\u5d06\u7b9c',
+    'kou': '\u62a0\u53e3\u6263\u5bc7\u82a4\u853b\u53e9\u770d\u7b58',
+    'ku': '\u67af\u54ed\u7a9f\u82e6\u9177\u5e93\u88e4\u5233\u5800\u55be\u7ed4\u9ab7',
+    'kua': '\u5938\u57ae\u630e\u8de8\u80ef\u4f89',
+    'kuai': '\u5757\u7b77\u4fa9\u5feb\u84af\u90d0\u8489\u72ef\u810d',
+    'kuan': '\u5bbd\u6b3e\u9acb',
+    'kuang': '\u5321\u7b50\u72c2\u6846\u77ff\u7736\u65f7\u51b5\u8bd3\u8bf3\u909d\u5739\u593c\u54d0\u7ea9\u8d36',
+    'kui': '\u4e8f\u76d4\u5cbf\u7aa5\u8475\u594e\u9b41\u5080\u9988\u6127\u6e83\u9997\u532e\u5914\u9697\u63c6\u55b9\u559f\u609d\u6126\u9615\u9035\u668c\u777d\u8069\u8770\u7bd1\u81fe\u8dec',
+    'kun': '\u5764\u6606\u6346\u56f0\u6083\u9603\u7428\u951f\u918c\u9cb2\u9ae1',
+    'kuo': '\u62ec\u6269\u5ed3\u9614\u86de',
+    'la': '\u5783\u62c9\u5587\u8721\u814a\u8fa3\u5566\u524c\u647a\u908b\u65ef\u782c\u760c',
+    'lai': '\u83b1\u6765\u8d56\u5d03\u5f95\u6d9e\u6fd1\u8d49\u7750\u94fc\u765e\u7c41',
+    'lan': '\u84dd\u5a6a\u680f\u62e6\u7bee\u9611\u5170\u6f9c\u8c30\u63fd\u89c8\u61d2\u7f06\u70c2\u6ee5\u5549\u5c9a\u61d4\u6f24\u6984\u6593\u7f71\u9567\u8934',
+    'lang': '\u7405\u6994\u72fc\u5eca\u90ce\u6717\u6d6a\u83a8\u8497\u5577\u9606\u9512\u7a02\u8782',
+    'lao': '\u635e\u52b3\u7262\u8001\u4f6c\u59e5\u916a\u70d9\u6d9d\u5520\u5d02\u6833\u94d1\u94f9\u75e8\u91aa',
+    'le': '\u52d2\u4e50\u808b\u4ec2\u53fb\u561e\u6cd0\u9cd3',
+    'lei': '\u96f7\u956d\u857e\u78ca\u7d2f\u5121\u5792\u64c2\u7c7b\u6cea\u7fb8\u8bd4\u837d\u54a7\u6f2f\u5ad8\u7f27\u6a91\u8012\u9179',
+    'ling': '\u68f1\u51b7\u62ce\u73b2\u83f1\u96f6\u9f84\u94c3\u4f36\u7f9a\u51cc\u7075\u9675\u5cad\u9886\u53e6\u4ee4\u9143\u5844\u82d3\u5464\u56f9\u6ce0\u7eeb\u67c3\u68c2\u74f4\u8046\u86c9\u7fce\u9cae',
+    'leng': '\u695e\u6123',
+    'li': '\u5398\u68a8\u7281\u9ece\u7bf1\u72f8\u79bb\u6f13\u7406\u674e\u91cc\u9ca4\u793c\u8389\u8354\u540f\u6817\u4e3d\u5389\u52b1\u783e\u5386\u5229\u5088\u4f8b\u4fd0\u75e2\u7acb\u7c92\u6ca5\u96b6\u529b\u7483\u54e9\u4fea\u4fda\u90e6\u575c\u82c8\u8385\u84e0\u85dc\u6369\u5456\u5533\u55b1\u7301\u6ea7\u6fa7\u9026\u5a0c\u5ae0\u9a8a\u7f21\u73de\u67a5\u680e\u8f79\u623e\u783a\u8a48\u7f79\u9502\u9e42\u75a0\u75ac\u86ce\u870a\u8821\u7b20\u7be5\u7c9d\u91b4\u8dde\u96f3\u9ca1\u9ce2\u9ee7',
+    'lian': '\u4fe9\u8054\u83b2\u8fde\u9570\u5ec9\u601c\u6d9f\u5e18\u655b\u8138\u94fe\u604b\u70bc\u7ec3\u631b\u8539\u5941\u6f4b\u6fc2\u5a08\u740f\u695d\u6b93\u81c1\u81a6\u88e2\u880a\u9ca2',
+    'liang': '\u7cae\u51c9\u6881\u7cb1\u826f\u4e24\u8f86\u91cf\u667e\u4eae\u8c05\u589a\u690b\u8e09\u9753\u9b49',
+    'liao': '\u64a9\u804a\u50da\u7597\u71ce\u5be5\u8fbd\u6f66\u4e86\u6482\u9563\u5ed6\u6599\u84fc\u5c25\u5639\u7360\u5bee\u7f2d\u948c\u9e69\u8022',
+    'lie': '\u5217\u88c2\u70c8\u52a3\u730e\u51bd\u57d2\u6d0c\u8d94\u8e90\u9b23',
+    'lin': '\u7433\u6797\u78f7\u9716\u4e34\u90bb\u9cde\u6dcb\u51db\u8d41\u541d\u853a\u5d99\u5eea\u9074\u6aa9\u8f9a\u77b5\u7cbc\u8e8f\u9e9f',
+    'liu': '\u6e9c\u7409\u69b4\u786b\u998f\u7559\u5218\u7624\u6d41\u67f3\u516d\u62a1\u507b\u848c\u6cd6\u6d4f\u905b\u9a9d\u7efa\u65d2\u7198\u950d\u954f\u9e68\u938f',
+    'long': '\u9f99\u804b\u5499\u7b3c\u7abf\u9686\u5784\u62e2\u9647\u5f04\u5785\u830f\u6cf7\u73d1\u680a\u80e7\u783b\u7643',
+    'lou': '\u697c\u5a04\u6402\u7bd3\u6f0f\u964b\u55bd\u5d5d\u9542\u7618\u8027\u877c\u9ac5',
+    'lu': '\u82a6\u5362\u9885\u5e90\u7089\u63b3\u5364\u864f\u9c81\u9e93\u788c\u9732\u8def\u8d42\u9e7f\u6f5e\u7984\u5f55\u9646\u622e\u5786\u6445\u64b8\u565c\u6cf8\u6e0c\u6f09\u7490\u680c\u6a79\u8f73\u8f82\u8f98\u6c07\u80ea\u9565\u9e2c\u9e6d\u7c0f\u823b\u9c88',
+    'lv': '\u9a74\u5415\u94dd\u4fa3\u65c5\u5c65\u5c61\u7f15\u8651\u6c2f\u5f8b\u7387\u6ee4\u7eff\u634b\u95fe\u6988\u8182\u7a06\u891b',
+    'luan': '\u5ce6\u5b6a\u6ee6\u5375\u4e71\u683e\u9e3e\u92ae',
+    'lue': '\u63a0\u7565\u950a',
+    'lun': '\u8f6e\u4f26\u4ed1\u6ca6\u7eb6\u8bba\u56f5',
+    'luo': '\u841d\u87ba\u7f57\u903b\u9523\u7ba9\u9aa1\u88f8\u843d\u6d1b\u9a86\u7edc\u502e\u8366\u645e\u7321\u6cfa\u6924\u8136\u9559\u7630\u96d2',
+    'ma': '\u5988\u9ebb\u739b\u7801\u8682\u9a6c\u9a82\u561b\u5417\u551b\u72b8\u5b37\u6769\u9ebd',
+    'mai': '\u57cb\u4e70\u9ea6\u5356\u8fc8\u8109\u52a2\u836c\u54aa\u973e',
+    'man': '\u7792\u9992\u86ee\u6ee1\u8513\u66fc\u6162\u6f2b\u8c29\u5881\u5e54\u7f26\u71b3\u9558\u989f\u87a8\u9cd7\u9794',
+    'mang': '\u8292\u832b\u76f2\u5fd9\u83bd\u9099\u6f2d\u6726\u786d\u87d2',
+    'meng': '\u6c13\u840c\u8499\u6aac\u76df\u9530\u731b\u68a6\u5b5f\u52d0\u750d\u77a2\u61f5\u791e\u867b\u8722\u8813\u824b\u8268\u9efe',
+    'miao': '\u732b\u82d7\u63cf\u7784\u85d0\u79d2\u6e3a\u5e99\u5999\u55b5\u9088\u7f08\u7f2a\u676a\u6dfc\u7707\u9e4b\u8731',
+    'mao': '\u8305\u951a\u6bdb\u77db\u94c6\u536f\u8302\u5192\u5e3d\u8c8c\u8d38\u4f94\u88a4\u52d6\u8306\u5cc1\u7441\u6634\u7266\u8004\u65c4\u61cb\u7780\u86d1\u8765\u87ca\u9ae6',
+    'me': '\u4e48',
+    'mei': '\u73ab\u679a\u6885\u9176\u9709\u7164\u6ca1\u7709\u5a92\u9541\u6bcf\u7f8e\u6627\u5bd0\u59b9\u5a9a\u5776\u8393\u5d4b\u7338\u6d7c\u6e44\u6963\u9545\u9e5b\u8882\u9b45',
+    'men': '\u95e8\u95f7\u4eec\u626a\u739f\u7116\u61d1\u9494',
+    'mi': '\u772f\u919a\u9761\u7cdc\u8ff7\u8c1c\u5f25\u7c73\u79d8\u89c5\u6ccc\u871c\u5bc6\u5e42\u8288\u5196\u8c27\u863c\u5627\u7315\u736f\u6c68\u5b93\u5f2d\u8112\u6549\u7cf8\u7e3b\u9e8b',
+    'mian': '\u68c9\u7720\u7ef5\u5195\u514d\u52c9\u5a29\u7f05\u9762\u6c94\u6e4e\u817c\u7704',
+    'mie': '\u8511\u706d\u54a9\u881b\u7bfe',
+    'min': '\u6c11\u62bf\u76bf\u654f\u60af\u95fd\u82e0\u5cb7\u95f5\u6cef\u73c9',
+    'ming': '\u660e\u879f\u9e23\u94ed\u540d\u547d\u51a5\u8317\u6e9f\u669d\u7791\u9169',
+    'miu': '\u8c2c',
+    'mo': '\u6478\u6479\u8611\u6a21\u819c\u78e8\u6469\u9b54\u62b9\u672b\u83ab\u58a8\u9ed8\u6cab\u6f20\u5bde\u964c\u8c1f\u8309\u84e6\u998d\u5aeb\u9546\u79e3\u763c\u8031\u87c6\u8c8a\u8c98',
+    'mou': '\u8c0b\u725f\u67d0\u53b6\u54de\u5a7a\u7738\u936a',
+    'mu': '\u62c7\u7261\u4ea9\u59c6\u6bcd\u5893\u66ae\u5e55\u52df\u6155\u6728\u76ee\u7766\u7267\u7a46\u4eeb\u82dc\u5452\u6c90\u6bea\u94bc',
+    'na': '\u62ff\u54ea\u5450\u94a0\u90a3\u5a1c\u7eb3\u5185\u637a\u80ad\u954e\u8872\u7bac',
+    'nai': '\u6c16\u4e43\u5976\u8010\u5948\u9f10\u827f\u8418\u67f0',
+    'nan': '\u5357\u7537\u96be\u56ca\u5583\u56e1\u6960\u8169\u877b\u8d67',
+    'nao': '\u6320\u8111\u607c\u95f9\u5b6c\u57b4\u7331\u7459\u7847\u94d9\u86f2',
+    'ne': '\u6dd6\u5462\u8bb7',
+    'nei': '\u9981',
+    'nen': '\u5ae9\u80fd\u6798\u6041',
+    'ni': '\u59ae\u9713\u502a\u6ce5\u5c3c\u62df\u4f60\u533f\u817b\u9006\u6eba\u4f32\u576d\u730a\u6029\u6ee0\u6635\u65ce\u7962\u615d\u7768\u94cc\u9cb5',
+    'nian': '\u852b\u62c8\u5e74\u78be\u64b5\u637b\u5ff5\u5eff\u8f87\u9ecf\u9c87\u9cb6',
+    'niang': '\u5a18\u917f',
+    'niao': '\u9e1f\u5c3f\u8311\u5b32\u8132\u8885',
+    'nie': '\u634f\u8042\u5b7d\u556e\u954a\u954d\u6d85\u4e5c\u9667\u8616\u55eb\u8080\u989e\u81ec\u8e51',
+    'nin': '\u60a8\u67e0',
+    'ning': '\u72de\u51dd\u5b81\u62e7\u6cde\u4f5e\u84e5\u549b\u752f\u804d',
+    'niu': '\u725b\u626d\u94ae\u7ebd\u72c3\u5ff8\u599e\u86b4',
+    'nong': '\u8113\u6d53\u519c\u4fac',
+    'nu': '\u5974\u52aa\u6012\u5476\u5e11\u5f29\u80ec\u5b65\u9a7d',
+    'nv': '\u5973\u6067\u9495\u8844',
+    'nuan': '\u6696',
+    'nuenue': '\u8650',
+    'nue': '\u759f\u8c11',
+    'nuo': '\u632a\u61e6\u7cef\u8bfa\u50a9\u6426\u558f\u9518',
+    'ou': '\u54e6\u6b27\u9e25\u6bb4\u85d5\u5455\u5076\u6ca4\u6004\u74ef\u8026',
+    'pa': '\u556a\u8db4\u722c\u5e15\u6015\u7436\u8469\u7b62',
+    'pai': '\u62cd\u6392\u724c\u5f98\u6e43\u6d3e\u4ff3\u848e',
+    'pan': '\u6500\u6f58\u76d8\u78d0\u76fc\u7554\u5224\u53db\u723f\u6cee\u88a2\u897b\u87e0\u8e52',
+    'pang': '\u4e53\u5e9e\u65c1\u802a\u80d6\u6ec2\u9004',
+    'pao': '\u629b\u5486\u5228\u70ae\u888d\u8dd1\u6ce1\u530f\u72cd\u5e96\u812c\u75b1',
+    'pei': '\u5478\u80da\u57f9\u88f4\u8d54\u966a\u914d\u4f69\u6c9b\u638a\u8f94\u5e14\u6de0\u65c6\u952b\u9185\u9708',
+    'pen': '\u55b7\u76c6\u6e53',
+    'peng': '\u7830\u62a8\u70f9\u6f8e\u5f6d\u84ec\u68da\u787c\u7bf7\u81a8\u670b\u9e4f\u6367\u78b0\u576f\u580b\u562d\u6026\u87db',
+    'pi': '\u7812\u9739\u6279\u62ab\u5288\u7435\u6bd7\u5564\u813e\u75b2\u76ae\u5339\u75de\u50fb\u5c41\u8b6c\u4e15\u9674\u90b3\u90eb\u572e\u9f19\u64d7\u567c\u5e80\u5ab2\u7eb0\u6787\u7513\u7765\u7f74\u94cd\u75e6\u7656\u758b\u868d\u8c94',
+    'pian': '\u7bc7\u504f\u7247\u9a97\u8c1d\u9a88\u728f\u80fc\u890a\u7fe9\u8e41',
+    'piao': '\u98d8\u6f02\u74e2\u7968\u527d\u560c\u5ad6\u7f25\u6b8d\u779f\u87b5',
+    'pie': '\u6487\u77a5\u4e3f\u82e4\u6c15',
+    'pin': '\u62fc\u9891\u8d2b\u54c1\u8058\u62da\u59d8\u5ad4\u6980\u725d\u98a6',
+    'ping': '\u4e52\u576a\u82f9\u840d\u5e73\u51ed\u74f6\u8bc4\u5c4f\u4fdc\u5a09\u67b0\u9c86',
+    'po': '\u5761\u6cfc\u9887\u5a46\u7834\u9b44\u8feb\u7c95\u53f5\u9131\u6ea5\u73c0\u948b\u94b7\u76a4\u7b38',
+    'pou': '\u5256\u88d2\u8e23',
+    'pu': '\u6251\u94fa\u4ec6\u8386\u8461\u83e9\u84b2\u57d4\u6734\u5703\u666e\u6d66\u8c31\u66dd\u7011\u530d\u5657\u6fee\u749e\u6c06\u9564\u9568\u8e7c',
+    'qi': '\u671f\u6b3a\u6816\u621a\u59bb\u4e03\u51c4\u6f06\u67d2\u6c8f\u5176\u68cb\u5947\u6b67\u7566\u5d0e\u8110\u9f50\u65d7\u7948\u7941\u9a91\u8d77\u5c82\u4e5e\u4f01\u542f\u5951\u780c\u5668\u6c14\u8fc4\u5f03\u6c7d\u6ce3\u8bab\u4e9f\u4e93\u573b\u8291\u840b\u847a\u5601\u5c7a\u5c90\u6c54\u6dc7\u9a90\u7eee\u742a\u7426\u675e\u6864\u69ed\u6b39\u797a\u61a9\u789b\u86f4\u871e\u7da6\u7dae\u8dbf\u8e4a\u9ccd\u9e92',
+    'qia': '\u6390\u6070\u6d3d\u845c',
+    'qian': '\u7275\u6266\u948e\u94c5\u5343\u8fc1\u7b7e\u4edf\u8c26\u4e7e\u9ed4\u94b1\u94b3\u524d\u6f5c\u9063\u6d45\u8c34\u5811\u5d4c\u6b20\u6b49\u4f65\u9621\u828a\u82a1\u8368\u63ae\u5c8d\u60ad\u614a\u9a9e\u6434\u8930\u7f31\u6920\u80b7\u6106\u94a4\u8654\u7b9d',
+    'qiang': '\u67aa\u545b\u8154\u7f8c\u5899\u8537\u5f3a\u62a2\u5af1\u6a2f\u6217\u709d\u9516\u9535\u956a\u8941\u8723\u7f9f\u8deb\u8dc4',
+    'qiao': '\u6a47\u9539\u6572\u6084\u6865\u77a7\u4e54\u4fa8\u5de7\u9798\u64ac\u7fd8\u5ced\u4fcf\u7a8d\u5281\u8bee\u8c2f\u835e\u6100\u6194\u7f32\u6a35\u6bf3\u7857\u8df7\u9792',
+    'qie': '\u5207\u8304\u4e14\u602f\u7a83\u90c4\u553c\u60ec\u59be\u6308\u9532\u7ba7',
+    'qin': '\u94a6\u4fb5\u4eb2\u79e6\u7434\u52e4\u82b9\u64d2\u79bd\u5bdd\u6c81\u82a9\u84c1\u8572\u63ff\u5423\u55ea\u5659\u6eb1\u6a8e\u8793\u887e',
+    'qing': '\u9752\u8f7b\u6c22\u503e\u537f\u6e05\u64ce\u6674\u6c30\u60c5\u9877\u8bf7\u5e86\u5029\u82d8\u570a\u6aa0\u78ec\u873b\u7f44\u7b90\u8b26\u9cad\u9ee5',
+    'qiong': '\u743c\u7a77\u909b\u8315\u7a79\u7b47\u928e',
+    'qiu': '\u79cb\u4e18\u90b1\u7403\u6c42\u56da\u914b\u6cc5\u4fc5\u6c3d\u5def\u827d\u72b0\u6e6b\u9011\u9052\u6978\u8d47\u9e20\u866c\u86af\u8764\u88d8\u7cd7\u9cc5\u9f3d',
+    'qu': '\u8d8b\u533a\u86c6\u66f2\u8eaf\u5c48\u9a71\u6e20\u53d6\u5a36\u9f8b\u8da3\u53bb\u8bce\u52ac\u8556\u8627\u5c96\u8862\u9612\u74a9\u89d1\u6c0d\u795b\u78f2\u766f\u86d0\u883c\u9eb4\u77bf\u9ee2',
+    'quan': '\u5708\u98a7\u6743\u919b\u6cc9\u5168\u75ca\u62f3\u72ac\u5238\u529d\u8be0\u8343\u737e\u609b\u7efb\u8f81\u754e\u94e8\u8737\u7b4c\u9b08',
+    'que': '\u7f3a\u7094\u7638\u5374\u9e4a\u69b7\u786e\u96c0\u9619\u60ab',
+    'qun': '\u88d9\u7fa4\u9021',
+    'ran': '\u7136\u71c3\u5189\u67d3\u82d2\u9aef',
+    'rang': '\u74e4\u58e4\u6518\u56b7\u8ba9\u79b3\u7a70',
+    'rao': '\u9976\u6270\u7ed5\u835b\u5a06\u6861',
+    'ruo': '\u60f9\u82e5\u5f31',
+    're': '\u70ed\u504c',
+    'ren': '\u58ec\u4ec1\u4eba\u5fcd\u97e7\u4efb\u8ba4\u5203\u598a\u7eab\u4ede\u834f\u845a\u996a\u8f6b\u7a14\u887d',
+    'reng': '\u6254\u4ecd',
+    'ri': '\u65e5',
+    'rong': '\u620e\u8338\u84c9\u8363\u878d\u7194\u6eb6\u5bb9\u7ed2\u5197\u5d58\u72e8\u7f1b\u6995\u877e',
+    'rou': '\u63c9\u67d4\u8089\u7cc5\u8e42\u97a3',
+    'ru': '\u8339\u8815\u5112\u5b7a\u5982\u8fb1\u4e73\u6c5d\u5165\u8925\u84d0\u85b7\u5685\u6d33\u6ebd\u6fe1\u94f7\u8966\u98a5',
+    'ruan': '\u8f6f\u962e\u670a',
+    'rui': '\u854a\u745e\u9510\u82ae\u8564\u777f\u868b',
+    'run': '\u95f0\u6da6',
+    'sa': '\u6492\u6d12\u8428\u5345\u4ee8\u6332\u98d2',
+    'sai': '\u816e\u9cc3\u585e\u8d5b\u567b',
+    'san': '\u4e09\u53c1\u4f1e\u6563\u5f61\u9993\u6c35\u6bf5\u7cc1\u9730',
+    'sang': '\u6851\u55d3\u4e27\u6421\u78c9\u98a1',
+    'sao': '\u6414\u9a9a\u626b\u5ac2\u57fd\u81ca\u7619\u9ccb',
+    'se': '\u745f\u8272\u6da9\u556c\u94e9\u94ef\u7a51',
+    'sen': '\u68ee',
+    'seng': '\u50e7',
+    'sha': '\u838e\u7802\u6740\u5239\u6c99\u7eb1\u50bb\u5565\u715e\u810e\u6b43\u75e7\u88df\u970e\u9ca8',
+    'shai': '\u7b5b\u6652\u917e',
+    'shan': '\u73ca\u82eb\u6749\u5c71\u5220\u717d\u886b\u95ea\u9655\u64c5\u8d61\u81b3\u5584\u6c55\u6247\u7f2e\u5261\u8baa\u912f\u57cf\u829f\u6f78\u59d7\u9a9f\u81bb\u9490\u759d\u87ee\u8222\u8dda\u9cdd',
+    'shang': '\u5892\u4f24\u5546\u8d4f\u664c\u4e0a\u5c1a\u88f3\u57a7\u7ef1\u6b87\u71b5\u89de',
+    'shao': '\u68a2\u634e\u7a0d\u70e7\u828d\u52fa\u97f6\u5c11\u54e8\u90b5\u7ecd\u52ad\u82d5\u6f72\u86f8\u7b24\u7b72\u8244',
+    'she': '\u5962\u8d4a\u86c7\u820c\u820d\u8d66\u6444\u5c04\u6151\u6d89\u793e\u8bbe\u538d\u4f58\u731e\u7572\u9e9d',
+    'shen': '\u7837\u7533\u547b\u4f38\u8eab\u6df1\u5a20\u7ec5\u795e\u6c88\u5ba1\u5a76\u751a\u80be\u614e\u6e17\u8bdc\u8c02\u5432\u54c2\u6e16\u6939\u77e7\u8703',
+    'sheng': '\u58f0\u751f\u7525\u7272\u5347\u7ef3\u7701\u76db\u5269\u80dc\u5723\u4e1e\u6e11\u5ab5\u771a\u7b19',
+    'shi': '\u5e08\u5931\u72ee\u65bd\u6e7f\u8bd7\u5c38\u8671\u5341\u77f3\u62fe\u65f6\u4ec0\u98df\u8680\u5b9e\u8bc6\u53f2\u77e2\u4f7f\u5c4e\u9a76\u59cb\u5f0f\u793a\u58eb\u4e16\u67ff\u4e8b\u62ed\u8a93\u901d\u52bf\u662f\u55dc\u566c\u9002\u4ed5\u4f8d\u91ca\u9970\u6c0f\u5e02\u6043\u5ba4\u89c6\u8bd5\u8c25\u57d8\u83b3\u84cd\u5f11\u5511\u9963\u8f7c\u8006\u8d33\u70bb\u793b\u94c8\u94ca\u87ab\u8210\u7b6e\u8c55\u9ca5\u9cba',
+    'shou': '\u6536\u624b\u9996\u5b88\u5bff\u6388\u552e\u53d7\u7626\u517d\u624c\u72e9\u7ef6\u824f',
+    'shu': '\u852c\u67a2\u68b3\u6b8a\u6292\u8f93\u53d4\u8212\u6dd1\u758f\u4e66\u8d4e\u5b70\u719f\u85af\u6691\u66d9\u7f72\u8700\u9ecd\u9f20\u5c5e\u672f\u8ff0\u6811\u675f\u620d\u7ad6\u5885\u5eb6\u6570\u6f31\u6055\u500f\u587e\u83fd\u5fc4\u6cad\u6d91\u6f8d\u59dd\u7ebe\u6bf9\u8167\u6bb3\u956f\u79eb\u9e6c',
+    'shua': '\u5237\u800d\u5530\u6dae',
+    'shuai': '\u6454\u8870\u7529\u5e05\u87c0',
+    'shuan': '\u6813\u62f4\u95e9',
+    'shuang': '\u971c\u53cc\u723d\u5b40',
+    'shui': '\u8c01\u6c34\u7761\u7a0e',
+    'shun': '\u542e\u77ac\u987a\u821c\u6042',
+    'shuo': '\u8bf4\u7855\u6714\u70c1\u84b4\u6420\u55cd\u6fef\u5981\u69ca\u94c4',
+    'si': '\u65af\u6495\u5636\u601d\u79c1\u53f8\u4e1d\u6b7b\u8086\u5bfa\u55e3\u56db\u4f3a\u4f3c\u9972\u5df3\u53ae\u4fdf\u5155\u83e5\u549d\u6c5c\u6cd7\u6f8c\u59d2\u9a77\u7f0c\u7940\u7960\u9536\u9e36\u801c\u86f3\u7b25',
+    'song': '\u677e\u8038\u6002\u9882\u9001\u5b8b\u8bbc\u8bf5\u51c7\u83d8\u5d27\u5d69\u5fea\u609a\u6dde\u7ae6',
+    'sou': '\u641c\u8258\u64de\u55fd\u53df\u55d6\u55fe\u998a\u6eb2\u98d5\u778d\u953c\u878b',
+    'su': '\u82cf\u9165\u4fd7\u7d20\u901f\u7c9f\u50f3\u5851\u6eaf\u5bbf\u8bc9\u8083\u5919\u8c21\u850c\u55c9\u612b\u7c0c\u89eb\u7a23',
+    'suan': '\u9178\u849c\u7b97',
+    'sui': '\u867d\u968b\u968f\u7ee5\u9ad3\u788e\u5c81\u7a57\u9042\u96a7\u795f\u84d1\u51ab\u8c07\u6fc9\u9083\u71e7\u772d\u7762',
+    'sun': '\u5b59\u635f\u7b0b\u836a\u72f2\u98e7\u69ab\u8de3\u96bc',
+    'suo': '\u68ad\u5506\u7f29\u7410\u7d22\u9501\u6240\u5522\u55e6\u5a11\u686b\u7743\u7fa7',
+    'ta': '\u584c\u4ed6\u5b83\u5979\u5854\u736d\u631e\u8e4b\u8e0f\u95fc\u6ebb\u9062\u69bb\u6c93',
+    'tai': '\u80ce\u82d4\u62ac\u53f0\u6cf0\u915e\u592a\u6001\u6c70\u90b0\u85b9\u80bd\u70b1\u949b\u8dc6\u9c90',
+    'tan': '\u574d\u644a\u8d2a\u762b\u6ee9\u575b\u6a80\u75f0\u6f6d\u8c2d\u8c08\u5766\u6bef\u8892\u78b3\u63a2\u53f9\u70ad\u90ef\u8548\u6619\u94bd\u952c\u8983',
+    'tang': '\u6c64\u5858\u642a\u5802\u68e0\u819b\u5510\u7cd6\u50a5\u9967\u6e8f\u746d\u94f4\u9557\u8025\u8797\u87b3\u7fb0\u91a3',
+    'thang': '\u5018\u8eba\u6dcc',
+    'theng': '\u8d9f\u70eb',
+    'tao': '\u638f\u6d9b\u6ed4\u7ee6\u8404\u6843\u9003\u6dd8\u9676\u8ba8\u5957\u6311\u9f17\u5555\u97ec\u9955',
+    'te': '\u7279',
+    'teng': '\u85e4\u817e\u75bc\u8a8a\u6ed5',
+    'ti': '\u68af\u5254\u8e22\u9511\u63d0\u9898\u8e44\u557c\u4f53\u66ff\u568f\u60d5\u6d95\u5243\u5c49\u8351\u608c\u9016\u7ee8\u7f07\u9e48\u88fc\u918d',
+    'tian': '\u5929\u6dfb\u586b\u7530\u751c\u606c\u8214\u8146\u63ad\u5fdd\u9617\u6b84\u754b\u94bf\u86ba',
+    'tiao': '\u6761\u8fe2\u773a\u8df3\u4f7b\u7967\u94eb\u7a95\u9f86\u9ca6',
+    'tie': '\u8d34\u94c1\u5e16\u841c\u992e',
+    'ting': '\u5385\u542c\u70c3\u6c40\u5ef7\u505c\u4ead\u5ead\u633a\u8247\u839b\u8476\u5a77\u6883\u8713\u9706',
+    'tong': '\u901a\u6850\u916e\u77b3\u540c\u94dc\u5f64\u7ae5\u6876\u6345\u7b52\u7edf\u75db\u4f5f\u50ee\u4edd\u833c\u55f5\u6078\u6f7c\u783c',
+    'tou': '\u5077\u6295\u5934\u900f\u4ea0',
+    'tu': '\u51f8\u79c3\u7a81\u56fe\u5f92\u9014\u6d82\u5c60\u571f\u5410\u5154\u580d\u837c\u83df\u948d\u9174',
+    'tuan': '\u6e4d\u56e2\u7583',
+    'tui': '\u63a8\u9893\u817f\u8715\u892a\u9000\u5fd2\u717a',
+    'tun': '\u541e\u5c6f\u81c0\u9968\u66be\u8c5a\u7a80',
+    'tuo': '\u62d6\u6258\u8131\u9e35\u9640\u9a6e\u9a7c\u692d\u59a5\u62d3\u553e\u4e47\u4f57\u5768\u5eb9\u6cb1\u67dd\u7823\u7ba8\u8204\u8dce\u9f0d',
+    'wa': '\u6316\u54c7\u86d9\u6d3c\u5a03\u74e6\u889c\u4f64\u5a32\u817d',
+    'wai': '\u6b6a\u5916',
+    'wan': '\u8c4c\u5f2f\u6e7e\u73a9\u987d\u4e38\u70f7\u5b8c\u7897\u633d\u665a\u7696\u60cb\u5b9b\u5a49\u4e07\u8155\u525c\u8284\u82cb\u83c0\u7ea8\u7efe\u742c\u8118\u7579\u873f\u7ba2',
+    'wang': '\u6c6a\u738b\u4ea1\u6789\u7f51\u5f80\u65fa\u671b\u5fd8\u5984\u7f54\u5c22\u60d8\u8f8b\u9b4d',
+    'wei': '\u5a01\u5dcd\u5fae\u5371\u97e6\u8fdd\u6845\u56f4\u552f\u60df\u4e3a\u6f4d\u7ef4\u82c7\u840e\u59d4\u4f1f\u4f2a\u5c3e\u7eac\u672a\u851a\u5473\u754f\u80c3\u5582\u9b4f\u4f4d\u6e2d\u8c13\u5c09\u6170\u536b\u502d\u504e\u8bff\u9688\u8473\u8587\u5e0f\u5e37\u5d34\u5d6c\u7325\u732c\u95f1\u6ca9\u6d27\u6da0\u9036\u5a13\u73ae\u97ea\u8ece\u709c\u7168\u71a8\u75ff\u8249\u9c94',
+    'wen': '\u761f\u6e29\u868a\u6587\u95fb\u7eb9\u543b\u7a33\u7d0a\u95ee\u520e\u6120\u960c\u6c76\u74ba\u97eb\u6b81\u96ef',
+    'weng': '\u55e1\u7fc1\u74ee\u84ca\u8579',
+    'wo': '\u631d\u8717\u6da1\u7a9d\u6211\u65a1\u5367\u63e1\u6c83\u83b4\u5e44\u6e25\u674c\u809f\u9f8c',
+    'wu': '\u5deb\u545c\u94a8\u4e4c\u6c61\u8bec\u5c4b\u65e0\u829c\u68a7\u543e\u5434\u6bcb\u6b66\u4e94\u6342\u5348\u821e\u4f0d\u4fae\u575e\u620a\u96fe\u6664\u7269\u52ff\u52a1\u609f\u8bef\u5140\u4ef5\u9622\u90ac\u572c\u82b4\u5e91\u6003\u5fe4\u6d6f\u5be4\u8fd5\u59a9\u9a9b\u727e\u7110\u9e49\u9e5c\u8708\u92c8\u9f2f',
+    'xi': '\u6614\u7199\u6790\u897f\u7852\u77fd\u6670\u563b\u5438\u9521\u727a\u7a00\u606f\u5e0c\u6089\u819d\u5915\u60dc\u7184\u70ef\u6eaa\u6c50\u7280\u6a84\u88ad\u5e2d\u4e60\u5ab3\u559c\u94e3\u6d17\u7cfb\u9699\u620f\u7ec6\u50d6\u516e\u96b0\u90d7\u831c\u8478\u84f0\u595a\u550f\u5f99\u9969\u960b\u6d60\u6dc5\u5c63\u5b09\u73ba\u6a28\u66e6\u89cb\u6b37\u71b9\u798a\u79a7\u94b8\u7699\u7a78\u8725\u87cb\u823e\u7fb2\u7c9e\u7fd5\u91af\u9f37',
+    'xia': '\u778e\u867e\u5323\u971e\u8f96\u6687\u5ce1\u4fa0\u72ed\u4e0b\u53a6\u590f\u5413\u6380\u846d\u55c4\u72ce\u9050\u7455\u7856\u7615\u7f45\u9ee0',
+    'xian': '\u9528\u5148\u4ed9\u9c9c\u7ea4\u54b8\u8d24\u8854\u8237\u95f2\u6d8e\u5f26\u5acc\u663e\u9669\u73b0\u732e\u53bf\u817a\u9985\u7fa1\u5baa\u9677\u9650\u7ebf\u51bc\u85d3\u5c98\u7303\u66b9\u5a34\u6c19\u7946\u9e47\u75eb\u86ac\u7b45\u7c7c\u9170\u8df9',
+    'xiang': '\u76f8\u53a2\u9576\u9999\u7bb1\u8944\u6e58\u4e61\u7fd4\u7965\u8be6\u60f3\u54cd\u4eab\u9879\u5df7\u6a61\u50cf\u5411\u8c61\u8297\u8459\u9977\u5ea0\u9aa7\u7f03\u87d3\u9c9e\u98e8',
+    'xiao': '\u8427\u785d\u9704\u524a\u54ee\u56a3\u9500\u6d88\u5bb5\u6dc6\u6653\u5c0f\u5b5d\u6821\u8096\u5578\u7b11\u6548\u54d3\u54bb\u5d24\u6f47\u900d\u9a81\u7ee1\u67ad\u67b5\u7b71\u7bab\u9b48',
+    'xie': '\u6954\u4e9b\u6b47\u874e\u978b\u534f\u631f\u643a\u90aa\u659c\u80c1\u8c10\u5199\u68b0\u5378\u87f9\u61c8\u6cc4\u6cfb\u8c22\u5c51\u5055\u4eb5\u52f0\u71ee\u85a4\u64b7\u5ee8\u7023\u9082\u7ec1\u7f2c\u69ad\u698d\u6b59\u8e9e',
+    'xin': '\u85aa\u82af\u950c\u6b23\u8f9b\u65b0\u5ffb\u5fc3\u4fe1\u8845\u56df\u99a8\u8398\u6b46\u94fd\u946b',
+    'xing': '\u661f\u8165\u7329\u60fa\u5174\u5211\u578b\u5f62\u90a2\u884c\u9192\u5e78\u674f\u6027\u59d3\u9649\u8347\u8365\u64e4\u60bb\u784e',
+    'xiong': '\u5144\u51f6\u80f8\u5308\u6c79\u96c4\u718a\u828e',
+    'xiu': '\u4f11\u4fee\u7f9e\u673d\u55c5\u9508\u79c0\u8896\u7ee3\u83a0\u5cab\u9990\u5ea5\u9e3a\u8c85\u9af9',
+    'xu': '\u589f\u620c\u9700\u865a\u5618\u987b\u5f90\u8bb8\u84c4\u9157\u53d9\u65ed\u5e8f\u755c\u6064\u7d6e\u5a7f\u7eea\u7eed\u8bb4\u8be9\u5729\u84ff\u6035\u6d2b\u6e86\u987c\u6829\u7166\u7809\u76f1\u80e5\u7cc8\u9191',
+    'xuan': '\u8f69\u55a7\u5ba3\u60ac\u65cb\u7384\u9009\u7663\u7729\u7eda\u5107\u8c16\u8431\u63ce\u9994\u6ceb\u6d35\u6e32\u6f29\u7487\u6966\u6684\u70ab\u714a\u78b9\u94c9\u955f\u75c3',
+    'xue': '\u9774\u859b\u5b66\u7a74\u96ea\u8840\u5671\u6cf6\u9cd5',
+    'xun': '\u52cb\u718f\u5faa\u65ec\u8be2\u5bfb\u9a6f\u5de1\u6b89\u6c5b\u8bad\u8baf\u900a\u8fc5\u5dfd\u57d9\u8340\u85b0\u5ccb\u5f87\u6d54\u66db\u7aa8\u91ba\u9c9f',
+    'ya': '\u538b\u62bc\u9e26\u9e2d\u5440\u4e2b\u82bd\u7259\u869c\u5d16\u8859\u6daf\u96c5\u54d1\u4e9a\u8bb6\u4f22\u63e0\u5416\u5c88\u8fd3\u5a05\u740a\u6860\u6c29\u7811\u775a\u75d6',
+    'yan': '\u7109\u54bd\u9609\u70df\u6df9\u76d0\u4e25\u7814\u8712\u5ca9\u5ef6\u8a00\u989c\u960e\u708e\u6cbf\u5944\u63a9\u773c\u884d\u6f14\u8273\u5830\u71d5\u538c\u781a\u96c1\u5501\u5f66\u7130\u5bb4\u8c1a\u9a8c\u53a3\u9765\u8d5d\u4fe8\u5043\u5156\u8ba0\u8c33\u90fe\u9122\u82ab\u83f8\u5d26\u6079\u95eb\u960f\u6d07\u6e6e\u6edf\u598d\u5ae3\u7430\u664f\u80ed\u814c\u7131\u7f68\u7b75\u917d\u9b47\u990d\u9f39',
+    'yang': '\u6b83\u592e\u9e2f\u79e7\u6768\u626c\u4f6f\u75a1\u7f8a\u6d0b\u9633\u6c27\u4ef0\u75d2\u517b\u6837\u6f3e\u5f89\u600f\u6cf1\u7080\u70ca\u6059\u86d8\u9785',
+    'yao': '\u9080\u8170\u5996\u7476\u6447\u5c27\u9065\u7a91\u8c23\u59da\u54ac\u8200\u836f\u8981\u8000\u592d\u723b\u5406\u5d3e\u5fad\u7039\u5e7a\u73e7\u6773\u66dc\u80b4\u9e5e\u7a88\u7e47\u9cd0',
+    'ye': '\u6930\u564e\u8036\u7237\u91ce\u51b6\u4e5f\u9875\u6396\u4e1a\u53f6\u66f3\u814b\u591c\u6db2\u8c12\u90ba\u63f6\u9980\u6654\u70e8\u94d8',
+    'yi': '\u4e00\u58f9\u533b\u63d6\u94f1\u4f9d\u4f0a\u8863\u9890\u5937\u9057\u79fb\u4eea\u80f0\u7591\u6c82\u5b9c\u59e8\u5f5d\u6905\u8681\u501a\u5df2\u4e59\u77e3\u4ee5\u827a\u6291\u6613\u9091\u5c79\u4ebf\u5f79\u81c6\u9038\u8084\u75ab\u4ea6\u88d4\u610f\u6bc5\u5fc6\u4e49\u76ca\u6ea2\u8be3\u8bae\u8c0a\u8bd1\u5f02\u7ffc\u7fcc\u7ece\u5208\u5293\u4f7e\u8bd2\u572a\u572f\u57f8\u61ff\u82e1\u858f\u5f08\u5955\u6339\u5f0b\u5453\u54a6\u54bf\u566b\u5cc4\u5db7\u7317\u9974\u603f\u6021\u6092\u6f2a\u8fe4\u9a7f\u7f22\u6baa\u8d3b\u65d6\u71a0\u9487\u9552\u9571\u75cd\u7617\u7654\u7fca\u8864\u8734\u8223\u7fbf\u7ff3\u914f\u9edf',
+    'yin': '\u8335\u836b\u56e0\u6bb7\u97f3\u9634\u59fb\u541f\u94f6\u6deb\u5bc5\u996e\u5c39\u5f15\u9690\u5370\u80e4\u911e\u5819\u831a\u5591\u72fa\u5924\u6c24\u94df\u763e\u8693\u972a\u9f88',
+    'ying': '\u82f1\u6a31\u5a74\u9e70\u5e94\u7f28\u83b9\u8424\u8425\u8367\u8747\u8fce\u8d62\u76c8\u5f71\u9896\u786c\u6620\u5b34\u90e2\u8314\u83ba\u8426\u6484\u5624\u81ba\u6ee2\u6f46\u701b\u745b\u748e\u6979\u9e66\u763f\u988d\u7f42',
+    'yo': '\u54df\u5537',
+    'yong': '\u62e5\u4f63\u81c3\u75c8\u5eb8\u96cd\u8e0a\u86f9\u548f\u6cf3\u6d8c\u6c38\u607f\u52c7\u7528\u4fd1\u58c5\u5889\u6175\u9095\u955b\u752c\u9cd9\u9954',
+    'you': '\u5e7d\u4f18\u60a0\u5fe7\u5c24\u7531\u90ae\u94c0\u72b9\u6cb9\u6e38\u9149\u6709\u53cb\u53f3\u4f51\u91c9\u8bf1\u53c8\u5e7c\u5363\u6538\u4f91\u83b8\u5466\u56ff\u5ba5\u67da\u7337\u7256\u94d5\u75a3\u8763\u9c7f\u9edd\u9f2c',
+    'yu': '\u8fc2\u6de4\u4e8e\u76c2\u6986\u865e\u611a\u8206\u4f59\u4fde\u903e\u9c7c\u6109\u6e1d\u6e14\u9685\u4e88\u5a31\u96e8\u4e0e\u5c7f\u79b9\u5b87\u8bed\u7fbd\u7389\u57df\u828b\u90c1\u5401\u9047\u55bb\u5cea\u5fa1\u6108\u6b32\u72f1\u80b2\u8a89\u6d74\u5bd3\u88d5\u9884\u8c6b\u9a6d\u79ba\u6bd3\u4f1b\u4fe3\u8c00\u8c15\u8438\u84e3\u63c4\u5581\u5704\u5709\u5d5b\u72f3\u996b\u5ebe\u9608\u59aa\u59a4\u7ea1\u745c\u6631\u89ce\u8174\u6b24\u65bc\u715c\u71e0\u807f\u94b0\u9e46\u7610\u7600\u7ab3\u8753\u7afd\u8201\u96e9\u9f89',
+    'yuan': '\u9e33\u6e0a\u51a4\u5143\u57a3\u8881\u539f\u63f4\u8f95\u56ed\u5458\u5706\u733f\u6e90\u7f18\u8fdc\u82d1\u613f\u6028\u9662\u586c\u6c85\u5a9b\u7457\u6a7c\u7230\u7722\u9e22\u8788\u9f0b',
+    'yue': '\u66f0\u7ea6\u8d8a\u8dc3\u94a5\u5cb3\u7ca4\u6708\u60a6\u9605\u9fa0\u6a3e\u5216\u94ba',
+    'yun': '\u8018\u4e91\u90e7\u5300\u9668\u5141\u8fd0\u8574\u915d\u6655\u97f5\u5b55\u90d3\u82b8\u72c1\u607d\u7ead\u6b92\u6600\u6c32',
+    'za': '\u531d\u7838\u6742\u62f6\u5482',
+    'zai': '\u683d\u54c9\u707e\u5bb0\u8f7d\u518d\u5728\u54b1\u5d3d\u753e',
+    'zan': '\u6512\u6682\u8d5e\u74d2\u661d\u7c2a\u7ccc\u8db1\u933e',
+    'zang': '\u8d43\u810f\u846c\u5958\u6215\u81e7',
+    'zao': '\u906d\u7cdf\u51ff\u85fb\u67a3\u65e9\u6fa1\u86a4\u8e81\u566a\u9020\u7682\u7076\u71e5\u5523\u7f2b',
+    'ze': '\u8d23\u62e9\u5219\u6cfd\u4ec4\u8d5c\u5567\u8fee\u6603\u7b2e\u7ba6\u8234',
+    'zei': '\u8d3c',
+    'zen': '\u600e\u8c2e',
+    'zeng': '\u589e\u618e\u66fe\u8d60\u7f2f\u7511\u7f7e\u9503',
+    'zha': '\u624e\u55b3\u6e23\u672d\u8f67\u94e1\u95f8\u7728\u6805\u69a8\u548b\u4e4d\u70b8\u8bc8\u63f8\u5412\u54a4\u54f3\u600d\u781f\u75c4\u86b1\u9f44',
+    'zhai': '\u6458\u658b\u5b85\u7a84\u503a\u5be8\u7826',
+    'zhan': '\u77bb\u6be1\u8a79\u7c98\u6cbe\u76cf\u65a9\u8f97\u5d2d\u5c55\u8638\u6808\u5360\u6218\u7ad9\u6e5b\u7efd\u8c35\u640c\u65c3',
+    'zhang': '\u6a1f\u7ae0\u5f70\u6f33\u5f20\u638c\u6da8\u6756\u4e08\u5e10\u8d26\u4ed7\u80c0\u7634\u969c\u4ec9\u9123\u5e5b\u5d82\u7350\u5adc\u748b\u87d1',
+    'zhao': '\u62db\u662d\u627e\u6cbc\u8d75\u7167\u7f69\u5146\u8087\u53ec\u722a\u8bcf\u68f9\u948a\u7b0a',
+    'zhe': '\u906e\u6298\u54f2\u86f0\u8f99\u8005\u9517\u8517\u8fd9\u6d59\u8c2a\u966c\u67d8\u8f84\u78d4\u9e67\u891a\u8707\u8d6d',
+    'zhen': '\u73cd\u659f\u771f\u7504\u7827\u81fb\u8d1e\u9488\u4fa6\u6795\u75b9\u8bca\u9707\u632f\u9547\u9635\u7f1c\u6862\u699b\u8f78\u8d48\u80d7\u6715\u796f\u755b\u9e29',
+    'zheng': '\u84b8\u6323\u7741\u5f81\u72f0\u4e89\u6014\u6574\u62ef\u6b63\u653f\u5e27\u75c7\u90d1\u8bc1\u8be4\u5ce5\u94b2\u94ee\u7b5d',
+    'zhi': '\u829d\u679d\u652f\u5431\u8718\u77e5\u80a2\u8102\u6c41\u4e4b\u7ec7\u804c\u76f4\u690d\u6b96\u6267\u503c\u4f84\u5740\u6307\u6b62\u8dbe\u53ea\u65e8\u7eb8\u5fd7\u631a\u63b7\u81f3\u81f4\u7f6e\u5e1c\u5cd9\u5236\u667a\u79e9\u7a1a\u8d28\u7099\u75d4\u6ede\u6cbb\u7a92\u536e\u965f\u90c5\u57f4\u82b7\u646d\u5e19\u5fee\u5f58\u54ab\u9a98\u6809\u67b3\u6800\u684e\u8f75\u8f7e\u6534\u8d3d\u81a3\u7949\u7957\u9ef9\u96c9\u9e37\u75e3\u86ed\u7d77\u916f\u8dd6\u8e2c\u8e2f\u8c78\u89ef',
+    'zhong': '\u4e2d\u76c5\u5fe0\u949f\u8877\u7ec8\u79cd\u80bf\u91cd\u4ef2\u4f17\u51a2\u953a\u87bd\u8202\u822f\u8e35',
+    'zhou': '\u821f\u5468\u5dde\u6d32\u8bcc\u7ca5\u8f74\u8098\u5e1a\u5492\u76b1\u5b99\u663c\u9aa4\u5544\u7740\u501c\u8bf9\u836e\u9b3b\u7ea3\u80c4\u78a1\u7c40\u8233\u914e\u9cb7',
+    'zhu': '\u73e0\u682a\u86db\u6731\u732a\u8bf8\u8bdb\u9010\u7af9\u70db\u716e\u62c4\u77a9\u5631\u4e3b\u8457\u67f1\u52a9\u86c0\u8d2e\u94f8\u7b51\u4f4f\u6ce8\u795d\u9a7b\u4f2b\u4f8f\u90be\u82ce\u8331\u6d19\u6e1a\u6f74\u9a7a\u677c\u69e0\u6a65\u70b7\u94e2\u75b0\u7603\u86b0\u7afa\u7bb8\u7fe5\u8e85\u9e88',
+    'zhua': '\u6293',
+    'zhuai': '\u62fd',
+    'zhuan': '\u4e13\u7816\u8f6c\u64b0\u8d5a\u7bc6\u629f\u556d\u989b',
+    'zhuang': '\u6869\u5e84\u88c5\u5986\u649e\u58ee\u72b6\u4e2c',
+    'zhui': '\u690e\u9525\u8ffd\u8d58\u5760\u7f00\u8411\u9a93\u7f12',
+    'zhun': '\u8c06\u51c6',
+    'zhuo': '\u6349\u62d9\u5353\u684c\u7422\u8301\u914c\u707c\u6d4a\u502c\u8bfc\u5ef4\u855e\u64e2\u555c\u6d5e\u6dbf\u6753\u712f\u799a\u65ab',
+    'zi': '\u5179\u54a8\u8d44\u59ff\u6ecb\u6dc4\u5b5c\u7d2b\u4ed4\u7c7d\u6ed3\u5b50\u81ea\u6e0d\u5b57\u8c18\u5d6b\u59ca\u5b73\u7f01\u6893\u8f8e\u8d40\u6063\u7726\u9531\u79ed\u8014\u7b2b\u7ca2\u89dc\u8a3e\u9cbb\u9aed',
+    'zong': '\u9b03\u68d5\u8e2a\u5b97\u7efc\u603b\u7eb5\u8159\u7cbd',
+    'zou': '\u90b9\u8d70\u594f\u63cd\u9139\u9cb0',
+    'zu': '\u79df\u8db3\u5352\u65cf\u7956\u8bc5\u963b\u7ec4\u4fce\u83f9\u5550\u5f82\u9a75\u8e74',
+    'zuan': '\u94bb\u7e82\u6525\u7f35',
+    'zui': '\u5634\u9189\u6700\u7f6a',
+    'zun': '\u5c0a\u9075\u6499\u6a3d\u9cdf',
+    'zuo': '\u6628\u5de6\u4f50\u67de\u505a\u4f5c\u5750\u5ea7\u961d\u963c\u80d9\u795a\u9162',
+    'cou': '\u85ae\u6971\u8f8f\u8160',
+    'nang': '\u652e\u54dd\u56d4\u9995\u66e9',
+    'o': '\u5594',
+    'dia': '\u55f2',
+    'chuai': '\u562c\u81aa\u8e39',
+    'cen': '\u5c91\u6d94',
+    'diu': '\u94e5',
+    'nou': '\u8028',
+    'fou': '\u7f36',
+    'bia': '\u9adf'
+};
\ No newline at end of file
diff --git a/wxcomponents/email-popup/email-popup.vue b/wxcomponents/email-popup/email-popup.vue
index 9f6235f..1d8364e 100644
--- a/wxcomponents/email-popup/email-popup.vue
+++ b/wxcomponents/email-popup/email-popup.vue
@@ -6,9 +6,9 @@
         <text class="close" @tap="onClose">关闭</text>
         <text class="title">客服邮箱</text>
       </view>
-      <view class="email-content" @tap="copyEmail">
+      <view class="email-content" >
         <text>hanhaihuishouhf@hh.com</text>
-        <uni-icons type="email" size="23" class="copy-icon"></uni-icons>
+        <uni-icons type="email" size="23" class="copy-icon" @tap="copyEmail"></uni-icons>
       </view>
     </view>
   </view>
@@ -28,15 +28,7 @@ export default {
       this.$emit('close')
     },
     copyEmail() {
-      uni.setClipboardData({
-        data: 'hanhaihuishouhf@hh.com',
-        success: () => {
-          uni.showToast({
-            title: '邮箱已复制',
-            icon: 'success'
-          })
-        }
-      })
+    this.$emit('copyEmail')
     }
   }
 }