From 2d6e69b68ff3f14775298f050cbc8c843d93cfb9 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 20 May 2022 17:01:03 +0800
Subject: [PATCH] BUG 29748

---
 src/apps/AppCreditPoints/AppIntegralOrder.vue | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppCreditPoints/AppIntegralOrder.vue b/src/apps/AppCreditPoints/AppIntegralOrder.vue
index 3db474f7..4781f1ef 100644
--- a/src/apps/AppCreditPoints/AppIntegralOrder.vue
+++ b/src/apps/AppCreditPoints/AppIntegralOrder.vue
@@ -1,7 +1,11 @@
 <template>
   <section class="AppIntegralOrder">
     <AiTopFixed>
-      <u-search v-model="search" @change="current=1,getList()" clearable :show-action="false" placeholder="搜索订单编号"/>
+      <div class="header" flex>
+        <AiAreaPicker v-model="search.areaId" :area-id="user.areaId" isForm/>
+        <u-search class="fill" v-model="search.name" @change="current=1,getList()" clearable :show-action="false" placeholder="搜索订单编号"/>
+      </div>
+
     </AiTopFixed>
     <div class="card" v-for="row in list" :key="row.id">
       <div class="header bottomBorder" flex>
@@ -38,19 +42,25 @@
 </template>
 
 <script>
+import {mapState} from "vuex";
+import AiMore from "../../components/AiMore";
 
 export default {
   name: "AppIntegralOrder",
+  components: {AiMore},
   appName: "积分超市订单",
   data() {
-    return {search: "", current: 1, list: [], pages: 0}
+    return {search: {}, current: 1, list: [], pages: 0}
+  },
+  computed: {
+    ...mapState(['user'])
   },
   methods: {
     getList() {
       let {current, search, pages} = this
       if ((!pages && current == 1) || current <= pages) {
         this.$http.post("/app/appvillagerintegralshoporder/list", null, {
-          params: {current, name: search}
+          params: {current, ...search}
         }).then(res => {
           if (res?.data) {
             res.data.records?.map(e => {
@@ -93,6 +103,7 @@ export default {
   },
   created() {
     this.$dict.load('integralOrderStatus')
+    this.search.areaId = this.user.areaId
     this.getList()
   },
   onReachBottom() {