From 41115bb4b6d0161ff6d2c15ef6b3d5386a14ac9c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 02 三月 2026 16:40:54 +0800
Subject: [PATCH] 合并
---
admin/src/components/business/OperaIntegralShopMoneyWindow.vue | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/admin/src/components/business/OperaIntegralShopMoneyWindow.vue b/admin/src/components/business/OperaIntegralShopMoneyWindow.vue
index ca830d8..b769f97 100644
--- a/admin/src/components/business/OperaIntegralShopMoneyWindow.vue
+++ b/admin/src/components/business/OperaIntegralShopMoneyWindow.vue
@@ -2,11 +2,12 @@
<GlobalWindow
:title="title"
width="100%"
+ :withFooter="false"
:visible.sync="visible"
>
<TableLayout :permissions="['business:integral:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" id='curSearchForm' :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" id='curSearchForm' :model="searchForm" label-width="100px" >
<el-form-item label="" prop="type">
<el-select v-model="searchForm.type" placeholder="璇烽�夋嫨鏀舵敮绫诲瀷" @change="search" >
<el-option :key="0" :value="0" label="鏀跺叆"></el-option>
@@ -24,7 +25,6 @@
<el-option :key="20" :value="25" label="璁㈠崟缁撶畻閫�鍥�"></el-option>
</el-select>
</el-form-item>
- <div class="date-style" style="display: inline">
<el-form-item label="浜ゆ槗鏃堕棿" prop="starttime" >
<el-date-picker
style="width: 190px"
@@ -49,7 +49,6 @@
placeholder="鎴鏃堕棿"
></el-date-picker>
</el-form-item>
- </div>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button type="primary" :loading="isWorking.export" v-permissions="['business:integral:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
@@ -61,7 +60,6 @@
<el-table
v-loading="isWorking.search"
:data="tableData.list"
- :height="tableHeight"
stripe
border
>
@@ -155,10 +153,10 @@
}
</script>
<style scoped>
-.table-pagination{
+/*.table-pagination{
position: fixed !important;
- bottom: 50px;
-}
+ bottom: 0px;
+}*/
.header-b{
display: inline-block;
font-size: 16px;
--
Gitblit v1.9.3