From 10cea217bf272c330dfa2dea52f30e71c7e1db31 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 8 Nov 2022 08:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppMerchantDiscounts.vue                    | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/project/tianfuxing/AppMerchantDiscounts/AppMerchantDiscounts.vue b/project/tianfuxing/AppMerchantDiscounts/AppMerchantDiscounts.vue
index 9eee8976..7c4f60fa 100644
--- a/project/tianfuxing/AppMerchantDiscounts/AppMerchantDiscounts.vue
+++ b/project/tianfuxing/AppMerchantDiscounts/AppMerchantDiscounts.vue
@@ -5,6 +5,14 @@
       <template #content>
         <ai-search-bar>
           <template #left>
+            <ai-select
+              v-model="search.status"
+              @change="page.current = 1, getList()"
+              placeholder="状态"
+              :selectList="dict.getDict('integralDeclareStatus')">
+            </ai-select>
+          </template>
+          <template #right>
             <el-input
               v-model="search.title"
               class="search-input"
@@ -16,12 +24,6 @@
               @clear="page.current = 1, page.content = '', getList()"
               suffix-icon="iconfont iconSearch">
             </el-input>
-            <ai-select
-              v-model="search.status"
-              @change="page.current = 1, getList()"
-              placeholder="状态"
-              :selectList="dict.getDict('integralDeclareStatus')">
-            </ai-select>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" 
@@ -76,7 +78,7 @@ export default {
       return [
         {prop: "merchantName", label: "商户名称", align: "left", showOverflowTooltip: true},
         {prop: "title", label: "优惠标题", align: "center"},
-        {prop: "content", label: "优惠内容", align: "center",showOverflowTooltip: true},
+        {prop: "content", label: "优惠内容", align: "center"},
         {prop: "status", label: "状态", align: "center", dict:"integralDeclareStatus"},
         {slot: "options"},
       ]
@@ -87,6 +89,7 @@ export default {
       this.instance.post(`/appmerchantinfo/discountList`,null, {
         params: {
           ...this.page,
+          ...this.search
         }
       }).then(res=> {
         if(res?.data) {