diff --git a/App.vue b/App.vue
index 76b2937..839c098 100644
--- a/App.vue
+++ b/App.vue
@@ -1,7 +1,32 @@
+<template>
+	<view v-if="!globalDataLoaded" class="global-loading">
+		<view class="loading-container">
+			<view class="loading-logo">
+				<image src="/static/回收/衣物.png" mode="aspectFit" class="logo-img" />
+			</view>
+			<view class="loading-spinner">
+				<view class="spinner"></view>
+			</view>
+			<text class="loading-text">正在加载...</text>
+			<view class="loading-progress">
+				<view class="progress-bar" :style="{width: loadingProgress + '%'}"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
 <script>
 	import routerInterception from '@/utils/router-interception.js'
 	import config from  '/config.js'
 	export default {
+		data() {
+			return {
+				globalDataLoaded: false,
+				loadingProgress: 0,
+				loadedCount: 0,
+				totalRequests: 4 // 总共需要加载的请求数量
+			}
+		},
 		globalData: {
 			flag: 1,
 			login_status: true,
@@ -9,69 +34,150 @@
 			bannerList: [],
 			pricePreviewList: [],
 			configData: [],
-			qr_path: ''
+			qr_path: '',
+			isAppDataReady: false // 新增标志位
 		},
 		onLaunch: function() {
 			routerInterception()
-			this.getBannerList()
-			this.getPricePreviewList()
-			this.getConfigData()
-			this.getQrCode()
-			// console.log(this.$utils)
+			this.initializeAppData()
 			console.log('App Launch')
 		},
 		onLoad: function() {
-			this.getBannerList()
-			this.getQrCode();
 			console.log('App Show')
 		},
 		onHide: function() {
 			console.log('App Hide')
 		},
 		methods: {
+			// 初始化应用数据
+			async initializeAppData() {
+				try {
+					// 设置初始进度
+					this.loadingProgress = 0
+					this.loadedCount = 0
+					
+					// 并发加载所有数据
+					const promises = [
+						this.getBannerList(),
+						this.getPricePreviewList(),
+						this.getConfigData(),
+						this.getQrCode()
+					]
+					
+					await Promise.all(promises)
+					
+					// 确保进度达到100%
+					this.loadingProgress = 100
+					
+					// 所有数据加载完成
+					this.globalDataLoaded = true
+					getApp().globalData.isAppDataReady = true
+					
+					// 延迟一点时间让用户看到加载完成的状态
+					setTimeout(() => {
+						uni.$emit('appDataReady')
+					}, 500)
+					
+				} catch (error) {
+					console.error('App data loading failed:', error)
+					// 即使失败也要让应用继续运行
+					this.loadingProgress = 100
+					this.globalDataLoaded = true
+					getApp().globalData.isAppDataReady = true
+					
+					setTimeout(() => {
+						uni.$emit('appDataReady')
+					}, 500)
+				}
+			},
+			
+			// 更新加载进度
+			updateProgress() {
+				this.loadedCount++
+				this.loadingProgress = Math.round((this.loadedCount / this.totalRequests) * 100)
+			},
+			
 			getBannerList() {
-				// 假设 this.$api 可用
-				this.$api && this.$api('getBanner', {}, res => {
-					if (res && res.code === 200 && Array.isArray(res.result)) {
-						getApp().globalData.bannerList = res.result
-						console.log(getApp().globalData.bannerList, 'bannerList')
-						uni.$emit('bannerListUpdated')
+				return new Promise((resolve) => {
+					if (!this.$api) {
+						this.updateProgress()
+						resolve()
+						return
 					}
+					
+					this.$api('getBanner', {}, res => {
+						if (res && res.code === 200 && Array.isArray(res.result)) {
+							getApp().globalData.bannerList = res.result
+							console.log(getApp().globalData.bannerList, 'bannerList')
+							uni.$emit('bannerListUpdated')
+						}
+						this.updateProgress()
+						resolve()
+					})
 				})
 			},
+			
 			getPricePreviewList() {
-				this.$api && this.$api('getPricePreviewClassList', {}, res => {
-					if (res && res.success && Array.isArray(res.result)) {
-						getApp().globalData.pricePreviewList = res.result
-						uni.$emit('pricePreviewListUpdated')
+				return new Promise((resolve) => {
+					if (!this.$api) {
+						this.updateProgress()
+						resolve()
+						return
 					}
+					
+					this.$api('getPricePreviewClassList', {}, res => {
+						if (res && res.success && Array.isArray(res.result)) {
+							getApp().globalData.pricePreviewList = res.result
+							uni.$emit('pricePreviewListUpdated')
+						}
+						this.updateProgress()
+						resolve()
+					})
 				})
 			},
+			
 			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)) )
+				return new Promise((resolve) => {
+					if (!this.$api) {
+						this.updateProgress()
+						resolve()
+						return
 					}
+					
+					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
+							uni.$emit('configDataUpdated')
+						}
+						this.updateProgress()
+						resolve()
+					})
 				})
 			},
+			
 			getQrCode() {
-				// console.log(config.baseUrl,'config.baseUrl')
-				let that = this;
-				if (!uni.getStorageSync('token')) {
-					return
-				}
-				uni.getImageInfo({
-					src: `${config.baseUrl}/recycle-admin/applet/promotion/getInviteCode?token=${uni.getStorageSync('token')}`,
-					success: res => {
-						getApp().globalData.configData.qr_path = res.path
-						console.log(getApp().globalData.configData.qr_path,
-							'getApp().globalData.configData.qr_path')
-					},
-					fail: err => {
-						console.log(err)
+				return new Promise((resolve) => {
+					if (!uni.getStorageSync('token')) {
+						this.updateProgress()
+						resolve()
+						return
 					}
+					
+					uni.getImageInfo({
+						src: `${config.baseUrl}/recycle-admin/applet/promotion/getInviteCode?token=${uni.getStorageSync('token')}`,
+						success: res => {
+							getApp().globalData.configData.qr_path = res.path
+							console.log(getApp().globalData.configData.qr_path, 'qr_path')
+							this.updateProgress()
+							resolve()
+						},
+						fail: err => {
+							console.log('QR code load failed:', err)
+							this.updateProgress()
+							resolve()
+						}
+					})
 				})
 			}
 		}
@@ -79,8 +185,81 @@
 </script>
 
 <style>
-	/* // @import "./uni_modules/vk-uview-ui/index.scss"; */
+	/* 全局loading样式 */
+	.global-loading {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		z-index: 99999;
+	}
+	
+	.loading-container {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+	
+	.loading-logo {
+		margin-bottom: 60rpx;
+	}
+	
+	.logo-img {
+		width: 160rpx;
+		height: 160rpx;
+		border-radius: 32rpx;
+		box-shadow: 0 8rpx 32rpx rgba(0, 0, 0, 0.2);
+	}
+	
+	.loading-spinner {
+		margin-bottom: 40rpx;
+	}
+	
+	.spinner {
+		width: 60rpx;
+		height: 60rpx;
+		border: 4rpx solid rgba(255, 255, 255, 0.3);
+		border-top-color: #fff;
+		border-radius: 50%;
+		animation: spin 1s linear infinite;
+	}
+	
+	.loading-text {
+		color: #fff;
+		font-size: 32rpx;
+		font-weight: 500;
+		margin-bottom: 40rpx;
+		opacity: 0.9;
+	}
+	
+	.loading-progress {
+		width: 400rpx;
+		height: 6rpx;
+		background: rgba(255, 255, 255, 0.2);
+		border-radius: 3rpx;
+		overflow: hidden;
+	}
+	
+	.progress-bar {
+		height: 100%;
+		background: linear-gradient(90deg, #fff 0%, #f0f8ff 100%);
+		border-radius: 3rpx;
+		transition: width 0.3s ease;
+		box-shadow: 0 0 10rpx rgba(255, 255, 255, 0.3);
+	}
+	
+	@keyframes spin {
+		from { transform: rotate(0deg); }
+		to { transform: rotate(360deg); }
+	}
 
+	/* 原有样式 */
 	/*每个页面公共css */
 	.uni-tabbar-bottom {
 		display: none;
diff --git a/README.md b/README.md
index 9a7916a..680461b 100644
--- a/README.md
+++ b/README.md
@@ -409,3 +409,73 @@ export default {
    - 确认网络请求是否正常
    - 查看请求参数格式是否正确
 
+## 全局加载机制
+
+### 概述
+为了确保应用启动时的数据完整性，项目实现了全局加载机制。在App.vue中的关键数据加载完成之前，会显示加载页面，防止用户在数据未准备好的情况下访问功能。
+
+### 实现原理
+
+#### 1. App.vue 全局数据加载
+- **数据类型**: bannerList（轮播图）、pricePreviewList（价格预览）、configData（配置数据）、qr_path（二维码）
+- **加载方式**: 并发加载所有数据，使用 Promise.all 确保全部完成
+- **进度显示**: 实时更新加载进度条（0-100%）
+- **状态标识**: globalData.isAppDataReady 标识数据是否准备完成
+
+#### 2. 页面等待机制
+主要页面（首页、回收页、我的页面）会检查App数据状态：
+- 如果数据未准备好：显示uni.showLoading，监听'appDataReady'事件
+- 如果数据已准备好：直接初始化页面数据
+
+#### 3. 加载界面设计
+- **背景**: 渐变色背景（紫色到蓝色）
+- **元素**: Logo图片、旋转加载器、加载文字、进度条
+- **动画**: 平滑的旋转动画和进度条过渡效果
+
+### 使用方式
+
+#### 在新页面中添加等待逻辑：
+
+```javascript
+onLoad(options) {
+  // 保存参数
+  this.loadOptions = options
+  
+  // 检查App数据是否已经准备好
+  if (!getApp().globalData.isAppDataReady) {
+    // 显示加载状态
+    uni.showLoading({
+      title: '加载中...',
+      mask: true
+    })
+    
+    // 监听App数据准备完成事件
+    uni.$on('appDataReady', () => {
+      uni.hideLoading()
+      this.initializePageData()
+    })
+  } else {
+    // App数据已经准备好，直接初始化页面数据
+    this.initializePageData()
+  }
+},
+
+// 初始化页面数据的方法
+initializePageData() {
+  // 在这里放置原来在onLoad中的数据初始化逻辑
+  // ...
+}
+```
+
+### 优势
+1. **用户体验**: 避免页面显示不完整或错误数据
+2. **数据一致性**: 确保全局数据在页面使用前已加载完成
+3. **错误处理**: 即使加载失败也会继续运行，不会阻塞应用
+4. **性能优化**: 并发加载提高加载效率
+5. **视觉反馈**: 清晰的加载进度和状态提示
+
+### 注意事项
+- 管理页面等非核心页面可以不使用此机制
+- 确保在页面卸载时移除事件监听器
+- 加载失败时应有合理的降级处理
+
diff --git a/pages/component/home.vue b/pages/component/home.vue
index 722211a..5ab01c0 100644
--- a/pages/component/home.vue
+++ b/pages/component/home.vue
@@ -220,6 +220,7 @@ export default {
       cityList: [],
       addressCion: '',
       sbkCion: '',
+      queryParams: {},
     }
   },
   computed: {
@@ -357,17 +358,22 @@ export default {
       this.addressCion = address ? address.keyContent : '';
       this.sbkCion = sbk ? sbk.keyContent : '';
     },
-  },
-  onLoad(query) {
-    if (query.shareId) {
-				uni.setStorageSync('shareId', query.shareId)
-			};
-      this.getAreaList();
-      this.getPricePreview();
-      this.getRecentGoods();
+    // 初始化页面数据的方法
+    initializePageData() {
+      const query = this.queryParams || {}
+      
+      if (query.shareId) {
+        uni.setStorageSync('shareId', query.shareId)
+      }
+      
+      this.getAreaList()
+      this.getPricePreview()
+      this.getRecentGoods()
       this.pricePreviewList = getApp().globalData.pricePreviewList || []
       this.bannerList = getApp().globalData.bannerList || []
-      this.getFreeCityList();
+      this.getFreeCityList()
+      
+      // 监听数据更新事件
       uni.$on('pricePreviewListUpdated', () => {
         this.pricePreviewList = getApp().globalData.pricePreviewList || []
         this.getPricePreview()
@@ -375,6 +381,29 @@ export default {
       uni.$on('bannerListUpdated', () => {
         this.bannerList = getApp().globalData.bannerList || []
       })
+    },
+  },
+  onLoad(query) {
+    // 保存query参数
+    this.queryParams = query
+    
+    // 检查App数据是否已经准备好
+    if (!getApp().globalData.isAppDataReady) {
+      // 显示加载状态
+      uni.showLoading({
+        title: '加载中...',
+        mask: true
+      })
+      
+      // 监听App数据准备完成事件
+      uni.$on('appDataReady', () => {
+        uni.hideLoading()
+        this.initializePageData()
+      })
+    } else {
+      // App数据已经准备好，直接初始化页面数据
+      this.initializePageData()
+    }
   },
   onUnload() {
     uni.$off('pricePreviewListUpdated')
@@ -386,7 +415,7 @@ export default {
     // 监听全局数据更新
     uni.$on('configDataUpdated', this.updateCionData);
     this.getPricePreview();
-  }
+  },
 }
 </script>
 
diff --git a/pages/component/my.vue b/pages/component/my.vue
index bde85c2..c309849 100644
--- a/pages/component/my.vue
+++ b/pages/component/my.vue
@@ -30,7 +30,7 @@
     <view class="user-card" v-if="login_status">
       <view class="user-info">
         <view class="avatar-badge-box">
-          <image class="avatar" :src="userInfo.headImage" mode="aspectFill"></image>
+        <image class="avatar" :src="userInfo.headImage" mode="aspectFill"></image>
           <view class="avatar-badge">{{ userTypeText }}</view>
         </view>
         <view class="info">
@@ -360,6 +360,26 @@ export default {
           this.totalOrders = 0
         }
       })
+    },
+    // 初始化页面数据的方法
+    initializePageData() {
+      // 移除自动下拉刷新
+      // uni.startPullDownRefresh()
+      uni.$on('refreshUserInfo', () => {
+        this.fetchUserInfo()
+      })
+      this.fetchUserInfo()
+      this.fetchOrderList()
+      this.getCumulativeRecoveryCount()
+      uni.$on('bannerListUpdated', () => {
+        this.$forceUpdate && this.$forceUpdate()
+      })
+      if (getApp().globalData.bannerList && getApp().globalData.bannerList.length > 0) {
+        this.$forceUpdate && this.$forceUpdate()
+      }
+    },
+    goAbout(){
+
     }
   },
   computed: {
@@ -384,19 +404,22 @@ export default {
     }
 		},
   onLoad() {
-    // 移除自动下拉刷新
-    // uni.startPullDownRefresh()
-    uni.$on('refreshUserInfo', () => {
-      this.fetchUserInfo()
-    })
-    this.fetchUserInfo()
-    this.fetchOrderList()
-    this.getCumulativeRecoveryCount()
-    uni.$on('bannerListUpdated', () => {
-      this.$forceUpdate && this.$forceUpdate()
-    })
-    if (getApp().globalData.bannerList && getApp().globalData.bannerList.length > 0) {
-      this.$forceUpdate && this.$forceUpdate()
+    // 检查App数据是否已经准备好
+    if (!getApp().globalData.isAppDataReady) {
+      // 显示加载状态
+      uni.showLoading({
+        title: '加载中...',
+        mask: true
+      })
+      
+      // 监听App数据准备完成事件
+      uni.$on('appDataReady', () => {
+        uni.hideLoading()
+        this.initializePageData()
+      })
+    } else {
+      // App数据已经准备好，直接初始化页面数据
+      this.initializePageData()
     }
   },
   onShow() {
diff --git a/pages/component/recycle.vue b/pages/component/recycle.vue
index a3dd7bc..764723b 100644
--- a/pages/component/recycle.vue
+++ b/pages/component/recycle.vue
@@ -351,6 +351,7 @@ export default {
       reduceItem: null, // 待减少数量的商品
       reduceBrandList: [], // 可减少的品牌列表
       viewedRuleItems: new Set(), // 已查看过规则的商品ID集合
+      loadOptions: null, // 保存options参数
     }
   },
   computed: {
@@ -891,6 +892,44 @@ export default {
       return '#'
     },
 
+    // 初始化页面数据的方法
+    initializePageData() {
+      const options = this.loadOptions || {}
+      
+      if (options && options.categoryId) {
+        const idx = this.categories.findIndex(c => c.id == options.categoryId)
+        if (idx !== -1) this.currentCategory = idx
+      }
+      
+      if (this.categories.length > 0) {
+        this.fetchGoodsList(this.categories[this.currentCategory].id, 1)
+      }
+      
+      uni.$on('bannerListUpdated', () => {
+        this.$forceUpdate && this.$forceUpdate()
+      })
+      
+      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)
+            if (item.brandQuantities) {
+              this.$set(item, 'brandQuantities', {})
+            }
+          })
+        })
+        // 清空已查看规则的记录
+        this.viewedRuleItems.clear()
+        this.showDetailPanel = false
+        this.$forceUpdate()
+        getApp().globalData.shouldClearRecycle = false
+      }
+    },
   },
   created() {
     this.currentCategory = 0
@@ -917,34 +956,28 @@ export default {
     })
   },
   onLoad(options) {
-    if (options && options.categoryId) {
-      const idx = this.categories.findIndex(c => c.id == options.categoryId)
-      if (idx !== -1) this.currentCategory = idx
-    }
-    this.fetchGoodsList(this.categories[this.currentCategory].id, 1)
-    uni.$on('bannerListUpdated', () => {
-      this.$forceUpdate && this.$forceUpdate()
-    })
-    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)
-          if (item.brandQuantities) {
-            this.$set(item, 'brandQuantities', {})
-          }
-        })
+    // 保存options参数
+    this.loadOptions = options
+    
+    // 检查App数据是否已经准备好
+    if (!getApp().globalData.isAppDataReady) {
+      // 显示加载状态
+      uni.showLoading({
+        title: '加载中...',
+        mask: true
       })
-      // 清空已查看规则的记录
-      this.viewedRuleItems.clear()
-      this.showDetailPanel = false
-      this.$forceUpdate()
-      getApp().globalData.shouldClearRecycle = false
+      
+      // 监听App数据准备完成事件
+      uni.$on('appDataReady', () => {
+        uni.hideLoading()
+        this.initializePageData()
+      })
+    } else {
+      // App数据已经准备好，直接初始化页面数据
+      this.initializePageData()
     }
   },
+  
   onUnload() {
     uni.$off('bannerListUpdated')
     // 移除事件监听
diff --git a/pages/manager/inspect-result.vue b/pages/manager/inspect-result.vue
index 1f2a082..2f0dcb9 100644
--- a/pages/manager/inspect-result.vue
+++ b/pages/manager/inspect-result.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="inspect-result-container">
+  <view class="inspect-result-container" :class="{ 'popup-open': isPopupOpen }">
     <!-- 顶部导航栏 -->
     <view class="nav-bar">
       <view class="back" @tap="goBack">
@@ -12,52 +12,73 @@
     </view>
     <view class="main-content">
       <!-- 合格产品卡片 -->
-      <view class="result-card">
+      <view v-if="hasQualifiedItems" class="result-card">
         <view class="card-title">合格产品</view>
         <view v-for="item in qualifiedList" :key="item.id" class="result-row">
           <view class="row-main">
-            <text class="row-name">{{item.name}}</text>
+            <view class="goods-name-section">
+              <text class="goods-name">{{getItemName(item.id)}}</text>
+              <text class="goods-brand">{{getItemBrand(item.id)}}</text>
+            </view>
             <text class="row-price">¥ {{item.price}} <text class="row-unit">/件</text></text>
             <text class="row-count">x{{item.count}}</text>
             <text class="row-total">¥{{item.total}}</text>
           </view>
           <view class="row-reason">
-            <text class="reason-label">理由填写</text>
-            <input class="reason-input" v-model="item.reason" placeholder="请选择理由（选填）" />
+            <text class="reason-label">{{getItemName(item.id)}}</text>
+            <view class="reason-select" @tap="selectReasonForQualified(item)">
+              <text class="reason-placeholder" :class="{ 'selected': hasSelectedReason(item) }">
+                {{ hasSelectedReason(item) ? '已选择' : '请选择理由（选填）' }}
+              </text>
+              <uni-icons type="right" size="18" color="#bbb" />
+            </view>
           </view>
         </view>
       </view>
       <!-- 不合格产品卡片 -->
-      <view class="result-card">
+      <view v-if="hasUnqualifiedItems" class="result-card">
         <view class="card-title">不合格产品</view>
         <view v-for="group in unqualifiedGroups" :key="group.name" class="result-group">
           <view class="row-main">
-            <text class="row-name">{{group.name}}</text>
+            <view class="goods-name-section">
+              <text class="goods-name">{{getItemName(group.id)}}</text>
+              <text class="goods-brand">{{getItemBrand(group.id)}}</text>
+            </view>
             <text class="row-price">¥ {{group.price}} <text class="row-unit">/件</text></text>
             <text class="row-total">¥{{group.total}}</text>
           </view>
           <view v-for="item in group.items" :key="item.id" class="row-reason">
             <text class="reason-label">{{item.name}}</text>
             <view class="reason-select" @tap="selectReason(item)">
-              <text class="reason-placeholder">请选择理由</text>
+              <text class="reason-placeholder" :class="{ 'selected': hasSelectedReason(item) }">
+                {{ hasSelectedReason(item) ? '已选择' : '请选择理由' }}
+              </text>
               <uni-icons type="right" size="18" color="#bbb" />
             </view>
           </view>
         </view>
       </view>
       <!-- 不可回收产品卡片 -->
-      <view class="result-card">
+      <view v-if="hasUnrecyclableItems" class="result-card">
         <view class="card-title">不可回收产品</view>
         <view v-for="item in unrecyclableList" :key="item.id" class="result-row">
           <view class="row-main">
-            <text class="row-name">{{item.name}}</text>
+            <view class="goods-name-section">
+              <text class="goods-name">{{getItemName(item.id)}}</text>
+              <text class="goods-brand">{{getItemBrand(item.id)}}</text>
+            </view>
             <text class="row-price">¥ {{item.price || '—'}} <text class="row-unit">/件</text></text>
             <text class="row-count">x{{item.count}}</text>
             <text class="row-total">¥{{item.total}}</text>
           </view>
           <view class="row-reason">
-            <text class="reason-label">理由填写</text>
-            <input class="reason-input" v-model="item.reason" placeholder="请选择理由（选填）" />
+            <text class="reason-label">{{getItemName(item.id)}}</text>
+            <view class="reason-select" @tap="selectReasonForUnrecyclable(item)">
+              <text class="reason-placeholder" :class="{ 'selected': hasSelectedReason(item) }">
+                {{ hasSelectedReason(item) ? '已选择' : '请选择理由（选填）' }}
+              </text>
+              <uni-icons type="right" size="18" color="#bbb" />
+            </view>
           </view>
         </view>
       </view>
@@ -69,11 +90,11 @@
         </view>
         <view class="info-row">
           <text class="info-label">订单编号</text>
-          <text class="info-value copy-btn">RE82738127861525 复制</text>
+          <text class="info-value copy-btn">{{ order?.ordeNo || 'RE82738127861525' }} 复制</text>
         </view>
         <view class="info-row">
           <text class="info-label">取件时间</text>
-          <text class="info-value">2025-03-20 11:00</text>
+          <text class="info-value">{{ order?.goTime || '2025-03-20 11:00' }}</text>
         </view>
       </view>
     </view>
@@ -83,31 +104,33 @@
       <button class="btn-main" @tap="finishInspect">完成质检</button>
     </view>
     <!-- 理由弹窗 -->
-    <uni-popup ref="reasonPopup" type="bottom" :mask-click="false">
+    <uni-popup ref="reasonPopup" type="bottom" :mask-click="false" :safe-area="false" class="reason-popup-wrapper">
       <view class="reason-popup">
         <view class="popup-header">
           <text class="popup-close" @tap="closeReasonPopup">关闭</text>
           <text class="popup-title">{{ currentReasonTitle }}</text>
         </view>
-        <view class="popup-section">
-          <text class="section-label">上传图片</text>
-          <view class="img-list">
-            <view v-for="(img, idx) in reasonImages" :key="idx" class="img-item">
-              <image :src="img" class="img" />
-              <view class="img-del" @tap="removeReasonImg(idx)">×</view>
-            </view>
-            <view class="img-item add" @tap="addReasonImg">
-              <uni-icons type="plusempty" size="40" color="#bbb" />
+        <scroll-view class="popup-content" scroll-y="true">
+          <view class="popup-section">
+            <text class="section-label">上传图片</text>
+            <view class="img-list">
+              <view class="img-item add" @tap="addReasonImg">
+                <uni-icons type="plusempty" size="32" color="#bbb" />
+              </view>
+              <view v-for="(img, idx) in reasonImages" :key="idx" class="img-item">
+                <image :src="img" class="img" />
+                <view class="img-del" @tap="removeReasonImg(idx)">×</view>
+              </view>
             </view>
           </view>
-        </view>
-        <view class="popup-section">
-          <text class="section-label">选择理由</text>
-          <view v-for="(item, idx) in reasonOptions" :key="item" class="reason-row" @tap="toggleReason(idx)">
-            <view :class="['checkbox', {checked: reasonChecked[idx]}]" />
-            <text class="reason-text">{{ item }}</text>
+          <view class="popup-section">
+            <text class="section-label">选择理由</text>
+            <view v-for="(item, idx) in reasonOptions" :key="item" class="reason-row" @tap="toggleReason(idx)">
+              <view :class="['checkbox', {checked: reasonChecked[idx]}]" />
+              <text class="reason-text">{{ item }}</text>
+            </view>
           </view>
-        </view>
+        </scroll-view>
         <button class="popup-save-btn" @tap="saveReason">保存</button>
       </view>
     </uni-popup>
@@ -116,46 +139,186 @@
 
 <script>
 import pullRefreshMixin from '../mixins/pullRefreshMixin.js'
+import OSS from '@/utils/oss-upload/oss/index.js'
+
 export default {
   mixins: [pullRefreshMixin],
   data() {
     return {
-      qualifiedList: [
-        { id: 1, name: '羽绒服', price: 8, count: 8, total: 64, reason: '' }
-      ],
-      unqualifiedGroups: [
-        {
-          name: '羽绒服', price: 8, total: 0,
-          items: [
-            { id: 11, name: '羽绒服1', reason: '' },
-            { id: 12, name: '羽绒服2', reason: '' },
-            { id: 13, name: '羽绒服3', reason: '' },
-            { id: 14, name: '羽绒服4', reason: '' },
-            { id: 15, name: '羽绒服5', reason: '' },
-            { id: 16, name: '羽绒服6', reason: '' },
-            { id: 17, name: '羽绒服7', reason: '' },
-            { id: 18, name: '羽绒服8', reason: '' }
-          ]
-        },
-        {
-          name: '品牌服饰', price: 8, total: 0,
-          items: [
-            { id: 21, name: '品牌服饰1', reason: '' }
-          ]
-        }
-      ],
-      unrecyclableList: [
-        { id: 31, name: '毛衣', price: '', count: 8, total: 0, reason: '' }
-      ],
+      inspectData: null, // 从步骤一传过来的质检数据
+      order: null, // 订单数据
+      qualifiedList: [],
+      unqualifiedGroups: [],
+      unrecyclableList: [],
       reasonPopupVisible: false,
       currentReasonTitle: '',
       reasonImages: [],
       reasonOptions: ['大面积破损', '不可回收', '顽固污渍', '污渍无法清除', '异味严重', '带有危险物品'],
       reasonChecked: [false, true, false, true, false, false],
-      currentReasonItem: null
+      currentReasonItem: null,
+      isPopupOpen: false // 控制弹窗状态
+    }
+  },
+  computed: {
+    hasQualifiedItems() {
+      return this.qualifiedList && this.qualifiedList.length > 0
+    },
+    hasUnqualifiedItems() {
+      return this.unqualifiedGroups && this.unqualifiedGroups.length > 0
+    },
+    hasUnrecyclableItems() {
+      return this.unrecyclableList && this.unrecyclableList.length > 0
     }
   },
+      onLoad(options) {
+      // 接收质检数据和订单数据
+      if (options && options.resultData) {
+        try {
+          const resultData = JSON.parse(decodeURIComponent(options.resultData))
+          this.inspectData = resultData.inspectResult
+          this.order = resultData.order
+          console.log('接收到的质检数据:', this.inspectData)
+          console.log('接收到的订单数据:', this.order)
+          this.processInspectData()
+        } catch (error) {
+          console.error('解析数据失败:', error)
+        }
+      }
+      
+      // 兼容旧的参数格式
+      if (options && options.inspectData && !options.resultData) {
+        try {
+          this.inspectData = JSON.parse(decodeURIComponent(options.inspectData))
+          console.log('接收到的质检数据:', this.inspectData)
+          this.processInspectData()
+        } catch (error) {
+          console.error('解析质检数据失败:', error)
+        }
+      }
+    },
   methods: {
+
+    processInspectData() {
+      if (!this.inspectData || !this.inspectData.list) return
+      
+      this.qualifiedList = []
+      this.unqualifiedGroups = []
+      this.unrecyclableList = []
+      
+      this.inspectData.list.forEach(item => {
+        // 跳过不可回收分类
+        if (item.id === 'unrecyclable') return
+        
+        // 从order中获取对应的商品信息
+        const orderItem = this.order?.commonOrderList?.find(orderGoods => orderGoods.id == item.id)
+        if (!orderItem) return
+        
+        const itemName = orderItem.title || '未知商品'
+        const itemBrand = orderItem.pinName || ''
+        const displayName = itemBrand ? `${itemName} ${itemBrand}` : itemName
+        const itemNames = itemBrand ? `${itemName}` : itemName
+        const itemPrice = orderItem.onePrice || 0
+        
+        // 统计各种状态的数量
+        let qualifiedCount = 0
+        let unqualifiedCount = 0
+        let unrecyclableCount = 0
+        
+        item.commonOrderList.forEach(commonItem => {
+          if (commonItem.testingStatus === 0) {
+            qualifiedCount++
+          } else if (commonItem.testingStatus === 1) {
+            unqualifiedCount++
+          } else if (commonItem.testingStatus === 2) {
+            unrecyclableCount++
+          }
+        })
+        
+        // 处理合格产品
+        if (qualifiedCount > 0) {
+          // 获取合格商品的理由和图片信息
+          const qualifiedCommonItem = item.commonOrderList.find(commonItem => commonItem.testingStatus === 0)
+          const savedImages = qualifiedCommonItem?.testingImages ? qualifiedCommonItem.testingImages.split(',').filter(img => img) : []
+          const savedReasons = this.parseTestingInstructions(qualifiedCommonItem?.testingInstructions || '')
+          
+          this.qualifiedList.push({
+            id: item.id,
+            name: displayName,
+            shopClass: item.shopClass,
+            shopId: item.shopId,  
+            price: itemPrice,
+            count: qualifiedCount,
+            total: item.price || 0, // 使用质检时填写的总金额
+            reason: '',
+            images: savedImages,
+            reasons: savedReasons
+          })
+        }
+        
+        // 处理不合格产品
+        if (unqualifiedCount > 0) {
+          const unqualifiedItems = []
+          let index = 1
+          
+          item.commonOrderList.forEach(commonItem => {
+            if (commonItem.testingStatus === 1) {
+              const savedImages = commonItem.testingImages ? commonItem.testingImages.split(',').filter(img => img) : []
+              const savedReasons = this.parseTestingInstructions(commonItem.testingInstructions || '')
+              
+              unqualifiedItems.push({
+                id: commonItem.id,
+                name: `${itemNames}${index}`,
+                shopClass: item.shopClass,
+                shopId: item.shopId,  
+                reason: '',
+                images: savedImages,
+                reasons: savedReasons
+              })
+              index++
+            }
+          })
+          
+          if (unqualifiedItems.length > 0) {
+            this.unqualifiedGroups.push({
+              id: item.id,
+              name: displayName,
+              shopClass: item.shopClass,
+              shopId: item.shopId,  
+              price: itemPrice,
+              total: 0, // 不合格产品总价为0
+              items: unqualifiedItems
+            })
+          }
+        }
+        
+        // 处理不可回收产品
+        if (unrecyclableCount > 0) {
+          // 获取不可回收商品的理由和图片信息
+          const unrecyclableCommonItem = item.commonOrderList.find(commonItem => commonItem.testingStatus === 2)
+          const savedImages = unrecyclableCommonItem?.testingImages ? unrecyclableCommonItem.testingImages.split(',').filter(img => img) : []
+          const savedReasons = this.parseTestingInstructions(unrecyclableCommonItem?.testingInstructions || '')
+          
+          this.unrecyclableList.push({
+            id: item.id,
+            name: displayName,
+            shopClass: item.shopClass,
+            shopId: item.shopId,  
+            price: '', // 不可回收产品不显示价格
+            count: unrecyclableCount,
+            total: 0,
+            reason: '',
+            images: savedImages,
+            reasons: savedReasons
+          })
+        }
+      })
+      
+      console.log('处理后的数据:', {
+        qualifiedList: this.qualifiedList,
+        unqualifiedGroups: this.unqualifiedGroups,
+        unrecyclableList: this.unrecyclableList
+      })
+    },
     goBack() {
       uni.navigateBack()
     },
@@ -163,6 +326,17 @@ export default {
       uni.navigateBack()
     },
     finishInspect() {
+      // 这里可以将最终的inspectData提交到服务器
+      console.log('最终的质检数据:', JSON.stringify(this.inspectData, null, 2))
+      
+      // 可以调用API提交数据
+      // this.$api('submitInspectResult', { inspectData: this.inspectData }, res => {
+      //   if (res && res.code === 200) {
+      //     uni.showToast({ title: '质检完成', icon: 'success' })
+      //     uni.navigateBack()
+      //   }
+      // })
+      
       uni.showToast({ title: '完成质检', icon: 'success' })
     },
     selectReason(item) {
@@ -170,19 +344,94 @@ export default {
       this.currentReasonTitle = item.name
       this.reasonImages = item.images || []
       this.reasonChecked = item.reasons || Array(this.reasonOptions.length).fill(false)
+      this.lockScroll()
+      this.$refs.reasonPopup.open()
+    },
+    selectReasonForQualified(item) {
+      this.currentReasonItem = item
+      this.currentReasonTitle = this.getItemName(item.id)
+      this.reasonImages = item.images || []
+      this.reasonChecked = item.reasons || Array(this.reasonOptions.length).fill(false)
+      this.lockScroll()
+      this.$refs.reasonPopup.open()
+    },
+    selectReasonForUnrecyclable(item) {
+      this.currentReasonItem = item
+      this.currentReasonTitle = this.getItemName(item.id)
+      this.reasonImages = item.images || []
+      this.reasonChecked = item.reasons || Array(this.reasonOptions.length).fill(false)
+      this.lockScroll()
       this.$refs.reasonPopup.open()
     },
     closeReasonPopup() {
+      this.unlockScroll()
       this.$refs.reasonPopup.close()
     },
     addReasonImg() {
-      uni.chooseImage({
-        count: 3 - this.reasonImages.length,
-        success: res => {
-          this.reasonImages = this.reasonImages.concat(res.tempFilePaths)
+      // 检查是否已达到最大数量限制
+      if (this.reasonImages.length >= 3) {
+        uni.showToast({
+          title: '最多只能上传3张图片',
+          icon: 'none'
+        })
+        return
+      }
+      
+      uni.chooseMedia({
+        count: 3 - this.reasonImages.length, // 剩余可选择数量
+        mediaType: ['image'], // 只选择图片
+        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机
+        maxDuration: 30,
+        camera: 'back',
+        success: (res) => {
+          console.log('选择的图片:', res.tempFiles)
+          
+          // 显示上传进度
+          uni.showLoading({
+            title: '上传中...'
+          })
+          
+          // 处理选择的图片
+          const uploadPromises = res.tempFiles.map(file => {
+            return this.uploadImageToOSS(file.tempFilePath)
+          })
+          
+          // 批量上传
+          Promise.all(uploadPromises).then(urls => {
+            this.reasonImages = this.reasonImages.concat(urls)
+            uni.hideLoading()
+            uni.showToast({
+              title: '上传成功',
+              icon: 'success'
+            })
+          }).catch(error => {
+            console.error('上传失败:', error)
+            uni.hideLoading()
+            uni.showToast({
+              title: '上传失败，请重试',
+              icon: 'none'
+            })
+          })
+        },
+        fail: (error) => {
+          console.error('选择图片失败:', error)
+          uni.showToast({
+            title: '选择图片失败',
+            icon: 'none'
+          })
         }
       })
     },
+    async uploadImageToOSS(filePath) {
+      try {
+        // 使用项目中的OSS上传工具
+        const url = await OSS.ossUpload(filePath)
+        return url
+      } catch (error) {
+        console.error('OSS上传失败:', error)
+        throw error
+      }
+    },
     removeReasonImg(idx) {
       this.reasonImages.splice(idx, 1)
     },
@@ -194,15 +443,140 @@ export default {
       if (this.currentReasonItem) {
         this.currentReasonItem.images = [...this.reasonImages]
         this.currentReasonItem.reasons = [...this.reasonChecked]
+        
+        // 更新inspectData中的数据
+        this.updateInspectData()
       }
       this.closeReasonPopup()
     },
+    updateInspectData() {
+      if (!this.inspectData || !this.currentReasonItem) return
+      
+      // 获取选中的理由ID（假设理由选项的索引就是ID）
+      const selectedReasonIds = []
+      this.reasonChecked.forEach((checked, index) => {
+        if (checked) {
+          selectedReasonIds.push(index.toString())
+        }
+      })
+      
+      // 将理由ID用逗号分割保存
+      const testingInstructions = selectedReasonIds.join(',')
+      
+      // 将图片URL用逗号分割保存
+      const testingImages = this.reasonImages.join(',')
+      
+      // 根据当前选择的商品类型，找到对应的inspectData项进行更新
+      if (this.isQualifiedItem(this.currentReasonItem)) {
+        this.updateQualifiedItemInspectData(testingInstructions, testingImages)
+      } else if (this.isUnqualifiedItem(this.currentReasonItem)) {
+        this.updateUnqualifiedItemInspectData(testingInstructions, testingImages)
+      } else if (this.isUnrecyclableItem(this.currentReasonItem)) {
+        this.updateUnrecyclableItemInspectData(testingInstructions, testingImages)
+      }
+      
+      console.log('更新后的inspectData:', JSON.stringify(this.inspectData, null, 2))
+    },
+    isQualifiedItem(item) {
+      return this.qualifiedList.some(qualified => qualified.id === item.id)
+    },
+    isUnqualifiedItem(item) {
+      return this.unqualifiedGroups.some(group => 
+        group.items.some(unqualified => unqualified.id === item.id)
+      )
+    },
+    isUnrecyclableItem(item) {
+      return this.unrecyclableList.some(unrecyclable => unrecyclable.id === item.id)
+    },
+    updateQualifiedItemInspectData(testingInstructions, testingImages) {
+      const inspectItem = this.inspectData.list.find(item => item.id == this.currentReasonItem.id)
+      if (inspectItem && inspectItem.commonOrderList) {
+        // 为合格的商品更新所有状态为0的项
+        inspectItem.commonOrderList.forEach(commonItem => {
+          if (commonItem.testingStatus === 0) {
+            commonItem.testingInstructions = testingInstructions
+            commonItem.testingImages = testingImages
+          }
+        })
+      }
+    },
+    updateUnqualifiedItemInspectData(testingInstructions, testingImages) {
+      // 对于不合格商品，需要根据具体的commonOrderList项ID来更新
+      this.unqualifiedGroups.forEach(group => {
+        const targetItem = group.items.find(item => item.id === this.currentReasonItem.id)
+        if (targetItem) {
+          // 找到对应的inspectData项
+          const inspectItem = this.inspectData.list.find(item => item.id == group.id)
+          if (inspectItem && inspectItem.commonOrderList) {
+            // 根据不合格项的ID找到对应的commonOrderList项
+            const commonItem = inspectItem.commonOrderList.find(common => common.id === targetItem.id)
+            if (commonItem) {
+              commonItem.testingInstructions = testingInstructions
+              commonItem.testingImages = testingImages
+            }
+          }
+        }
+      })
+    },
+    updateUnrecyclableItemInspectData(testingInstructions, testingImages) {
+      const inspectItem = this.inspectData.list.find(item => item.id == this.currentReasonItem.id)
+      if (inspectItem && inspectItem.commonOrderList) {
+        // 为不可回收的商品更新所有状态为2的项
+        inspectItem.commonOrderList.forEach(commonItem => {
+          if (commonItem.testingStatus === 2) {
+            commonItem.testingInstructions = testingInstructions
+            commonItem.testingImages = testingImages
+          }
+        })
+      }
+    },
+    lockScroll() {
+      // 禁用页面滚动
+      this.isPopupOpen = true
+    },
+    unlockScroll() {
+      // 恢复页面滚动
+      this.isPopupOpen = false
+    },
     async onRefresh() {
       await this.refreshData && this.refreshData()
     },
     refreshData() {
       // 可根据实际需求刷新质检结果数据
       // 例如重新请求接口或重置数据
+    },
+    getItemName(id) {
+      if (this.order && this.order.commonOrderList) {
+        const orderItem = this.order.commonOrderList.find(item => item.id == id)
+        return orderItem ? (orderItem.title || '未知商品') : '未知商品'
+      }
+      return '未知商品'
+    },
+    getItemBrand(id) {
+      if (this.order && this.order.commonOrderList) {
+        const orderItem = this.order.commonOrderList.find(item => item.id == id)
+        return orderItem ? (orderItem.pinName || '') : ''
+      }
+      return ''
+    },
+    parseTestingInstructions(instructions) {
+      // 解析理由ID字符串，返回布尔数组
+      const reasonArray = Array(this.reasonOptions.length).fill(false)
+      if (instructions) {
+        const selectedIds = instructions.split(',').map(id => id.trim()).filter(id => id)
+        selectedIds.forEach(id => {
+          const index = parseInt(id)
+          if (index >= 0 && index < reasonArray.length) {
+            reasonArray[index] = true
+          }
+        })
+      }
+      return reasonArray
+    },
+    hasSelectedReason(item) {
+      // 检查该商品是否已选择理由或上传图片
+      return (item.reasons && item.reasons.some(checked => checked)) || 
+             (item.images && item.images.length > 0)
     }
   }
 }
@@ -214,6 +588,12 @@ export default {
   background: #f8f8f8;
   display: flex;
   flex-direction: column;
+  &.popup-open {
+    overflow: hidden;
+    position: fixed;
+    width: 100%;
+    height: 100vh;
+  }
 }
 .nav-bar {
   display: flex;
@@ -247,7 +627,7 @@ export default {
   }
 }
 .main-content {
-  margin-top: calc(150rpx + var(--status-bar-height));
+  margin-top: calc(200rpx + var(--status-bar-height));
   display: flex;
   flex-direction: column;
   background: none;
@@ -261,7 +641,7 @@ export default {
   padding: 24px 24px 0 24px;
 }
 .card-title {
-  font-size: 18px;
+  font-size: 16px;
   font-weight: bold;
   color: #222;
   margin-bottom: 18px;
@@ -275,7 +655,7 @@ export default {
 .status-tag {
   background: #fff7e6;
   color: #ffb400;
-  font-size: 14px;
+  font-size: 12px;
   border-radius: 12px;
   padding: 2px 14px;
   font-weight: 400;
@@ -289,29 +669,47 @@ export default {
 .row-main {
   display: flex;
   align-items: center;
+  .goods-name-section {
+    display: flex;
+    flex-direction: column;
+    margin-right: 8px;
+    .goods-name {
+      font-size: 14px;
+      font-weight: bold;
+      color: #222;
+      line-height: 1.2;
+    }
+    .goods-brand {
+      font-size: 11px;
+      color: #999;
+      font-weight: normal;
+      line-height: 1.2;
+      margin-top: 2px;
+    }
+  }
   .row-name {
-    font-size: 16px;
+    font-size: 14px;
     font-weight: bold;
     color: #222;
     margin-right: 8px;
   }
   .row-price {
-    font-size: 15px;
+    font-size: 13px;
     color: #ffb400;
     font-weight: bold;
     margin-right: 8px;
     .row-unit {
-      font-size: 13px;
+      font-size: 11px;
       color: #bbb;
     }
   }
   .row-count {
-    font-size: 15px;
+    font-size: 13px;
     color: #888;
     margin-right: 8px;
   }
   .row-total {
-    font-size: 16px;
+    font-size: 14px;
     color: #222;
     font-weight: bold;
     margin-left: auto;
@@ -322,17 +720,17 @@ export default {
   align-items: center;
   margin-top: 8px;
   .reason-label {
-    font-size: 15px;
+    font-size: 13px;
     color: #bbb;
     min-width: 80px;
   }
   .reason-input {
     flex: 1;
-    height: 40px;
+    height: 36px;
     border-radius: 12px;
     background: #f6f6f6;
     border: none;
-    font-size: 16px;
+    font-size: 14px;
     color: #222;
     padding-left: 12px;
     margin-left: 8px;
@@ -341,18 +739,22 @@ export default {
     flex: 1;
     display: flex;
     align-items: center;
-    height: 40px;
+    height: 36px;
     border-radius: 12px;
     background: #f6f6f6;
-    font-size: 16px;
+    font-size: 14px;
     color: #bbb;
     padding-left: 12px;
     margin-left: 8px;
-    justify-content: space-between;
+    justify-content: flex-end;
   }
   .reason-placeholder {
     color: #bbb;
-    font-size: 16px;
+    font-size: 14px;
+    &.selected {
+      color: #52c41a;
+      font-weight: 500;
+    }
   }
 }
 .info-card {
@@ -367,12 +769,12 @@ export default {
   align-items: center;
   margin-bottom: 16px;
   .info-label {
-    font-size: 15px;
+    font-size: 13px;
     color: #bbb;
     min-width: 80px;
   }
   .info-value {
-    font-size: 15px;
+    font-size: 13px;
     color: #222;
     margin-left: 8px;
   }
@@ -416,70 +818,90 @@ export default {
     padding: 0 18px;
   }
 }
+.reason-popup-wrapper {
+  z-index: 10000 !important;
+}
+.reason-popup-wrapper .uni-popup__wrapper {
+  z-index: 10000 !important;
+}
 .reason-popup {
   background: #fff;
-  border-radius: 32px 32px 0 0;
-  padding: 0 0 24px 0;
+  border-radius: 24px 24px 0 0;
+  padding: 0;
+  height: 75vh;
+  position: relative;
+  z-index: 9999;
   .popup-header {
     display: flex;
     align-items: center;
     justify-content: center;
-    height: 56px;
-    border-bottom: 1px solid #f5f5f5;
+    height: 60px;
+    border-bottom: 1px solid #f0f0f0;
     position: relative;
     .popup-close {
       position: absolute;
-      left: 24px;
-      color: #888;
-      font-size: 18px;
+      left: 20px;
+      color: #666;
+      font-size: 16px;
     }
     .popup-title {
-      font-size: 20px;
-      font-weight: bold;
+      font-size: 18px;
+      font-weight: 600;
       color: #222;
     }
   }
+  .popup-content {
+    height: calc(75vh - 60px - 82px);
+    overflow-y: auto;
+  }
   .popup-section {
-    padding: 24px 24px 0 24px;
+    padding: 0 20px 24px 20px;
+    &:first-child {
+      padding-top: 24px;
+    }
     .section-label {
       font-size: 16px;
-      color: #888;
-      margin-bottom: 12px;
+      color: #222;
+      margin-bottom: 16px;
       display: block;
+      font-weight: 500;
     }
     .img-list {
       display: flex;
       gap: 12px;
-      margin-bottom: 16px;
+      margin-bottom: 32px;
       .img-item {
         width: 80px;
         height: 80px;
-        border-radius: 16px;
-        background: #f6f6f6;
+        border-radius: 12px;
+        background: #f8f8f8;
         position: relative;
         .img {
           width: 100%;
           height: 100%;
-          border-radius: 16px;
+          border-radius: 12px;
+          object-fit: cover;
         }
         .img-del {
           position: absolute;
-          top: 4px;
-          right: 4px;
-          width: 20px;
-          height: 20px;
-          background: rgba(0,0,0,0.3);
+          top: -6px;
+          right: -6px;
+          width: 24px;
+          height: 24px;
+          background: rgba(0,0,0,0.6);
           color: #fff;
           border-radius: 50%;
           text-align: center;
-          line-height: 20px;
+          line-height: 24px;
           font-size: 16px;
+          font-weight: bold;
         }
         &.add {
           display: flex;
           align-items: center;
           justify-content: center;
-          background: #f6f6f6;
+          background: #f8f8f8;
+          border: 2px dashed #ddd;
           color: #bbb;
         }
       }
@@ -487,39 +909,57 @@ export default {
     .reason-row {
       display: flex;
       align-items: center;
-      padding: 18px 0;
-      border-bottom: 1px solid #f5f5f5;
+      padding: 16px 0;
+      border-bottom: 1px solid #f0f0f0;
+      &:last-child {
+        border-bottom: none;
+      }
       .checkbox {
-        width: 22px;
-        height: 22px;
-        border-radius: 6px;
+        width: 20px;
+        height: 20px;
+        border-radius: 4px;
         border: 2px solid #ddd;
-        margin-right: 16px;
+        margin-right: 12px;
         background: #fff;
+        position: relative;
         &.checked {
           border-color: #ffb400;
           background: #ffb400;
+          &::after {
+            content: '✓';
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+            color: #fff;
+            font-size: 12px;
+            font-weight: bold;
+          }
         }
       }
       .reason-text {
         font-size: 16px;
         color: #222;
+        line-height: 1.4;
       }
     }
   }
   .popup-save-btn {
-    width: 90%;
-    margin: 32px auto 0 auto;
-    height: 52px;
-    border-radius: 26px;
+    position: fixed;
+    bottom: 34px;
+    left: 20px;
+    right: 20px;
+    height: 48px;
+    border-radius: 24px;
     background: linear-gradient(90deg, #ffd01e 0%, #ffac04 100%);
     color: #fff;
-    font-size: 20px;
-    font-weight: bold;
+    font-size: 18px;
+    font-weight: 600;
     border: none;
     display: flex;
     align-items: center;
     justify-content: center;
+    box-shadow: 0 4px 12px rgba(255, 172, 4, 0.3);
   }
 }
 </style> 
\ No newline at end of file
diff --git a/pages/manager/inspect.vue b/pages/manager/inspect.vue
index 65a9d8e..bcd7b7e 100644
--- a/pages/manager/inspect.vue
+++ b/pages/manager/inspect.vue
@@ -1,527 +1,811 @@
 <template>
-    <view class="inspect-container">
-      <!-- 顶部导航栏 -->
-      <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="scan" size="24" color="#222" />
-        </view>
+  <view class="inspect-container">
+    <!-- 顶部导航栏 -->
+    <view class="nav-bar">
+      <view class="back" @tap="goBack">
+        <uni-icons type="left" size="20" color="#222" />
       </view>
-      <view class="main-content">
-        <!-- 左侧分类导航 -->
-        <view class="category-nav">
-          <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>
+      <text class="nav-title">步骤一：数量确认</text>
+      <view class="nav-icons">
+        <uni-icons type="scan" size="24" color="#222" />
+      </view>
+    </view>
+    <view class="main-content">
+      <!-- 左侧分类导航 -->
+      <view class="category-nav">
+        <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 class="goods-list">
-          <view v-for="(item, idx) in currentGoods" :key="item.id" class="goods-card">
-            <view class="goods-header">
-              <image :src="item.image" class="goods-img" />
-              <view class="goods-info">
-                <view class="goods-title-row">
-                  <text class="goods-name">{{item.name}}</text>
-                  <text class="goods-price">¥ {{item.price}} <text class="goods-unit">/件</text></text>
-                </view>
-                <text class="goods-desc">{{item.desc}}</text>
-              </view>
-            </view>
-            <view class="goods-row">
-              <text class="row-label">合格数量</text>
-              <view class="num-ctrl">
-                <button class="num-btn" @tap="changeNum(item, 'qualified', -1)">-</button>
-                <text class="num">{{item.qualified}}</text>
-                <button class="num-btn" @tap="changeNum(item, 'qualified', 1)">+</button>
+      </view>
+      <!-- 右侧商品卡片区 -->
+      <view class="goods-list">
+        <view v-for="(item, idx) in currentGoods" :key="item.id" class="goods-card">
+          <view class="goods-header">
+            <image :src="item.image" class="goods-img" />
+            <view class="goods-info">
+              <view class="goods-title-row">
+                <text class="goods-name">{{ item.name }}</text>
+                <text class="goods-price">¥ {{ item.price }} <text class="goods-unit">/件</text></text>
               </view>
+              <text class="goods-desc">{{ item.desc }}</text>
+              <text v-if="item.brand" class="goods-brand">品牌：{{ item.brand }}</text>
+              <text v-if="item.originalNum" class="goods-limit">总数量：{{ item.originalNum }}件</text>
             </view>
-            <view class="goods-row">
-              <text class="row-label">不合格数量</text>
-              <view class="num-ctrl">
-                <button class="num-btn" @tap="changeNum(item, 'unqualified', -1)">-</button>
-                <text class="num">{{item.unqualified}}</text>
-                <button class="num-btn" @tap="changeNum(item, 'unqualified', 1)">+</button>
-              </view>
+          </view>
+          <view class="goods-row">
+            <text class="row-label">合格数量</text>
+            <view class="num-ctrl">
+              <button class="num-btn" @tap="changeNum(item, 'qualified', -1)">-</button>
+              <text class="num">{{ item.qualified }}</text>
+              <button class="num-btn" @tap="changeNum(item, 'qualified', 1)">+</button>
             </view>
-            <view class="goods-row">
-              <text class="row-label">总金额</text>
-              <input class="amount-input" v-model="item.amount" placeholder="请输入金额" />
+          </view>
+          <view class="goods-row">
+            <text class="row-label">不合格数量</text>
+            <view class="num-ctrl">
+              <button class="num-btn" @tap="changeNum(item, 'unqualified', -1)">-</button>
+              <text class="num">{{ item.unqualified }}</text>
+              <button class="num-btn" @tap="changeNum(item, 'unqualified', 1)">+</button>
             </view>
           </view>
+
+          <view class="goods-row">
+            <text class="row-label">总金额</text>
+            <input class="amount-input" :value="getInspectPrice(item)" @input="updateInspectPrice(item, $event)" placeholder="请输入金额" />
+          </view>
         </view>
       </view>
-      <!-- 底部操作按钮 -->
-      <view class="footer-btns">
-        <button class="btn-outline" @tap="goBack">返回订单详情</button>
-        <button class="btn-main" @tap="goNext">下一步</button>
-      </view>
     </view>
-  </template>
-  
-  <script>
-  import pullRefreshMixin from '../mixins/pullRefreshMixin.js'
-  export default {
-    mixins: [pullRefreshMixin],
-    data() {
-      return {
-        statusBarHeight: 0,
-        currentCategory: 0,
-        allProducts: {},      // { [categoryId]: [商品数组] }
-        allProductsPage: {},  // { [categoryId]: 当前已加载页码 }
-        allProductsTotal: {}, // { [categoryId]: 总数 }
-        pageSize: 10,
-        loadingMore: false,
-        finished: false,
+    <!-- 底部操作按钮 -->
+    <view class="footer-btns">
+      <button class="btn-outline" @tap="goBack">返回订单详情</button>
+      <button class="btn-main" @tap="goNext">下一步</button>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      statusBarHeight: 0,
+      currentCategory: 0,
+      orderId: '',
+      order: null,  // 订单数据
+      currentGoods: [], // 当前显示的商品列表
+      inspectResult: {}, // 质检结果对象，按照新的数据格式
+    }
+  },
+  computed: {
+    categories() {
+      const list = getApp().globalData.pricePreviewList || []
+      let filteredCategories = []
+      
+      // 如果有订单数据，根据订单商品过滤分类
+      if (this.order && this.order.commonOrderList) {
+        // 获取订单中所有商品的分类ID（去重）
+        const orderCategoryIds = new Set()
+        this.order.commonOrderList.forEach(item => {
+          // 如果有shopClass字段直接使用
+          if (item.shopClass) {
+            orderCategoryIds.add(item.shopClass)
+          } else {
+            // 如果没有shopClass，通过商品标题匹配分类
+            const matchedCategory = list.find(cat => 
+              cat.pid === '0' && item.title && item.title.includes(cat.title)
+            )
+            if (matchedCategory) {
+              orderCategoryIds.add(matchedCategory.id)
+            }
+          }
+        })
+        
+        // 过滤出订单中包含的分类
+        filteredCategories = list.filter(item => 
+          item.pid === '0' && orderCategoryIds.has(item.id)
+        ).sort((a, b) => a.sort - b.sort)
+        
+        // 如果没有匹配到任何分类，显示所有分类
+        if (filteredCategories.length === 0) {
+          filteredCategories = list.filter(item => item.pid === '0').sort((a, b) => a.sort - b.sort)
+        }
+      } else {
+        // 没有订单数据时显示所有分类
+        filteredCategories = list.filter(item => item.pid === '0').sort((a, b) => a.sort - b.sort)
       }
+      
+      // 新增不可回收分类
+      const extra = [{ id: 'unrecyclable', title: '不可回收' }]
+      return [...filteredCategories, ...extra]
+    }
+  },
+  methods: {
+    initInspectResult() {
+      if (!this.order || !this.order.commonOrderList) return
+      
+      this.inspectResult = {
+        id: this.order.id,
+        list: []
+      }
+      
+      // 按照订单商品分组（按originalId分组）
+      const groupedGoods = {}
+      this.order.commonOrderList.forEach(item => {
+        if (!groupedGoods[item.id]) {
+          groupedGoods[item.id] = {
+            id: item.id,
+            price: '', // 初始为空字符串
+            qualifiedNum: 0,
+            noQualifiedNum: 0,
+            unrecyclable: 0,
+            commonOrderList: []
+          }
+        }
+        
+        // 为每个数量创建对应的质检项
+        for (let i = 0; i < (item.num || 0); i++) {
+          groupedGoods[item.id].commonOrderList.push({
+            id: `${item.id}-${i}`, // 生成唯一ID
+            testingInstructions: '',
+            testingImages: '',
+            testingStatus: '' // 默认为空
+          })
+        }
+      })
+      
+      // 添加不可回收分类 - 暂时注释掉
+      // const totalOrderNum = this.order.commonOrderList.reduce((sum, item) => sum + (item.num || 0), 0)
+      // groupedGoods['unrecyclable'] = {
+      //   id: 'unrecyclable',
+      //   price: '',
+      //   qualifiedNum: 0,
+      //   noQualifiedNum: 0,
+      //   unrecyclable: totalOrderNum, // 初始化时全部为不可回收状态
+      //   commonOrderList: []
+      // }
+      
+      // // 为不可回收创建对应数量的质检项
+      // for (let i = 0; i < totalOrderNum; i++) {
+      //   groupedGoods['unrecyclable'].commonOrderList.push({
+      //     id: `unrecyclable-${i}`,
+      //     testingInstructions: '',
+      //     testingImages: '',
+      //     testingStatus: 2 // 不可回收状态
+      //   })
+      // }
+      
+      this.inspectResult.list = Object.values(groupedGoods)
     },
-    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() {
-        const currentCategoryId = this.categories[this.currentCategory]?.id
-        // 不可回收分类内容
-        if (currentCategoryId === 'unrecyclable') {
-          return [{
-            id: 'unrecyclable-1',
-            image: '/static/回收/衣物.png',
-            name: '不可回收品类',
-            price: '—',
-            desc: '允许脏破烂，160码以上',
-            quantity: 2,
-            amount: ''
-          }]
+    updateCurrentGoods() {
+      const currentCategoryId = this.categories[this.currentCategory]?.id
+      const currentCategoryTitle = this.categories[this.currentCategory]?.title
+      
+      // 不可回收分类内容
+      if (currentCategoryId === 'unrecyclable') {
+        // 计算订单中所有商品的总数量作为不可回收的最大限制
+        let totalOrderNum = 0
+        if (this.order && this.order.commonOrderList) {
+          totalOrderNum = this.order.commonOrderList.reduce((sum, item) => sum + (item.num || 0), 0)
         }
-        return this.allProducts[currentCategoryId] || []
+        
+        this.currentGoods = [{
+          id: 'unrecyclable-1',
+          image: '/static/回收/衣物.png',
+          name: '不可回收品类',
+          price: '—',
+          desc: '允许脏破烂，160码以上',
+          qualified: 0,
+          unqualified: 0,
+          amount: '',
+          originalNum: totalOrderNum // 设置最大数量为订单总数
+        }]
+        return
       }
-    },
-    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 (this.order && this.order.commonOrderList) {
+        const orderGoods = this.order.commonOrderList.filter(item => {
+          // 如果有shopClass字段，直接匹配
+          if (item.shopClass) {
+            return item.shopClass === currentCategoryId
           }
-          if (callback) callback()
+          // 如果没有shopClass，通过商品标题匹配分类
+          return item.title && currentCategoryTitle && item.title.includes(currentCategoryTitle)
         })
-      },
-      goBack() {
-        uni.navigateBack()
-      },
-      goNext() {
-        // 跳转到下一步页面，带上质检数据
-        uni.navigateTo({
-          url: '/pages/manager/inspect-result'
+        
+        // 根据pinName展示不同品牌的商品，不进行去重
+        const goodsList = orderGoods.map((item, index) => ({
+          id: `${item.id}`, 
+          image: item.image || '/static/回收/衣物.png',
+          name: item.title,
+          brand: item.pinName || '未知品牌',
+          price: item.onePrice || 0,
+          desc: item.details || '',
+          qualified: 0,
+          unqualified: 0,
+          amount: '',
+          originalNum: item.num || 0,
+          estimatedPrice: item.price || 0,
+          originalId: item.id // 保存原始ID
+        }))
+        
+        this.currentGoods = goodsList
+        return
+      }
+      
+      // 没有订单数据时返回空数组
+      this.currentGoods = []
+    },
+
+    goBack() {
+      uni.navigateBack()
+    },
+    goNext() {
+      // 检测是否所有商品都已完成质检和填写价格
+      const validationResult = this.validateInspectData()
+      if (!validationResult.isValid) {
+        uni.showToast({
+          title: validationResult.message,
+          icon: 'none',
+          duration: 2000
         })
-      },
-      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
+        return
+      }
+      
+      // 构造传递给步骤二的完整数据
+      const resultData = {
+        inspectResult: this.inspectResult,
+        order: this.order // 同时传递订单信息
+      }
+      
+      const resultDataStr = encodeURIComponent(JSON.stringify(resultData))
+      uni.navigateTo({
+        url: `/pages/manager/inspect-result?resultData=${resultDataStr}`
+      })
+    },
+    validateInspectData() {
+      if (!this.inspectResult.list || this.inspectResult.list.length === 0) {
+        return {
+          isValid: false,
+          message: '没有质检数据'
         }
-        if (!this.allProducts[categoryId]) {
-          this.fetchGoodsList(categoryId, 1)
+      }
+      
+      for (const item of this.inspectResult.list) {
+        // 跳过不可回收分类的检查
+        if (item.id === 'unrecyclable') {
+          continue
         }
-      },
-      changeNum(item, key, delta) {
-        if (key === 'qualified') {
-          item.qualified = Math.max(0, (item.qualified || 0) + delta)
+        
+        // 获取商品信息用于显示错误消息
+        const orderItem = this.order.commonOrderList.find(orderGoods => orderGoods.id == item.id)
+        const brandName = orderItem ? (orderItem.title+' '+orderItem.pinName || orderItem.title || '未知商品') : '未知商品'
+        
+        // 检查是否有空的testingStatus
+        const hasEmptyStatus = item.commonOrderList.some(commonItem => 
+          commonItem.testingStatus === '' || commonItem.testingStatus === null || commonItem.testingStatus === undefined
+        )
+        
+        if (hasEmptyStatus) {
+          return {
+            isValid: false,
+            message: `${brandName} 还未完成质检选择`
+          }
+        }
+        
+        // 检查价格是否为空
+        if (!item.price || item.price === 0 || item.price === '') {
+          return {
+            isValid: false,
+            message: `${brandName} 还未填写总金额`
+          }
+        }
+      }
+      
+      return {
+        isValid: true,
+        message: ''
+      }
+    },
+    switchCategory(idx) {
+      this.currentCategory = idx
+      this.updateCurrentGoods()
+    },
+    changeNum(item, key, delta) {
+      const currentQualified = item.qualified || 0
+      const currentUnqualified = item.unqualified || 0
+      const maxNum = item.originalNum || 0
+      
+      if (key === 'qualified') {
+        const newQualified = Math.max(0, currentQualified + delta)
+        const totalAfterChange = newQualified + currentUnqualified
+        
+        // 检查总数是否超过原始数量
+        if (totalAfterChange <= maxNum) {
+          this.$set(item, 'qualified', newQualified)
+          // 更新inspectResult对象
+          this.updateInspectResult(item, 'qualified', delta)
+          console.log('更新后的inspectResult:', JSON.stringify(this.inspectResult, null, 2))
+        } else {
+          uni.showToast({
+            title: `总数不能超过${maxNum}件`,
+            icon: 'none',
+            duration: 1500
+          })
+        }
+      } else if (key === 'unqualified') {
+        const newUnqualified = Math.max(0, currentUnqualified + delta)
+        const totalAfterChange = currentQualified + newUnqualified
+        
+        // 检查总数是否超过原始数量
+        if (totalAfterChange <= maxNum) {
+          this.$set(item, 'unqualified', newUnqualified)
+          // 更新inspectResult对象
+          this.updateInspectResult(item, 'unqualified', delta)
         } else {
-          item.unqualified = Math.max(0, (item.unqualified || 0) + delta)
+          uni.showToast({
+            title: `总数不能超过${maxNum}件`,
+            icon: 'none',
+            duration: 1500
+          })
         }
-      },
-      refreshData() {
-        // 可根据实际需求刷新商品数据、分类等
-        // 例如重新请求接口或重置数据
-      },
-      async onRefresh() {
-        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)
+    updateInspectResult(item, type, delta) {
+      // 处理不可回收分类 - 暂时注释掉
+      // if (item.id === 'unrecyclable-1') {
+      //   const unrecyclableItem = this.inspectResult.list.find(listItem => listItem.id === 'unrecyclable')
+      //   if (!unrecyclableItem) return
+        
+      //   if (type === 'qualified' && delta > 0) {
+      //     // 增加合格数量：找到第一个不可回收状态的项改为合格
+      //     const targetItem = unrecyclableItem.commonOrderList.find(commonItem => commonItem.testingStatus === 2)
+      //     if (targetItem) {
+      //       targetItem.testingStatus = 0
+      //       unrecyclableItem.unrecyclable--
+      //       unrecyclableItem.qualifiedNum++
+      //     }
+      //   } else if (type === 'qualified' && delta < 0) {
+      //     // 减少合格数量：找到第一个合格状态的项改为不可回收
+      //     const targetItem = unrecyclableItem.commonOrderList.find(commonItem => commonItem.testingStatus === 0)
+      //     if (targetItem) {
+      //       targetItem.testingStatus = 2
+      //       unrecyclableItem.qualifiedNum--
+      //       unrecyclableItem.unrecyclable++
+      //     }
+      //   } else if (type === 'unqualified' && delta > 0) {
+      //     // 增加不合格数量：找到第一个不可回收状态的项改为质量问题
+      //     const targetItem = unrecyclableItem.commonOrderList.find(commonItem => commonItem.testingStatus === 2)
+      //     if (targetItem) {
+      //       targetItem.testingStatus = 1
+      //       unrecyclableItem.unrecyclable--
+      //       unrecyclableItem.noQualifiedNum++
+      //     }
+      //   } else if (type === 'unqualified' && delta < 0) {
+      //     // 减少不合格数量：找到第一个质量问题状态的项改为不可回收
+      //     const targetItem = unrecyclableItem.commonOrderList.find(commonItem => commonItem.testingStatus === 1)
+      //     if (targetItem) {
+      //       targetItem.testingStatus = 2
+      //       unrecyclableItem.noQualifiedNum--
+      //       unrecyclableItem.unrecyclable++
+      //     }
+      //   }
+        
+      //   console.log('更新后的不可回收inspectResult:', JSON.stringify(unrecyclableItem, null, 2))
+      //   return
+      // }
+      
+      // 找到对应的inspectResult项
+      const originalId = item.originalId || item.id.split('-')[0]
+      const inspectItem = this.inspectResult.list.find(listItem => listItem.id == originalId)
+      
+      if (!inspectItem) return
+      
+      if (type === 'qualified' && delta > 0) {
+        // 增加合格数量：优先找空状态的项，其次找非合格状态的项
+        let targetItem = inspectItem.commonOrderList.find(commonItem => commonItem.testingStatus === '')
+        if (!targetItem) {
+          targetItem = inspectItem.commonOrderList.find(commonItem => 
+            commonItem.testingStatus === 1 || commonItem.testingStatus === 2
+          )
+        }
+        if (targetItem) {
+          const oldStatus = targetItem.testingStatus
+          targetItem.testingStatus = 0
+          inspectItem.qualifiedNum++
+          if (oldStatus === 1) {
+            inspectItem.noQualifiedNum--
+          } else if (oldStatus === 2) {
+            inspectItem.unrecyclable--
           }
         }
-      })
+      } else if (type === 'qualified' && delta < 0) {
+        // 减少合格数量：找到第一个合格状态的项改为空状态
+        const targetItem = inspectItem.commonOrderList.find(commonItem => commonItem.testingStatus === 0)
+        if (targetItem) {
+          targetItem.testingStatus = ''
+          inspectItem.qualifiedNum--
+        }
+      } else if (type === 'unqualified' && delta > 0) {
+        // 增加不合格数量：优先找空状态的项，其次找合格状态的项
+        let targetItem = inspectItem.commonOrderList.find(commonItem => commonItem.testingStatus === '')
+        if (!targetItem) {
+          targetItem = inspectItem.commonOrderList.find(commonItem => commonItem.testingStatus === 0)
+        }
+        if (targetItem) {
+          const oldStatus = targetItem.testingStatus
+          targetItem.testingStatus = 1
+          inspectItem.noQualifiedNum++
+          if (oldStatus === 0) {
+            inspectItem.qualifiedNum--
+          }
+        }
+      } else if (type === 'unqualified' && delta < 0) {
+        // 减少不合格数量：找到第一个质量问题状态的项改为空状态
+        const targetItem = inspectItem.commonOrderList.find(commonItem => commonItem.testingStatus === 1)
+        if (targetItem) {
+          targetItem.testingStatus = ''
+          inspectItem.noQualifiedNum--
+        }
+      }
+      
+      console.log('更新后的inspectResult:', JSON.stringify(this.inspectResult, null, 2))
     },
-    onLoad() {
-      this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
+    getInspectPrice(item) {
+      // 获取inspectResult中对应商品的price
+      if (item.id === 'unrecyclable-1') {
+        return ''
+      }
+      
+      const originalId = item.originalId || item.id.split('-')[0]
+      const inspectItem = this.inspectResult.list?.find(listItem => listItem.id == originalId)
+      return inspectItem ? inspectItem.price : ''
     },
-    onPullDownRefresh() {
-      this.refreshData && this.refreshData()
-      uni.stopPullDownRefresh()
+    updateInspectPrice(item, event) {
+      // 更新inspectResult中对应商品的price
+      if (item.id === 'unrecyclable-1') {
+        return
+      }
+      
+      const originalId = item.originalId || item.id.split('-')[0]
+      const inspectItem = this.inspectResult.list?.find(listItem => listItem.id == originalId)
+      
+      if (inspectItem) {
+        const newPrice = parseFloat(event.detail.value) || 0
+        inspectItem.price = newPrice
+        console.log('更新价格:', originalId, newPrice)
+      }
+    },
+  },
+  created() {
+    this.currentCategory = 0
+  },
+  onLoad(options) {
+    
+    // 接收订单数据
+    if (options && options.orderData) {
+      try {
+        this.order = JSON.parse(decodeURIComponent(options.orderData))
+        console.log('接收到的订单数据:', this.order)
+        // 订单数据加载完成后更新商品列表和初始化质检结果
+        this.$nextTick(() => {
+          this.initInspectResult()
+          this.updateCurrentGoods()
+        })
+      } catch (error) {
+        console.error('解析订单数据失败:', error)
+      }
+    }
+    
+    if (options && options.orderId) {
+      this.orderId = options.orderId
     }
+    
+    console.log(this.orderId, 'orderId')
+  },
+
+}
+</script>
+
+<style lang="scss" scoped>
+.inspect-container {
+  min-height: 100vh;
+  background: #f8f8f8;
+  display: flex;
+  flex-direction: column;
+}
+
+.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;
   }
-  </script>
-  
-  <style lang="scss" scoped>
-  .inspect-container {
-    min-height: 100vh;
-    background: #f8f8f8;
+
+  .nav-title {
+    flex: 1;
+    text-align: center;
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #222;
+  }
+
+  .nav-icons {
     display: flex;
-    flex-direction: column;
+    align-items: center;
+    gap: 12px;
   }
-  .nav-bar {
+}
+
+.main-content {
+  margin-top: calc(200rpx + var(--status-bar-height));
+  display: flex;
+  background: none;
+}
+
+.category-nav {
+  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: 64px;
+    height: 44px;
+    border-radius: 16px 0 0 16px;
     display: flex;
     align-items: center;
-    height: calc(150rpx + var(--status-bar-height));
-    padding: 0 32rpx;
-    padding-top: var(--status-bar-height);
+    justify-content: flex-start;
+    font-size: 16px;
+    color: #222;
+    margin-bottom: 12px;
     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;
+    position: relative;
+    transition: background 0.2s, color 0.2s, font-weight 0.2s;
+    padding-left: 12px;
+
+    &.active {
+      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;
+      }
     }
-    .nav-icons {
+
+    .category-badge {
+      position: absolute;
+      top: 6px;
+      right: 10px;
+      background: #ff4d4f;
+      color: #fff;
+      font-size: 12px;
+      border-radius: 50%;
+      width: 18px;
+      height: 18px;
       display: flex;
       align-items: center;
-      gap: 12px;
+      justify-content: center;
     }
   }
-  .main-content {
-    margin-top: calc(150rpx + var(--status-bar-height));
-    display: flex;
-    background: none;
+}
+
+.goods-list {
+  flex: 1;
+  height: calc(100vh - 110rpx - var(--status-bar-height) - 80px);
+  padding: 0 0 0 16px;
+  overflow-y: auto;
+  background: none;
+}
+
+.goods-card {
+  background: #fff;
+  border-radius: 24px;
+  box-shadow: 0 4px 24px rgba(0, 0, 0, 0.06);
+  margin-bottom: 18px;
+  padding: 18px 18px 9px 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;
   }
-  .category-nav {
-    width: 80px;
-    background: #fff;
-    border-radius: 24px 0 0 24px;
-    padding: 24px 0;
+
+  .goods-info {
+    flex: 1;
     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: 64px;
-      height: 44px;
-      border-radius: 16px 0 0 16px;
+    justify-content: center;
+    min-width: 0;
+
+    .goods-title-row {
       display: flex;
-      align-items: 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: linear-gradient(90deg, #fff7e6 80%, #fff 100%);
+      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;
-        &::before {
-          content: '';
-          position: absolute;
-          left: 0;
-          top: 30%;
-          height: 40%;
-          width: 2px;
-          border-radius: 4px;
-          background: #ffb400;
-          bottom: auto;
+
+        .goods-unit {
+          font-size: 13px;
+          color: #bbb;
         }
       }
-      .category-badge {
-        position: absolute;
-        top: 6px;
-        right: 10px;
-        background: #ff4d4f;
-        color: #fff;
-        font-size: 12px;
-        border-radius: 50%;
-        width: 18px;
-        height: 18px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
     }
-  }
-  .goods-list {
-    flex: 1;
-    height: calc(100vh - 110rpx - var(--status-bar-height) - 80px);
-    padding: 0 0 0 16px;
-    overflow-y: auto;
-    background: none;
-  }
-  .goods-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;
-    &.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-desc {
+      font-size: 13px;
+      color: #999;
+      margin-top: 4px;
     }
   }
-  .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;
   }
-  .goods-row {
+
+  .num-ctrl {
     display: flex;
     align-items: center;
-    margin-bottom: 12px;
-    .row-label {
-      font-size: 14px;
-      color: #888;
-      width: 80px;
-      flex-shrink: 0;
-    }
-    .num-ctrl {
+
+    .num-btn {
+      width: 60rpx;
+      height: 60rpx;
+      padding: 0;
+      margin: 0;
       display: flex;
       align-items: center;
-      .num-btn {
-        width: 32px;
-        height: 32px;
-        border-radius: 50%;
-        background: #f6f6f6;
-        color: #bbb;
-        font-size: 20px;
+      justify-content: center;
+      font-size: 28rpx;
+      color: #666;
+      background: #ffffff;
+      border: none;
+      border-radius: 50%;
+
+      &::after {
         border: none;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin: 0 6px;
       }
-      .num {
-        font-size: 16px;
-        color: #222;
-        width: 28px;
-        text-align: center;
+
+      &:active {
+        opacity: 0.8;
       }
     }
-    .amount-input {
-      flex: 1;
-      height: 32px;
-      border-radius: 12px;
-      background: #f6f6f6;
-      border: none;
-      font-size: 15px;
-      color: #222;
-      padding-left: 10px;
-      margin-left: 8px;
+
+    .num {
+      width: 80rpx;
+      text-align: center;
+      font-size: 32rpx;
+      color: #333;
     }
   }
-  .footer-btns {
-    position: fixed;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: #fff;
-    display: flex;
-    gap: 16px;
-    padding: 12px 16px 24px 16px;
-    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, #ffd01e 0%, #ffac04 100%);
-      color: #fff;
-      border: none;
-      font-size: 15px;
-      font-weight: 500;
-      box-shadow: none;
-      padding: 0 18px;
-    }
+
+  .amount-input {
+    flex: 1;
+    height: 32px;
+    border-radius: 12px;
+    background: #f6f6f6;
+    border: none;
+    font-size: 15px;
+    color: #222;
+    padding-left: 10px;
+    margin-left: 8px;
+  }
+}
+
+.footer-btns {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: #fff;
+  display: flex;
+  gap: 16px;
+  padding: 12px 16px 24px 16px;
+  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, #ffd01e 0%, #ffac04 100%);
+    color: #fff;
+    border: none;
+    font-size: 15px;
+    font-weight: 500;
+    box-shadow: none;
+    padding: 0 18px;
   }
-  </style>
-  
\ No newline at end of file
+}
+
+
+
+.goods-brand {
+  font-size: 12px;
+  color: #ffb400;
+  margin-top: 2px;
+  font-weight: 500;
+}
+
+.goods-limit {
+  font-size: 12px;
+  color: #ffb400;
+  margin-top: 2px;
+  font-weight: 500;
+}
+
+
+</style>
+
diff --git a/pages/manager/order-detail.vue b/pages/manager/order-detail.vue
index b0a04fc..7737064 100644
--- a/pages/manager/order-detail.vue
+++ b/pages/manager/order-detail.vue
@@ -80,13 +80,14 @@
             <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.pinName }}</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>
+            <text class="custom-goods-total">¥{{ item.estimatedPrice }}</text>
           </view>
         </view>
       </view>
@@ -119,13 +120,14 @@
             <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.pinName }}</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>
+            <text class="custom-goods-total">¥{{ item.estimatedPrice }}</text>
           </view>
         </view>
       </view>
@@ -161,13 +163,14 @@
             <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.pinName }}</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>
+            <text class="custom-goods-total">¥{{ item.estimatedPrice }}</text>
           </view>
         </view>
       </view>
@@ -262,7 +265,10 @@ export default {
       return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
     },
     goToInspect() {
-      uni.navigateTo({ url: '/pages/manager/inspect' })
+      const orderData = encodeURIComponent(JSON.stringify(this.order))
+      uni.navigateTo({ 
+        url: `/pages/manager/inspect?orderData=${orderData}` 
+      })
     },
     async onUserStatClick() {
       if (!this.order || !this.order.userId) return;
@@ -361,7 +367,7 @@ $order-card-padding: 40px 28px;
   }
 }
 .main-content {
-  margin-top: calc(150rpx + var(--status-bar-height));
+  margin-top: calc(200rpx + var(--status-bar-height));
   width: 100vw;
   min-width: 0;
   box-sizing: border-box;
@@ -545,6 +551,7 @@ $order-card-padding: 40px 28px;
       position: relative;
       min-height: 36px;
       justify-content: space-between;
+      align-items: center;
       .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; }
diff --git a/pages/manager/order.vue b/pages/manager/order.vue
index 59b01f6..5cba921 100644
--- a/pages/manager/order.vue
+++ b/pages/manager/order.vue
@@ -146,8 +146,8 @@ export default {
       searchMode: false,
       searchText: '',
       historyOrderMode: false,
-      pageNum: 1,
-      pageSize: 10,
+      pageNo: 1,
+      pageSize: 3,
       hasMore: true,
       isLoading: false,
       userId: ''
@@ -207,9 +207,10 @@ export default {
     },
     onTabChange(idx) {
       this.currentTab = idx
-      this.pageNum = 1
+      this.pageNo = 1
       this.hasMore = true
       this.orderList = []
+      this.isLoading = false
       this.fetchOrderList()
     },
     onSearchIconClick() {
@@ -236,18 +237,22 @@ export default {
     async onRefresh() {
       await this.refreshData && this.refreshData()
     },
-    fetchOrderList(isLoadMore = false) {
-      if (this.isLoading || (!isLoadMore && !this.hasMore)) return
+    fetchOrderList(isLoadMore) {
+      if (this.isLoading) return
+      if (isLoadMore && !this.hasMore) return
+      console.log(isLoadMore,'isLoadMore')
       this.isLoading = true
       const params = {
-        pageNum: this.pageNum,
+        pageNo: isLoadMore ? this.pageNo + 1 : 1,
         pageSize: this.pageSize
       }
+      console.log(params,'params')
       if (this.userId) {
         params.userId = this.userId;
       }
       this.$api && this.$api('getOrderList', params, res => {
         if (res && res.code === 200 && res.result && res.result.records) {
+          console.log(res.result,'res.result.records')
           const newOrders = res.result.records.map(order => {
             const statusInfo = this.getOrderStatusInfo(order.status, order.state)
             return {
@@ -265,13 +270,22 @@ export default {
               status: this.getOrderStatus(order.status, order.state)
             }
           })
+          
           if (isLoadMore) {
-            this.orderList = [...this.orderList, ...newOrders]
+            // 数据去重处理
+            const existingIds = new Set(this.orderList.map(order => order.id))
+            const uniqueNewOrders = newOrders.filter(order => !existingIds.has(order.id))
+            this.orderList = [...this.orderList, ...uniqueNewOrders]
+            this.pageNo = params.pageNo +1
           } else {
             this.orderList = newOrders
+            this.pageNo = 1
           }
+          
+          // 判断是否还有更多数据
           this.hasMore = newOrders.length === this.pageSize
-          this.pageNum = isLoadMore ? this.pageNum + 1 : 1
+        } else {
+          this.hasMore = false
         }
         this.isLoading = false
       })
@@ -280,13 +294,13 @@ export default {
       // if (state === 3) {
       //   return { label: '已取消', class: 'gray' }
       // }
-      if (status === 1 ) {
+      if (status === 1 && state != 3) {
         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) {
+      } else if (state ===4) {
         return { label: '已驳回', class: 'red' }
       }
       return { label: '未知状态', class: 'gray' }
@@ -305,7 +319,7 @@ export default {
       if (status === 3 ) return 3
       
       // 已驳回状态 - 快递上门终止
-      if (status === 1 && state === 3) return 4
+      if (state ===4) return 4
       
       return -1
     },
@@ -347,9 +361,10 @@ export default {
     },
   },
   onPullDownRefresh() {
-    this.pageNum = 1;
+    this.pageNo = 1;
     this.hasMore = true;
     this.orderList = [];
+    this.isLoading = false;
     this.fetchOrderList();
     uni.stopPullDownRefresh();
   },
diff --git a/pages/subcomponent/detail.vue b/pages/subcomponent/detail.vue
index e06377f..b11d266 100644
--- a/pages/subcomponent/detail.vue
+++ b/pages/subcomponent/detail.vue
@@ -111,14 +111,15 @@
           <view class="goods-item" v-for="(item, index) in clothesList" :key="index">
             <image class="goods-img" :src="item.image" mode="aspectFit"></image>
             <view class="goods-info">
-              <text class="goods-name">{{ item.name }}</text>
+              <text class="goods-name">{{ item.title }}</text>
+              <text class="desc">{{ item.pinName }}</text>
               <text class="goods-desc">{{ item.details }}</text>
               <view class="goods-meta">
                 <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.price }}</text>
+            <text class="goods-total">¥{{ item.estimatedPrice }}</text>
           </view>
         </view>
       </view>
@@ -359,7 +360,7 @@ export default {
           // 赋值页面字段
           this.address = res.result.address + (res.result.addressDetail || '')
           this.appointmentTime = res.result.goTime || ''
-          this.estimatePrice = res.result.price || ''
+          this.estimatePrice = res.result.estimatedPrice || ''
           this.finalPrice = res.result.price || ''
           this.clothesList = res.result.commonOrderList || []
           this.expressCompany = res.result.wliu || ''
@@ -750,6 +751,7 @@ letter-spacing: 0%;
   font-weight: bold;
   margin-bottom: 6rpx;
 }
+.desc { font-size: 24rpx; color: #999; margin: 4rpx 0 8rpx 0; }
 .goods-desc {
   font-size: 24rpx;
   color: #bcbcbc;
diff --git a/pages/subcomponent/promotion.vue b/pages/subcomponent/promotion.vue
index 64e9121..94387e0 100644
--- a/pages/subcomponent/promotion.vue
+++ b/pages/subcomponent/promotion.vue
@@ -165,6 +165,7 @@ export default {
   },
   onShow(){
     this.getMyPromotionInfo()
+    
   },
   onPullDownRefresh() {
     this.getUserInfoByToken()