From 28f52973f37277db3a545db41bf08249465b2429 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 30 Nov 2022 16:17:55 +0800
Subject: [PATCH] bug

---
 project/pidu/app/AppGoods/components/List.vue |  6 ++--
 project/pidu/app/AppOrder/components/List.vue | 31 ++++++++++++-------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/project/pidu/app/AppGoods/components/List.vue b/project/pidu/app/AppGoods/components/List.vue
index 4a689953..11b066c5 100644
--- a/project/pidu/app/AppGoods/components/List.vue
+++ b/project/pidu/app/AppGoods/components/List.vue
@@ -29,12 +29,12 @@
         </template>
         <template #right>
           <el-input
-            v-model="search.name"
+            v-model="search.merchandiseName"
             size="small"
             placeholder="请输入商品名称"
             clearable
             v-throttle="() => {search.current = 1, getList()}"
-            @clear="search.current = 1, search.name = '', getList()"
+            @clear="search.current = 1, search.merchandiseName = '', getList()"
             suffix-icon="iconfont iconSearch">
           </el-input>
         </template>
@@ -85,7 +85,7 @@
         search: {
           current: 1,
           size: 10,
-          name: '',
+          merchandiseName: '',
           girdId: ''
         },
         name: '',
diff --git a/project/pidu/app/AppOrder/components/List.vue b/project/pidu/app/AppOrder/components/List.vue
index bbf49eb1..63bdc768 100644
--- a/project/pidu/app/AppOrder/components/List.vue
+++ b/project/pidu/app/AppOrder/components/List.vue
@@ -8,7 +8,7 @@
     <template slot="content">
       <ai-search-bar bottomBorder>
         <template #left>
-          <ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false">
+          <ai-user-selecter v-model="user" :instance="instance" @change="onUserChange" :isMultiple="false">
             <div class="userSelcet">
               <span style="color: #606266;" v-if="search.consumerId">{{ name }}</span>
               <span v-else>兑换人</span>
@@ -24,7 +24,7 @@
             @change="search.current = 1, getList()">
           </ai-select>
           <el-date-picker
-            v-model="search.queryBeginTime"
+            v-model="search.createTimeStart"
             type="date"
             size="small"
             value-format="yyyy-MM-dd"
@@ -32,7 +32,7 @@
             @change="search.current = 1, getList()">
           </el-date-picker>
           <el-date-picker
-            v-model="search.queryEndTime"
+            v-model="search.createTimeEnd"
             type="date"
             size="small"
             value-format="yyyy-MM-dd"
@@ -120,7 +120,9 @@
           size: 10,
           merchandiseName: '',
           orderStatus: '',
-          consumerId: ''
+          consumerId: '',
+          createTimeStart: '',
+          createTimeEnd: ''
         },
         id: '',
         form: {
@@ -134,8 +136,8 @@
           { slot: 'goods', label: '商品' },
           { prop: 'merchandiseIntegral', align: 'center', label: '单价' },
           { prop: 'merchandiseNumber', align: 'center', label: '数量' },
-          // { 
-          //   prop: 'areaName', label: '活动地区', align: 'center' , 
+          // {
+          //   prop: 'areaName', label: '活动地区', align: 'center' ,
           //   render: (h, params) => {
           //     return h('span', {
           //     }, params.row.areaName)
@@ -170,8 +172,16 @@
     },
 
     methods: {
-      onUserChange () {
-        
+      onUserChange (e) {
+        if (e.length) {
+          this.name = e[0].name
+          this.search.consumerId = e[0].id
+        } else {
+          this.search.consumerId = ''
+        }
+        this.search.current = 1
+
+        this.getList()
       },
 
       onConfirm() {
@@ -196,10 +206,7 @@
       getList () {
         this.instance.post(`/app/appintegralmerchandiseorder/list`, null, {
           params: {
-            ...this.search,
-            arriveAreaId: this.search.arriveAreaId,
-            queryBeginTime: this.search.queryBeginTime ? this.search.queryBeginTime + ' 00:00:00' : '',
-            queryEndTime: this.search.queryEndTime ? this.search.queryEndTime + ' 23:59:59' : ''
+            ...this.search
           }
         }).then(res => {
           if (res.code == 0) {