From 194f840e3e49fc004aed72d17b11d96f2d287973 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 16 Sep 2025 22:01:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=92=8C=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=85=B3?=
 =?UTF-8?q?=E9=94=AE=E5=AD=97=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    | 14 +++++
 .../orderallot-list/orderallot-list.vue       | 51 ++++++++++++++--
 pages/plugins/shop/index/index.vue            |  2 +-
 pages/user-order/user-order.css               |  6 +-
 pages/user-order/user-order.vue               | 61 ++++++++++++++-----
 5 files changed, 110 insertions(+), 24 deletions(-)

diff --git a/pages.json b/pages.json
index f6aa9d78..9cd08e38 100644
--- a/pages.json
+++ b/pages.json
@@ -319,6 +319,13 @@
                 {
                     "path": "user-order",
                     "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": ""
                     }
@@ -1486,6 +1493,13 @@
                 {
                     "path": "orderallot-list/orderallot-list",
                     "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": ""
                     }
diff --git a/pages/plugins/realstore/orderallot-list/orderallot-list.vue b/pages/plugins/realstore/orderallot-list/orderallot-list.vue
index 6ffbab68..1399f0fe 100644
--- a/pages/plugins/realstore/orderallot-list/orderallot-list.vue
+++ b/pages/plugins/realstore/orderallot-list/orderallot-list.vue
@@ -1,5 +1,13 @@
 <template>
     <view :class="theme_view">
+        <!-- 搜索 -->
+        <component-nav-back :propFixed="false" propClass="bg-white cr-black" propColor="#333" :style="'padding-top:' + status_bar_height + 'px;'">
+            <template slot="right" :class="is_mp_env ? 'top-search-width' : ''">
+                <view class="margin-left-main" :class="is_mp_env ? '' : 'flex-1 flex-width'">
+                    <component-search @onsearch="search_button_event" :propDefaultValue="search_keywords" :propIsOnEvent="true" :propIsRequired="false" propIconColor="#ccc" propPlaceholderClass="cr-grey-c" propBgColor="#f6f6f6"></component-search>
+                </view>
+            </template>
+        </component-nav-back>
         <!-- 导航 -->
         <view class="nav-base bg-white">
             <block v-for="(item, index) in nav_status_list" :key="index">
@@ -7,9 +15,8 @@
                 <view v-else class="item fl tc" :data-index="index" @tap="nav_event">{{ item.name }}</view>
             </block>
         </view>
-
         <!-- 数据列表 -->
-        <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+        <scroll-view :scroll-y="true" class="scroll-box" :style="content_style" @scrolltolower="scroll_lower" lower-threshold="60">
             <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main">
                 <view v-for="(item, index) in data_list" :key="index" class="list-item padding-horizontal-main padding-top-main border-radius-main bg-white oh spacing-mb">
                     <view class="item-base oh br-b padding-bottom-main">
@@ -95,14 +102,28 @@
 <script>
     const app = getApp();
     import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentSearch from '@/components/search/search';
     import componentNoData from "@/components/no-data/no-data";
     import componentBottomLine from "@/components/bottom-line/bottom-line";
     import componentPayment from '@/components/payment/payment';
 
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    // #ifdef MP-TOUTIAO || H5
+    bar_height = 0;
+    // #endif
     export default {
         data() {
             return {
                 theme_view: app.globalData.get_theme_value_view(),
+                client_type: app.globalData.application_client_type(),
+                status_bar_height: bar_height,
+                is_mp_env: false,
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-ALIPAY || MP-QQ || MP-KUAISHOU
+                is_mp_env: true,
+                // #endif
+                params: {},
                 data_list: [],
                 data_total: 0,
                 data_page_total: 0,
@@ -110,7 +131,8 @@
                 data_list_loding_status: 1,
                 data_bottom_line_status: false,
                 data_is_loading: 0,
-                params: null,
+                search_keywords: '',
+                content_style: '',
                 nav_status_list: [
                     { name: this.$t('common.all'), value: "-1" },
                     { name: this.$t('extraction.extraction.53h4fj'), value: "0,1" },
@@ -139,6 +161,8 @@
 
         components: {
             componentCommon,
+            componentNavBack,
+            componentSearch,
             componentNoData,
             componentBottomLine,
             componentPayment
@@ -148,6 +172,9 @@
             // 调用公共事件方法
             app.globalData.page_event_onload_handle(params);
 
+            // 参数处理
+            params = app.globalData.launch_params_handle(params);
+
             // 是否指定状态
             var nav_status_index = 0;
             if ((params.status || null) != null) {
@@ -161,6 +188,8 @@
             this.setData({
                 params: params,
                 nav_status_index: nav_status_index,
+                search_keywords: params.keywords || '',
+                content_style: 'height: calc(100vh - 80rpx - '+(this.status_bar_height+(this.client_type == 'h5' ? 55 : 50))+'px);',
             });
 
             // 初始化配置
@@ -257,6 +286,7 @@
                     method: "POST",
                     data: {
                         page: this.data_page,
+                        keywords: this.search_keywords,
                         status: status,
                         oid: this.params.oid || 0,
                     },
@@ -376,7 +406,6 @@
                     temp_pay_index: index,
                     payment_id: payment_id,
                     pay_price: e.currentTarget.dataset.price,
-                    order_select_ids: [],
                 });
             },
 
@@ -523,6 +552,20 @@
             url_event(e) {
                 app.globalData.url_event(e);
             },
+
+            // 关键字搜索
+            search_button_event(e) {
+                this.setData({
+                    search_keywords: e,
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                
+                // 重新拉取数据
+                this.get_data_list(1);
+            },
         },
     };
 </script>
diff --git a/pages/plugins/shop/index/index.vue b/pages/plugins/shop/index/index.vue
index 504dd586..a2ac852e 100644
--- a/pages/plugins/shop/index/index.vue
+++ b/pages/plugins/shop/index/index.vue
@@ -316,7 +316,7 @@
             // 关键字搜索
             search_button_event(e) {
                 this.setData({
-                    search_keywords: e || '',
+                    search_keywords: e,
                     data_page: 1,
                     data_list: [],
                     data_list_loding_status: 1,
diff --git a/pages/user-order/user-order.css b/pages/user-order/user-order.css
index 085b3c29..359f9f69 100644
--- a/pages/user-order/user-order.css
+++ b/pages/user-order/user-order.css
@@ -3,11 +3,7 @@
 */
 .nav-base .item {
     width: 16.66%;
-}
-
-.order-scroll {
-    height: calc(100vh - 80rpx);
-}
+}
 
 /*
 * 列表
diff --git a/pages/user-order/user-order.vue b/pages/user-order/user-order.vue
index b6849586..1c5e37ee 100644
--- a/pages/user-order/user-order.vue
+++ b/pages/user-order/user-order.vue
@@ -1,5 +1,13 @@
 <template>
     <view :class="theme_view">
+        <!-- 搜索 -->
+        <component-nav-back :propFixed="false" propClass="bg-white cr-black" propColor="#333" :style="'padding-top:' + status_bar_height + 'px;'">
+            <template slot="right" :class="is_mp_env ? 'top-search-width' : ''">
+                <view class="margin-left-main" :class="is_mp_env ? '' : 'flex-1 flex-width'">
+                    <component-search @onsearch="search_button_event" :propDefaultValue="search_keywords" :propIsOnEvent="true" :propIsRequired="false" propIconColor="#ccc" propPlaceholderClass="cr-grey-c" propBgColor="#f6f6f6"></component-search>
+                </view>
+            </template>
+        </component-nav-back>
         <!-- 导航 -->
         <view class="nav-base bg-white">
             <block v-for="(item, index) in nav_status_list" :key="index">
@@ -7,9 +15,8 @@
                 <view v-else class="item fl tc" :data-index="index" @tap="nav_event">{{ item.name }}</view>
             </block>
         </view>
-
         <!-- 订单列表 -->
-        <scroll-view :scroll-y="true" class="order-scroll" @scrolltolower="scroll_lower" lower-threshold="60">
+        <scroll-view :scroll-y="true" class="order-scroll" :style="content_style" @scrolltolower="scroll_lower" lower-threshold="60">
             <view :class="nav_status_index == 1 && order_select_ids.length > 0 && home_is_enable_order_bulk_pay == 1 ? 'page-bottom-fixed' : ''">
                 <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main">
                     <view v-for="(item, index) in data_list" :key="index" class="list-item padding-horizontal-main padding-top-main border-radius-main bg-white oh spacing-mb">
@@ -128,12 +135,19 @@
     const app = getApp();
     import base64 from '@/common/js/lib/base64.js';
     import componentCommon from '@/components/common/common';
+    import componentNavBack from '@/components/nav-back/nav-back';
+    import componentSearch from '@/components/search/search';
     import componentPopup from '@/components/popup/popup';
     import componentNoData from '@/components/no-data/no-data';
     import componentBottomLine from '@/components/bottom-line/bottom-line';
     import componentPayment from '@/components/payment/payment';
 
     var common_static_url = app.globalData.get_static_url('common');
+    // 状态栏高度
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
+    // #ifdef MP-TOUTIAO || H5
+    bar_height = 0;
+    // #endif
     export default {
         data() {
             return {
@@ -141,6 +155,13 @@
                 theme_color: app.globalData.get_theme_color(),
                 common_static_url: common_static_url,
                 bottom_fixed_style: '',
+                client_type: app.globalData.application_client_type(),
+                status_bar_height: bar_height,
+                is_mp_env: false,
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-ALIPAY || MP-QQ || MP-KUAISHOU
+                is_mp_env: true,
+                // #endif
+                params: {},
                 data_list: [],
                 data_total: 0,
                 data_page_total: 0,
@@ -148,7 +169,8 @@
                 data_list_loding_status: 1,
                 data_bottom_line_status: false,
                 data_is_loading: 0,
-                input_keyword_value: '',
+                search_keywords: '',
+                content_style: '',
                 nav_status_list: [
                     { name: this.$t('common.all'), value: '-1' },
                     { name: this.$t('user.user.9u8e61'), value: '1' },
@@ -163,8 +185,6 @@
                 nav_status_index: 0,
                 // 基础配置
                 home_is_enable_order_bulk_pay: 0,
-                // 页面从其他页面跳转过来携带的参数
-                params: {},
                 // 前往页面携带的参数
                 payment_currency_symbol: app.globalData.currency_symbol(),
                 pay_price: 0,
@@ -184,6 +204,8 @@
 
         components: {
             componentCommon,
+            componentNavBack,
+            componentSearch,
             componentPopup,
             componentNoData,
             componentBottomLine,
@@ -194,6 +216,9 @@
             // 调用公共事件方法
             app.globalData.page_event_onload_handle(params);
 
+            // 参数处理
+            params = app.globalData.launch_params_handle(params);
+
             // 是否指定状态
             var nav_status_index = 0;
             if ((params.status || null) != null) {
@@ -205,8 +230,10 @@
                 }
             }
             this.setData({
+                params: params,
                 nav_status_index: nav_status_index,
-                params: params || {},
+                search_keywords: params.keywords || '',
+                content_style: 'height: calc(100vh - 80rpx - '+(this.status_bar_height+(this.client_type == 'h5' ? 55 : 50))+'px);',
             });
 
             // 初始化配置
@@ -269,13 +296,6 @@
                 }
             },
 
-            // 输入框事件
-            input_event(e) {
-                this.setData({
-                    input_keyword_value: e.detail.value,
-                });
-            },
-
             // 获取数据
             get_data_list(is_mandatory) {
                 // 分页是否还有数据
@@ -311,7 +331,7 @@
                     method: 'POST',
                     data: {
                         page: this.data_page,
-                        keywords: this.input_keyword_value || '',
+                        keywords: this.search_keywords,
                         status: order_status,
                         is_more: 1,
                     },
@@ -819,6 +839,19 @@
                     },
                 });
             },
+
+            // 关键字搜索
+            search_button_event(e) {
+                this.setData({
+                    search_keywords: e,
+                    order_select_ids: [],
+                    data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
+                    data_bottom_line_status: false
+                });
+                this.get_data_list(1);
+            },
         },
     };
 </script>