diff --git a/src/pages/order-list/index.vue b/src/pages/order-list/index.vue
index 1230f05..7109414 100644
--- a/src/pages/order-list/index.vue
+++ b/src/pages/order-list/index.vue
@@ -18,12 +18,24 @@
 
 
         <scroll-view scroll-y style="padding: 10px; box-sizing: border-box" @scrolltolower="onScrollToLower">
-                <van-search
-                v-model="orderQueryParams.keyWord"
-                placeholder="请输入搜索内容"
-                @search="onSearch"
-                style="margin-bottom: 10px"
-                />
+
+                    <view style="display: flex; align-items: center;margin-bottom:10px">
+                        <van-field
+                            v-model="orderQueryParams.keyWord"
+                            placeholder="请输入搜索内容"
+                            @keydown.enter="onSearch"
+                            style="flex: 1; margin-bottom: 0;"
+                        />
+                        <van-button 
+                            type="primary" 
+                            size="small" 
+                            @click="onSearch" 
+                            style="width: 50px; margin-left: 10px;"
+                        >
+                            查询
+                        </van-button>
+                    </view>
+
             <view
                 class="order-set"
                 v-for="item in orderList"
@@ -589,19 +601,31 @@
 
         <!-- 新增弹窗部分 -->
         <van-popup v-model:show="showPickUpCodeTwo" position="center">
-            <div style="padding: 20px;">
+            <van-form  ref="pickupCodeFormRef">
+                <div style="padding: 20px;">
 
-                <van-field
-                    v-model="pickUpCodeForm.pickUpCode"
-                    label="取件码"
-                    placeholder="请输入取件码"
-                    required
-                />
-            <div style="display: flex; justify-content: flex-end; margin-top: 20px;">
-                <van-button type="primary" size="mini" @click="submitPickupCode" style="margin-right: 10px;">提交</van-button>
-                <van-button size="mini" @click="showPickUpCodeTwo = false">关闭</van-button>
-            </div>
-            </div>
+                    <van-field
+                        v-model="pickUpCodeForm.pickUpCode"
+                        label="取件码"
+                        placeholder="请输入取件码"
+                        :rules="[{ required: true, message: '请输入取件码' }]"
+                        required
+                    />
+                    <van-field
+                        v-model="pickUpCodeForm.orderRemark"
+                        label="备注"
+                        placeholder="请输入备注"
+                        type="textarea"
+                        :rows="2"
+                        :rules="[{ required: true, message: '请输入备注' }]"
+                        required
+                    />
+                <div style="display: flex; justify-content: flex-end; margin-top: 20px;">
+                    <van-button type="primary" size="mini" @click="submitPickupCode" style="margin-right: 10px;">提交</van-button>
+                    <van-button size="mini" @click="closeSubmit">关闭</van-button>
+                </div>
+                </div>
+            </van-form>
         </van-popup>
     </view>
 </template>
@@ -638,9 +662,11 @@ const orderQueryParams = ref({
     keyWord: '',
 })
 const pickUpCodeRef = ref(null); 
+const pickupCodeFormRef = ref(null);
 const submitPickupCode =  async() => {
     try {
-        console.log("222222222222",pickUpCodeForm.value.pickUpCode)
+         await pickupCodeFormRef.value.validate();
+         console.log("xxxxxxxxxxxxxxxxxxxxxxxxxs")
         if(pickUpCodeForm.value.pickUpCode==null || pickUpCodeForm.value.pickUpCode==''){
             console.log('cvssssssssssssss')
             showPickUpCodeTwo.value = false
@@ -655,18 +681,20 @@ const submitPickupCode =  async() => {
             const editParamsOne = {
                 orderId:itemTemp.value.orderId,
                 orderStatus: 4,
-                pickupCode:pickUpCodeForm.value.pickUpCode
+                pickupCode:pickUpCodeForm.value.pickUpCode,
+                orderRemark:pickUpCodeForm.value.orderRemark,
             }
-
+             showPickUpCodeTwo.value = false
              const res = await editOrderStatusAPI(editParamsOne)
-                showPickUpCodeTwo.value = false
-            console.log("bbbbbbbbbbbbb")
+             console.log("ppppppppppppppp",res)
+
             if (res.code === 200) {
                  showPickUpCodeTwo.value = false
                         uni.showToast({
                             title: '出库成功',
                             icon: 'none'
                         });
+                console.log("22222222222222")
                 orderQueryParams.value.pageNum = 1
                 getOrderListData()
             }else{
@@ -686,6 +714,15 @@ const submitPickupCode =  async() => {
     }
 }
 
+const closeSubmit = () => {
+    // 清除表单验证
+    if (pickupCodeFormRef.value) {
+        pickupCodeFormRef.value.resetValidation();
+    }
+    showPickUpCodeTwo.value = false
+
+}
+
 const submitParams = ref({
     code: '',
     orderId: '',
@@ -959,6 +996,7 @@ const onSubmitCode =  (item, status) => {
         itemTemp.value = item
         statusTemp.value = status
         pickUpCodeForm.value.pickUpCode = ''
+        pickUpCodeForm.value.orderRemark = ''
         // 显示弹窗
         showPickUpCodeTwo.value = true;
 };