diff --git a/pages/plugins/invoice/invoice/invoice.css b/pages/plugins/invoice/invoice/invoice.css
index 09382af3..e10b5a8b 100644
--- a/pages/plugins/invoice/invoice/invoice.css
+++ b/pages/plugins/invoice/invoice/invoice.css
@@ -2,7 +2,7 @@
 * 导航
 */
 .scroll-box-ece-nav {
-    height: calc(100vh - 312rpx);
+    height: calc(100vh - 252rpx);
 }
 
 /*
diff --git a/pages/plugins/invoice/order/order.css b/pages/plugins/invoice/order/order.css
index 0a5a6ff9..ece27f18 100644
--- a/pages/plugins/invoice/order/order.css
+++ b/pages/plugins/invoice/order/order.css
@@ -1,6 +1,10 @@
 /*
 * 列表
 */
+.select-scroll-box {
+    height: calc(100vh - 182rpx);
+}
+
 .data-list .item .select-icon {
     width: 35rpx;
     height: 35rpx !important;
@@ -10,8 +14,9 @@
 * 合并按钮
 */
 .invoice-merge-submit {
-    padding: 42rpx 46rpx;
+    padding: 44rpx 90rpx;
     z-index: 0;
+    box-shadow: inset 0px 1px 3px 0px rgba(0, 0, 0, 0.08);
 }
 
 .invoice-merge-submit button {
diff --git a/pages/plugins/invoice/order/order.vue b/pages/plugins/invoice/order/order.vue
index d51cb428..838e6adb 100644
--- a/pages/plugins/invoice/order/order.vue
+++ b/pages/plugins/invoice/order/order.vue
@@ -1,8 +1,8 @@
 <template>
     <view>
-        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
-            <view class="data-list">
-                <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+        <view v-if="data_list.length > 0" class="data-list">
+            <scroll-view :scroll-y="true" :class="select_ids.length > 0 ? 'select-scroll-box' : 'scroll-box'" @scrolltolower="scroll_lower" lower-threshold="60">
+                <view class="padding-horizontal-main padding-top-main">
                     <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
                         <view class="base oh br-b-dashed padding-bottom-main">
                             <iconfont
@@ -31,21 +31,19 @@
                             <button class="round bg-white br-grey-9 text-size-md" type="default" size="mini" hover-class="none" :data-ids="item.id" data-type="item" @tap="invoice_event">开票</button>
                         </view>
                     </view>
-
-                    <!-- 合并开票 -->
-                    <view class="bottom-fixed bg-white invoice-merge-submit">
-                        <button v-if="select_ids.length > 0" class="bg-white cr-main br-main round wh-auto" type="default" size="mini" hover-class="none" data-type="all" @tap="invoice_event">合并开票</button>
-                    </view>
+                    <!-- 结尾 -->
+                    <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
                 </view>
-                <view v-else>
-                    <!-- 提示信息 -->
-                    <component-no-data :propStatus="data_list_loding_status"></component-no-data>
-                </view>
-
-                <!-- 结尾 -->
-                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            </scroll-view>
+            <!-- 合并开票 -->
+            <view v-if="select_ids.length > 0" class="bottom-fixed bg-white invoice-merge-submit">
+                <button class="bg-white cr-main br-main round wh-auto" type="default" size="mini" hover-class="none" data-type="all" @tap="invoice_event">合并开票</button>
             </view>
-        </scroll-view>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </view>
     </view>
 </template>
 <script>